update changelog

The web page for the tool has moved to the Salus home page, so we no longer need a mkdocs file to generate the home page. But we keep the other docs around for reference.

EDBGS.sln

@@ -5,7 +5,14 @@ VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EDPlayerJournal", "EDPlayerJournal\EDPlayerJournal.csproj", "{8148BB04-148E-41E4-A344-8E735E188BEE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDPlayerJournalTests", "EDPlayerJournalTests\EDPlayerJournalTests.csproj", "{63F80451-B9DC-4B80-8DAD-03C7D587D54A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EDPlayerJournalTests", "EDPlayerJournalTests\EDPlayerJournalTests.csproj", "{63F80451-B9DC-4B80-8DAD-03C7D587D54A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EliteBGS", "EliteBGS\EliteBGS.csproj", "{14B03115-B9D5-4006-A993-9A5069BB172E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1381D5DE-139E-4FEC-BDC4-A3FDADEAEE5C}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +28,10 @@ Global
 		{63F80451-B9DC-4B80-8DAD-03C7D587D54A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{63F80451-B9DC-4B80-8DAD-03C7D587D54A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{63F80451-B9DC-4B80-8DAD-03C7D587D54A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14B03115-B9D5-4006-A993-9A5069BB172E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14B03115-B9D5-4006-A993-9A5069BB172E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14B03115-B9D5-4006-A993-9A5069BB172E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14B03115-B9D5-4006-A993-9A5069BB172E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

EDPlayerJournal/BGS-ODDITIES.md

@@ -16,6 +16,22 @@ the game:
 }
 ```
 
+## Bounty vouchers show up twice
+
+Sometimes bounty vouchers are redeemed twice. This happens because FDev writes out two
+`RedeemVoucher` entries with the same values:
+
+```
+{ "timestamp":"2022-11-20T14:30:30Z", "event":"RedeemVoucher", "Type":"bounty", "Amount":3197549,
+  "Factions":[ { "Faction":"Nova Paresa", "Amount":3197549 } ] }
+{ "timestamp":"2022-11-20T14:30:34Z", "event":"RedeemVoucher", "Type":"bounty", "Amount":4785831,
+  "Factions":[ { "Faction":"", "Amount":723175 }, { "Faction":"Nova Paresa", "Amount":3197549 }, { "Faction":"Prismatic Imperium", "Amount":4062656 } ] }
+```
+
+Two separate events (apart by four seconds) containing the same entries twice. This
+happens when you turn in one bounty manually, and then click the "redeem all" button
+again, which contains the already turned in vouchers.
+
 ## Combat zones
 
 Combat zones receive no mention within the player journal whatsoever. There is no event

EDPlayerJournal/BGS/Cartographics.cs

@@ -1,10 +1,11 @@
-using System.Linq;
-using System.Text;
+using System.Text;
 using EDPlayerJournal.Entries;
 
 namespace EDPlayerJournal.BGS;
 
 public class Cartographics : Transaction {
+    public Cartographics() { }
+
     public Cartographics(MultiSellExplorationDataEntry e) {
         Entries.Add(e);
     }
@@ -34,10 +35,10 @@ public class Cartographics : Transaction {
             /* add multi sell and normal ones together */
             long total =
                 Entries.OfType<MultiSellExplorationDataEntry>()
-                .Sum(x => x.TotalEarnings)
+                .Sum(x => x.Total)
                 +
                 Entries.OfType<SellExplorationDataEntry>()
-                .Sum(x => x.TotalEarnings)
+                .Sum(x => x.Total)
                 ;
             return total;
         }

EDPlayerJournal/BGS/CombatZone.cs

@@ -3,17 +3,95 @@ using System.Linq;
 
 namespace EDPlayerJournal.BGS; 
 public class CombatZone : Transaction {
-    public string Type { get; set; } = "";
-    public string Grade { get; set; } = "";
-    public int Amount { get; set; } = 0;
-    public DateTime Completed { get; set; } = DateTime.UtcNow;
+    /// <summary>
+    /// Type, either on foot or ship
+    /// </summary>
+    public string Type { get; set; } = CombatZones.ShipCombatZone;
 
-    public override string CompletedAt {
+    /// <summary>
+    /// Difficulty type, low, medium or high. Null means unknown.
+    /// </summary>
+    public string? Grade { get; set; }
+
+    /// <summary>
+    /// Whether spec ops were won.
+    /// </summary>
+    public bool? SpecOps { get; set; }
+
+    /// <summary>
+    /// Whether allied captain objective was won
+    /// </summary>
+    public bool? AlliedCaptain { get; set; }
+
+    /// <summary>
+    /// Whether enemy captain objective was won
+    /// </summary>
+    public bool? EnemyCaptain { get; set; }
+
+    /// <summary>
+    /// Whether the allied correspondent objective was won
+    /// </summary>
+    public bool? AlliedCorrespondent { get; set; }
+
+    /// <summary>
+    /// Whether the enemy correspondent objective was won
+    /// </summary>
+    public bool? EnemyCorrespondent { get; set; }
+
+    /// <summary>
+    /// Whether cap ship objective was won
+    /// </summary>
+    public bool? CapitalShip { get; set; }
+
+    /// <summary>
+    /// If we have a combat zone, this might point to the settlement
+    /// in question.
+    /// </summary>
+    public string? Settlement { get; set; }
+
+    /// <summary>
+    /// How many optional objectives were completed?
+    /// </summary>
+    public int OptionalObjectivesCompleted {
         get {
-            return Completed.ToString("dd.MM.yyyy HH:mm UTC");
+            if (IsGround) {
+                return 0;
+            }
+            return new List<bool?>() { 
+                SpecOps, 
+                AlliedCaptain,
+                EnemyCaptain,
+                AlliedCorrespondent,
+                EnemyCorrespondent,
+                CapitalShip 
+            }
+                .Where(x => x != null && x == true)
+                .Count()
+                ;
         }
     }
 
+    /// <summary>
+    /// Returns true if it is an on foot/ground combat zone
+    /// </summary>
+    public bool IsGround {
+        get { return string.Compare(Type, CombatZones.GroundCombatZone) == 0; }
+    }
+
+    /// <summary>
+    /// Returns true if it is an on foot combat zone
+    /// </summary>
+    public bool IsShip {
+        get { return string.Compare(Type, CombatZones.ShipCombatZone) == 0; }
+    }
+
+    /// <summary>
+    /// Returns true if it is a thargoid combat zone
+    /// </summary>
+    public bool IsThargoid {
+        get { return string.Compare(Type, CombatZones.AXCombatZone) == 0; }
+    }
+
     public override int CompareTo(Transaction? obj) {
         if (obj == null || obj.GetType() != typeof(CombatZone)) {
             return -1;
@@ -36,7 +114,10 @@ public class CombatZone : Transaction {
     }
 
     public override string ToString() {
-        return string.Format("Won {0} x {1} {2} Combat Zone(s) for {3}",
-            Amount, Grade, Type, Faction);
+        if (!string.IsNullOrEmpty(Grade)) {
+            return string.Format("Won {0} {1} Combat Zone", Grade, Type);
+        } else {
+            return string.Format("Won {0} Combat Zone", Type);
+        }
     }
 }

EDPlayerJournal/BGS/FactionKillBonds.cs

@@ -2,11 +2,11 @@
 
 namespace EDPlayerJournal.BGS; 
 public class FactionKillBonds : Transaction {
-    public int TotalSum {
+    public ulong TotalSum {
         get {
-            return Entries
+            return (ulong)Entries
                 .OfType<FactionKillBondEntry>()
-                .Sum(x => x.Reward)
+                .Sum(x => (decimal)x.Reward)
                 ;
         }
     }

EDPlayerJournal/BGS/IncompleteTransaction.cs

@@ -1,12 +1,16 @@
-namespace EDPlayerJournal.BGS; 
-internal class IncompleteTransaction : Transaction {
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+public class IncompleteTransaction : Transaction {
     public Transaction? UnderlyingTransaction { get; set; } = null;
     public string Reason { get; set; } = "";
 
     public IncompleteTransaction() { }
 
-    public IncompleteTransaction(Transaction? underlying, string reason) {
+    public IncompleteTransaction(Transaction? underlying, string reason, Entry entry) {
         UnderlyingTransaction = underlying;
         Reason = reason;
+        Entries.Add(entry);
     }
 }

EDPlayerJournal/BGS/InfluenceSupport.cs

@@ -9,15 +9,24 @@ namespace EDPlayerJournal.BGS;
 /// faction to another. Both sometimes gain influence.
 /// </summary>
 public class InfluenceSupport : Transaction {
-    public string Influence { get; set; } = "";
+    public MissionInfluence? Influence { get; set; } = null;
+
+    /// <summary>
+    /// Relevant mission completed entry
+    /// </summary>
     public MissionCompletedEntry? RelevantMission { get; set; }
 
-    public override string CompletedAt {
+    /// <summary>
+    /// Mission information
+    /// </summary>
+    public Mission? Mission { get; set; }
+
+    public override DateTime? CompletedAtDateTime {
         get { 
             if (RelevantMission == null) {
-                return "";
+                return null;
             }
-            return RelevantMission.Timestamp.ToString("dd.MM.yyyy hh:mm UTC"); 
+            return RelevantMission.Timestamp; 
         }
     }
 
@@ -26,7 +35,7 @@ public class InfluenceSupport : Transaction {
         string? missionname;
 
         if (RelevantMission != null && RelevantMission.Mission != null) {
-            missionname = RelevantMission.Mission.LocalisedName;
+            missionname = RelevantMission.Mission.FriendlyName;
         } else {
             missionname = "UNKNOWN MISSION";
         }
@@ -37,7 +46,7 @@ public class InfluenceSupport : Transaction {
 
         builder.AppendFormat("Influence gained from \"{0}\": \"{1}\"",
             missionname,
-            string.IsNullOrEmpty(Influence) ? "NONE" : Influence
+            Influence == null ? "NONE" : Influence.TrendAdjustedInfluence
             );
 
         return builder.ToString();

EDPlayerJournal/BGS/MissionCompleted.cs

@@ -1,58 +1,86 @@
-using System.Text;
+using System.Collections.Generic;
+using System.Text;
 using EDPlayerJournal.Entries;
 
 namespace EDPlayerJournal.BGS;
 
 public class MissionCompleted : Transaction {
+    public MissionCompletedEntry? CompletedEntry { get; set; }
+
+    public MissionAcceptedEntry? AcceptedEntry { get; set; }
+
+    public Mission? Mission { get; set; }
+
     public MissionCompleted() { }
-    public MissionCompleted(MissionCompletedEntry e) {
-        Entries.Add(e);
+
+    public override DateTime? CompletedAtDateTime {
+        get {
+            if (CompletedEntry == null) {
+                return null;
+            }
+            return CompletedEntry.Timestamp;
+        }
     }
 
     public string MissionName {
         get {
-            MissionCompletedEntry? c = Entries[0] as MissionCompletedEntry;
-            if (c == null || c.Mission == null) {
+            if (CompletedEntry == null || CompletedEntry.Mission == null) {
                 return "";
             }
 
-            if (string.IsNullOrEmpty(c.Mission.LocalisedName)) {
-                return (c.Mission.Name ?? "");
-            } else {
-                return c.Mission.LocalisedName;
-            }
+            return CompletedEntry.Mission.FriendlyName;
         }
     }
 
     public string Influence {
         get {
-            MissionCompletedEntry? e = (Entries[0] as MissionCompletedEntry);
-
-            if (e == null || Faction == null || e.Mission == null) {
+            if (CompletedEntry == null || Faction == null || CompletedEntry.Mission == null) {
                 return "";
             }
 
-            return (e.Mission.GetInfluenceForFaction(Faction, SystemAddress) ?? "");
+            return string.Join("",
+                CompletedEntry
+                .Mission
+                .GetInfluenceForFaction(Faction, SystemAddress)
+                .Select(x => x.Influence)
+                .ToArray()
+                )
+                ;
+        }
+    }
+
+    /// <summary>
+    /// Rescue missions contribute to the system.
+    /// </summary>
+    public override bool SystemContribution {
+        get {
+            if (Mission == null || Mission.Name == null) {
+                return false;
+            }
+
+            // If the mission starts with the name for thargoid war mission
+            // names, we assume its a system contribution
+            if (Mission.Name.Contains("Mission_TW_")) {
+                return true;
+            }
+
+            return false;
         }
     }
 
     public override string ToString() {
-        if (Faction == null || Entries.Count <= 0) {
+        if (Faction == null || CompletedEntry == null || CompletedEntry.Mission == null) {
             return "";
         }
 
         StringBuilder builder = new StringBuilder();
-        var entry = Entries[0] as MissionCompletedEntry;
-
-        if (entry == null || entry.Mission == null) {
-            return "";
-        }
-
-        var influence = entry.Mission.GetInfluenceForFaction(Faction, SystemAddress);
+        var influence = CompletedEntry.Mission.GetInfluenceForFaction(Faction, SystemAddress);
 
         builder.AppendFormat("{0}", MissionName);
-        if (influence != "") {
-            builder.AppendFormat(", Influence: {0}", influence);
+        if (influence != null && influence.Length > 0) {
+            builder.AppendFormat(", Influence: {0}", 
+                influence.Select(x => x.InfluenceAmount).Sum()
+                );
         }
 
         return builder.ToString();

EDPlayerJournal/BGS/MissionFailed.cs

@@ -4,16 +4,28 @@ using EDPlayerJournal.Entries;
 namespace EDPlayerJournal.BGS; 
 public class MissionFailed : Transaction {
     public MissionFailedEntry? Failed { get; set; }
-    public MissionAcceptedEntry? Accepted { get; set; }
+    public Mission? Mission { get; set; }
 
     public MissionFailed() { }
 
-    public MissionFailed(MissionAcceptedEntry accepted) {
-        if (accepted.Mission == null) {
-            throw new Exception("Mission cannot be null");
+    public MissionFailed(MissionFailedEntry failed) {
+        Entries.Add(failed);
+        Failed = failed;
+    }
+
+    /// <summary>
+    /// Returns the amount of influence generated by failing this mission. The
+    /// system returns no influence for one INF missions, but sadly also for
+    /// when the influence had no affect at all (i.e. during a war).
+    /// </summary>
+    public long InfluenceAmount {
+        get {
+            if (Mission == null || string.IsNullOrEmpty(Mission.Influence)) {
+                return -1;
+            } else {
+                return Mission.Influence.Length * -1;
+            }
         }
-        Accepted = accepted;
-        Faction = accepted.Mission.Faction;
     }
 
     public override int CompareTo(Transaction? other) {
@@ -39,20 +51,15 @@ public class MissionFailed : Transaction {
         return -1;
     }
 
-    // +1 since the other entries are just copies of the one we have in our properties
-    public int Amount => Entries.Count + 1;
-
     public override string ToString() {
         StringBuilder builder = new StringBuilder();
 
-        if (Failed == null || Accepted == null) {
+        if (Failed == null || Mission == null) {
             return "";
         }
 
-        builder.AppendFormat("{0}x Mission failed: \"{1}\"",
-            Amount,
-            Failed?.Mission?.LocalisedName != null ? 
-            Failed?.Mission?.LocalisedName : Failed?.Mission?.Name
+        builder.AppendFormat(" Mission failed: \"{0}\"",
+            Mission?.FriendlyName
             );
 
         return builder.ToString();

EDPlayerJournal/BGS/OrganicData.cs

@@ -4,6 +4,8 @@ using EDPlayerJournal.Entries;
 namespace EDPlayerJournal.BGS;
 
 public class OrganicData : Transaction {
+    public OrganicData() { }
+
     public OrganicData(SellOrganicDataEntry e) {
         Entries.Add(e);
     }
@@ -36,6 +38,8 @@ public class OrganicData : Transaction {
 
     /* Selling organic data only helps the controlling faction, just like
      * selling cartographic data.
+     * 
+     * Right now: Organic data helps no one.
      */
     public override bool OnlyControllingFaction => true;
 }

EDPlayerJournal/BGS/Parsers/ApproachSettlementParser.cs

@@ -0,0 +1,15 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS.Parsers;
+
+internal class ApproachSettlementParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        ApproachSettlementEntry? approach = entry as ApproachSettlementEntry;
+        if (approach == null || string.IsNullOrEmpty(approach.Name)) {
+            return;
+        }
+
+        context.Settlement = approach.Name;
+    }
+}
+

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/CommanderParser.cs

@@ -0,0 +1,17 @@
+using EDPlayerJournal.BGS;
+using EDPlayerJournal.Entries;
+
+internal class CommanderParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        CommanderEntry commanderEntry = (CommanderEntry)entry;
+        if (commanderEntry != null && !string.IsNullOrEmpty(commanderEntry.FullName)) {
+            if (!context.Commanders.Contains(commanderEntry.FullName)) {
+                context.Commanders.Add(commanderEntry.FullName);
+            }
+        }
+        // A commander entry happens when you log out, and log back in again
+        // for example when switching from Open, to Solo or PG.
+        context.DiscernCombatZone(transactions, entry);
+        context.ResetCombatZone();
+    }
+}

EDPlayerJournal/BGS/Parsers/MarketBuyParser.cs

@@ -0,0 +1,44 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+internal class MarketBuyParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        MarketBuyEntry? entry = e as MarketBuyEntry;
+        if (entry == null) {
+            throw new NotImplementedException();
+        }
+
+        context.BoughtCargo(entry.Type, entry.BuyPrice);
+
+        // We still want the information on buy price for profit,
+        // but if the option is on, we don't care for parsing it
+        // further.
+        // TODO: might be wise to split this parser into two; one for
+        //       determining profit, the other for the BGS information
+        if (options.IgnoreMarketBuy) {
+            return;
+        }
+
+        if (context.StationOwner == null) {
+            transactions.AddIncomplete(
+                new BuyCargo(),
+                "Could not discern the station owner for market buy.",
+                e);
+            return;
+        }
+
+        // Ignore if its a fleet carrier faction.
+        if (string.Compare(context.StationOwner, Factions.FleetCarrier, StringComparison.OrdinalIgnoreCase) == 0 &&
+            options.IgnoreFleetCarrierFaction) {
+            return;
+        }
+
+        transactions.Add(new BuyCargo(entry) {
+            System = context.CurrentSystem,
+            Station = context.CurrentStation,
+            Faction = context.StationOwner,
+            IsLegacy = context.IsLegacy,
+        });
+    }
+}

EDPlayerJournal/BGS/Parsers/MarketSellParser.cs

@@ -0,0 +1,45 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+internal class MarketSellParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        long profit = 0;
+
+        if (context.StationOwner == null) {
+            transactions.AddIncomplete(
+                new SellCargo(),
+                "Could not discern the station owner market sell.",
+                e);
+            return;
+        }
+
+        // Ignore if its a fleet carrier faction.
+        if (string.Compare(context.StationOwner, Factions.FleetCarrier, StringComparison.OrdinalIgnoreCase) == 0 &&
+            options.IgnoreFleetCarrierFaction) {
+            return;
+        }
+
+        MarketSellEntry? entry = e as MarketSellEntry;
+        if (entry == null) {
+            throw new NotImplementedException();
+        }
+
+        if (entry.Type == null) {
+            throw new InvalidJournalEntryException("market sell contains no cargo type");
+        }
+
+        if (context.BuyCost.ContainsKey(entry.Type)) {
+            long avg = context.BuyCost[entry.Type];
+            profit = (long)entry.TotalSale - (avg * entry.Count);
+        }
+
+        transactions.Add(new SellCargo(entry) {
+            System = context.CurrentSystem,
+            Station = context.CurrentStation,
+            Faction = context.StationOwner,
+            Profit = profit,
+            IsLegacy = context.IsLegacy,
+        });
+    }
+}

EDPlayerJournal/BGS/Parsers/MultiSellExplorationDataParser.cs

@@ -0,0 +1,33 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+internal class MultiSellExplorationDataParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        MultiSellExplorationDataEntry? entry = e as MultiSellExplorationDataEntry;
+        if (entry == null) {
+            throw new NotImplementedException();
+        }
+
+        if (context.StationOwner == null) {
+            transactions.AddIncomplete(
+                new Cartographics(),
+                "Could not discern the station owner for cartographics sell.",
+                e);
+            return;
+        }
+
+        // Ignore if its a fleet carrier faction.
+        if (string.Compare(context.StationOwner, Factions.FleetCarrier, StringComparison.OrdinalIgnoreCase) == 0 &&
+            options.IgnoreFleetCarrierFaction) {
+            return;
+        }
+
+        transactions.Add(new Cartographics(entry) {
+            System = context.CurrentSystem,
+            Station = context.CurrentStation,
+            Faction = context.StationOwner,
+            IsLegacy = context.IsLegacy,
+        });
+    }
+}

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/Parsers/RedeemVoucherParser.cs

@@ -0,0 +1,84 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS.Parsers;
+
+internal class RedeemVoucherParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        RedeemVoucherEntry? entry = e as RedeemVoucherEntry;
+        if (entry == null) {
+            throw new NotImplementedException();
+        }
+
+        if (context.CurrentSystem == null) {
+            transactions.AddIncomplete(new Vouchers(),
+                "Could not find out where the vouchers were redeemed", e
+                );
+            return;
+        }
+
+        List<Faction>? current_factions = context.GetFactions(context.CurrentSystem);
+        if (current_factions == null) {
+            transactions.AddIncomplete(new Vouchers(),
+                "Current system factions are unknown, so vouchers were ineffective", e);
+        }
+
+        foreach (string faction in entry.Factions) {
+            bool relevantBond = false;
+            string relevantFaction = faction;
+
+            if (string.Compare(faction, Factions.PilotsFederationVouchers) == 0) {
+                // Target faction is pilots' federation, so we assume thargoid bonks
+                // Also assign this combat bond to the Pilots Federation
+                relevantFaction = Factions.PilotsFederation;
+                relevantBond = true;
+            }
+
+            if (current_factions != null && !relevantBond) {
+                // If we have local factions, and it ain't thargoid bonds see if the bonds were
+                // useful in the current system
+                if (current_factions.Find(x => string.Compare(x.Name, faction, true) == 0) != null) {
+                    relevantBond = true;
+                } else {
+                    transactions.AddIncomplete(new Vouchers(),
+                        string.Format("Vouchers for \"{0}\" had no effect in \"{1}\" since said " +
+                        "faction is not present there", faction, context.CurrentSystem), e
+                    );
+                }
+            }
+
+            if (!relevantBond) {
+                continue;
+            }
+
+            var voucher = new Vouchers(entry) {
+                System = context.CurrentSystem,
+                Station = context.CurrentStation,
+                Faction = relevantFaction,
+                ControllingFaction = context.ControllingFaction,
+                IsLegacy = context.IsLegacy,
+            };
+
+            if (options.FilterDoubleRedeemVouchers) {
+                // To filter out doubly redeemed vouchers, find another redeem voucher
+                // event that happened in the same system, same total sum, and also the
+                // same faction. If there is one, filter this one out.
+                var doubledEntry = transactions
+                    .OfType<Vouchers>()
+                    .Where(x => x.TotalSum == voucher.TotalSum &&
+                                x.System == voucher.System &&
+                                x.Faction == voucher.Faction)
+                    .ToList()
+                    ;
+                if (doubledEntry.Count > 0) {
+                    transactions.AddIncomplete(
+                        voucher, 
+                        string.Format("A doubled redeem voucher for {0} valued {1} was detected",
+                                      voucher.Faction, Credits.FormatMillions(voucher.TotalSum)), 
+                        e);
+                    return;
+                }
+            }
+            transactions.Add(voucher);
+        }
+    }
+}

EDPlayerJournal/BGS/Parsers/SellExplorationDataParser.cs

@@ -0,0 +1,33 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+internal class SellExplorationDataParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        SellExplorationDataEntry? entry = e as SellExplorationDataEntry;
+        if (entry == null) {
+            throw new NotImplementedException();
+        }
+
+        if (context.StationOwner == null) {
+            transactions.AddIncomplete(
+                new Cartographics(),
+                "Could not discern the station owner for cartographics sell.",
+                e);
+            return;
+        }
+
+        // Ignore if its a fleet carrier faction.
+        if (string.Compare(context.StationOwner, Factions.FleetCarrier, StringComparison.OrdinalIgnoreCase) == 0 &&
+            options.IgnoreFleetCarrierFaction) {
+            return;
+        }
+
+        transactions.Add(new Cartographics(entry) {
+            System = context.CurrentSystem,
+            Station = context.CurrentStation,
+            Faction = context.StationOwner,
+            IsLegacy = context.IsLegacy,
+        });
+    }
+}

EDPlayerJournal/BGS/Parsers/SellOrganicDataParser.cs

@@ -0,0 +1,38 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+internal class SellOrganicDataParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        // If exo biology is ignored, simply do nothing
+        if (options.IgnoreExoBiology) {
+            return;
+        }
+
+        SellOrganicDataEntry? entry = e as SellOrganicDataEntry;
+        if (entry == null) {
+            throw new NotImplementedException();
+        }
+
+        if (context.StationOwner == null) {
+            transactions.AddIncomplete(
+                new OrganicData(),
+                "Could not discern the station owner for organic data sell.",
+                e);
+            return;
+        }
+
+        // Ignore if its a fleet carrier faction.
+        if (string.Compare(context.StationOwner, Factions.FleetCarrier, StringComparison.OrdinalIgnoreCase) == 0 &&
+            options.IgnoreFleetCarrierFaction) {
+            return;
+        }
+
+        transactions.Add(new OrganicData(entry) {
+            System = context.CurrentSystem,
+            Station = context.CurrentStation,
+            Faction = context.StationOwner,
+            IsLegacy = context.IsLegacy,
+        });
+    }
+}

EDPlayerJournal/BGS/Parsers/ShipTargetedParser.cs

@@ -0,0 +1,65 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+/// <summary>
+/// With ship targeted we might find out to which faction a given NPC belonged. This is
+/// useful later when said NPC gets killed or murdered.
+/// </summary>
+internal class ShipTargetedParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        ShipTargetedEntry? entry = e as ShipTargetedEntry;
+        if (entry == null) {
+            throw new NotImplementedException();
+        }
+
+        // Scan happens in stages, and sometimes this information is not known
+        // yet. Do now throw an error, this is expected behaviour.
+        if (!string.IsNullOrEmpty(entry.PilotNameLocalised) &&
+            !string.IsNullOrEmpty(entry.Faction)) {
+            context.NPCFaction.TryAdd(entry.PilotNameLocalised, entry.Faction);
+        }
+
+        string? faction = context.LastRecordedAwardingFaction;
+
+        // We have seen a captain?
+        if (NPCs.IsWarzoneCaptain(entry.PilotName)) {
+            // if we have faction information, we can compare it to figure out
+            // whether it is the enemy or allied faction. but this is not always
+            // possible. In such a case we assume we have seen the enemy captain.
+            if (!string.IsNullOrEmpty(entry.Faction) &&
+                !string.IsNullOrEmpty(faction)) {
+                if (string.Compare(faction, entry.Faction) != 0) {
+                    context.HaveSeenEnemyCaptain = true;
+                } else {
+                    context.HaveSeenAlliedCaptain = true;
+                }
+            } else {
+                context.HaveSeenEnemyCaptain = true;
+            }
+        }
+
+        // Spec ops?
+        if (NPCs.IsSpecOps(entry.PilotName)) {
+            context.HaveSeenSpecOps = true;
+        }
+
+        // Correspondent?
+        if (NPCs.IsWarzoneCorrespondent(entry.PilotName)) {
+            // if we have faction information, we can compare it to figure out
+            // whether it is the enemy or allied faction. but this is not always
+            // possible. In such a case we assume we have seen the enemy
+            // correspondent.
+            if (!string.IsNullOrEmpty(entry.Faction) &&
+                !string.IsNullOrEmpty(faction)) {
+                if (string.Compare(faction, entry.Faction) != 0) {
+                    context.HaveSeenEnemyCorrespondent = true;
+                } else {
+                    context.HaveSeenAlliedCorrespondent = true;
+                }
+            } else {
+                context.HaveSeenEnemyCorrespondent = true;
+            }
+        }
+    }
+}

EDPlayerJournal/BGS/Parsers/SupercruiseDestinationDropParser.cs

@@ -0,0 +1,14 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS.Parsers;
+
+internal class SupercruiseDestinationDropParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        SupercruiseDestinationDropEntry? drop = entry as SupercruiseDestinationDropEntry;
+        if (drop == null || drop.Type == null) {
+            return;
+        }
+
+        context.CurrentInstanceType = drop.Type;
+    }
+}

EDPlayerJournal/BGS/Report.cs

@@ -1,664 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EDPlayerJournal.Entries;
-
-namespace EDPlayerJournal.BGS;
-
-public class Report {
-    private List<Objective> objectives = new List<Objective>();
-
-    public delegate void OnLogDelegate(string log);
-
-    public event OnLogDelegate? OnLog;
-
-    public List<Objective> Objectives {
-        get { return objectives; }
-        set { objectives = value; }
-    }
-
-    public bool AddObjective(Objective objective) {
-        var found = objectives.Find(x => x.CompareTo(objective) == 0);
-        bool added = false;
-
-        if (found == null) {
-            objectives.Add(objective);
-            added = true;
-        }
-
-        return added;
-    }
-
-    public static bool IsRelevant(Entry e) {
-        return e.Is(Events.CommitCrime) ||
-            e.Is(Events.Docked) ||
-            e.Is(Events.FactionKillBond) ||
-            e.Is(Events.FSDJump) ||
-            e.Is(Events.Location) ||
-            e.Is(Events.MarketBuy) ||
-            e.Is(Events.MarketSell) ||
-            e.Is(Events.MissionAccepted) ||
-            e.Is(Events.MissionFailed) ||
-            e.Is(Events.MultiSellExplorationData) ||
-            e.Is(Events.RedeemVoucher) ||
-            e.Is(Events.SearchAndRescue) ||
-            e.Is(Events.SellExplorationData) ||
-            e.Is(Events.SellMicroResources) ||
-            e.Is(Events.SellOrganicData) ||
-            e.Is(Events.ShipTargeted) ||
-            e.Is(Events.MissionCompleted)
-            ;
-    }
-
-    public void Scan(PlayerJournal journal, DateTime start, DateTime end) {
-        /* Log files only get rotated if you restart the game client. This means that there might
-         * be - say - entries from the 4th of May in the file with a timestamp of 3rd of May. This
-         * happens if you happen to play a session late into the night.
-         * At first I tried extracting the first and last line of a file to see the date range, but
-         * if you have a lot of files this becomes quite slow, and quite the memory hog (as journal
-         * files have to be read in their entirety to check this). So we assume that you can't play
-         * three days straight, and keep the code fast.
-         */
-        DateTime actualstart = start.AddDays(-3);
-        List<Entry> entries = journal.Files
-            .Where(f => f.NormalisedDateTime >= actualstart && f.NormalisedDateTime <= end)
-            .SelectMany(e => e.Entries)
-            .ToList()
-            ;
-        // Now further sort the list down to entries that are actually within the given datetime
-        // Note that entry datetimes are not normalised, so we have to sort until end + 1 day
-        DateTime actualend = end.AddDays(1);
-
-        entries = entries
-            .Where(e => e.Timestamp >= start && e.Timestamp < actualend)
-            .ToList()
-            ;
-        Scan(entries);
-    }
-
-    public void Scan(List<Entry> entries) {
-        if (entries.Count <= 0) {
-            return;
-        }
-
-        List<Entry> relevant = entries
-            .Where(x => IsRelevant(x))
-            .ToList()
-            ;
-
-        Dictionary<ulong, MissionAcceptedEntry> acceptedMissions = new Dictionary<ulong, MissionAcceptedEntry>();
-        Dictionary<string, long> buyCost = new Dictionary<string, long>();
-        Dictionary<ulong, string> systems = new Dictionary<ulong, string>();
-        Dictionary<string, string> npcfactions = new Dictionary<string, string>();
-        Dictionary<string, List<Faction>> system_factions = new Dictionary<string, List<Faction>>();
-
-        // A dictionary resolving to a station at which each mission was accepted
-        Dictionary<ulong, string> acceptedStations = new Dictionary<ulong, string>();
-        // A dictionary resolving to a system at which each mission was accepted
-        Dictionary<ulong, ulong> acceptedSystems = new Dictionary<ulong, ulong>();
-
-        string? current_system = null;
-        ulong? current_system_address = null;
-        string? current_station = null;
-        string? controlling_faction = null;
-
-        objectives.ForEach(x => x.Clear());
-
-        foreach (Entry e in relevant) {
-            List<Transaction> results = new List<Transaction>();
-            bool collate = false;
-
-            if (e.Is(Events.Docked)) {
-                DockedEntry? docked = e as DockedEntry;
-                if (docked == null) {
-                    continue;
-                }
-
-                /* gleem the current station from this message
-                 */
-                current_station = docked.StationName;
-                current_system = docked.StarSystem;
-                controlling_faction = docked.StationFaction;
-                current_system_address = docked.SystemAddress;
-
-                if (current_system_address != null && current_system != null) {
-                    if (!systems.ContainsKey(current_system_address.Value)) {
-                        systems.Add(current_system_address.Value, current_system);
-                    }
-                }
-            } else if (e.Is(Events.FSDJump)) {
-                /* Gleem current system and controlling faction from this message.
-                 */
-                FSDJumpEntry? fsd = e as FSDJumpEntry;
-
-                if (fsd == null || fsd.StarSystem == null) {
-                    continue;
-                }
-
-                current_system_address = fsd.SystemAddress;
-                current_system = fsd.StarSystem;
-                controlling_faction = fsd.SystemFaction;
-
-                if (!systems.ContainsKey(fsd.SystemAddress)) {
-                    systems.Add(fsd.SystemAddress, fsd.StarSystem);
-                }
-
-                if (!system_factions.ContainsKey(fsd.StarSystem) &&
-                    fsd.SystemFactions.Count > 0) {
-                    system_factions[fsd.StarSystem] = fsd.SystemFactions;
-                }
-            } else if (e.Is(Events.Location)) {
-                /* Get current system, faction name and station from Location message
-                 */
-                LocationEntry? location = e as LocationEntry;
-
-                if (location == null || location.StarSystem == null) {
-                    continue;
-                }
-
-                current_system = location.StarSystem;
-                current_system_address = location.SystemAddress;
-
-                if (!systems.ContainsKey(location.SystemAddress)) {
-                    systems.Add(location.SystemAddress, location.StarSystem);
-                }
-
-                if (!string.IsNullOrEmpty(location.SystemFaction)) {
-                    controlling_faction = location.SystemFaction;
-                }
-                if (!string.IsNullOrEmpty(location.StationName)) {
-                    current_station = location.StationName;
-                }
-
-                if (!system_factions.ContainsKey(location.StarSystem) &&
-                    location.SystemFactions.Count > 0) {
-                    system_factions[location.StarSystem] = location.SystemFactions;
-                }
-            } else if (e.Is(Events.ShipTargeted)) {
-                ShipTargetedEntry? targeted = e as ShipTargetedEntry;
-
-                if (targeted == null) {
-                    continue;
-                }
-
-                if (string.IsNullOrEmpty(targeted.PilotNameLocalised) ||
-                    string.IsNullOrEmpty(targeted.Faction)) {
-                    continue;
-                }
-
-                npcfactions[targeted.PilotNameLocalised] = targeted.Faction;
-            } else if (e.Is(Events.CommitCrime)) {
-                CommitCrimeEntry? crime = e as CommitCrimeEntry;
-                if (crime == null) {
-                    continue;
-                }
-
-                string? faction = crime.Faction;
-
-                if (faction == null || !crime.IsMurder) {
-                    /* we don't care about anything but murder for now */
-                    continue;
-                }
-
-                /* use localised victim name if we have it, otherwise use normal name */
-                string? victim = crime.VictimLocalised;
-                if (string.IsNullOrEmpty(victim)) {
-                    victim = crime.Victim;
-                }
-
-                if (string.IsNullOrEmpty(victim)) {
-                    continue;
-                }
-
-                if (!npcfactions.ContainsKey(victim)) {
-                    /* The faction in the crime report is the faction that issues the bounty,
-                     * and not the faction of the victim.
-                     */
-                    OnLog?.Invoke(string.Format(
-                        "No faction found for victim \"{0}\", using faction that issued the bounty instead.",
-                        victim, crime.Faction
-                        ));
-                } else {
-                    faction = npcfactions[victim];
-                }
-
-                results.Add(new FoulMurder(crime) {
-                    System = current_system,
-                    Faction = faction,
-                });
-                collate = true;
-            } else if (e.Is(Events.MissionCompleted)) {
-                MissionCompletedEntry? completed = e as MissionCompletedEntry;
-
-                if (completed == null ||
-                    completed.Mission == null) {
-                    continue;
-                }
-
-                MissionAcceptedEntry? accepted = null;
-                MissionCompleted? main_mission = null;
-                ulong accepted_address;
-                string? accepted_system;
-
-                string? target_faction_name = completed.Mission.TargetFaction;
-                string? source_faction_name = completed.Mission.Faction;
-
-                if (!acceptedMissions.TryGetValue(completed.Mission.MissionID, out accepted)) {
-                    OnLog?.Invoke(string.Format(
-                        "Unable to find mission acceptance for mission \"{0}\". " +
-                        "Please extend range to include the mission acceptance.", completed.Mission.LocalisedName
-                        ));
-                    continue;
-                }
-
-                if (!acceptedSystems.TryGetValue(completed.Mission.MissionID, out accepted_address)) {
-                    OnLog?.Invoke(string.Format(
-                        "Unable to figure out in which system mission \"{0}\" was accepted.", completed.Mission.LocalisedName
-                        ));
-                    continue;
-                }
-
-                if (!systems.TryGetValue(accepted_address, out accepted_system)) {
-                    OnLog?.Invoke(string.Format(
-                        "Unable to figure out in which system mission \"{0}\" was accepted.", completed.Mission.LocalisedName
-                        ));
-                    continue;
-                }
-
-                foreach (var other in completed.Mission.Influences) {
-                    string faction = other.Key;
-                    if (string.IsNullOrEmpty(faction)) {
-                        OnLog?.Invoke(string.Format(
-                            "Mission \"{0}\" has empty faction name in influence block, "+
-                            "so this influence support was ignored. " +
-                            "Please check the README on why this happens.", completed.Mission.LocalisedName)
-                            );
-                        continue;
-                    }
-
-                    /* Now comes the fun part. Sometimes the influence list is empty for a faction.
-                     * This happens if the faction in question 
-                     */
-                    if (other.Value.Count() == 0) {
-                        OnLog?.Invoke(string.Format(
-                            "Mission \"{0}\" gave no influence to \"{1}\", so we assume this is because the " +
-                            "faction is in a conflict and cannot gain influence right now. " +
-                            "If this assessment is wrong, just remove the entry from the objective list.",
-                            completed.Mission.LocalisedName, faction
-                            ));
-
-                        if (string.Compare(target_faction_name, faction, true) == 0) {
-                            /* here we assume that if the faction in question is the target faction,
-                             * that we gave said target faction no influence in the target system, aka
-                             * current system
-                             */
-                            if (current_system_address == null) {
-                                continue;
-                            }
-                            other.Value.Add(current_system_address.Value, "");
-                            OnLog?.Invoke(string.Format(
-                                "Mission \"{0}\" gave no influence to \"{1}\". Since \"{1}\" is the target faction " +
-                                "of the mission, we assume the influence was gained in \"{2}\". " +
-                                "Please remove the entry if this assumption is wrong.",
-                                completed.Mission.LocalisedName, faction, current_system
-                                ));
-                        } else if (string.Compare(source_faction_name, faction, true) == 0) {
-                            /* source faction of the mission is not getting any influence. This could be because
-                             * the source faction is in an election state in its home system and cannot gain any
-                             * influence. It may also very well be that the source and target faction are the same
-                             * since the faction is present in both target and source system. In which case we add
-                             * both and hope for the best.
-                             */
-                            other.Value.Add(accepted_address, "");
-                            OnLog?.Invoke(string.Format(
-                                "Mission \"{0}\" gave no influence to \"{1}\". Since \"{1}\" is the source faction " +
-                                "of the mission, we assume the influence was gained in \"{2}\". " +
-                                "Please remove the entry if this assumption is wrong.",
-                                completed.Mission.LocalisedName, faction, accepted_system
-                                ));
-
-                            /* check if source/target faction are equal, in which case we also need an entry
-                             * for the target system. As said factions can be present in two systems, and can
-                             * give missions that target each other.
-                             */
-                            if (string.Compare(source_faction_name, target_faction_name, true) == 0 &&
-                                current_system_address != null) {
-                                other.Value.Add(current_system_address.Value, "");
-                                OnLog?.Invoke(string.Format(
-                                    "Mission \"{0}\" gave no influence to \"{1}\". Since \"{1}\" is the source and target faction " +
-                                    "of the mission, we assume the influence was also gained in target system \"{2}\". " +
-                                    "Please remove the entry if this assumption is wrong.",
-                                    completed.Mission.LocalisedName, faction, current_system
-                                    ));
-                            }
-                        }
-                    }
-
-                    foreach (var influences in other.Value) {
-                        ulong system_address = influences.Key;
-                        string? system;
-                        string? accepted_station;
-
-                        if (completed.Mission == null) {
-                            continue;
-                        }
-
-                        if (!systems.TryGetValue(system_address, out system)) {
-                            OnLog?.Invoke(string.Format(
-                                "Unknown system \"{0}\" unable to assign that mission a target.", system_address
-                                ));
-                            continue;
-                        }
-
-                        if (!acceptedStations.TryGetValue(completed.Mission.MissionID, out accepted_station)) {
-                            OnLog?.Invoke(string.Format(
-                                "Unable to figure out in which station mission \"{0}\" was accepted.", completed.Mission.LocalisedName
-                                ));
-                            continue;
-                        }
-
-                        if (faction.Equals(source_faction_name) && system_address == accepted_address) {
-                            /* This is the influence block for the origin of the mission.
-                             */
-                            main_mission = new MissionCompleted(completed) {
-                                System = accepted_system,
-                                Faction = source_faction_name,
-                                SystemAddress = accepted_address,
-                                Station = accepted_station,
-                            };
-                            results.Add(main_mission);
-                        } else if (!faction.Equals(source_faction_name) ||
-                            (faction.Equals(source_faction_name) && system_address != accepted_address)) {
-                            /* This block is for secondary factions (first if), or if the secondary faction
-                             * is the same as the mission giver, but in another system (second if).
-                             */
-                            results.Add(new InfluenceSupport() {
-                                Faction = faction,
-                                Influence = influences.Value,
-                                System = system,
-                                SystemAddress = system_address,
-                                RelevantMission = completed
-                            });
-                        }
-                    }
-                }
-            } else if (e.Is(Events.MissionAccepted)) {
-                MissionAcceptedEntry? accepted = e as MissionAcceptedEntry;
-
-                if (accepted == null ||
-                    current_station == null ||
-                    current_system_address == null) {
-                    continue;
-                }
-
-                if (accepted.Mission == null) {
-                    continue;
-                }
-
-                ulong id = accepted.Mission.MissionID;
-
-                if (!acceptedMissions.ContainsKey(id)) {
-                    acceptedMissions[id] = accepted;
-                }
-                if (!acceptedStations.ContainsKey(id)) {
-                    acceptedStations[id] = current_station;
-                }
-                if (!acceptedSystems.ContainsKey(id)) {
-                    acceptedSystems[id] = current_system_address.Value;
-                }
-            } else if (e.Is(Events.MissionFailed)) {
-                MissionFailedEntry? failed = e as MissionFailedEntry;
-                MissionAcceptedEntry? accepted = null;
-                ulong accepted_address = 0;
-                string? accepted_system;
-                string? accepted_station;
-
-                if (failed == null || failed.Mission == null) {
-                    continue;
-                }
-
-                if (!acceptedMissions.TryGetValue(failed.Mission.MissionID, out accepted)) {
-                    OnLog?.Invoke("A mission failed which wasn't accepted in the given time frame. " +
-                        "Please adjust start date to when the mission was accepted to include it in the list.");
-                    continue;
-                }
-
-                if (accepted.Mission == null) {
-                    continue;
-                }
-
-                if (!acceptedSystems.TryGetValue(failed.Mission.MissionID, out accepted_address)) {
-                    OnLog?.Invoke(string.Format(
-                        "Unable to figure out in which system mission \"{0}\" was accepted.", accepted.Mission.Name
-                        ));
-                    continue;
-                }
-
-                if (!systems.TryGetValue(accepted_address, out accepted_system)) {
-                    OnLog?.Invoke(string.Format(
-                        "Unable to figure out in which system mission \"{0}\" was accepted.", accepted.Mission.Name
-                        ));
-                    continue;
-                }
-
-                if (!acceptedStations.TryGetValue(failed.Mission.MissionID, out accepted_station)) {
-                    OnLog?.Invoke(string.Format(
-                        "Unable to figure out in which station mission \"{0}\" was accepted.", accepted.Mission.Name
-                        ));
-                    continue;
-                }
-
-                results.Add(new MissionFailed(accepted) {
-                    Failed = failed, 
-                    System = accepted_system,
-                    Station = accepted_station,
-                    Faction = accepted.Mission.Faction,
-                    SystemAddress = accepted_address,
-                });
-
-                /* Mission failed should be collated if they are in the same system/station
-                 */
-                collate = true;
-            } else if (e.Is(Events.SellExplorationData)) {
-                SellExplorationDataEntry? explo = e as SellExplorationDataEntry;
-
-                if (explo == null) {
-                    continue;
-                }
-
-                results.Add(new Cartographics(explo) {
-                    System = current_system,
-                    Station = current_station,
-                    Faction = controlling_faction,
-                });
-
-                /* colate single cartographic selling into one */
-                collate = true;
-            } else if (e.Is(Events.SellOrganicData)) {
-                SellOrganicDataEntry? organic = e as SellOrganicDataEntry;
-
-                if (organic == null) {
-                    return;
-                }
-
-                /* organic data sold to Vista Genomics */
-                results.Add(new OrganicData(organic) {
-                    System = current_system,
-                    Station = current_station,
-                    Faction = controlling_faction,
-                });
-
-                collate = true;
-            } else if (e.Is(Events.MultiSellExplorationData)) {
-                MultiSellExplorationDataEntry? explo = e as MultiSellExplorationDataEntry;
-
-                if (explo == null) {
-                    continue;
-                }
-
-                /* For multi-sell-exploraton-data only the controlling faction of the station sold to matters.
-                 */
-                results.Add(new Cartographics(explo) {
-                    System = current_system,
-                    Station = current_station,
-                    Faction = controlling_faction
-                });
-
-                collate = true;
-            } else if (e.Is(Events.RedeemVoucher)) {
-                RedeemVoucherEntry? voucher = e as RedeemVoucherEntry;
-                List<Faction> current_factions = new List<Faction>();
-
-                if (voucher == null || current_system == null) {
-                    continue;
-                }
-
-                if (system_factions.ContainsKey(current_system)) {
-                    current_factions = system_factions[current_system];
-                } else {
-                    OnLog?.Invoke("There are no current system factions, so turned in vouchers were ignored.");
-                    continue;
-                }
-
-                foreach (string faction in voucher.Factions) {
-                    if (current_factions.Find(x => x.Name == faction) == null) {
-                        OnLog?.Invoke(
-                            string.Format("Vouchers for \"{0}\" were ignored in \"{1}\" since said " +
-                            "faction is not present there.", faction, current_system)
-                            );
-                        continue; /* faction is not present, so it is ignored */
-                    }
-
-                    /* Same for selling combat vouchers. Only the current controlling faction matters here.
-                     */
-                    results.Add(new Vouchers(voucher) {
-                        System = current_system,
-                        Station = current_station,
-                        Faction = faction,
-                        ControllingFaction = controlling_faction,
-                    });
-                }
-
-                collate = true;
-            } else if (e.Is(Events.SellMicroResources)) {
-                SellMicroResourcesEntry? smr = e as SellMicroResourcesEntry;
-
-                if (smr == null) {
-                    continue;
-                }
-
-                results.Add(new SellMicroResources(smr) {
-                    Faction = controlling_faction,
-                    Station = current_station,
-                    System = current_system
-                });
-            } else if (e.Is(Events.MarketBuy)) {
-                MarketBuyEntry? buy = e as MarketBuyEntry;
-
-                if (buy == null) {
-                    continue;
-                }
-
-                if (string.IsNullOrEmpty(buy.Type) || buy.BuyPrice == 0) {
-                    continue;
-                }
-                buyCost[buy.Type] = buy.BuyPrice;
-
-                results.Add(new BuyCargo(buy) {
-                    Faction = controlling_faction,
-                    Station = current_station,
-                    System = current_system,
-                });
-
-                collate = true;
-            } else if (e.Is(Events.SearchAndRescue)) {
-                SearchAndRescueEntry? sar = e as SearchAndRescueEntry;
-
-                if (sar == null) {
-                    continue;
-                }
-
-                results.Add(new SearchAndRescue(sar) {
-                    Faction = controlling_faction,
-                    Station = current_station,
-                    System = current_system,
-                });
-
-                collate = true;
-            } else if (e.Is(Events.MarketSell)) {
-                MarketSellEntry? sell = e as MarketSellEntry;
-                long profit = 0;
-
-                if (sell == null || sell.Type == null) {
-                    continue;
-                }
-
-                if (!buyCost.ContainsKey(sell.Type)) {
-                    OnLog?.Invoke("Could not find buy order for the given commodity. Please adjust profit manually.");
-                } else {
-                    long avg = buyCost[sell.Type];
-                    profit = (long)sell.TotalSale - (avg * sell.Count);
-                }
-
-                results.Add(new SellCargo(sell) {
-                    Faction = controlling_faction,
-                    Station = current_station,
-                    System = current_system,
-                    Profit = profit
-                });
-            }
-
-            if (results == null || results.Count <= 0) {
-                continue;
-            }
-
-            foreach (Transaction entry in results) {
-                /* Find all objectives that generally match.
-                 */
-                var matches = objectives
-                    .Where(x => x.Matches(entry) >= 2)
-                    .OrderBy(x => x.Matches(entry))
-                    ;
-
-                Objective? objective = null;
-                if (matches != null && matches.Count() > 0) {
-                    /* Then select the one that matches the most.
-                     */
-                    objective = matches
-                        .OrderBy(x => x.Matches(entry))
-                        .Reverse()
-                        .First()
-                        ;
-                } else {
-                    /* create a new objective if we don't have one */
-                    objective = new Objective() {
-                        Station = (entry.Station ?? ""),
-                        Faction = (entry.Faction ?? ""),
-                        System = (entry.System ?? ""),
-                    };
-                    objectives.Add(objective);
-                }
-
-                Transaction? existing = null;
-
-                existing = objective.LogEntries.Find(x => {
-                    try {
-                        return x.CompareTo(entry) == 0;
-                    } catch (NotImplementedException) {
-                        return false;
-                    }
-                });
-
-                if (collate && existing != null) {
-                    existing.Entries.Add(e);
-                } else if (!collate || existing == null) {
-                    objective.LogEntries.Add(entry);
-                }
-            }
-        }
-    }
-
-    public void Scan(PlayerJournal journal) {
-        Scan(journal, DateTime.Now, DateTime.Now);
-    }
-}

EDPlayerJournal/BGS/SellCargo.cs

@@ -49,10 +49,11 @@ public class SellCargo : Transaction {
         }
 
         foreach (MarketSellEntry sell in sold) {
-            builder.AppendFormat("Sold {0} {1} to the {2}",
+            builder.AppendFormat("Sold {0} {1} to the {2} of {3}",
                 sell.Count,
                 Cargo,
-                Market
+                Market,
+                Station
                 );
 
             if (Profit != 0) {

EDPlayerJournal/BGS/ThargoidKill.cs

@@ -0,0 +1,47 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+public class ThargoidKill : Transaction {
+    /// <summary>
+    /// Thargoid vessel that was killed
+    /// </summary>
+    public ThargoidVessel ThargoidType { get; set; } = ThargoidVessel.Unknown;
+
+    /// <summary>
+    /// Name of the thargoid type killed
+    /// </summary>
+    public string? ThargoidName { get; set; }
+
+    /// <summary>
+    /// Total reward received
+    /// </summary>
+    public ulong TotalReward {
+        get { return (ulong)Entries.OfType<FactionKillBondEntry>().Sum(x => (decimal)x.Reward); }
+    }
+
+    /// <summary>
+    /// Kiling thargoids contributes to the system wide effort of
+    /// the thargoid war.
+    /// </summary>
+    public override bool SystemContribution {
+        get { return true; }
+    }
+
+    public ThargoidKill() { }
+
+    public ThargoidKill(FactionKillBondEntry entry) {
+        if (!Factions.IsThargoid(entry.VictimFaction)) {
+            throw new Exception("Not a valid thargoid kill");
+        }
+
+        Entries.Add(entry);
+
+        ThargoidType = Thargoid.GetVesselByPayout(entry.Reward);
+        ThargoidName = Thargoid.GetVesselName(ThargoidType);
+    }
+
+    public override string ToString() {
+        return string.Format("{0}x {1} killed", Entries.Count, ThargoidName);
+    }
+}

EDPlayerJournal/BGS/Transaction.cs

@@ -1,25 +1,52 @@
 using EDPlayerJournal.Entries;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EDPlayerJournal.BGS; 
 
 public class Transaction : IComparable<Transaction> {
     public List<Entry> Entries { get; } = new List<Entry>();
 
-    public virtual string CompletedAt {
+    public string CompletedAt {
+        get {
+            DateTime? datetime = CompletedAtDateTime;
+            if (datetime == null) {
+                return "Unknown";
+            }
+
+            return datetime.Value.ToString("dd.MM.yyyy HH:mm UTC");
+        }
+    }
+
+    public virtual DateTime? CompletedAtDateTime {
         get {
             var items = Entries
                 .OrderBy(x => x.Timestamp)
                 .ToArray()
                 ;
             if (items == null || items.Length == 0) {
-                return "Unknown";
+                return null;
             }
 
             Entry last = items.Last();
-            return last.Timestamp.ToString("dd.MM.yyyy HH:mm UTC");
+            return last.Timestamp;
         }
     }
 
+    /// <summary>
+    /// Whether the transaction helps the entire system.
+    /// While all transactions are related to one faction, sometimes their
+    /// overall effect on the system as a whole is more important, than to
+    /// their faction. For example, rescuing refugees helps the Thargoid war
+    /// effort in the system as a whole, not just for the faction.
+    /// So this is true for transactions that help the system as a whole.
+    /// </summary>
+    public virtual bool SystemContribution { get; } = false;
+
+    /// <summary>
+    /// Returns true if this transaction was completed in legacy ED
+    /// </summary>
+    public bool IsLegacy { get; set; } = false;
+
     /// <summary>
     /// Controlling faction of the station this entry was made/turned into.
     /// </summary>

EDPlayerJournal/BGS/TransactionParser.cs

@@ -1,103 +1,56 @@
-using EDPlayerJournal.Entries;
-using System.Collections.Generic;
-using System.Reflection.Metadata.Ecma335;
+using EDPlayerJournal.BGS.Parsers;
+using EDPlayerJournal.Entries;
 
-namespace EDPlayerJournal.BGS; 
+namespace EDPlayerJournal.BGS;
 
-internal class TransactionParserContext {
-    public string? CurrentSystem { get; set; }
-    public ulong? CurrentSystemAddress { get; set; }
-    public string? CurrentStation { get; set; }
-    public string? ControllingFaction { get; set; }
+public class TransactionParserOptions {
+    /// <summary>
+    /// Whether to ignore exo biology. It does not contribute to BGS, so this
+    /// is true per default.
+    /// </summary>
+    public bool IgnoreExoBiology { get; set; } = true;
 
     /// <summary>
-    /// A list of accepted missions index by their mission ID
+    /// Whether to ignore influence support. Usually one only cares about the
+    /// primary faction for the influence.
     /// </summary>
-    public Dictionary<ulong, MissionAcceptedEntry> AcceptedMissions { get; } = new();
-    public Dictionary<ulong, Location> AcceptedMissionLocation { get; } = new();
+    public bool IgnoreInfluenceSupport { get; set; } = false;
+
     /// <summary>
-    /// A way to lookup a system by its system id
+    /// Whether to ignore market buy. Buying from a market gives a small amount
+    /// of INF if it is sold to a high demand market, but generally one buys from
+    /// a market to aid the faction the stuff is being sold to. So allow it to be
+    /// disabled.
     /// </summary>
-    public Dictionary<ulong, string> SystemsByID { get; } = new();
+    public bool IgnoreMarketBuy { get; set; } = false;
+
     /// <summary>
-    /// A list of factions present in the given star system
+    /// Whether we should ignore things done for the fleet carrier faction.
     /// </summary>
-    public Dictionary<string, List<Faction>> SystemFactions { get; } = new();
+    public bool IgnoreFleetCarrierFaction { get; set; } = true;
+
     /// <summary>
-    /// To which faction a given named NPC belonged to.
+    /// Filter out double redeem vouchers that happen when you redeem a specific
+    /// voucher, and then redeem the rest of your vouchers (say from a KWS) in
+    /// bulk. The bulk redeem will also list the first voucher redeem again in
+    /// its bulk list.
     /// </summary>
-    public Dictionary<string, string> NPCFaction { get; } = new();
-    /// <summary>
-    /// Buy costs for a given commodity
-    /// </summary>
-    public Dictionary<string, long> BuyCost = new();
-
-    public void BoughtCargo(string? cargo, long? cost) {
-        if (cargo == null || cost == null) {
-            return;
-        }
-
-        BuyCost[cargo] = cost.Value;
-    }
-
-    public List<Faction>? GetFactions(string? system) {
-        if (system == null || !SystemFactions.ContainsKey(system)) {
-            return null;
-        }
-
-        return SystemFactions[system];
-    }
-
-    public void MissionAccepted(MissionAcceptedEntry accepted) {
-        if (CurrentSystem == null || CurrentSystemAddress == null) {
-            throw new Exception("Mission accepted without knowing where.");
-        }
-
-        if (accepted.Mission == null) {
-            throw new Exception("Mission is null");
-        }
-
-        AcceptedMissions.TryAdd(accepted.Mission.MissionID, accepted);
-
-        Location location = new() {
-            StarSystem = CurrentSystem,
-            SystemAddress = CurrentSystemAddress.Value,
-            Station = (CurrentStation ?? ""),
-        };
-
-        AcceptedMissionLocation.TryAdd(accepted.Mission.MissionID, location);
-    }
+    public bool FilterDoubleRedeemVouchers { get; set; } = true;
 }
 
 public class TransactionList : List<Transaction> {
-    public void AddIncomplete(Transaction underlying, string reason) {
-        Add(new IncompleteTransaction(underlying, reason));
+    public void AddIncomplete(Transaction underlying, string reason, Entry entry) {
+        Add(new IncompleteTransaction(underlying, reason, entry));
     }
 }
 
-internal interface TransactionParserPart{
-    /// <summary>
-    /// Parse a given entry of the entry type specified when declaring to implement this
-    /// interface. You must add your transaction to the passed list in case you did have
-    /// enough information to parse one or more. You may update the parser context
-    /// with new information in case the entry yielded new information.
-    /// Throw an exception if there was an error or a malformed entry. If you have an
-    /// incomplete entry, i.e. not enough information to complete one, add an
-    /// IncompleteTransaction to the list
-    /// </summary>
-    /// <param name="entry">The entry to parse</param>
-    /// <param name="context">Parsing context that may contain useful information</param>
-    /// <param name="transactions">List of parsed transactions</param>
-    public void Parse(Entry entry, TransactionParserContext context, TransactionList transactions);
-}
-
 /// <summary>
 /// The location parser only updates the context with useful information, and does not
 /// by itself generate any transactions. Location is the best information gatherer here
 /// as we are getting controlling faction, system factions, address and station name.
 /// </summary>
-internal class LocationParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class LocationParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         LocationEntry? entry = e as LocationEntry;
         if (entry == null) {
             throw new NotImplementedException();
@@ -120,15 +73,20 @@ internal class LocationParser : TransactionParserPart {
             context.CurrentStation = entry.StationName;
         }
 
-        if (!context.SystemFactions.ContainsKey(entry.StarSystem) &&
-            entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
+        if (!string.IsNullOrEmpty(entry.StationFaction)) {
+            context.StationOwner = entry.StationFaction;
+        } else {
+            context.StationOwner = null;
+        }
+
+        if (entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
             context.SystemFactions[entry.StarSystem] = entry.SystemFactions;
         }
     }
 }
 
-internal class FSDJumpParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class FSDJumpParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         FSDJumpEntry? entry = e as FSDJumpEntry;
         if (entry == null) {
             throw new NotImplementedException();
@@ -138,6 +96,14 @@ internal class FSDJumpParser : TransactionParserPart {
             throw new InvalidJournalEntryException();
         }
 
+        // If you FSD jump straight out of the combat zone into a different system
+        // then the combat zone will be placed in the wrong system otherwise.
+        // This call needs to be *before* changing the current system.
+        context.DiscernCombatZone(transactions, e);
+        context.ResetCombatZone();
+
+        context.LeftInstance();
+
         context.CurrentSystem = entry.StarSystem;
         context.CurrentSystemAddress = entry.SystemAddress;
 
@@ -147,15 +113,14 @@ internal class FSDJumpParser : TransactionParserPart {
             context.ControllingFaction = entry.SystemFaction;
         }
 
-        if (!context.SystemFactions.ContainsKey(entry.StarSystem) &&
-            entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
+        if (entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
             context.SystemFactions[entry.StarSystem] = entry.SystemFactions;
         }
     }
 }
 
-internal class DockedParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class DockedParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         DockedEntry? entry = e as DockedEntry;
         if (entry == null) {
             throw new NotImplementedException();
@@ -171,7 +136,7 @@ internal class DockedParser : TransactionParserPart {
         context.SystemsByID.TryAdd(entry.SystemAddress.Value, entry.StarSystem);
 
         if (!string.IsNullOrEmpty(entry.StationFaction)) {
-            context.ControllingFaction = entry.StationFaction;
+            context.StationOwner = entry.StationFaction;
         }
 
         if (!string.IsNullOrEmpty(entry.StationName)) {
@@ -180,32 +145,12 @@ internal class DockedParser : TransactionParserPart {
     }
 }
 
-/// <summary>
-/// With ship targeted we might find out to which faction a given NPC belonged. This is
-/// useful later when said NPC gets killed or murdered.
-/// </summary>
-internal class ShipTargetedParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        ShipTargetedEntry? entry = e as ShipTargetedEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        // Scan happens in stages, and sometimes this information is not known
-        // yet. Do now throw an error, this is expected behaviour.
-        if (!string.IsNullOrEmpty(entry.PilotNameLocalised) &&
-            !string.IsNullOrEmpty(entry.Faction)) {
-            context.NPCFaction.TryAdd(entry.PilotNameLocalised, entry.Faction);
-        }
-    }
-}
-
 /// <summary>
 /// Commit crime can result in a transaction, especially if the crime committed is
 /// murder.
 /// </summary>
-internal class CommitCrimeParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class CommitCrimeParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         CommitCrimeEntry? entry = e as CommitCrimeEntry;
         if (entry == null) {
             throw new NotImplementedException();
@@ -228,25 +173,69 @@ internal class CommitCrimeParser : TransactionParserPart {
             victim = "Unknown";
         }
 
-        if (!context.NPCFaction.ContainsKey(victim)) {
-            transactions.AddIncomplete(
-                new FoulMurder(),
-                "Crime victim was not properly scanned."
-                );
-            return;
-        }
+        string faction;
 
-        string faction = context.NPCFaction[victim];
+        if (entry.IsCrime(CrimeTypes.OnFootMurder)) {
+            if (entry.Faction == null) {
+                transactions.AddIncomplete(
+                    new FoulMurder(),
+                    "On foot murder victim did not have a faction", e
+                    );
+                return;
+            }
+            // On foot murders are different, there the faction is
+            // the faction the NPC belonged too
+            faction = entry.Faction;
+        } else {
+            if (!context.NPCFaction.ContainsKey(victim)) {
+                transactions.AddIncomplete(
+                    new FoulMurder(),
+                    "Crime victim was not properly scanned.", e
+                    );
+                return;
+            }
+            faction = context.NPCFaction[victim];
+        }
 
         transactions.Add(new FoulMurder(entry) {
             System = context.CurrentSystem,
+            IsLegacy = context.IsLegacy,
             Faction = faction,
         });
     }
 }
 
-internal class MissionAcceptedParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class MissionsParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        MissionsEntry? missions = entry as MissionsEntry;
+
+        if (missions == null) {
+            return;
+        }
+
+        if (context.CurrentSystem == null || context.CurrentSystemAddress == null) {
+            transactions.AddIncomplete(new MissionCompleted(),
+                "Could not determine current location on Missions event.",
+                entry
+                );
+            return;
+        }
+
+        foreach (Mission mission in missions.Active) {
+            try {
+                context.MissionAccepted(mission);
+            } catch (Exception exception) {
+                transactions.AddIncomplete(new MissionCompleted(),
+                    exception.Message,
+                    entry
+                    );
+            }
+        }
+    }
+}
+
+internal class MissionAcceptedParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         MissionAcceptedEntry? entry = e as MissionAcceptedEntry;
         if (entry == null) {
             throw new NotImplementedException();
@@ -254,7 +243,8 @@ internal class MissionAcceptedParser : TransactionParserPart {
 
         if (context.CurrentSystem == null || context.CurrentSystemAddress == null) {
             transactions.AddIncomplete(new MissionCompleted(),
-                "Could not determine current location on mission acceptance."
+                "Could not determine current location on mission acceptance.",
+                e
                 );
             return;
         }
@@ -263,36 +253,37 @@ internal class MissionAcceptedParser : TransactionParserPart {
             context.MissionAccepted(entry);
         } catch (Exception exception) {
             transactions.AddIncomplete(new MissionCompleted(),
-                exception.Message
+                exception.Message,
+                e
                 );
         }
     }
 }
 
-internal class MissionCompletedParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class MissionCompletedParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         MissionCompletedEntry? entry = e as MissionCompletedEntry;
         if (entry == null || entry.Mission == null) {
             throw new NotImplementedException();
         }
 
-        MissionAcceptedEntry? accepted = null;
-        Location? accepted_location = null;
+        Mission? mission;
+        Location? accepted_location;
         string? target_faction_name = entry.Mission.TargetFaction;
         string? source_faction_name = entry.Mission.Faction;
 
         // We did not find when the mission was accepted.
-        if (!context.AcceptedMissions.TryGetValue(entry.Mission.MissionID, out accepted)) {
+        if (!context.AcceptedMissions.TryGetValue(entry.Mission.MissionID, out mission)) {
             transactions.AddIncomplete(new MissionCompleted(),
                 String.Format("Mission acceptance for mission id {0} was not found",
-                entry.Mission.MissionID));
+                entry.Mission.MissionID), e);
             return;
         }
 
         if (!context.AcceptedMissionLocation.TryGetValue(entry.Mission.MissionID, out accepted_location)) {
             transactions.AddIncomplete(new MissionCompleted(),
                 String.Format("Location for acceptance for mission id {0} was not found",
-                entry.Mission.MissionID));
+                entry.Mission.MissionID), e);
             return;
         }
 
@@ -315,20 +306,20 @@ internal class MissionCompletedParser : TransactionParserPart {
                     if (context.CurrentSystemAddress == null) {
                         continue;
                     }
-                    other.Value.Add(context.CurrentSystemAddress.Value, "");
+                    other.Value.Add(context.CurrentSystemAddress.Value, new MissionInfluence());
                     // Mission gave no influence to the target faction, so we assume
                     // the target faction was in the same system.
                 } else if (string.Compare(source_faction_name, faction, true) == 0) {
                     // This happens if the source faction is not getting any influence
                     // This could be if the source faction is in a conflict, and thus does
                     // not gain any influence at all.
-                    other.Value.Add(accepted_location.SystemAddress, "");
+                    other.Value.Add(accepted_location.SystemAddress, new MissionInfluence());
 
                     // Just check if the target/source faction are the same, in which case
                     // we also have to make an additional entry
                     if (string.Compare(source_faction_name, target_faction_name, true) == 0 &&
                         context.CurrentSystemAddress != null) {
-                        other.Value.Add(context.CurrentSystemAddress.Value, "");
+                        other.Value.Add(context.CurrentSystemAddress.Value, new MissionInfluence());
                     }
                 }
             }
@@ -340,7 +331,8 @@ internal class MissionCompletedParser : TransactionParserPart {
 
                 if (!context.SystemsByID.TryGetValue(system_address, out system)) {
                     transactions.AddIncomplete(new MissionCompleted(),
-                        string.Format("Unknown system {0}, unable to assign that mission a target", system_address)
+                        string.Format("Unknown system {0}, unable to assign that mission a target", system_address),
+                        e
                         );
                     continue;
                 }
@@ -349,24 +341,33 @@ internal class MissionCompletedParser : TransactionParserPart {
                     system_address == accepted_location.SystemAddress) {
                     // Source and target faction are the same, and this is the block
                     // for the source system. So we make a full mission completed entry.
-                    transactions.Add(new MissionCompleted(entry) {
+                    transactions.Add(new MissionCompleted() {
+                        CompletedEntry = entry,
+                        Mission = mission,
                         System = accepted_location.StarSystem,
                         Faction = source_faction_name,
                         SystemAddress = accepted_location.SystemAddress,
                         Station = accepted_location.Station,
+                        IsLegacy = context.IsLegacy,
                     });
                 } else if (string.Compare(faction, source_faction_name, true) != 0 ||
                     (string.Compare(faction, source_faction_name) == 0 && 
                      system_address != accepted_location.SystemAddress)) {
+                    // Whether we ignore influence support
+                    if (options.IgnoreInfluenceSupport) {
+                        continue;
+                    }
                     // Source or target faction are different, and/or the system
                     // differs. Sometimes missions go to different systems but to
                     // the same faction.
                     transactions.Add(new InfluenceSupport() {
+                        Mission = mission,
                         Faction = faction,
                         Influence = influences.Value,
                         System = system,
                         SystemAddress = system_address,
                         RelevantMission = entry,
+                        IsLegacy = context.IsLegacy,
                     });
                 }
             }
@@ -374,11 +375,11 @@ internal class MissionCompletedParser : TransactionParserPart {
     }
 }
 
-internal class MissionFailedParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        MissionAcceptedEntry? accepted = null;
-        Location? accepted_location = null;
-        string? accepted_system = null;
+internal class MissionFailedParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        Mission? mission;
+        Location? accepted_location;
+        string? accepted_system;
 
         MissionFailedEntry? entry = e as MissionFailedEntry;
         if (entry == null) {
@@ -389,202 +390,233 @@ internal class MissionFailedParser : TransactionParserPart {
             throw new InvalidJournalEntryException("No mission specified in mission failure");
         }
 
-        if (!context.AcceptedMissions.TryGetValue(entry.Mission.MissionID, out accepted)) {
+        if (!context.AcceptedMissions.TryGetValue(entry.Mission.MissionID, out mission)) {
             transactions.AddIncomplete(new MissionFailed(),
-                "Mission acceptance was not found"
+                "Mission acceptance was not found", e
                 );
             return;
         }
 
-        if (!context.AcceptedMissionLocation.TryGetValue(entry.Mission.MissionID, out accepted_location)) {
+        if (!context.AcceptedMissionLocation.TryGetValue(mission.MissionID, out accepted_location)) {
             transactions.AddIncomplete(new MissionFailed(),
-                "Unable to figure out where failed mission was accepted"
+                "Unable to figure out where failed mission was accepted", e
                 );
             return;
         }
 
         if (!context.SystemsByID.TryGetValue(accepted_location.SystemAddress, out accepted_system)) {
             transactions.AddIncomplete(new MissionFailed(),
-                "Unable to figure out in which system failed mission was accepted"
+                "Unable to figure out in which system failed mission was accepted", e
                 );
             return;
         }
 
-        transactions.Add(new MissionFailed() {
-            Accepted = accepted,
-            Faction = accepted.Mission?.Faction,
-            Failed = entry,
+        if (string.IsNullOrEmpty(mission.Faction)) {
+            transactions.AddIncomplete(new MissionFailed(),
+                "Could not determine for what faction you failed a mission. This happens if the " +
+                "mission acceptance is not within the given time frame.",
+                entry
+                );
+        }
+
+        transactions.Add(new MissionFailed(entry) {
+            Faction = mission?.Faction,
+            Mission = mission,
             Station = accepted_location.Station,
             System = accepted_location.StarSystem,
             SystemAddress = accepted_location.SystemAddress,
+            IsLegacy = context.IsLegacy,
         });
     }
 }
 
-internal class SellExplorationDataParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        SellExplorationDataEntry? entry = e as SellExplorationDataEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        transactions.Add(new Cartographics(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.ControllingFaction,
-        });
-    }
-}
-
-internal class SellOrganicDataParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        SellOrganicDataEntry? entry = e as SellOrganicDataEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        transactions.Add(new OrganicData(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.ControllingFaction,
-        });
-    }
-}
-
-internal class MultiSellExplorationDataParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        MultiSellExplorationDataEntry? entry = e as MultiSellExplorationDataEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        transactions.Add(new Cartographics(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.ControllingFaction,
-        });
-    }
-}
-
-internal class RedeemVoucherParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        RedeemVoucherEntry? entry = e as RedeemVoucherEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        if (context.CurrentSystem == null) {
-            transactions.AddIncomplete(new Vouchers(),
-                "Could not find out where the vouchers were redeemed"
-                );
-            return;
-        }
-
-        List<Faction>? current_factions = context.GetFactions(context.CurrentSystem);
-        if (current_factions == null) {
-            transactions.AddIncomplete(new Vouchers(),
-                "Current system factions are unknown, so vouchers were ineffective");
-            return;
-        }
-
-        foreach (string faction in entry.Factions) {
-            if (current_factions.Find(x => string.Compare(x.Name, faction, true) == 0) == null) {
-                transactions.AddIncomplete(new Vouchers(),
-                    string.Format("Vouchers for {0} were ignored in {1} since said " +
-                    "faction is not present here", faction, context.CurrentSystem)
-                    );
-                continue;
-            }
-
-            transactions.Add(new Vouchers(entry) {
-                System = context.CurrentSystem,
-                Station = context.CurrentStation,
-                Faction = faction,
-                ControllingFaction = context.ControllingFaction,
-            });
-        }
-    }
-}
-
-internal class SellMicroResourcesParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class SellMicroResourcesParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         SellMicroResourcesEntry? entry = e as SellMicroResourcesEntry;
         if (entry == null) {
             throw new NotImplementedException();
         }
 
+        if (context.StationOwner == null) {
+            transactions.AddIncomplete(
+                new SellMicroResources(),
+                "Could not discern the station owner for micro resources sell.",
+                e);
+            return;
+        }
+
         transactions.Add(new SellMicroResources(entry) {
             System = context.CurrentSystem,
             Station = context.CurrentStation,
-            Faction = context.ControllingFaction,
+            Faction = context.StationOwner,
+            IsLegacy = context.IsLegacy,
         });
     }
 }
 
-internal class SearchAndRescueParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
+internal class SearchAndRescueParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         SearchAndRescueEntry? entry = e as SearchAndRescueEntry;
         if (entry == null) {
             throw new NotImplementedException();
         }
 
+        if (context.StationOwner == null) {
+            transactions.AddIncomplete(
+                new OrganicData(),
+                "Could not discern the station owner for S&R operations.",
+                e);
+            return;
+        }
+
         transactions.Add(new SearchAndRescue(entry) {
-            Faction = context.ControllingFaction,
-            Station = context.CurrentStation,
             System = context.CurrentSystem,
+            Station = context.CurrentStation,
+            Faction = context.StationOwner,
+            IsLegacy = context.IsLegacy,
         });
     }
 }
 
-internal class MarketBuyParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        MarketBuyEntry? entry = e as MarketBuyEntry;
+internal class FactionKillBondParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        FactionKillBondEntry? entry = e as FactionKillBondEntry;
         if (entry == null) {
             throw new NotImplementedException();
         }
 
-        context.BoughtCargo(entry.Type, entry.BuyPrice);
+        if (Factions.IsThargoid(entry.VictimFaction)) {
+            // Thargoid bonk
+            transactions.Add(new ThargoidKill(entry) {
+                System = context.CurrentSystem,
+                Faction = Factions.PilotsFederation,
+                Station = context.CurrentStation,
+                IsLegacy = context.IsLegacy,
+            });
 
-        transactions.Add(new BuyCargo(entry) {
-            Faction = context.ControllingFaction,
-            Station = context.CurrentStation,
-            System = context.CurrentSystem,
-        });
+            ThargoidVessel vessel = Thargoid.GetVesselByPayout(entry.Reward);
+            if (vessel != ThargoidVessel.Unknown) {
+                if (vessel == ThargoidVessel.Scout) {
+                    ++context.ThargoidScoutKills;
+                } else {
+                    ++context.ThargoidInterceptorKills;
+                }
+            }
+
+            // We are done
+            return;
+        }
+
+        context.RecordCombatBond(entry);
     }
 }
 
-internal class MarketSellParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionList transactions) {
-        long profit = 0;
+internal class EmbarkDisembarkParser : ITransactionParserPart {
+    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        if (e.Is(Events.Embark)) {
+            context.IsOnFoot = false;
+        } else if (e.Is(Events.Disembark)) {
+            context.IsOnFoot = true;
+        }
+    }
+}
 
-        MarketSellEntry? entry = e as MarketSellEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
+internal class SupercruiseEntryParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        // After a super cruise entry we are no longer on foot.
+        context.IsOnFoot = false;
+        context.DiscernCombatZone(transactions, entry);
+        context.ResetCombatZone();
+        // Supercruise entry means you left the current local instance
+        context.LeftInstance();
+    }
+}
+
+internal class ShutdownParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        context.DiscernCombatZone(transactions, entry);
+        context.ResetCombatZone();
+        // Shutdown (logout) means you left the instance
+        context.LeftInstance();
+    }
+}
+
+internal class CapShipBondParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        if (entry.GetType() != typeof(CapShipBondEntry)) {
+            return;
         }
 
-        if (entry.Type == null) {
-            throw new InvalidJournalEntryException("market sell contains no cargo type");
+        context.HaveSeenCapShip = true;
+    }
+}
+
+internal class FileHeaderParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        FileHeaderEntry? fileheader = entry as FileHeaderEntry;
+
+        if (fileheader == null) {
+            return;
         }
 
-        if (context.BuyCost.ContainsKey(entry.Type)) {
-            long avg = context.BuyCost[entry.Type];
-            profit = (long)entry.TotalSale - (avg * entry.Count);
+        context.IsLegacy = fileheader.IsLegacy;
+    }
+}
+
+internal class ReceiveTextParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        ReceiveTextEntry? receivetext = entry as ReceiveTextEntry;
+
+        if (receivetext == null) {
+            return;
         }
 
-        transactions.Add(new SellCargo(entry) {
-            Faction = context.ControllingFaction,
-            Station = context.CurrentStation,
-            System = context.CurrentSystem,
-            Profit = profit,
-        });
+        if (string.Compare(receivetext.Channel, Channels.NPC) != 0) {
+            return;
+        }
+
+        if (string.Compare(receivetext.NPCCategory, NPCs.AXMilitary) == 0) {
+            context.HaveSeenAXWarzoneNPC = true;
+        }
+    }
+}
+
+internal class DiedParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        // Death only matters in ship. On foot you can just redeploy with the dropship.
+        if (context.IsOnFoot) {
+            return;
+        }
+        // You can't complete a combat zone if you die in it. Others might keep it open
+        // for you, but still you will not have completed it unless you jump back in.
+        context.ResetCombatZone();
+        // Dying also moves you back to another instance
+        context.LeftInstance();
+    }
+}
+
+internal class DropshipDeployParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        // On drop ship deploy we are now on foot
+        context.IsOnFoot = true;
     }
 }
 
 public class TransactionParser {
-    private static Dictionary<string, TransactionParserPart> ParserParts { get; } = new()
+    private static Dictionary<string, ITransactionParserPart> ParserParts { get; } = new()
     {
+        { Events.ApproachSettlement, new ApproachSettlementParser() },
+        { Events.CapShipBond, new CapShipBondParser() },
+        { Events.CarrierJump, new CarrierJumpParser() },
+        { Events.Commander, new CommanderParser() },
         { Events.CommitCrime, new CommitCrimeParser() },
+        { Events.Died, new DiedParser() },
+        { Events.Disembark, new EmbarkDisembarkParser() },
         { Events.Docked, new DockedParser() },
+        { Events.DropshipDeploy, new DropshipDeployParser() },
+        { Events.Embark, new EmbarkDisembarkParser() },
+        { Events.FactionKillBond, new FactionKillBondParser() },
+        { Events.FileHeader, new FileHeaderParser() },
         { Events.FSDJump, new FSDJumpParser() },
         { Events.Location, new LocationParser() },
         { Events.MarketBuy, new MarketBuyParser() },
@@ -592,16 +624,48 @@ public class TransactionParser {
         { Events.MissionAccepted, new MissionAcceptedParser() },
         { Events.MissionCompleted, new MissionCompletedParser() },
         { 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() },
         { Events.SellExplorationData, new SellExplorationDataParser() },
         { Events.SellMicroResources, new SellMicroResourcesParser() },
         { Events.SellOrganicData, new SellOrganicDataParser() },
         { Events.ShipTargeted, new ShipTargetedParser() },
+        { Events.Shutdown, new ShutdownParser() },
+        { Events.SupercruiseDestinationDrop, new SupercruiseDestinationDropParser() },
+        { Events.SupercruiseEntry, new SupercruiseEntryParser() },
     };
 
+    public bool IsRelevant(string entry) {
+        return ParserParts.ContainsKey(entry);
+    }
+
+    public bool IsRelevant(Entry e) {
+        if (e.Event == null) {
+            return false;
+        }
+        return IsRelevant(e.Event);
+    }
+
+    /// <summary>
+    /// Parses a list of entries with default options.
+    /// </summary>
+    /// <param name="entries"></param>
+    /// <returns></returns>
     public List<Transaction>? Parse(IEnumerable<Entry> entries) {
+        TransactionParserOptions defaultOptions = new();
+        return Parse(entries, defaultOptions);
+    }
+
+    /// <summary>
+    /// List of commanders seen during parsing.
+    /// </summary>
+    public List<string> Commanders { get; set; } = new();
+
+    public List<Transaction>? Parse(IEnumerable<Entry> entries, TransactionParserOptions options) {
         TransactionList transactions = new();
         TransactionParserContext context = new();
 
@@ -614,10 +678,13 @@ public class TransactionParser {
                 continue;
             }
 
-            TransactionParserPart transactionParserPart = ParserParts[entry.Event];
-            transactionParserPart.Parse(entry, context, transactions);
+            ITransactionParserPart transactionParserPart = ParserParts[entry.Event];
+            transactionParserPart.Parse(entry, context, options, transactions);
         }
 
+        // Copy out list of commanders seen
+        Commanders = context.Commanders;
+
         return transactions.ToList();
     }
 }

EDPlayerJournal/BGS/TransactionParserContext.cs

@@ -0,0 +1,325 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+internal class TransactionParserContext {
+    /// <summary>
+    /// List of commander names seen in the logs. May be empty.
+    /// </summary>
+    public List<string> Commanders { get; } = new();
+
+    /// <summary>
+    /// Name of the current system the player is in.
+    /// </summary>
+    public string? CurrentSystem { get; set; }
+
+    /// <summary>
+    /// 64 bit address of the current system.
+    /// </summary>
+    public ulong? CurrentSystemAddress { get; set; }
+
+    /// <summary>
+    /// Controlling faction of the current system.
+    /// </summary>
+    public string? ControllingFaction { get; set; }
+
+    /// <summary>
+    /// Name of the current station the player is docked at.
+    /// </summary>
+    public string? CurrentStation { get; set; }
+
+    /// <summary>
+    /// Faction that owns the current station.
+    /// </summary>
+    public string? StationOwner { get; set; }
+
+    /// <summary>
+    /// Whether the player is currently on foot, or in an SRV/ship.
+    /// </summary>
+    public bool IsOnFoot { get; set; } = false;
+
+    /// <summary>
+    /// Type of the current instance after a SupercruiseDestinationDropEntry.
+    /// This is null if there is no current instance, or the current instance
+    /// is not known.
+    /// </summary>
+    public string? CurrentInstanceType { get; set; } = null;
+
+    /// <summary>
+    /// Last faction that awarded the player with combat bonds.
+    /// </summary>
+    public string? LastRecordedAwardingFaction { get; set; }
+
+    /// <summary>
+    /// Highest combat bond seen so far.
+    /// </summary>
+    public ulong? HighestCombatBond { get; set; }
+
+    public bool HaveSeenCapShip { get; set; } = false;
+    public bool HaveSeenAlliedCaptain { get; set; } = false;
+    public bool HaveSeenEnemyCaptain { get; set; } = false;
+    public bool HaveSeenSpecOps { get; set; } = false;
+    public bool HaveSeenAlliedCorrespondent { get; set; } = false;
+    public bool HaveSeenEnemyCorrespondent { get; set; } = false;
+
+    /// <summary>
+    /// Current Odyssey settlement.
+    /// </summary>
+    public string? Settlement { get; set; } = null;
+
+    /// <summary>
+    /// Returns true if the current session is legacy
+    /// </summary>
+    public bool IsLegacy { get; set; } = false;
+
+    /// <summary>
+    /// How many on foot kills were done.
+    /// </summary>
+    public ulong OnFootKills { get; set; } = 0;
+
+    /// <summary>
+    /// How many ship kills were done.
+    /// </summary>
+    public ulong ShipKills { get; set; } = 0;
+
+    /// <summary>
+    /// Thargoid scouts killed
+    /// </summary>
+    public ulong ThargoidScoutKills { get; set; } = 0;
+
+    /// <summary>
+    /// Thargoid interceptor kills
+    /// </summary>
+    public ulong ThargoidInterceptorKills { get; set; } = 0;
+
+    /// <summary>
+    /// Whether we have seen an AX warzone NPC talk to us with ReceiveText
+    /// </summary>
+    public bool HaveSeenAXWarzoneNPC { get; set; } = false;
+
+    /// <summary>
+    /// A list of accepted missions index by their mission ID
+    /// </summary>
+    public Dictionary<ulong, Mission> AcceptedMissions { get; } = new();
+    public Dictionary<ulong, Location> AcceptedMissionLocation { get; } = new();
+    /// <summary>
+    /// A way to lookup a system by its system id
+    /// </summary>
+    public Dictionary<ulong, string> SystemsByID { get; } = new();
+    /// <summary>
+    /// A list of factions present in the given star system
+    /// </summary>
+    public Dictionary<string, List<Faction>> SystemFactions { get; } = new();
+    /// <summary>
+    /// To which faction a given named NPC belonged to.
+    /// </summary>
+    public Dictionary<string, string> NPCFaction { get; } = new();
+    /// <summary>
+    /// Buy costs for a given commodity
+    /// </summary>
+    public Dictionary<string, long> BuyCost = new();
+
+    /// <summary>
+    /// Called when the player leaves an instance, either through logout, FSD jump or
+    /// supercruise instance.
+    /// </summary>
+    public void LeftInstance() {
+        CurrentInstanceType = null;
+        Settlement = null;
+    }
+
+    public void DiscernCombatZone(TransactionList transactions, Entry e) {
+        string? grade = CombatZones.DifficultyLow;
+        string cztype;
+        ulong highest = HighestCombatBond ?? 0;
+        string? faction = LastRecordedAwardingFaction;
+
+        if (HighestCombatBond == null &&
+            LastRecordedAwardingFaction == null &&
+            HaveSeenAXWarzoneNPC == false &&
+            CurrentInstanceType == null) {
+            return;
+        }
+
+        if (OnFootKills > 0 || IsOnFoot == true) {
+            cztype = CombatZones.GroundCombatZone;
+            // High on foot combat zones have enforcers that bring 80k a pop
+            if (highest >= 60000) {
+                grade = CombatZones.DifficultyHigh;
+            } else if (highest >= 30000) {
+                // In medium conflict zones, the enforcers are worth 30k
+                grade = CombatZones.DifficultyMedium;
+            } else {
+                grade = CombatZones.DifficultyLow;
+            }
+        } else if (CurrentInstanceType != null) {
+            if (!Instances.IsWarzone(CurrentInstanceType)) {
+                return;
+            }
+            if (LastRecordedAwardingFaction == null && 
+                Instances.IsHumanWarzone(CurrentInstanceType)) {
+                transactions.AddIncomplete(new CombatZone(), 
+                    "Could not discern for whom you fought for, " +
+                    "as it seems you haven't killed anyone in the ship combat zone.",
+                    e);
+                return;
+            }
+            // If we have information about the current instance being a warship use that
+            // information to determine the warzone.
+            if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneLow)) {
+                cztype = CombatZones.ShipCombatZone;
+                grade = CombatZones.DifficultyLow;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneMedium)) {
+                cztype = CombatZones.ShipCombatZone;
+                grade = CombatZones.DifficultyMedium;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneHigh)) {
+                cztype = CombatZones.ShipCombatZone;
+                grade = CombatZones.DifficultyHigh;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidLow)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyLow;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidMedium)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyMedium;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidHigh)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyHigh;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidVeryHigh)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyVeryHigh;
+            } else {
+                transactions.AddIncomplete(new CombatZone(),
+                    "Unknown conflict zone difficulty",
+                    e);
+                return;
+            }
+        } else if (ShipKills > 0 && !IsOnFoot) {
+            // Ship combat zones can be identified by the amount of kills
+            if (ShipKills > 20) {
+                grade = CombatZones.DifficultyHigh;
+            } else if (ShipKills > 10) {
+                grade = CombatZones.DifficultyMedium;
+            }
+
+            // Cap ship, means a high conflict zone
+            if (HaveSeenCapShip) {
+                grade = CombatZones.DifficultyHigh;
+            } else {
+                int warzoneNpcs = new List<bool>() { 
+                    HaveSeenEnemyCaptain, 
+                    HaveSeenEnemyCorrespondent, 
+                    HaveSeenSpecOps 
+                }
+                .Where(x => x == true)
+                .Count()
+                ;
+
+                if (warzoneNpcs >= 1 && grade == CombatZones.DifficultyLow) {
+                    grade = CombatZones.DifficultyMedium;
+                }
+            }
+            cztype = CombatZones.ShipCombatZone;
+        } else if ((ThargoidScoutKills > 0 && ThargoidInterceptorKills > 0) ||
+                   HaveSeenAXWarzoneNPC == true) {
+            // Could be a thargoid combat zones if interceptors and scouts are there
+            cztype = CombatZones.AXCombatZone;
+            // Still unknown
+            grade = null;
+        } else {
+            transactions.AddIncomplete(new CombatZone(), "Failed to discern combat zone type", e);
+            return;
+        }
+
+        CombatZone zone = new CombatZone() {
+            System = CurrentSystem,
+            Faction = faction,
+            IsLegacy = IsLegacy,
+            Settlement = Settlement,
+            Grade = grade,
+            Type = cztype,
+            // Sad truth is, if HaveSeenXXX is false, we just don't know for certain
+            CapitalShip = HaveSeenCapShip ? true : null,
+            SpecOps = HaveSeenSpecOps ? true : null,
+            EnemyCorrespondent = HaveSeenEnemyCorrespondent ? true : null,
+            AlliedCorrespondent = HaveSeenAlliedCorrespondent ? true : null,
+            EnemyCaptain = HaveSeenEnemyCaptain ? true : null,
+            AlliedCaptain = HaveSeenAlliedCaptain ? true : null,
+        };
+        zone.Entries.Add(e);
+        transactions.Add(zone);
+    }
+
+    public void RecordCombatBond(FactionKillBondEntry e) {
+        if (HighestCombatBond == null || e.Reward > HighestCombatBond) {
+            HighestCombatBond = e.Reward;
+        }
+
+        LastRecordedAwardingFaction = e.AwardingFaction;
+
+        if (IsOnFoot) {
+            ++OnFootKills;
+        } else {
+            ++ShipKills;
+        }
+    }
+
+    public void ResetCombatZone() {
+        HighestCombatBond = null;
+        HaveSeenCapShip = false;
+        HaveSeenAlliedCaptain = false;
+        HaveSeenEnemyCaptain = false;
+        HaveSeenAlliedCorrespondent = false;
+        HaveSeenEnemyCorrespondent = false;
+        HaveSeenSpecOps = false;
+        LastRecordedAwardingFaction = null;
+        OnFootKills = 0;
+        ShipKills = 0;
+        ThargoidInterceptorKills = 0;
+        ThargoidScoutKills = 0;
+        HaveSeenAXWarzoneNPC = false;
+    }
+
+    public void BoughtCargo(string? cargo, long? cost) {
+        if (cargo == null || cost == null) {
+            return;
+        }
+
+        BuyCost[cargo] = cost.Value;
+    }
+
+    public List<Faction>? GetFactions(string? system) {
+        if (system == null || !SystemFactions.ContainsKey(system)) {
+            return null;
+        }
+
+        return SystemFactions[system];
+    }
+
+    public void MissionAccepted(MissionAcceptedEntry? entry) {
+        if (entry == null) {
+            return;
+        }
+
+        MissionAccepted(entry.Mission);
+    }
+
+    public void MissionAccepted(Mission? mission) {
+        if (CurrentSystem == null || CurrentSystemAddress == null) {
+            throw new Exception("Mission accepted without knowing where.");
+        }
+
+        if (mission == null) {
+            throw new Exception("Mission is null");
+        }
+
+        AcceptedMissions.TryAdd(mission.MissionID, mission);
+
+        Location location = new() {
+            StarSystem = CurrentSystem,
+            SystemAddress = CurrentSystemAddress.Value,
+            Station = (CurrentStation ?? ""),
+        };
+
+        AcceptedMissionLocation.TryAdd(mission.MissionID, location);
+    }
+}

EDPlayerJournal/BGS/TransactionParserPart.cs

@@ -0,0 +1,19 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+internal interface ITransactionParserPart {
+    /// <summary>
+    /// Parse a given entry of the entry type specified when declaring to implement this
+    /// interface. You must add your transaction to the passed list in case you did have
+    /// enough information to parse one or more. You may update the parser context
+    /// with new information in case the entry yielded new information.
+    /// Throw an exception if there was an error or a malformed entry. If you have an
+    /// incomplete entry, i.e. not enough information to complete one, add an
+    /// IncompleteTransaction to the list
+    /// </summary>
+    /// <param name="entry">The entry to parse</param>
+    /// <param name="context">Parsing context that may contain useful information</param>
+    /// <param name="transactions">List of parsed transactions</param>
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions);
+}

EDPlayerJournal/BGS/Vouchers.cs

@@ -20,8 +20,8 @@ public class Vouchers : Transaction {
             }
             return Entries
                 .OfType<RedeemVoucherEntry>()
-                .Where(x => x.FactionBounties.ContainsKey(Faction))
-                .Sum(x => x.FactionBounties[Faction])
+                .ToList()
+                .Sum(x => (long)x.GetBountyForFaction(Faction))
                 ;
         }
     }
@@ -39,9 +39,9 @@ public class Vouchers : Transaction {
                              .First();
                 if (v == null) {
                     return null;
-                } else if (v == "CombatBond") {
+                } else if (v == Bonds.CombatBond) {
                     type = "Combat Bond";
-                } else if (v == "bounty") {
+                } else if (v == Bonds.Bounty) {
                     type = "Bounty";
                 } else {
                     type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(v);

EDPlayerJournal/Bonds.cs

@@ -0,0 +1,13 @@
+namespace EDPlayerJournal;
+
+public class Bonds {
+    /// <summary>
+    /// Internal string name for combat bonds.
+    /// </summary>
+    public static readonly string CombatBond = "CombatBond";
+
+    /// <summary>
+    /// Internal string name for bounties.
+    /// </summary>
+    public static readonly string Bounty = "bounty";
+}

EDPlayerJournal/Channels.cs

@@ -0,0 +1,8 @@
+namespace EDPlayerJournal;
+
+public class Channels {
+    /// <summary>
+    /// Channel NPCs use to talk to the commander.
+    /// </summary>
+    public static readonly string NPC = "npc";
+}

EDPlayerJournal/CombatZones.cs

@@ -0,0 +1,64 @@
+namespace EDPlayerJournal; 
+
+/// <summary>
+/// Static strings related to combat zones
+/// </summary>
+public class CombatZones {
+    /// <summary>
+    /// Type string for ground combat zone
+    /// </summary>
+    public static readonly string GroundCombatZone = "Ground";
+
+    /// <summary>
+    /// Type string for ship combat zones
+    /// </summary>
+    public static readonly string ShipCombatZone = "Ship";
+
+    /// <summary>
+    /// AX combat zone
+    /// </summary>
+    public static readonly string AXCombatZone = "AX";
+
+    /// <summary>
+    /// Difficulty low
+    /// </summary>
+    public static readonly string DifficultyLow = "Low";
+
+    /// <summary>
+    /// Difficulty medium
+    /// </summary>
+    public static readonly string DifficultyMedium = "Medium";
+
+    /// <summary>
+    /// Difficulty high
+    /// </summary>
+    public static readonly string DifficultyHigh = "High";
+
+    /// <summary>
+    /// Very high difficulty, so far AX combat zone only
+    /// </summary>
+    public static readonly string DifficultyVeryHigh = "Very High";
+
+    /// <summary>
+    /// Returns the given combat zone difficulty as an integer, so it can be sorted.
+    /// 0 = lowest difficulty, 1 = medium and so forth.
+    /// </summary>
+    public static int? DifficultyRank(string? difficulty) {
+        Dictionary<string, int> ranks = new() {
+            { DifficultyLow, 0 },
+            { DifficultyMedium, 1 },
+            { DifficultyHigh, 2 },
+            { DifficultyVeryHigh, 3 }
+        };
+
+        if (difficulty == null ) {
+            return null;
+        }
+
+        if (ranks.TryGetValue(difficulty, out int rank)) {
+            return rank;
+        }
+
+        return null;
+    }
+}

EDPlayerJournal/Credits.cs

@@ -3,7 +3,11 @@
 namespace EDPlayerJournal;
 
 public class Credits {
-    public static string FormatCredits(int amount) {
+    public static string FormatCredits(uint amount) {
+        return FormatCredits((long)amount);
+    }
+
+    public static string FormatCredits(ulong amount) {
         return FormatCredits((long)amount);
     }
 
@@ -30,4 +34,16 @@ public class Credits {
 
         return string.Format("{0} CR", amount.ToString("N", format));
     }
+
+    public static string FormatMillions(long amount) {
+        double millions = (amount / 1000000.0);
+
+        if (amount >= 100000) {
+            return string.Format("{0:0.0}M", millions);
+        } else if (amount >= 10000) {
+            return string.Format("{0:0.00}M", millions);
+        }
+
+        return string.Format("{0}", amount);
+    }
 }

EDPlayerJournal/EDPlayerJournal.csproj

@@ -10,10 +10,4 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="MissionNames.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

EDPlayerJournal/EnglishMissionNames.cs

@@ -0,0 +1,147 @@
+namespace EDPlayerJournal;
+
+public class EnglishMissionNames {
+    public static Dictionary<string, string> MissionNames { get; } = new Dictionary<string, string>() {
+        {"Chain_FindThePirateLord_name", "Assassination (Pirate Lord) (Chain)"},
+        {"Chain_RegainFooting_name", "Regain Footing (Chain)"},
+        {"Chain_SalvageJustice_name", "Assassination (Legal) (Chain)"},
+        {"Mission_Altruism_Bust_name", "Donate (Bust)" },
+        {"Mission_Altruism_CivilUnrest_name", "Donate (Civil Unrest)" },
+        {"Mission_Altruism_name", "Donate"},
+        {"Mission_Altruism_Outbreak_name", "Donate (Outbreak)" },
+        {"Mission_AltruismCredits_Bust_name", "Donate Credits (Bust)"},
+        {"Mission_AltruismCredits_CivilUnrest_name", "Donate Credits (Civil Unrest)" },
+        {"Mission_AltruismCredits_Famine_name", "Donate Credits (Famine)"},
+        {"Mission_AltruismCredits_name", "Donate Credits"},
+        {"Mission_AltruismCredits_Outbreak_name", "Donate Credits (Outbreak)" },
+        {"Mission_Assassinate_Illegal_BLOPS_name", "Assassination (Illegal)"},
+        {"MISSION_assassinate_Illegal_Planetary_name", "Assassination (Illegal, Planetary)" },
+        {"Mission_Assassinate_Legal_Bust_name", "Assassination (Bust, Legal)" },
+        {"MISSION_assassinate_legal_CivilUnrest_name", "Assassination (Civil Unrest, Legal)" },
+        {"Mission_Assassinate_Legal_Communism_name", "Assassination (Communism, Legal)" },
+        {"Mission_Assassinate_Legal_Corporate_name", "Assassination (Corporate, Legal)"},
+        {"Mission_Assassinate_Legal_War_name", "Assassination (War, Legal)" },
+        {"Mission_Assassinate_name", "Assassination"},
+        {"Mission_Assassinate_Planetary_Expansion_name", "Assassination (Planetary Scan, Expansion)" },
+        {"Mission_Assassinate_Planetary_name", "Assassination (Planetary Scan)"},
+        {"Mission_Collect_Bust_name", "Provide (Bust)"},
+        {"Mission_Collect_CivilLiberty_name", "Provide (Civil Liberty)"},
+        {"Mission_Collect_CivilUnrest_name", "Provide (Civil Unrest)"},
+        {"Mission_Collect_Famine_name", "Provide (Famine)"},
+        {"Mission_Collect_Industrial_name", "Provide (Industrial)"},
+        {"Mission_Collect_name", "Provide"},
+        {"Mission_Collect_Outbreak_name", "Provide (Outbreak)" },
+        {"Mission_Collect_RankEmp_name", "Provide (Imperial Navy)"},
+        {"Mission_Collect_Retreat_name", "Provide (Retreat)"},
+        {"Mission_Courier_CivilUnrest_name", "Courier (Divil Unrest)" },
+        {"Mission_Courier_Democracy_name", "Courier (Democracy)"},
+        {"Mission_Courier_Elections_name", "Courier (Elections)"},
+        {"Mission_Courier_Expansion_name", "Courier (Expansion)"},
+        {"Mission_Courier_Famine_name", "Courier (Famine)"},
+        {"Mission_Courier_Lockdown_name", "Courier (Lockdown)"},
+        {"Mission_Courier_name", "Courier"},
+        {"Mission_Courier_RankEmp_name", "Courier (Imperial Navy)"},
+        {"Mission_Courier_War_name", "Courier (War)" },
+        {"Mission_Delivery_Agriculture_name", "Delivery (Agriculture)"},
+        {"Mission_Delivery_Boom_name", "Delivery (Boom)"},
+        {"Mission_Delivery_CivilUnrest_name", "Delivery (Civil Unrest)"},
+        {"Mission_Delivery_Democracy_name", "Delivery (Democracy)"},
+        {"Mission_Delivery_Investment_name", "Delivery (Investment)"},
+        {"Mission_Delivery_name", "Delivery"},
+        {"Mission_Delivery_RankEmp_name", "Delivery (Imperial Navy)"},
+        {"Mission_Delivery_Retreat_name", "Delivery (Retreat)"},
+        {"Mission_DeliveryWing_name", "Delivery (Wing)"},
+        {"Mission_DeliveryWing_War_name", "Delivery (Wing) (War)"},
+        {"Mission_Disable_BLOPS_Expansion_name", "Disable Surface Installation (Expansion) (Black Ops)" },
+        {"MISSION_Disable_BLOPS_name", "Disable Surface Installation (Black Ops)" },
+        {"MISSION_Disable_name", "Disable Surface Installation" },
+        {"MISSION_Hack_name", "Hack Surface Installation" },
+        {"Mission_Hack_BLOPS_Boom_name", "Hack Surface Installation (Boom)"},
+        {"Mission_Hack_BLOPS_Elections_name", "Hack Surface Installation (Elections)"},
+        {"Mission_Hack_BLOPS_Expansion_name", "Hack Surface Installation (Expansion)"},
+        {"MISSION_Hack_BLOPS_name", "Hack Surface Installation"},
+        {"Mission_HackMegaship_name", "Hack Megaship"},
+        {"Mission_LongDistanceExpedition_Explorer_Boom_name", "Long Distance Expedition (Boom)"},
+        {"Mission_LongDistanceExpedition_name", "Long Distance Expedition"},
+        {"Mission_Massacre_Conflict_CivilWar_name", "Massacre (Civil War)"},
+        {"Mission_Massacre_name", "Massacre"},
+        {"Mission_Massacre_RankEmp_name", "Massacre (Imperial Navy)"},
+        {"Mission_MassacreWing_Legal_Bust_name", "Massacre (Wing) (Bust)"},
+        {"Mission_MassacreWing_name", "Massacre (Wing)"},
+        {"Mission_Mining_name", "Mining" },
+        {"Mission_OnFoot_Assassination_MB_name", "On Foot Assassination"},
+        {"Mission_OnFoot_Assassination_Hard_MB_name", "On Foot Assassination (Flight-Risk)" },
+        {"Mission_OnFoot_Assassination_Covert_MB_name", "On Foot Assassination (Covert)" },
+        {"Mission_OnFoot_AssassinationIllegal_MB_name", "On Foot Assassination (Illegal)"},
+        {"Mission_OnFoot_AssassinationIllegal_NCD_MB_name", "On Foot Assassination (Illegal)" },
+        {"Mission_OnFoot_Collect_Contact_MB_name", "On Foot Collect"},
+        {"Mission_OnFoot_Collect_MB_name", "On Foot Collection"},
+        {"Mission_OnFoot_Defence_MacGuffin_MB_StandardCanister_name", "On Foot Cargo Defence" },
+        {"Mission_OnFoot_Delivery_Contact_MB_name", "On Foot Delivery (Contact)"},
+        {"Mission_OnFoot_Hack_Upload_Covert_MB_name", "On Foot Hack (Covert Upload)"},
+        {"Mission_OnFoot_Hack_Upload_MB_name", "On Foot Hack (Upload)"},
+        {"Mission_OnFoot_Heist_MB_name", "On Foot Heist" },
+        {"Mission_OnFoot_Heist_POI_MB_name", "On Foot Heist (POI)"},
+        {"Mission_OnFoot_Massacre_MB_name", "On Foot Massacre" },
+        {"Mission_OnFoot_MassacreIllegal_MB_name", "On Foot Massacre (Illegal)"},
+        {"Mission_OnFoot_Onslaught_MB_name", "On Foot Onslaught"},
+        {"Mission_OnFoot_Onslaught_Offline_MB_name", "On Foot Onslaught (Offline)"},
+        {"Mission_OnFoot_ProductionHeist_Covert_MB_name", "On Foot Production Heist (Covert)"},
+        {"Mission_OnFoot_ProductionHeist_MB_name", "On Foot Production Heist"},
+        {"Mission_OnFoot_Reboot_MB_name", "On Foot Reboot"},
+        {"Mission_OnFoot_RebootRestore_MB_name", "On Foot Reboot/Restore"},
+        {"Mission_OnFoot_Sabotage_Power_MB_name", "On Foot Power Sabotage"},
+        {"Mission_OnFoot_Sabotage_Power_Covert_MB_name", "On Foot Power Sabotage (Covert)"},
+        {"Mission_OnFoot_Sabotage_Production_MB_name", "On Foot Production Sabotage"},
+        {"Mission_OnFoot_Sabotage_Production_Covert_MB_name", "On Foot Production Sabotage (Covert)"},
+        {"Mission_OnFoot_Salvage_MB_name", "On Foot Salvage"},
+        {"Mission_OnFoot_SalvageIllegal_MB_name", "On Foot Salvage (Illegal)"},
+        {"Mission_OnFoot_Smuggle_Contact_MB_name", "On Foot Smuggling" },
+        {"Mission_PassengerBulk_AIDWORKER_ARRIVING", "Seeking Transport (Aid Workers)"},
+        {"Mission_PassengerBulk_name", "Seeking Transport" },
+        {"Mission_PassengerVIP", "Passenger (VIP)"},
+        {"Mission_PassengerVIP_Criminal_BOOM_name", "Passenger Criminal (VIP) (Boom)"},
+        {"Mission_PassengerVIP_name", "Passenger (VIP)"},
+        {"Mission_PassengerVIP_Scientist_FAMINE_name", "Passenger Scientist (VIP) (Famine)"},
+        {"Mission_PassengerVIP_Tourist_BOOM_name", "Passenger Tourist (VIP) (Boom)"},
+        {"Mission_Rescue_Elections_name", "Liberate Hostages (Election)" },
+        {"Mission_Rescue_name", "Liberate Hostages" },
+        {"Mission_Rescue_Planet_Expansion_name", "Planet Rescue (Expansion)" },
+        {"Mission_Rescue_Planet_Retreat_name", "Planet Rescue (Retreat)" },
+        {"Mission_Rescue_Planet_name", "Planet Rescue"},
+        {"MISSION_Salvage_CivilUnrest_name", "Salvage (Civil Unrest)"},
+        {"MISSION_Salvage_Expansion_name", "Salvage (Expansion)"},
+        {"MISSION_Salvage_Illegal_name", "Salvage (Illegal)"},
+        {"Mission_Salvage_name", "Salvage"},
+        {"Mission_Salvage_RankEmp_name", "Salvage (Imperial Navy)"},
+        {"MISSION_Salvage_Refinery_name", "Salvage (Refinery)"},
+        {"MISSION_Salvage_Retreat_name", "Salvage (Retreat)"},
+        {"MISSION_Scan_name", "Scan"},
+        {"Mission_Sightseeing_Criminal_FAMINE_name", "Sightseeing (Criminal) (Famine)"},
+        {"Mission_Sightseeing_name", "Sightseeing"},
+        {"Mission_Smuggle_Anarchy_name", "Smuggling (Anarchy)" },
+        {"Mission_TW_Massacre_Basilisk_Plural_name", "Kill Basilisks" },
+        {"Mission_TW_Massacre_Basilisk_Singular_name", "Kill Basilisk" },
+        {"Mission_TW_Massacre_Cyclops_Plural_name", "Kill Cyclops" },
+        {"Mission_TW_Massacre_Cyclops_Singular_name", "Kill Cyclop" },
+        {"Mission_TW_Massacre_Hydra_Plural_name", "Kill Hydras" },
+        {"Mission_TW_Massacre_Hydra_Singular_name", "Kill Hydra" },
+        {"Mission_TW_Massacre_Medusa_Plural_name", "Kill Medusas" },
+        {"Mission_TW_Massacre_Medusa_Singular_name", "Kill Medusa" },
+        {"Mission_TW_Massacre_Scout_Plural_name", "Kill Scouts" },
+        {"Mission_TW_OnFoot_Reboot_Occupied_MB_name", "Reboot Settlement (Thargoid)" },
+        {"Mission_TW_OnFoot_Reboot_NR_name", "Reboot Settlement (Thargoid)" },
+        {"Mission_TW_OnFoot_Reboot_MB_name", "Reboot Settlement (Thargoid)" },
+        {"Mission_TW_PassengerEvacuation_Burning_name", "Passenger Evacuation (Significant Damage)" },
+        {"Mission_TW_PassengerEvacuation_UnderAttack_name", "Passenger Evacuation (Thargoid Invasion)" },
+        {"Mission_TW_Rescue_UnderAttack_name", "Rescue (Thargoid Attack)" },
+    };
+
+    public static string? Translate(string name) {
+        if (MissionNames.ContainsKey(name)) {
+            return MissionNames[name];
+        }
+
+        return null;
+    }
+}

EDPlayerJournal/Entries/ApproachSettlementEntry.cs

@@ -0,0 +1,48 @@
+namespace EDPlayerJournal.Entries;
+
+public class ApproachSettlementEntry : Entry {
+    /// <summary>
+    /// Settlement name
+    /// </summary>
+    public string? Name { get; set; } = null;
+
+    /// <summary>
+    /// Market ID of the settlement
+    /// </summary>
+    public long? MarketID { get; set; } = null;
+
+    /// <summary>
+    /// System ID
+    /// </summary>
+    public long? SystemAddress { get; set; } = null;
+
+    /// <summary>
+    /// Body ID
+    /// </summary>
+    public long? BodyID { get; set; } = null;
+
+    /// <summary>
+    /// Name of the planet
+    /// </summary>
+    public string? BodyName { get; set; } = null;
+
+    /// <summary>
+    /// Planet latitude
+    /// </summary>
+    public double Latitude { get; set; } = 0.0;
+
+    /// <summary>
+    /// Planet longitude
+    /// </summary>
+    public double Longitude { get; set; } = 0.0;
+
+    protected override void Initialise() {
+        Name = JSON.Value<string?>("Name");
+        MarketID = JSON.Value<long?>("MarketID");
+        SystemAddress = JSON.Value<long?>("SystemID");
+        BodyID = JSON.Value<long?>("BodyID");
+        BodyName = JSON.Value<string?>("BodyName");
+        Longitude = JSON.Value<double?>("Longitude") ?? 0.0;
+        Latitude = JSON.Value<double?>("Latitude") ?? 0.0;
+    }
+}

EDPlayerJournal/Entries/CapShipBondEntry.cs

@@ -0,0 +1,24 @@
+namespace EDPlayerJournal.Entries;
+
+public class CapShipBondEntry : Entry {
+    /// <summary>
+    /// Reward gained
+    /// </summary>
+    public ulong Reward { get; set; } = 0;
+
+    /// <summary>
+    /// Victim faction, i.e. to whom the cap ship belongs
+    /// </summary>
+    public string? VictimFaction { get; set; }
+
+    /// <summary>
+    /// Awarding faction.
+    /// </summary>
+    public string? AwardingFaction { get; set; }
+
+    protected override void Initialise() {
+        Reward = JSON.Value<ulong?>("Reward") ?? 0;
+        VictimFaction = JSON.Value<string?>("VictimFaction");
+        AwardingFaction = JSON.Value<string?>("AwardingFaction");
+    }
+}

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/CommanderEntry.cs

@@ -8,4 +8,13 @@ public class CommanderEntry : Entry {
         Name = JSON.Value<string>("Name") ?? "";
         FID = JSON.Value<string>("FID") ?? "";
     }
+
+    public string FullName {
+        get {
+            if (string.IsNullOrEmpty(Name)) {
+                return string.Empty;
+            }
+            return "CMDR " + Name;
+        }
+    }
 }

EDPlayerJournal/Entries/CommitCrimeEntry.cs

@@ -19,4 +19,12 @@ public class CommitCrimeEntry : Entry {
     public bool IsMurder {
         get { return CrimeType?.CompareTo(CrimeTypes.Murder) == 0 || CrimeType?.CompareTo(CrimeTypes.OnFootMurder) == 0; }
     }
+
+    public bool IsCrime(string crimetype) {
+        if (CrimeType == null) {
+            return false;
+        }
+
+        return string.Compare(CrimeType, crimetype) == 0;
+    }
 }

EDPlayerJournal/Entries/DisembarkEntry.cs

@@ -0,0 +1,66 @@
+namespace EDPlayerJournal.Entries;
+
+public class DisembarkEntry : Entry {
+    /// <summary>
+    /// Disembarked into an SRV?
+    /// </summary>
+    public bool SRV { get; set; } = false;
+
+    /// <summary>
+    /// Taxi?
+    /// </summary>
+    public bool Taxi { get; set; } = false;
+
+    /// <summary>
+    /// Multicrew or not.
+    /// </summary>
+    public bool Multicrew { get; set; } = false;
+
+    /// <summary>
+    /// Player's ship ID
+    /// </summary>
+    public ulong? ID { get; set; }
+
+    /// <summary>
+    /// Star system
+    /// </summary>
+    public string? StarSystem { get; set; }
+
+    /// <summary>
+    /// System address
+    /// </summary>
+    public ulong? SystemAddress { get; set; }
+
+    /// <summary>
+    /// Body, name e.g. HIP 6182 B 2 a
+    /// </summary>
+    public string? Body { get; set; }
+
+    /// <summary>
+    /// Body ID
+    /// </summary>
+    public ulong? BodyID { get; set; }
+
+    /// <summary>
+    /// Disembarked on a station?
+    /// </summary>
+    public bool OnStation { get; set; } = false;
+
+    /// <summary>
+    /// Disembarked on a planet?
+    /// </summary>
+    public bool OnPlanet { get; set; } = false;
+
+    protected override void Initialise() {
+        SRV = JSON.Value<bool?>("SRV") ?? false;
+        Taxi = JSON.Value<bool?>("Taxi") ?? false;
+        Multicrew = JSON.Value<bool?>("Multicrew") ?? false;
+        ID = JSON.Value<ulong?>("ID");
+        StarSystem = JSON.Value<string?>("StarSystem");
+        SystemAddress = JSON.Value<ulong?>("SystemAddress");
+        Body = JSON.Value<string?>("Body");
+        BodyID = JSON.Value<ulong?>("BodyID");
+        OnStation = JSON.Value<bool?>("OnStation") ?? false;
+        OnPlanet = JSON.Value<bool?>("OnPlanet") ?? false;
+    }
+}

EDPlayerJournal/Entries/DockedEntry.cs

@@ -2,15 +2,36 @@
 
 namespace EDPlayerJournal.Entries; 
 public class DockedEntry : Entry {
+    /// <summary>
+    /// Name of the station
+    /// </summary>
     public string? StationName { get; set; }
+
+    /// <summary>
+    /// Star system of the station
+    /// </summary>
     public string? StarSystem { get; set; }
+
+    /// <summary>
+    /// System address
+    /// </summary>
     public ulong? SystemAddress { get; set; }
+
+    /// <summary>
+    /// Faction owning the station.
+    /// </summary>
     public string? StationFaction { get; set; }
 
+    /// <summary>
+    /// State of the station, new in Update 14
+    /// </summary>
+    public string? StationState { get; set; }
+
     protected override void Initialise() {
         StationName = JSON.Value<string>("StationName");
         StarSystem = JSON.Value<string>("StarSystem");
         SystemAddress = JSON.Value<ulong?>("SystemAddress");
+        StationState = JSON.Value<string>("StationState");
         JObject? faction = JSON.Value<JObject>("StationFaction");
         if (faction != null) {
             StationFaction = faction.Value<string>("Name") ?? "";

EDPlayerJournal/Entries/DropshipDeployEntry.cs

@@ -0,0 +1,42 @@
+namespace EDPlayerJournal.Entries;
+
+public class DropshipDeployEntry : Entry {
+    /// <summary>
+    /// Star system this drop happened in.
+    /// </summary>
+    public string? StarSystem { get; set; }
+
+    /// <summary>
+    /// System address
+    /// </summary>
+    public ulong? SystemAddress { get; set; }
+
+    /// <summary>
+    /// Planetary body
+    /// </summary>
+    public string? Body { get; set; }
+
+    /// <summary>
+    /// Body ID
+    /// </summary>
+    public ulong? BodyID { get; set; }
+
+    /// <summary>
+    /// Whether it happened on station.
+    /// </summary>
+    public bool? OnStation { get; set; }
+
+    /// <summary>
+    /// Whether it happened on a planet.
+    /// </summary>
+    public bool? OnPlanet { get; set; }
+
+    protected override void Initialise() {
+        StarSystem = JSON.Value<string?>("StarSystem");
+        SystemAddress = JSON.Value<ulong?>("SystemAddress");
+        Body = JSON.Value<string?>("Body");
+        BodyID = JSON.Value<ulong?>("BodyID");
+        OnStation = JSON.Value<bool?>("OnStation");
+        OnPlanet = JSON.Value<bool?>("OnPlanet");
+    }
+}

EDPlayerJournal/Entries/EmbarkEntry.cs

@@ -0,0 +1,66 @@
+namespace EDPlayerJournal.Entries;
+
+public class EmbarkEntry : Entry {
+    /// <summary>
+    /// Disembarked into an SRV?
+    /// </summary>
+    public bool SRV { get; set; } = false;
+
+    /// <summary>
+    /// Taxi?
+    /// </summary>
+    public bool Taxi { get; set; } = false;
+
+    /// <summary>
+    /// Multicrew or not.
+    /// </summary>
+    public bool Multicrew { get; set; } = false;
+
+    /// <summary>
+    /// Player's ship ID
+    /// </summary>
+    public ulong? ID { get; set; }
+
+    /// <summary>
+    /// Star system
+    /// </summary>
+    public string? StarSystem { get; set; }
+
+    /// <summary>
+    /// System address
+    /// </summary>
+    public ulong? SystemAddress { get; set; }
+
+    /// <summary>
+    /// Body, name e.g. HIP 6182 B 2 a
+    /// </summary>
+    public string? Body { get; set; }
+
+    /// <summary>
+    /// Body ID
+    /// </summary>
+    public ulong? BodyID { get; set; }
+
+    /// <summary>
+    /// Disembarked on a station?
+    /// </summary>
+    public bool OnStation { get; set; } = false;
+
+    /// <summary>
+    /// Disembarked on a planet?
+    /// </summary>
+    public bool OnPlanet { get; set; } = false;
+
+    protected override void Initialise() {
+        SRV = JSON.Value<bool?>("SRV") ?? false;
+        Taxi = JSON.Value<bool?>("Taxi") ?? false;
+        Multicrew = JSON.Value<bool?>("Multicrew") ?? false;
+        ID = JSON.Value<ulong?>("ID");
+        StarSystem = JSON.Value<string?>("StarSystem");
+        SystemAddress = JSON.Value<ulong?>("SystemAddress");
+        Body = JSON.Value<string?>("Body");
+        BodyID = JSON.Value<ulong?>("BodyID");
+        OnStation = JSON.Value<bool?>("OnStation") ?? false;
+        OnPlanet = JSON.Value<bool?>("OnPlanet") ?? false;
+    }
+}

EDPlayerJournal/Entries/Entry.cs

@@ -12,13 +12,19 @@ namespace EDPlayerJournal.Entries;
 /// </summary>
 public class Entry {
     private static readonly Dictionary<string, Type> classes = new Dictionary<string, Type> {
+        { 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) },
+        { Events.Disembark, typeof(DisembarkEntry) },
         { Events.Docked, typeof(DockedEntry) },
-        { Events.FileHeader, typeof(FileHeaderEntry) },
+        { Events.DropshipDeploy, typeof(DropshipDeployEntry) },
+        { Events.Embark, typeof(EmbarkEntry) },
         { Events.FactionKillBond, typeof(FactionKillBondEntry) },
+        { Events.FileHeader, typeof(FileHeaderEntry) },
         { Events.FSDJump, typeof(FSDJumpEntry) },
         { Events.HullDamage, typeof(HullDamageEntry) },
         { Events.LoadGame, typeof(LoadGameEntry) },
@@ -32,6 +38,8 @@ 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) },
         { Events.SellExplorationData, typeof(SellExplorationDataEntry) },
@@ -39,6 +47,9 @@ public class Entry {
         { Events.SellOrganicData, typeof(SellOrganicDataEntry) },
         { Events.ShieldState, typeof(ShieldStateEntry) },
         { Events.ShipTargeted, typeof(ShipTargetedEntry) },
+        { Events.SupercruiseDestinationDrop, typeof(SupercruiseDestinationDropEntry) },
+        { Events.SupercruiseEntry, typeof(SupercruiseEntryEntry) },
+        { Events.SupercruiseExit, typeof(SupercruiseExitEntry) },
         { Events.UnderAttack, typeof(UnderAttackEntry) },
     };
 
@@ -55,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;
             }
@@ -98,7 +117,7 @@ public class Entry {
         this.datetime = json.GetValue("timestamp")?.ToString();
 
         if (!string.IsNullOrEmpty(this.datetime)) {
-            this.timestamp = DateTime.Parse(this.datetime);
+            this.timestamp = DateTime.Parse(this.datetime, null, System.Globalization.DateTimeStyles.RoundtripKind);
         }
     }
 

EDPlayerJournal/Entries/Events.cs

@@ -1,11 +1,17 @@
 namespace EDPlayerJournal.Entries;
 
 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";
+    public static readonly string Disembark = "Disembark";
     public static readonly string Docked = "Docked";
+    public static readonly string DropshipDeploy = "DropshipDeploy";
+    public static readonly string Embark = "Embark";
     public static readonly string FactionKillBond = "FactionKillBond";
     public static readonly string FighterDestroyed = "FighterDestroyed";
     public static readonly string FileHeader = "Fileheader";
@@ -22,6 +28,8 @@ 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";
     public static readonly string SellExplorationData = "SellExplorationData";
@@ -29,5 +37,9 @@ public class Events {
     public static readonly string SellOrganicData = "SellOrganicData";
     public static readonly string ShieldState = "ShieldState";
     public static readonly string ShipTargeted = "ShipTargeted";
+    public static readonly string Shutdown = "Shutdown";
+    public static readonly string SupercruiseDestinationDrop = "SupercruiseDestinationDrop";
+    public static readonly string SupercruiseEntry = "SupercruiseEntry";
+    public static readonly string SupercruiseExit = "SupercruiseExit";
     public static readonly string UnderAttack = "UnderAttack";
 }

EDPlayerJournal/Entries/FactionKillBondEntry.cs

@@ -1,13 +1,32 @@
 namespace EDPlayerJournal.Entries; 
 
 public class FactionKillBondEntry : Entry {
-    public int Reward { get; set; }
+    /// <summary>
+    /// Reward given
+    /// </summary>
+    public ulong Reward { get; set; } = 0;
+    /// <summary>
+    /// Faction that awarded the kill bond
+    /// </summary>
     public string? AwardingFaction { get; set; }
+    /// <summary>
+    /// Localised string of the awarding faction if available
+    /// </summary>
+    public string? AwardingFactionLocalised { get; set; }
+    /// <summary>
+    /// Victim faction, internal name
+    /// </summary>
     public string? VictimFaction { get; set; }
+    /// <summary>
+    /// Localised name of the victim faction
+    /// </summary>
+    public string? VictimFactionLocalised { get; set; }
 
     protected override void Initialise() {
-        Reward = JSON.Value<int?>("Reward") ?? 0;
+        Reward = JSON.Value<ulong?>("Reward") ?? 0;
         AwardingFaction = JSON.Value<string>("AwardingFaction");
+        AwardingFactionLocalised = JSON.Value<string>("AwardingFaction_Localised");
         VictimFaction = JSON.Value<string>("VictimFaction");
+        VictimFactionLocalised = JSON.Value<string>("VictimFaction_Localised");
     }
 }

EDPlayerJournal/Entries/FileHeaderEntry.cs

@@ -26,6 +26,22 @@ public class FileHeaderEntry : Entry {
     /// </summary>
     public string? Build { get; set; }
 
+    /// <summary>
+    /// Returns true if the version is legacy (3.X)
+    /// <summary>
+    public bool IsLegacy {
+        get {
+            return GameVersion.StartsWith("3.");
+        }
+    }
+
+    /// <summary>
+    /// Returns true if the version is live (4.x)
+    /// </summary>
+    public bool IsLive {
+        get { return !IsLegacy; }
+    }
+
     protected override void Initialise() {
         Part = JSON.Value<ulong?>("part") ?? 1;
         Language = JSON.Value<string?>("language") ?? string.Empty;

EDPlayerJournal/Entries/LocationEntry.cs

@@ -1,18 +1,47 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
+
+namespace EDPlayerJournal.Entries;
 
-namespace EDPlayerJournal.Entries; 
 public class LocationEntry : Entry {
+    /// <summary>
+    /// Current star system.
+    /// </summary>
     public string? StarSystem { get; set; }
+
+    /// <summary>
+    /// Faction in control of the current star system. Empty for unpopulated
+    /// systems.
+    /// </summary>
     public string? SystemFaction { get; set; }
-    public string? StationName { get; set; }
+
+    /// <summary>
+    /// 64bit system address.
+    /// </summary>
     public ulong SystemAddress { get; set; }
+
+    /// <summary>
+    /// Station name if docked at a station.
+    /// </summary>
+    public string? StationName { get; set; }
+
+    /// <summary>
+    /// Faction in control of the current station, if docked.
+    /// </summary>
+    public string? StationFaction { get; set; }
+
+    /// <summary>
+    /// Body within the system, might be null.
+    /// </summary>
     public string? Body { get; set; }
+
+    /// <summary>
+    /// Returns true if the player is docked somewhere.
+    /// </summary>
     public bool Docked { get; set; }
+
+    /// <summary>
+    /// Position of the star system.
+    /// </summary>
     public long[]? StarPos { get; set; }
 
     public List<Faction> SystemFactions { get; set; } = new List<Faction>();
@@ -30,7 +59,12 @@ public class LocationEntry : Entry {
 
         JObject? systemfaction = JSON.Value<JObject>("SystemFaction");
         if (systemfaction != null) {
-            SystemFaction = systemfaction.Value<string>("Name") ?? "";
+            SystemFaction = systemfaction.Value<string>("Name");
+        }
+
+        JObject? stationfaction = JSON.Value<JObject>("StationFaction");
+        if (stationfaction != null) {
+            StationFaction = stationfaction.Value<string>("Name");
         }
 
         JArray? factions = JSON.Value<JArray>("Factions");

EDPlayerJournal/Entries/MultiSellExplorationDataEntry.cs

@@ -1,8 +1,23 @@
-namespace EDPlayerJournal.Entries; 
+namespace EDPlayerJournal.Entries;
+
 public class MultiSellExplorationDataEntry : Entry {
     protected override void Initialise() {
-        TotalEarnings = (JSON.Value<int?>("TotalEarnings") ?? 0);
+        TotalEarnings = JSON.Value<long?>("TotalEarnings") ?? 0;
+        BaseValue = JSON.Value<long?>("BaseValue") ?? 0;
+        Bonus = JSON.Value<long?>("Bonus") ?? 0;
     }
 
-    public int TotalEarnings { get; set; } = 0;
+    public long Total {
+        get { return BaseValue + Bonus; }
+    }
+
+    public long BaseValue { get; set; } = 0;
+
+    public long Bonus { get; set; } = 0;
+
+    /// <summary>
+    /// Total Earnings are the actual earnings without bonus. So this
+    /// value is BaseValue minus any percent a crew pilot takes.
+    /// </summary>
+    public long TotalEarnings { get; set; } = 0;
 }

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/Entries/ReceiveTextEntry.cs

@@ -0,0 +1,77 @@
+namespace EDPlayerJournal.Entries;
+
+public class ReceiveTextEntry : Entry {
+    /// <summary>
+    /// From whom this message is
+    /// </summary>
+    public string? From { get; set; }
+    /// <summary>
+    /// The message, if it is just an NPC text, it will be a message ID
+    /// </summary>
+    public string? Message { get; set; }
+    /// <summary>
+    /// Message localised
+    /// </summary>
+    public string? MessageLocalised { get; set; }
+    /// <summary>
+    /// On what channel this was received.
+    /// </summary>
+    public string? Channel { get; set; }
+
+    public bool HasNPCCategory {
+        get {
+            if (From == null) {
+                return false;
+            }
+
+            if (From.Contains(';') && From.StartsWith("$")) {
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Returns the NPC's category, if it has one.
+    /// </summary>
+    public string? NPCCategory {
+        get {
+            if (!HasNPCCategory || From == null) {
+                return null;
+            }
+
+            string[] parts = From.Split(";", StringSplitOptions.TrimEntries);
+            if (parts.Length < 2) {
+                return null;
+            }
+
+            return string.Format("{0};", parts[0]);
+        }
+    }
+
+    /// <summary>
+    /// Returns the NPC's category, if it has one.
+    /// </summary>
+    public string? NPCName {
+        get {
+            if (!HasNPCCategory || From == null) {
+                return null;
+            }
+
+            string[] parts = From.Split(";", StringSplitOptions.TrimEntries);
+            if (parts.Length < 2) {
+                return null;
+            }
+
+            return parts[1];
+        }
+    }
+
+    protected override void Initialise() {
+        From = JSON.Value<string>("From");
+        Message = JSON.Value<string>("Message");
+        MessageLocalised = JSON.Value<string>("Message_localised");
+        Channel = JSON.Value<string>("Channel");
+    }
+}

EDPlayerJournal/Entries/RedeemVoucherEntry.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace EDPlayerJournal.Entries; 
 public class RedeemVoucherEntry : Entry {
     protected override void Initialise() {
-        Amount = (JSON.Value<int?>("Amount") ?? 0);
+        Amount = (JSON.Value<ulong?>("Amount") ?? 0);
         Type = JSON.Value<string>("Type");
 
         /* according to API, there should be a Factions structure */
@@ -12,7 +12,7 @@ public class RedeemVoucherEntry : Entry {
         if (factions != null) {
             foreach (JObject faction in factions.Children<JObject>()) {
                 string? faction_name = faction.Value<string>("Faction");
-                long? faction_bounty = faction.Value<long?>("Amount");
+                ulong? faction_bounty = faction.Value<ulong?>("Amount");
                 if (faction_name == null || faction_name.Length <= 0 || faction_bounty == null) {
                     continue;
                 }
@@ -35,8 +35,29 @@ public class RedeemVoucherEntry : Entry {
         }
     }
 
-    public int Amount { get; set; } = 0;
+    public ulong GetBountyForFaction(string? a) {
+        if (a == null) {
+            return 0;
+        }
+
+        var relevant = FactionBounties.Where(x => EDPlayerJournal.Factions.CompareFactions(x.Key, a) == 0).ToList();
+        if (relevant == null || relevant.Count() == 0) {
+            return 0;
+        }
+
+        return (ulong)relevant.Sum(x => (decimal)x.Value);
+    }
+
+    public ulong Amount { get; set; } = 0;
     public string? Type { get; set; } = "Bounty";
-    public List<string> Factions { get; set; } = new List<string>();
-    public Dictionary<string, long> FactionBounties { get; set; } = new Dictionary<string, long>();
+
+    /// <summary>
+    /// List of factions 
+    /// </summary>
+    public List<string> Factions { get; set; } = new();
+
+    /// <summary>
+    /// Bounties awarded by faction
+    /// </summary>
+    public Dictionary<string, ulong> FactionBounties { get; set; } = new();
 }

EDPlayerJournal/Entries/SellExplorationDataEntry.cs

@@ -6,8 +6,17 @@ namespace EDPlayerJournal.Entries;
 public class SellExplorationDataEntry : Entry {
     public long BaseValue { get; set; }
     public long Bonus { get; set; }
+
+    /// <summary>
+    /// Total Earnings are the actual earnings without bonus. So this
+    /// value is BaseValue minus any percent a crew pilot takes.
+    /// </summary>
     public long TotalEarnings { get; set; }
 
+    public long Total {
+        get { return BaseValue + Bonus; }
+    }
+
     public List<string> Systems { get; set; } = new List<string>();
     public List<string> Discovered { get; set; } = new List<string>();
 

EDPlayerJournal/Entries/SellOrganicDataEntry.cs

@@ -8,11 +8,17 @@ public class BioData {
     public string? SpeciesLocalised { get; set; }
     public long Value { get; set; } = 0;
     public long Bonus { get; set; } = 0;
-    public long TotalValue => Value + Bonus;
+
+    public long TotalValue {
+        get {
+            return Value + Bonus;
+        }
+    }
 }
 public class SellOrganicDataEntry : Entry {
     public long MarketID { get; set; }
-    public List<BioData> BioData => new List<BioData>();
+
+    public List<BioData> BioData { get; } = new();
 
     protected override void Initialise() {
         MarketID = JSON.Value<long?>("MarketID") ?? 0;

EDPlayerJournal/Entries/SupercruiseDestinationDropEntry.cs

@@ -0,0 +1,30 @@
+namespace EDPlayerJournal.Entries;
+
+public class SupercruiseDestinationDropEntry : Entry {
+    /// <summary>
+    /// Destination type, internal string.
+    /// </summary>
+    public string? Type { get; set; } = null;
+
+    /// <summary>
+    /// Destination type, localised string.
+    /// </summary>
+    public string? TypeLocalised { get; set; } = null;
+
+    /// <summary>
+    /// Threat of the destination, if known.
+    /// </summary>
+    public long? Threat { get; set; } = null;
+
+    /// <summary>
+    /// Market ID if it has one.
+    /// </summary>
+    public ulong? MarketID { get; set; } = null;
+
+    protected override void Initialise() {
+        Type = JSON.Value<string>("Type");
+        TypeLocalised = JSON.Value<string>("Type_Localised");
+        Threat = JSON.Value<long?>("Threat");
+        MarketID = JSON.Value<ulong?>("MarketID");
+    }
+}

EDPlayerJournal/Entries/SupercruiseEntry.cs

@@ -0,0 +1,30 @@
+namespace EDPlayerJournal.Entries;
+
+public class SupercruiseEntryEntry : Entry {
+    /// <summary>
+    /// Taxi?
+    /// </summary>
+    public bool Taxi { get; set; } = false;
+
+    /// <summary>
+    /// Multicrew or not.
+    /// </summary>
+    public bool Multicrew { get; set; } = false;
+
+    /// <summary>
+    /// Star system
+    /// </summary>
+    public string? StarSystem { get; set; }
+
+    /// <summary>
+    /// System address
+    /// </summary>
+    public ulong? SystemAddress { get; set; }
+
+    protected override void Initialise() {
+        Taxi = JSON.Value<bool?>("Taxi") ?? false;
+        Multicrew = JSON.Value<bool?>("Multicrew") ?? false;
+        StarSystem = JSON.Value<string?>("StarSystem");
+        SystemAddress = JSON.Value<ulong?>("SystemAddress");
+    }
+}

EDPlayerJournal/Entries/SupercruiseExitEntry.cs

@@ -0,0 +1,48 @@
+namespace EDPlayerJournal.Entries;
+
+public class SupercruiseExitEntry : Entry {
+    /// <summary>
+    /// Taxi?
+    /// </summary>
+    public bool Taxi { get; set; } = false;
+
+    /// <summary>
+    /// Multicrew or not.
+    /// </summary>
+    public bool Multicrew { get; set; } = false;
+
+    /// <summary>
+    /// Star system
+    /// </summary>
+    public string? StarSystem { get; set; }
+
+    /// <summary>
+    /// System address
+    /// </summary>
+    public ulong? SystemAddress { get; set; }
+
+    /// <summary>
+    /// Body, name e.g. HIP 6182 B 2 a
+    /// </summary>
+    public string? Body { get; set; }
+
+    /// <summary>
+    /// Body ID
+    /// </summary>
+    public ulong? BodyID { get; set; }
+
+    /// <summary>
+    /// Body type (star, planet etc.)
+    /// </summary>
+    public string? BodyType { get; set; }
+
+    protected override void Initialise() {
+        Taxi = JSON.Value<bool?>("Taxi") ?? false;
+        Multicrew = JSON.Value<bool?>("Multicrew") ?? false;
+        StarSystem = JSON.Value<string?>("StarSystem");
+        SystemAddress = JSON.Value<ulong?>("SystemAddress");
+        Body = JSON.Value<string?>("Body");
+        BodyType = JSON.Value<string?>("BodyType");
+        BodyID = JSON.Value<ulong?>("BodyID");
+    }
+}

EDPlayerJournal/Faction.cs

@@ -5,7 +5,8 @@ using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
-namespace EDPlayerJournal; 
+namespace EDPlayerJournal;
+
 public class FactionState {
     public string? State { get; set; }
     public long? Trend { get; set; }
@@ -28,6 +29,89 @@ public class FactionState {
     }
 }
 
+public class Factions {
+    /// <summary>
+    /// Internal name for the Pilots Federation faction
+    /// </summary>
+    public static string PilotsFederationInternal = "$faction_PilotsFederation;";
+
+    /// <summary>
+    /// Name used for Pilots Federation in vouchers
+    /// </summary>
+    public static string PilotsFederationVouchers = "PilotsFederation";
+
+    /// <summary>
+    /// Friendly name of the Pilots Federation
+    /// </summary>
+    public static string PilotsFederation = "Pilots' Federation";
+
+    /// <summary>
+    /// Internal name for the Thargoid faction
+    /// </summary>
+    public static string ThargoidInternal = "$faction_Thargoid;";
+
+    /// <summary>
+    /// Localised name of the Thargoids
+    /// </summary>
+    public static string Thargoid = "Thargoids";
+
+    /// <summary>
+    /// The faction the fleet carriers use.
+    /// </summary>
+    public static string FleetCarrier = "FleetCarrier";
+
+    public static bool IsPilotsFederation(string? name) {
+        if (name == null) {
+            return false;
+        }
+
+        if (string.Compare(name, PilotsFederationInternal) == 0 ||
+            string.Compare(name, PilotsFederationVouchers) == 0 ||
+            string.Compare(name, PilotsFederation) == 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public static bool IsThargoid(string? name) {
+        if (name == null) {
+            return false;
+        }
+
+        if (string.Compare(name, ThargoidInternal) == 0 ||
+            string.Compare(name, Thargoid) == 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Compares two factions names and sees if they are the same faction. Since
+    /// factions can have an internal name, and a public name, this function takes
+    /// these into account.
+    /// </summary>
+    /// <param name="a"></param>
+    /// <param name="b"></param>
+    /// <returns></returns>
+    public static int CompareFactions(string? a, string? b) {
+        if (a == null || b == null) {
+            return -1;
+        }
+
+        if (IsPilotsFederation(a) && IsPilotsFederation(b)) {
+            return 0;
+        }
+
+        if (IsThargoid(a) && IsThargoid(b)) {
+            return 0;
+        }
+
+        return string.Compare(a, b);
+    }
+}
+
 public class Faction {
     public string? Name { get; set; }
     public string? FactionState { get; set; }

EDPlayerJournal/HumanReadableMissionName.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml;
-
-namespace EDPlayerJournal;
-
-public class HumanReadableMissionName {
-    private static Dictionary<string, string>? humanreadable = null;
-
-    private static void LoadMissions() {
-        try {
-            string dir = AppDomain.CurrentDomain.BaseDirectory;
-            string file = Path.Combine(dir, "MissionNames.xml");
-
-            XmlDocument document = new XmlDocument();
-
-            using (FileStream stream = new FileStream(file, FileMode.Open)) {
-                document.Load(stream);
-                XmlNode? missions = document.DocumentElement;
-
-                if (missions == null || 
-                    missions.Name != "Missions" ||
-                    missions.ChildNodes == null) {
-                    throw new ApplicationException("Invalid XML");
-                }
-
-                humanreadable = new Dictionary<string, string>();
-
-                foreach (XmlNode mission in missions.ChildNodes) {
-                    if (mission.Attributes == null) {
-                        continue;
-                    }
-
-                    string? mission_key = mission.Attributes["Name"]?.Value;
-                    string? mission_name = mission.InnerText;
-
-                    if (mission_key == null || mission_name == null) {
-                        continue;
-                    }
-
-                    humanreadable.Add(mission_key, mission_name);
-                }
-            }
-        } catch (Exception) {
-            humanreadable = null;
-        }
-    }
-
-    public static string? MakeHumanReadableName(string name) {
-        LoadMissions();
-
-        if (humanreadable == null || name == null) {
-            return null;
-        }
-
-        if (humanreadable.ContainsKey(name)) {
-            return humanreadable[name];
-        }
-
-        return null;
-    }
-}

EDPlayerJournal/Instances.cs

@@ -0,0 +1,73 @@
+namespace EDPlayerJournal;
+
+/// <summary>
+/// Contains information regarding instances you can supercruise into,
+/// such as combat zones, installations and megaship scenarios.
+/// </summary>
+public class Instances {
+    /// <summary>
+    /// Low ship combat zone
+    /// </summary>
+    public static readonly string WarzoneLow = "$Warzone_PointRace_Low";
+    /// <summary>
+    /// Medium ship combat zone
+    /// </summary>
+    public static readonly string WarzoneMedium = "$Warzone_PointRace_Med";
+    /// <summary>
+    /// High ship combat zone.
+    /// </summary>
+    public static readonly string WarzoneHigh = "$Warzone_PointRace_High";
+
+    /// <summary>
+    /// Low Thargoid combat zone
+    /// </summary>
+    public static readonly string WarzoneThargoidLow = "$Warzone_TG_Low";
+    /// <summary>
+    /// Medium Thargoid combat zone
+    /// </summary>
+    public static readonly string WarzoneThargoidMedium = "$Warzone_TG_Med";
+    /// <summary>
+    /// High Thargoid combat zone
+    /// </summary>
+    public static readonly string WarzoneThargoidHigh = "$Warzone_TG_High";
+    /// <summary>
+    /// Very High Thargoid combat zone
+    /// </summary>
+    public static readonly string WarzoneThargoidVeryHigh = "$Warzone_TG_VeryHigh";
+
+    public static bool IsThargoidWarzone(string type) {
+        return 
+            IsInstance(type, WarzoneThargoidLow) ||
+            IsInstance(type, WarzoneThargoidMedium) ||
+            IsInstance(type, WarzoneThargoidHigh) ||
+            IsInstance(type, WarzoneThargoidVeryHigh)
+            ;
+    }
+
+    public static bool IsHumanWarzone(string type) {
+        return 
+            IsInstance(type, WarzoneLow) ||
+            IsInstance(type, WarzoneMedium) ||
+            IsInstance(type, WarzoneHigh)
+            ;
+    }
+
+    public static bool IsWarzone(string type) {
+        return IsHumanWarzone(type) || IsThargoidWarzone(type);
+    }
+
+    public static bool IsInstance(string type, string instance) {
+        if (string.IsNullOrEmpty(type) || string.IsNullOrEmpty(instance)) {
+            return false;
+        }
+
+        // Instance names are split by a semi colon, with the remainder being
+        // additional info to such as index.
+        string[] parts = type.Split(":");
+        if (!parts[0].StartsWith("$")) {
+            return false;
+        }
+
+        return string.Compare(parts[0], instance, true) == 0;
+    }
+}

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,14 +130,19 @@ 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;
             }
-            Entry? entry = Entry.Parse(line);
-            if (entry != null) {
-                entries.Add(entry);
+            try {
+                Entry? entry = Entry.Parse(line);
+                if (entry != null) {
+                    entries.Add(entry);
+                }
+            } catch (Exception ex) {
+                Errors.Add(ex);
             }
         }
     }

EDPlayerJournal/Mission.cs

@@ -36,6 +36,31 @@ public class MissionInfluence {
     /// </summary>
     public string Influence { get; set; } = string.Empty;
 
+    public long InfluenceAmount {
+        get {
+            string trend = TrendAdjustedInfluence;
+            return (long)
+                   (trend.Count(x => x == '-') * -1) +
+                    trend.Count(x => x == '+')
+                   ;
+        }
+    }
+
+    /// <summary>
+    /// Returns how much influence was made, represented in pluses for positive influence,
+    /// and minuses with negative influence. This takes Trend (up, bad etc.) into account.
+    /// </summary>
+    public string TrendAdjustedInfluence {
+        get {
+            if (!string.IsNullOrEmpty(Trend) &&
+                Trend.Contains("bad", StringComparison.OrdinalIgnoreCase)) {
+                return new string('-', Influence.Length);
+            } else {
+                return new string('+', Influence.Length);
+            }
+        }
+    }
+
     public static MissionInfluence FromJSON(JObject obj) {
         MissionInfluence missionInfluence = new MissionInfluence();
 
@@ -109,6 +134,11 @@ public class MissionFactionEffects {
 }
 
 public class Mission : IComparable<Mission> {
+    /// <summary>
+    /// Passenger type for refugees
+    /// </summary>
+    public static readonly string PassengerTypeRefugee = "Refugee";
+
     public ulong MissionID { get; set; } = 0;
 
     /// <summary>
@@ -250,6 +280,67 @@ public class Mission : IComparable<Mission> {
     /// </summary>
     public List<MissionFactionEffects> FactionEffects { get; set; } = new List<MissionFactionEffects>();
 
+    /// <summary>
+    /// Returns true if the name is an on foot mission.
+    /// </summary>
+    public bool IsOnFoot {
+        get {
+            if (string.IsNullOrEmpty(Name)) {
+                return false;
+            }
+
+            return Name.Contains("OnFoot");
+        }
+    }
+
+    public bool IsPassengerMission {
+        get {
+            if (PassengerCount == null || PassengerCount == 0) {
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+    public bool IsRescueMission {
+        get {
+            if (!IsPassengerMission) {
+                return false;
+            }
+
+            if (string.Compare(PassengerType, PassengerTypeRefugee) == 0) {
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Returns a friendly human-readable name for the mission. If a localised name is available
+    /// it will use that, baring that it will check EnglishMissionNames for a translation, and
+    /// if that ain't available either, it will just use the internal Name.
+    /// </summary>
+    public string FriendlyName {
+        get {
+            if (!string.IsNullOrEmpty(LocalisedName)) {
+                return LocalisedName;
+            }
+
+            if (string.IsNullOrEmpty(Name)) {
+                return "Unknown Mission";
+            }
+
+            string? translate = EnglishMissionNames.Translate(Name);
+            if (!string.IsNullOrEmpty(translate)) {
+                return translate;
+            }
+
+            return Name;
+        }
+    }
+
     public int CompareTo(Mission? other) {
         if (other == null) {
             return 1;
@@ -328,27 +419,29 @@ public class Mission : IComparable<Mission> {
     /// <param name="faction">Faction name in question.</param>
     /// <param name="systemaddr">Star System address</param>
     /// <returns>null if no entry was found, or a string denoting pluses for the amount influence gained.</returns>
-    public string? GetInfluenceForFaction(string faction, ulong systemaddr) {
+    public MissionInfluence[]? GetInfluenceForFaction(string faction, ulong systemaddr) {
         var results = FactionEffects
             .Where(x => string.Compare(x.Faction, faction) == 0)
             .SelectMany(x => x.Influences)
             .Where(x => (x.SystemAddress != null && x.SystemAddress == systemaddr))
-            .Select(x => x.Influence)
+            .Select(x => x)
             .ToArray()
             ;
 
         if (results == null || results.Length == 0) {
-            return null;
+            return new MissionInfluence[0];
         }
 
-        return string.Join("", results);
+        return results;
     }
 
     /// <summary>
     /// A convenient Dictionary containing all influences given out by faction,
-    /// then by system address and then by influence handed out.
+    /// then by system address and then by influence handed out. Influence can
+    /// be either a series of "+" for positive influence, or "-" for negative
+    /// influence.
     /// </summary>
-    public Dictionary<string, Dictionary<ulong, string>> Influences {
+    public Dictionary<string, Dictionary<ulong, MissionInfluence>> Influences {
         get {
             return FactionEffects
                 .Where(x => x.Faction != null)
@@ -356,7 +449,10 @@ public class Mission : IComparable<Mission> {
                     x => (x.Faction ?? string.Empty),
                     x => x.Influences
                             .Where(x => x.SystemAddress != null)
-                            .ToDictionary(x => (x.SystemAddress ?? 0), x => x.Influence)
+                            .ToDictionary(
+                                x => (x.SystemAddress ?? 0), 
+                                x => x
+                                )
                     );
         }
     }

EDPlayerJournal/MissionNames.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Missions>
-    <Mission Name="Chain_FindThePirateLord_name">Assassination (Pirate Lord) (Chain)</Mission>
-    <Mission Name="Chain_RegainFooting_name">Regain Footing (Chain)</Mission>
-    <Mission Name="Chain_SalvageJustice_name">Assassination (Legal) (Chain)</Mission>
-    <Mission Name="Mission_Altruism_name">Donate</Mission>
-    <Mission Name="Mission_AltruismCredits_Bust_name">Donate Credits (Bust)</Mission>
-    <Mission Name="Mission_AltruismCredits_Famine_name">Donate Credits (Famine)</Mission>
-    <Mission Name="Mission_AltruismCredits_name">Donate Credits</Mission>
-    <Mission Name="Mission_Assassinate_Illegal_BLOPS_name">Assassination (Illegal)</Mission>
-    <Mission Name="Mission_Assassinate_Legal_Corporate_name">Corporate Assassination (Legal)</Mission>
-    <Mission Name="Mission_Assassinate_name">Assassination</Mission>
-    <Mission Name="Mission_Assassinate_Planetary_name">Assassination (Planetary Scan)</Mission>
-    <Mission Name="Mission_Collect_Bust_name">Provide (Bust)</Mission>
-    <Mission Name="Mission_Collect_CivilLiberty_name">Provide (Civil Liberty)</Mission>
-    <Mission Name="Mission_Collect_CivilUnrest_name">Provide (Civil Unrest)</Mission>
-    <Mission Name="Mission_Collect_Famine_name">Provide (Famine)</Mission>
-    <Mission Name="Mission_Collect_Industrial_name">Provide (Industrial)</Mission>
-    <Mission Name="Mission_Collect_name">Provide</Mission>
-    <Mission Name="Mission_Collect_RankEmp_name">Provide (Imperial Navy)</Mission>
-    <Mission Name="Mission_Collect_Retreat_name">Provide (Retreat)</Mission>
-    <Mission Name="Mission_Courier_Democracy_name">Courier (Democracy)</Mission>
-    <Mission Name="Mission_Courier_Elections_name">Courier (Elections)</Mission>
-    <Mission Name="Mission_Courier_Expansion_name">Courier (Expansion)</Mission>
-    <Mission Name="Mission_Courier_Famine_name">Courier (Famine)</Mission>
-    <Mission Name="Mission_Courier_Lockdown_name">Courier (Lockdown)</Mission>
-    <Mission Name="Mission_Courier_name">Courier</Mission>
-    <Mission Name="Mission_Courier_RankEmp_name">Courier (Imperial Navy)</Mission>
-    <Mission Name="Mission_Delivery_Agriculture_name">Delivery (Agriculture)</Mission>
-    <Mission Name="Mission_Delivery_Boom_name">Delivery (Boom)</Mission>
-    <Mission Name="Mission_Delivery_Democracy_name">Delivery (Democracy)</Mission>
-    <Mission Name="Mission_Delivery_Investment_name">Delivery (Investment)</Mission>
-    <Mission Name="Mission_Delivery_name">Delivery</Mission>
-    <Mission Name="Mission_Delivery_RankEmp_name">Delivery (Imperial Navy)</Mission>
-    <Mission Name="Mission_Delivery_Retreat_name">Delivery (Retreat)</Mission>
-    <Mission Name="Mission_DeliveryWing_name">Delivery (Wing)</Mission>
-    <Mission Name="Mission_DeliveryWing_War_name">Delivery (Wing) (War)</Mission>
-    <Mission Name="Mission_Hack_BLOPS_Boom_name">Hack Surface Installation (Boom)</Mission>
-    <Mission Name="Mission_Hack_BLOPS_Elections_name">Hack Surface Installation (Elections)</Mission>
-    <Mission Name="Mission_Hack_BLOPS_Expansion_name">Hack Surface Installation (Expansion)</Mission>
-    <Mission Name="MISSION_Hack_BLOPS_name">Hack Surface Installation</Mission>
-    <Mission Name="Mission_HackMegaship_name">Hack Megaship</Mission>
-    <Mission Name="Mission_LongDistanceExpedition_Explorer_Boom_name">Long Distance Expedition (Boom)</Mission>
-    <Mission Name="Mission_LongDistanceExpedition_name">Long Distance Expedition</Mission>
-    <Mission Name="Mission_Massacre_Conflict_CivilWar_name">Massacre (Civil War)</Mission>
-    <Mission Name="Mission_Massacre_name">Massacre</Mission>
-    <Mission Name="Mission_Massacre_RankEmp_name">Massacre (Imperial Navy)</Mission>
-    <Mission Name="Mission_MassacreWing_Legal_Bust_name">Massacre (Wing) (Bust)</Mission>
-    <Mission Name="Mission_MassacreWing_name">Massacre (Wing)</Mission>
-    <Mission Name="Mission_OnFoot_Assassination_MB_name">On Foot Assassination</Mission>
-    <Mission Name="Mission_OnFoot_AssassinationIllegal_MB_name">On Foot Assassination (Illegal)</Mission>
-    <Mission Name="Mission_OnFoot_Collect_Contact_MB_name">On Foot Collect</Mission>
-    <Mission Name="Mission_OnFoot_Collect_MB_name">On Foot Collection</Mission>
-    <Mission Name="Mission_OnFoot_Delivery_Contact_MB_name">On Foot Delivery (Contact)</Mission>
-    <Mission Name="Mission_OnFoot_Hack_Upload_Covert_MB_name">On Foot Hack (Covert Upload)</Mission>
-    <Mission Name="Mission_OnFoot_Hack_Upload_MB_name">On Foot Hack (Upload)</Mission>
-    <Mission Name="Mission_OnFoot_Heist_POI_MB_name">On Foot Heist (POI)</Mission>
-    <Mission Name="Mission_OnFoot_Onslaught_MB_name">On Foot Onslaught</Mission>
-    <Mission Name="Mission_OnFoot_Onslaught_Offline_MB_name">On Foot Onslaught (Offline)</Mission>
-    <Mission Name="Mission_OnFoot_ProductionHeist_Covert_MB_name">On Foot Production Heist (Covert)</Mission>
-    <Mission Name="Mission_OnFoot_ProductionHeist_MB_name">On Foot Production Heist</Mission>
-    <Mission Name="Mission_OnFoot_Reboot_MB_name">On Foot Reboot</Mission>
-    <Mission Name="Mission_OnFoot_RebootRestore_MB_name">On Foot Reboot/Restore</Mission>
-    <Mission Name="Mission_OnFoot_Sabotage_Production_Covert_MB_name">On Foot Sabotage Production (Covert)</Mission>
-    <Mission Name="Mission_OnFoot_Salvage_MB_name">On Foot Salvage</Mission>
-    <Mission Name="Mission_OnFoot_SalvageIllegal_MB_name">On Foot Salvage (Illegal)</Mission>
-    <Mission Name="Mission_PassengerBulk_AIDWORKER_ARRIVING">Aid Workers Seeking Transport</Mission>
-    <Mission Name="Mission_PassengerVIP">Passenger (VIP)</Mission>
-    <Mission Name="Mission_PassengerVIP_Criminal_BOOM_name">Passenger Criminal (VIP) (Boom)</Mission>
-    <Mission Name="Mission_PassengerVIP_name">Passenger (VIP)</Mission>
-    <Mission Name="Mission_PassengerVIP_Scientist_FAMINE_name">Passenger Scientist (VIP) (Famine)</Mission>
-    <Mission Name="Mission_PassengerVIP_Tourist_BOOM_name">Passenger Tourist (VIP) (Boom)</Mission>
-    <Mission Name="Mission_Rescue_Planet_name">Planet Rescue</Mission>
-    <Mission Name="MISSION_Salvage_CivilUnrest_name">Salvage (Civil Unrest)</Mission>
-    <Mission Name="MISSION_Salvage_Expansion_name">Salvage (Expansion)</Mission>
-    <Mission Name="MISSION_Salvage_Illegal_name">Salvage (Illegal)</Mission>
-    <Mission Name="Mission_Salvage_name">Salvage</Mission>
-    <Mission Name="Mission_Salvage_RankEmp_name">Salvage (Imperial Navy)</Mission>
-    <Mission Name="MISSION_Salvage_Refinery_name">Salvage (Refinery)</Mission>
-    <Mission Name="MISSION_Salvage_Retreat_name">Salvage (Retreat)</Mission>
-    <Mission Name="MISSION_Scan_name">Scan</Mission>
-    <Mission Name="Mission_Sightseeing_Criminal_FAMINE_name">Sightseeing (Criminal) (Famine)</Mission>
-    <Mission Name="Mission_Sightseeing_name">Sightseeing</Mission>
-</Missions>

EDPlayerJournal/NPC.cs

@@ -0,0 +1,122 @@
+namespace EDPlayerJournal;
+
+public class NPCs {
+    /// <summary>
+    /// Internal name of Spec Ops Wing Alpha
+    /// </summary>
+    public static string SpecOpsAInternal = "$LUASC_Scenario_Warzone_NPC_SpecOps_A;";
+
+    /// <summary>
+    /// Internal name of Spec Ops Wing Beta
+    /// </summary>
+    public static string SpecOpsBInternal = "$LUASC_Scenario_Warzone_NPC_SpecOps_B;";
+
+    /// <summary>
+    /// Internal name of Spec Ops Wing Gamma
+    /// </summary>
+    public static string SpecOpsGInternal = "$LUASC_Scenario_Warzone_NPC_SpecOps_G;";
+
+    /// <summary>
+    /// Internal name of Spec Ops Wing Delta
+    /// </summary>
+    public static string SpecOpsDInternal = "$LUASC_Scenario_Warzone_NPC_SpecOps_D;";
+
+    /// <summary>
+    /// Empire captain
+    /// </summary>
+    public static string EmpireCaptain = "$LUASC_Scenario_Warzone_NPC_WarzoneGeneral_Emp;";
+
+    /// <summary>
+    /// Federation captain
+    /// </summary>
+    public static string FederationCaptain = "$LUASC_Scenario_Warzone_NPC_WarzoneGeneral_Fed;";
+
+    /// <summary>
+    /// Federation captain
+    /// </summary>
+    public static string IndependentCaptain = "$LUASC_Scenario_Warzone_NPC_WarzoneGeneral_Ind;";
+
+    /// <summary>
+    /// Warzone correspondant
+    /// </summary>
+    public static string WarzoneCorrespondent = "$LUASC_Scenario_Warzone_NPC_WarzoneCorrespondent;";
+
+    /// <summary>
+    /// AX Military NPC
+    /// </summary>
+    public static string AXMilitary = "$Name_AX_Military;";
+
+    /// <summary>
+    /// Returns true if the pilotname is either a captain, specops, or correspondent
+    /// </summary>
+    /// <param name="pilotname"></param>
+    /// <returns></returns>
+    public static bool IsWarzoneNPC(string? pilotname) {
+        if (IsWarzoneCaptain(pilotname) || 
+            IsWarzoneCorrespondent(pilotname) ||
+            IsSpecOps(pilotname)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns true if the given pilot name is a warzone correspondent
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public static bool IsWarzoneCorrespondent(string? pilotname) {
+        if (pilotname == null) {
+            return false;
+        }
+
+        if (string.Compare(pilotname, WarzoneCorrespondent) == 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns true if the given pilot name is a spec ops wing.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public static bool IsSpecOps(string? pilotname) {
+        if (pilotname == null) {
+            return false;
+        }
+
+        if (string.Compare(pilotname, SpecOpsAInternal) == 0 ||
+            string.Compare(pilotname, SpecOpsBInternal) == 0 ||
+            string.Compare(pilotname, SpecOpsGInternal) == 0 ||
+            string.Compare(pilotname, SpecOpsDInternal) == 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Returns true if the given pilot name is a warzone captain
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public static bool IsWarzoneCaptain(string? pilotname) {
+        if (pilotname == null) {
+            return false;
+        }
+
+        if (string.Compare(pilotname, EmpireCaptain) == 0 ||
+            string.Compare(pilotname, FederationCaptain) == 0 ||
+            string.Compare(pilotname, IndependentCaptain) == 0) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+public class NPC {
+}

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

@@ -0,0 +1,81 @@
+namespace EDPlayerJournal;
+
+public enum ThargoidVessel {
+    Unknown = 0,
+    Scout = 1,
+    Orthrus = 2,
+    Cyclops = 3,
+    Basilisk = 4,
+    Medusa = 5,
+    Hydra = 6,
+    // Includes Glaive and Scythe
+    Hunter = 7,
+    /// <summary>
+    /// Thargoid drone
+    /// </summary>
+    Revenant = 8,
+    /// <summary>
+    /// New thargoid drone in U17
+    /// </summary>
+    Banshee = 9,
+}
+
+public class Thargoid {
+    public static string ThargoidFaction = Factions.Thargoid;
+
+    public static Dictionary<ulong, ThargoidVessel> VesselPayout { get; } = new() {
+        // Up to date values ever since 14.02
+        {    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 },
+        { 20000000, ThargoidVessel.Basilisk },
+        //{ 25000000, ThargoidVessel.Orthrus },
+        { 34000000, ThargoidVessel.Medusa },
+        // March, 16th 2023 the Orthrus payout was buffed again.
+        { 40000000, ThargoidVessel.Orthrus },
+        { 50000000, ThargoidVessel.Hydra },
+        // These are the old values pre Update 14.02
+        //{    80000, ThargoidVessel.Scout },
+        //{  8000000, ThargoidVessel.Cyclops },
+        //{ 24000000, ThargoidVessel.Basilisk },
+        // In Update 14.1 the payout for Orthrus has been rebalanced.
+        //{ 30000000, ThargoidVessel.Orthrus },
+        //{ 40000000, ThargoidVessel.Medusa },
+        // This used to be the old payout value for Orthrus, it now conflicts
+        // with Post Update 14.02 Hydra values
+        //{ 50000000, ThargoidVessel.Orthrus },
+        //{ 60000000, ThargoidVessel.Hydra },
+    };
+
+    public static Dictionary<ThargoidVessel, string?> VesselNames { get; } = new() {
+        { ThargoidVessel.Unknown, "(Unknown)" },
+        { ThargoidVessel.Revenant, "Revenant" },
+        { ThargoidVessel.Scout, "Scout" },
+        { ThargoidVessel.Orthrus, "Orthrus" },
+        { ThargoidVessel.Cyclops, "Cyclops" },
+        { ThargoidVessel.Basilisk, "Basilisk" },
+        { ThargoidVessel.Medusa, "Medusa" },
+        { ThargoidVessel.Hydra, "Hydra" },
+        { ThargoidVessel.Hunter, "Hunter" },
+        { ThargoidVessel.Banshee, "Banshee" },
+    };
+
+    public static ThargoidVessel GetVesselByPayout(ulong payout) {
+        if (VesselPayout.ContainsKey(payout)) {
+            return VesselPayout[payout];
+        }
+        return ThargoidVessel.Unknown;
+    }
+
+    public static string? GetVesselName(ThargoidVessel v) {
+        if (VesselNames.ContainsKey(v)) {
+            return VesselNames[v];
+        }
+        return null;
+    }
+}

EDPlayerJournalTests/CombatZoneTest.cs

@@ -0,0 +1,28 @@
+using EDPlayerJournal;
+using EDPlayerJournal.Entries;
+using EDPlayerJournal.BGS;
+
+namespace EDPlayerJournalTests;
+
+[TestClass]
+public class CombatZoneTest {
+    [TestMethod]
+    public void DropshipDeployTest() {
+        TransactionParser parser = new();
+
+        List<Entry>? entries = Helper.LoadTestData("dropship-deploy.txt");
+        Assert.IsNotNull(entries);
+
+        List<Transaction>? transactions = parser.Parse(entries);
+        Assert.IsNotNull(transactions);
+
+        Vouchers? vouchers = transactions[0] as Vouchers;
+        Assert.IsNotNull(vouchers);
+
+        CombatZone? combatzone = transactions[1] as CombatZone;
+        Assert.IsNotNull(combatzone);
+
+        Assert.AreEqual(combatzone.Type, CombatZones.GroundCombatZone);
+        Assert.AreEqual(combatzone.Grade, CombatZones.DifficultyHigh);
+    }
+}

EDPlayerJournalTests/DoubleVouchers.txt

@@ -0,0 +1,2 @@
+{ "timestamp":"2022-11-20T14:30:30Z", "event":"RedeemVoucher", "Type":"bounty", "Amount":3197549, "Factions":[ { "Faction":"Nova Paresa", "Amount":3197549 } ] }
+{ "timestamp":"2022-11-20T14:30:34Z", "event":"RedeemVoucher", "Type":"bounty", "Amount":4785831, "Factions":[ { "Faction":"", "Amount":723175 }, { "Faction":"Nova Paresa", "Amount":3197549 }, { "Faction":"Prismatic Imperium", "Amount":4062656 } ] }

EDPlayerJournalTests/EDPlayerJournalTests.csproj

@@ -26,6 +26,12 @@
     <None Update="double-support.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="dropship-deploy.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="legacy-transaction.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="mission-failed.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -44,6 +50,12 @@
     <None Update="SellOrganicData.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="ThargoidBonds.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="ThargoidKills.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

EDPlayerJournalTests/FileHeaderTest.cs

@@ -21,6 +21,8 @@ public class FileHeaderTest {
         Assert.AreEqual(header.Language, "English/UK");
         Assert.AreEqual(header.Odyssey, true);
         Assert.AreEqual(header.GameVersion, "4.0.0.1450");
+        Assert.AreEqual(header.IsLegacy, false);
+        Assert.AreEqual(header.IsLive, true);
         // Someone at FDev messed up string building there.
         Assert.AreEqual(header.Build, "r286858/r0 ");
     }
@@ -44,6 +46,8 @@ public class FileHeaderTest {
         Assert.AreEqual(header.Language, """English\UK""");
         Assert.AreEqual(header.Odyssey, false);
         Assert.AreEqual(header.GameVersion, "3.5.3.400 EDH");
+        Assert.AreEqual(header.IsLegacy, true);
+        Assert.AreEqual(header.IsLive, false);
         // ~73k commits in two years. Not bad.
         Assert.AreEqual(header.Build, "r213094/r0 ");
     }

EDPlayerJournalTests/Helper.cs

@@ -0,0 +1,25 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournalTests;
+
+public class Helper {
+    public static List<Entry>? LoadTestData(string filename) {
+        string path = Path.GetFullPath("./" + filename);
+        string[] lines = File.ReadAllLines(path);
+        List<Entry> entries = new();
+
+        foreach (string line in lines) {
+            line.Trim();
+            if (string.IsNullOrEmpty(line)) {
+                continue;
+            }
+
+            Entry? entry = Entry.Parse(line);
+            if (entry != null) {
+                entries.Add(entry);
+            }
+        }
+
+        return entries;
+    }
+}

EDPlayerJournalTests/MissionTest.cs

@@ -59,9 +59,9 @@ public class MissionTest {
         Assert.IsTrue(e.IsEmptyFaction);
         Assert.AreEqual(e.Faction, string.Empty);
 
-        string? influence = m.GetInfluenceForFaction("", 251012319587UL);
+        var influence = m.GetInfluenceForFaction("", 251012319587UL);
         Assert.IsNotNull(influence);
-        Assert.AreEqual(influence, "+");
+        Assert.AreEqual(influence[0].Influence, "+");
 
         e = m.FactionEffects[1];
         Assert.AreEqual(e.Faction, "Social LHS 6103 Confederation");
@@ -101,22 +101,25 @@ public class MissionTest {
 
         Assert.AreEqual(effect.Reputation, "++");
 
-        string? influence;
-
-        influence = m.GetInfluenceForFaction("Salus Imperial Society", 1865919973739UL);
-        Assert.AreEqual(influence, "++");
+        var influence = m.GetInfluenceForFaction("Salus Imperial Society", 1865919973739UL);
+        Assert.IsNotNull(influence);
+        Assert.IsTrue(influence.Length > 0);
+        Assert.AreEqual(influence[0].Influence, "++");
 
         influence = m.GetInfluenceForFaction("Salus Imperial Society", 1733186884306UL);
-        Assert.AreEqual(influence, "++");
+        Assert.IsNotNull(influence);
+        Assert.IsTrue(influence.Length > 0);
+        Assert.AreEqual(influence[0].Influence, "++");
 
         influence = m.GetInfluenceForFaction("Saelishi Saxons", 1733186884306UL);
-        Assert.IsNull(influence);
+        Assert.IsNotNull(influence);
+        Assert.AreEqual(influence.Length, 0);
 
         // Only one entry are we only have Salus
         Assert.AreEqual(m.Influences.Count, 1);
         Assert.AreEqual(m.Influences["Salus Imperial Society"].Count, 2);
-        Assert.AreEqual(m.Influences["Salus Imperial Society"][1865919973739UL], "++");
-        Assert.AreEqual(m.Influences["Salus Imperial Society"][1733186884306UL], "++");
+        Assert.AreEqual(m.Influences["Salus Imperial Society"][1865919973739UL].Influence, "++");
+        Assert.AreEqual(m.Influences["Salus Imperial Society"][1733186884306UL].Influence, "++");
     }
 
     [TestMethod]

EDPlayerJournalTests/TestTransactionParser.cs

@@ -6,31 +6,40 @@ namespace EDPlayerJournalTests;
 
 [TestClass]
 public class TestTransactionParser {
-    private List<Entry>? LoadTestData(string filename) {
-        string path = Path.GetFullPath("./" + filename);
-        string[] lines = File.ReadAllLines(path);
-        List<Entry> entries = new();
+    [TestMethod]
+    public void Legacy() {
+        TransactionParser parser = new();
 
-        foreach (string line in lines) {
-            line.Trim();
-            if (string.IsNullOrEmpty(line)) {
-                continue;
-            }
+        // File header, followed by two legacy transactions, followed by another
+        // file header with an Odyssey transaction
+        List<Entry>? entries = Helper.LoadTestData("legacy-transaction.txt");
+        Assert.IsNotNull(entries, "could not load test data");
 
-            Entry? entry = Entry.Parse(line);
-            if (entry != null) {
-                entries.Add(entry);
-            }
+        if (entries == null) {
+            return;
         }
 
-        return entries;
+        var options = new TransactionParserOptions() {
+            IgnoreInfluenceSupport = false,
+            IgnoreExoBiology = false,
+            IgnoreFleetCarrierFaction = false,
+            IgnoreMarketBuy = false,
+        };
+        List<Transaction>? transactions = parser.Parse(entries, options);
+        Assert.IsNotNull(transactions, "could not parse entries");
+        Assert.AreEqual(transactions.Count, 3);
+
+        Assert.AreEqual(transactions[0].IsLegacy, true);
+        Assert.AreEqual(transactions[1].IsLegacy, true);
+
+        Assert.AreEqual(transactions[2].IsLegacy, false);
     }
 
     [TestMethod]
     public void DoubleFiveINF() {
         TransactionParser parser = new();
 
-        List<Entry>? entries = LoadTestData("double-five-inf.txt");
+        List<Entry>? entries = Helper.LoadTestData("double-five-inf.txt");
         Assert.IsNotNull(entries, "could not load test data");
 
         if (entries == null) {
@@ -46,7 +55,7 @@ public class TestTransactionParser {
     public void DoubleSupport() {
         TransactionParser parser = new();
 
-        List<Entry>? entries = LoadTestData("double-support.txt");
+        List<Entry>? entries = Helper.LoadTestData("double-support.txt");
         Assert.IsNotNull(entries, "could not load test data");
 
         if (entries == null) {
@@ -62,7 +71,7 @@ public class TestTransactionParser {
     public void MissionFailed() {
         TransactionParser parser = new();
 
-        List<Entry>? entries = LoadTestData("mission-failed.txt");
+        List<Entry>? entries = Helper.LoadTestData("mission-failed.txt");
         Assert.IsNotNull(entries, "could not load test data");
 
         if (entries == null) {
@@ -78,7 +87,7 @@ public class TestTransactionParser {
     public void MissionNoINF() {
         TransactionParser parser = new();
 
-        List<Entry>? entries = LoadTestData("mission-noinfforsourceortarget.txt");
+        List<Entry>? entries = Helper.LoadTestData("mission-noinfforsourceortarget.txt");
         Assert.IsNotNull(entries, "could not load test data");
 
         if (entries == null) {
@@ -94,7 +103,7 @@ public class TestTransactionParser {
     public void Murder() {
         TransactionParser parser = new();
 
-        List<Entry>? entries = LoadTestData("murder.txt");
+        List<Entry>? entries = Helper.LoadTestData("murder.txt");
         Assert.IsNotNull(entries, "could not load test data");
 
         if (entries == null) {
@@ -118,7 +127,7 @@ public class TestTransactionParser {
     public void NoFactionNameNoInfluence() {
         TransactionParser parser = new();
 
-        List<Entry>? entries = LoadTestData("nofactionname-andnoinfluence.txt");
+        List<Entry>? entries = Helper.LoadTestData("nofactionname-andnoinfluence.txt");
         Assert.IsNotNull(entries, "could not load test data");
 
         if (entries == null) {
@@ -134,14 +143,21 @@ public class TestTransactionParser {
     public void SellOrganicData() {
         TransactionParser parser = new();
 
-        List<Entry>? entries = LoadTestData("SellOrganicData.txt");
+        List<Entry>? entries = Helper.LoadTestData("SellOrganicData.txt");
         Assert.IsNotNull(entries, "could not load test data");
 
         if (entries == null) {
             return;
         }
 
-        List<Transaction>? transactions = parser.Parse(entries);
+        var options = new TransactionParserOptions() {
+            IgnoreInfluenceSupport = false,
+            IgnoreExoBiology = false,
+            IgnoreFleetCarrierFaction = false,
+            IgnoreMarketBuy = false,
+        };
+
+        List<Transaction>? transactions = parser.Parse(entries, options);
         Assert.IsNotNull(transactions, "could not parse entries");
         Assert.AreEqual(transactions.Count, 1);
         Assert.IsInstanceOfType(transactions[0], typeof(OrganicData), "result is not of type Organic Data");

EDPlayerJournalTests/ThargoidBonds.txt

@@ -0,0 +1,3 @@
+{ "timestamp":"2022-11-25T10:10:43Z", "event":"FSDJump", "Taxi":false, "Multicrew":false, "StarSystem":"Nyalayan", "SystemAddress":1458309042898, "StarPos":[29.71875,-172.71875,-6.46875], "SystemAllegiance":"Independent", "SystemEconomy":"$economy_Agri;", "SystemEconomy_Localised":"Agriculture", "SystemSecondEconomy":"$economy_Refinery;", "SystemSecondEconomy_Localised":"Refinery", "SystemGovernment":"$government_Theocracy;", "SystemGovernment_Localised":"Theocracy", "SystemSecurity":"$SYSTEM_SECURITY_medium;", "SystemSecurity_Localised":"Medium Security", "Population":1920608781, "Body":"Nyalayan A", "BodyID":1, "BodyType":"Star", "JumpDist":7.769, "FuelUsed":0.142448, "FuelLevel":15.857553, "Factions":[ { "Name":"Nyalayan Imperial Society", "FactionState":"Election", "Government":"Patronage", "Influence":0.165138, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":17.496799, "ActiveStates":[ { "State":"Election" } ] }, { "Name":"Reret Emperor's Grace", "FactionState":"War", "Government":"Patronage", "Influence":0.257900, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":100.000000, "ActiveStates":[ { "State":"Expansion" }, { "State":"War" } ] }, { "Name":"Nyalayan Silver Transport Org", "FactionState":"None", "Government":"Corporate", "Influence":0.076453, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":81.875000 }, { "Name":"Nyalayan Power & Co", "FactionState":"None", "Government":"Corporate", "Influence":0.060143, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":23.173201 }, { "Name":"Amanogawa Enlight", "FactionState":"War", "Government":"Theocracy", "Influence":0.257900, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":-1.210600, "ActiveStates":[ { "State":"Expansion" }, { "State":"War" } ] }, { "Name":"Nyalayan Crimson Dragons", "FactionState":"None", "Government":"Anarchy", "Influence":0.017329, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":-13.530000 }, { "Name":"Traditional Nyalayan Front", "FactionState":"Election", "Government":"Dictatorship", "Influence":0.165138, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":64.699997, "ActiveStates":[ { "State":"Election" } ] } ], "SystemFaction":{ "Name":"Amanogawa Enlight", "FactionState":"War" }, "Conflicts":[ { "WarType":"election", "Status":"active", "Faction1":{ "Name":"Nyalayan Imperial Society", "Stake":"Pilcher Port", "WonDays":2 }, "Faction2":{ "Name":"Traditional Nyalayan Front", "Stake":"Lamar Falls", "WonDays":0 } }, { "WarType":"war", "Status":"active", "Faction1":{ "Name":"Reret Emperor's Grace", "Stake":"", "WonDays":1 }, "Faction2":{ "Name":"Amanogawa Enlight", "Stake":"Sutter Ring", "WonDays":2 } } ] }
+{ "timestamp":"2022-11-25T10:13:32Z", "event":"Docked", "StationName":"Pilcher Port", "StationType":"Orbis", "Taxi":false, "Multicrew":false, "StarSystem":"Nyalayan", "SystemAddress":1458309042898, "MarketID":3222853120, "StationFaction":{ "Name":"Nyalayan Imperial Society", "FactionState":"Election" }, "StationGovernment":"$government_Patronage;", "StationGovernment_Localised":"Patronage", "StationAllegiance":"Empire", "StationServices":[ "dock", "autodock", "commodities", "contacts", "exploration", "missions", "outfitting", "crewlounge", "rearm", "refuel", "repair", "shipyard", "tuning", "engineer", "missionsgenerated", "flightcontroller", "stationoperations", "powerplay", "searchrescue", "stationMenu", "shop", "livery", "socialspace", "bartender", "vistagenomics", "pioneersupplies", "apexinterstellar", "frontlinesolutions" ], "StationEconomy":"$economy_Refinery;", "StationEconomy_Localised":"Refinery", "StationEconomies":[ { "Name":"$economy_Refinery;", "Name_Localised":"Refinery", "Proportion":1.000000 } ], "DistFromStarLS":76.465557, "LandingPads":{ "Small":8, "Medium":11, "Large":6 } }
+{ "timestamp":"2022-11-25T10:13:53Z", "event":"RedeemVoucher", "Type":"CombatBond", "Amount":24240000, "Faction":"PilotsFederation" }

EDPlayerJournalTests/ThargoidKills.cs

@@ -0,0 +1,57 @@
+using EDPlayerJournal;
+using EDPlayerJournal.BGS;
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournalTests;
+
+[TestClass]
+public class ThargoidKills {
+    [TestMethod]
+    public void ThargoidBonks() {
+        TransactionParser parser = new();
+
+        List<Entry>? entries = Helper.LoadTestData("ThargoidKills.txt");
+        Assert.IsNotNull(entries, "could not load test data");
+
+        if (entries == null) {
+            return;
+        }
+
+        List<ThargoidKill>? transactions = parser.Parse(entries)?.OfType<ThargoidKill>().ToList();
+
+        Assert.IsNotNull(transactions, "could not parse entries");
+        Assert.AreEqual(transactions.Count, 3);
+
+        // In recent updates the payout was changed, that's why this test reports unknown thargoid vessels
+        // This test makes sure the new parser does not conflict with legacy values
+        //
+        Assert.IsInstanceOfType(transactions[0], typeof(ThargoidKill), "result is not of type ThargoidKill");
+        Assert.AreEqual(transactions[0].ThargoidType, EDPlayerJournal.ThargoidVessel.Unknown);
+
+        Assert.IsInstanceOfType(transactions[1], typeof(ThargoidKill), "result is not of type ThargoidKill");
+        Assert.AreEqual(transactions[1].ThargoidType, EDPlayerJournal.ThargoidVessel.Unknown);
+
+        Assert.IsInstanceOfType(transactions[2], typeof(ThargoidKill), "result is not of type ThargoidKill");
+        Assert.AreEqual(transactions[2].ThargoidType, EDPlayerJournal.ThargoidVessel.Unknown);
+    }
+
+    [TestMethod]
+    public void ThargoidBonds() {
+        TransactionParser parser = new();
+
+        List<Entry>? entries = Helper.LoadTestData("ThargoidBonds.txt");
+        Assert.IsNotNull(entries, "could not load test data");
+
+        if (entries == null) {
+            return;
+        }
+
+        List<Vouchers>? transactions = parser.Parse(entries)?.OfType<Vouchers>().ToList();
+
+        Assert.IsNotNull(transactions, "could not parse entries");
+        Assert.AreEqual(transactions.Count, 1);
+        Assert.AreEqual(Factions.IsPilotsFederation(transactions[0].Faction), true);
+        Assert.AreEqual(transactions[0].TotalSum, 24240000L);
+        Assert.AreEqual(transactions[0].Type, "Combat Bond");
+    }
+}

EDPlayerJournalTests/ThargoidKills.txt

@@ -0,0 +1,3 @@
+{ "timestamp":"2022-11-25T09:50:45Z", "event":"FactionKillBond", "Reward":80000, "AwardingFaction":"$faction_PilotsFederation;", "AwardingFaction_Localised":"Pilots' Federation", "VictimFaction":"$faction_Thargoid;", "VictimFaction_Localised":"Thargoids" }
+{ "timestamp":"2022-11-25T09:52:28Z", "event":"FactionKillBond", "Reward":24000000, "AwardingFaction":"$faction_PilotsFederation;", "AwardingFaction_Localised":"Pilots' Federation", "VictimFaction":"$faction_Thargoid;", "VictimFaction_Localised":"Thargoids" }
+{ "timestamp":"2022-11-25T09:47:19Z", "event":"FactionKillBond", "Reward":80000, "AwardingFaction":"$faction_PilotsFederation;", "AwardingFaction_Localised":"Pilots' Federation", "VictimFaction":"$faction_Thargoid;", "VictimFaction_Localised":"Thargoids" }

EDPlayerJournalTests/ThargoidKillsAndBonds.txt

@@ -0,0 +1,6 @@
+{ "timestamp":"2022-11-25T10:10:43Z", "event":"FSDJump", "Taxi":false, "Multicrew":false, "StarSystem":"Nyalayan", "SystemAddress":1458309042898, "StarPos":[29.71875,-172.71875,-6.46875], "SystemAllegiance":"Independent", "SystemEconomy":"$economy_Agri;", "SystemEconomy_Localised":"Agriculture", "SystemSecondEconomy":"$economy_Refinery;", "SystemSecondEconomy_Localised":"Refinery", "SystemGovernment":"$government_Theocracy;", "SystemGovernment_Localised":"Theocracy", "SystemSecurity":"$SYSTEM_SECURITY_medium;", "SystemSecurity_Localised":"Medium Security", "Population":1920608781, "Body":"Nyalayan A", "BodyID":1, "BodyType":"Star", "JumpDist":7.769, "FuelUsed":0.142448, "FuelLevel":15.857553, "Factions":[ { "Name":"Nyalayan Imperial Society", "FactionState":"Election", "Government":"Patronage", "Influence":0.165138, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":17.496799, "ActiveStates":[ { "State":"Election" } ] }, { "Name":"Reret Emperor's Grace", "FactionState":"War", "Government":"Patronage", "Influence":0.257900, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":100.000000, "ActiveStates":[ { "State":"Expansion" }, { "State":"War" } ] }, { "Name":"Nyalayan Silver Transport Org", "FactionState":"None", "Government":"Corporate", "Influence":0.076453, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":81.875000 }, { "Name":"Nyalayan Power & Co", "FactionState":"None", "Government":"Corporate", "Influence":0.060143, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":23.173201 }, { "Name":"Amanogawa Enlight", "FactionState":"War", "Government":"Theocracy", "Influence":0.257900, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":-1.210600, "ActiveStates":[ { "State":"Expansion" }, { "State":"War" } ] }, { "Name":"Nyalayan Crimson Dragons", "FactionState":"None", "Government":"Anarchy", "Influence":0.017329, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":-13.530000 }, { "Name":"Traditional Nyalayan Front", "FactionState":"Election", "Government":"Dictatorship", "Influence":0.165138, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":64.699997, "ActiveStates":[ { "State":"Election" } ] } ], "SystemFaction":{ "Name":"Amanogawa Enlight", "FactionState":"War" }, "Conflicts":[ { "WarType":"election", "Status":"active", "Faction1":{ "Name":"Nyalayan Imperial Society", "Stake":"Pilcher Port", "WonDays":2 }, "Faction2":{ "Name":"Traditional Nyalayan Front", "Stake":"Lamar Falls", "WonDays":0 } }, { "WarType":"war", "Status":"active", "Faction1":{ "Name":"Reret Emperor's Grace", "Stake":"", "WonDays":1 }, "Faction2":{ "Name":"Amanogawa Enlight", "Stake":"Sutter Ring", "WonDays":2 } } ] }
+{ "timestamp":"2022-11-25T09:50:45Z", "event":"FactionKillBond", "Reward":80000, "AwardingFaction":"$faction_PilotsFederation;", "AwardingFaction_Localised":"Pilots' Federation", "VictimFaction":"$faction_Thargoid;", "VictimFaction_Localised":"Thargoids" }
+{ "timestamp":"2022-11-25T09:52:28Z", "event":"FactionKillBond", "Reward":24000000, "AwardingFaction":"$faction_PilotsFederation;", "AwardingFaction_Localised":"Pilots' Federation", "VictimFaction":"$faction_Thargoid;", "VictimFaction_Localised":"Thargoids" }
+{ "timestamp":"2022-11-25T09:47:19Z", "event":"FactionKillBond", "Reward":80000, "AwardingFaction":"$faction_PilotsFederation;", "AwardingFaction_Localised":"Pilots' Federation", "VictimFaction":"$faction_Thargoid;", "VictimFaction_Localised":"Thargoids" }
+{ "timestamp":"2022-11-25T10:13:32Z", "event":"Docked", "StationName":"Pilcher Port", "StationType":"Orbis", "Taxi":false, "Multicrew":false, "StarSystem":"Nyalayan", "SystemAddress":1458309042898, "MarketID":3222853120, "StationFaction":{ "Name":"Nyalayan Imperial Society", "FactionState":"Election" }, "StationGovernment":"$government_Patronage;", "StationGovernment_Localised":"Patronage", "StationAllegiance":"Empire", "StationServices":[ "dock", "autodock", "commodities", "contacts", "exploration", "missions", "outfitting", "crewlounge", "rearm", "refuel", "repair", "shipyard", "tuning", "engineer", "missionsgenerated", "flightcontroller", "stationoperations", "powerplay", "searchrescue", "stationMenu", "shop", "livery", "socialspace", "bartender", "vistagenomics", "pioneersupplies", "apexinterstellar", "frontlinesolutions" ], "StationEconomy":"$economy_Refinery;", "StationEconomy_Localised":"Refinery", "StationEconomies":[ { "Name":"$economy_Refinery;", "Name_Localised":"Refinery", "Proportion":1.000000 } ], "DistFromStarLS":76.465557, "LandingPads":{ "Small":8, "Medium":11, "Large":6 } }
+{ "timestamp":"2022-11-25T10:13:53Z", "event":"RedeemVoucher", "Type":"CombatBond", "Amount":24240000, "Faction":"PilotsFederation" }

EDPlayerJournalTests/double-vouchers-2.txt

@@ -0,0 +1,7 @@
+{"timestamp":"2024-04-27T13:27:08Z","event":"Fileheader","part":1,"language":"English/UK","Odyssey":true,"gameversion":"4.0.0.1803","build":"r301470/r0 "}
+{"timestamp":"2024-04-27T13:27:34Z","event":"Commander","FID":"F9183790","Name":"Jeremaya"}
+{"timestamp":"2024-04-27T15:06:31Z","event":"FSDJump","Taxi":false,"Multicrew":false,"StarSystem":"HIP 3318","SystemAddress":525890177387,"StarPos":[50.21875,-190.6875,37.5],"SystemAllegiance":"Empire","SystemEconomy":"$economy_Refinery;","SystemEconomy_Localised":"Refinery","SystemSecondEconomy":"$economy_Extraction;","SystemSecondEconomy_Localised":"Extraction","SystemGovernment":"$government_Patronage;","SystemGovernment_Localised":"Patronage","SystemSecurity":"$SYSTEM_SECURITY_high;","SystemSecurity_Localised":"High Security","Population":239484,"Body":"HIP 3318 A","BodyID":2,"BodyType":"Star","JumpDist":27.495,"FuelUsed":3.115176,"FuelLevel":13.228082,"Factions":[{"Name":"HIP 3318 Autocracy","FactionState":"None","Government":"Dictatorship","Influence":0.119192,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":0.0},{"Name":"Chakho Gold Galactic Limited","FactionState":"None","Government":"Corporate","Influence":0.09798,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":0.0},{"Name":"HIP 3318 Interstellar","FactionState":"None","Government":"Corporate","Influence":0.075758,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":0.0},{"Name":"HIP 3318 Values Party","FactionState":"None","Government":"Democracy","Influence":0.032323,"Allegiance":"Independent","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":0.0},{"Name":"Nationalists of HIP 3318","FactionState":"None","Government":"Dictatorship","Influence":0.035354,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":0.0},{"Name":"Nova Paresa","FactionState":"Boom","Government":"Patronage","Influence":0.434343,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","SquadronFaction":true,"MyReputation":100.0,"PendingStates":[{"State":"Expansion","Trend":0}]},{"Name":"Empire Consulate Ltd","FactionState":"None","Government":"Patronage","Influence":0.20505,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":94.474998}],"SystemFaction":{"Name":"Nova Paresa","FactionState":"Boom"}}
+{"timestamp":"2024-04-27T15:12:23Z","event":"ApproachSettlement","Name":"Koh Biological Installation","MarketID":3803792128,"StationFaction":{"Name":"Nova Paresa","FactionState":"Boom"},"StationGovernment":"$government_Patronage;","StationGovernment_Localised":"Patronage","StationAllegiance":"Empire","StationServices":["dock","autodock","commodities","contacts","exploration","missions","refuel","repair","engineer","missionsgenerated","flightcontroller","stationoperations","searchrescue","stationMenu"],"StationEconomy":"$economy_HighTech;","StationEconomy_Localised":"High Tech","StationEconomies":[{"Name":"$economy_HighTech;","Name_Localised":"High Tech","Proportion":1.0}],"SystemAddress":525890177387,"BodyID":26,"BodyName":"HIP 3318 D 3","Latitude":-0.893061,"Longitude":-62.928345}
+{"timestamp":"2024-04-27T15:14:08Z","event":"Docked","StationName":"Koh Biological Installation","StationType":"OnFootSettlement","Taxi":false,"Multicrew":false,"StarSystem":"HIP 3318","SystemAddress":525890177387,"MarketID":3803792128,"StationFaction":{"Name":"Nova Paresa","FactionState":"Boom"},"StationGovernment":"$government_Patronage;","StationGovernment_Localised":"Patronage","StationAllegiance":"Empire","StationServices":["dock","autodock","commodities","contacts","exploration","missions","refuel","repair","engineer","missionsgenerated","flightcontroller","stationoperations","searchrescue","stationMenu"],"StationEconomy":"$economy_HighTech;","StationEconomy_Localised":"High Tech","StationEconomies":[{"Name":"$economy_HighTech;","Name_Localised":"High Tech","Proportion":1.0}],"DistFromStarLS":11972.63409,"LandingPads":{"Small":1,"Medium":0,"Large":1}}
+{"timestamp":"2024-04-27T15:15:10Z","event":"RedeemVoucher","Type":"bounty","Amount":9449329,"Factions":[{"Faction":"Nova Paresa","Amount":9449329}]}
+{"timestamp":"2024-04-27T15:15:51Z","event":"RedeemVoucher","Type":"bounty","Amount":18780130,"Factions":[{"Faction":"","Amount":224449},{"Faction":"","Amount":730880},{"Faction":"","Amount":1272764},{"Faction":"","Amount":580384},{"Faction":"","Amount":10180261},{"Faction":"","Amount":1413153},{"Faction":"","Amount":1365934},{"Faction":"","Amount":202193},{"Faction":"Nova Paresa","Amount":9449329},{"Faction":"","Amount":104412},{"Faction":"","Amount":2453443},{"Faction":"","Amount":252257}]}

EDPlayerJournalTests/dropship-deploy.txt

@@ -0,0 +1,63 @@
+{"timestamp":"2022-12-09T14:23:52Z","event":"Fileheader","part":1,"language":"English/UK","Odyssey":true,"gameversion":"4.0.0.1476","build":"r289925/r0 "}
+{"timestamp":"2022-12-09T14:33:01Z","event":"Location","DistFromStarLS":774.492896,"Docked":false,"OnFoot":true,"StarSystem":"Kazahua","SystemAddress":2871050905001,"StarPos":[93.28125,-180.25,14.6875],"SystemAllegiance":"Empire","SystemEconomy":"$economy_Industrial;","SystemEconomy_Localised":"Industrial","SystemSecondEconomy":"$economy_Colony;","SystemSecondEconomy_Localised":"Colony","SystemGovernment":"$government_Patronage;","SystemGovernment_Localised":"Patronage","SystemSecurity":"$SYSTEM_SECURITY_low;","SystemSecurity_Localised":"Low Security","Population":17949,"Body":"Kazahua 4 a","BodyID":5,"BodyType":"Planet","Factions":[{"Name":"Kazahua Co","FactionState":"None","Government":"Corporate","Influence":0.049098,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":0.0},{"Name":"Kazahua Crimson Ring","FactionState":"None","Government":"Anarchy","Influence":0.01002,"Allegiance":"Independent","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":0.0},{"Name":"HIP 10611 Shared","FactionState":"None","Government":"Cooperative","Influence":0.091182,"Allegiance":"Independent","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":2.97},{"Name":"Traditional Yao Tzu Liberty Party","FactionState":"None","Government":"Dictatorship","Influence":0.058116,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":-10.56},{"Name":"Sapii allied","FactionState":"War","Government":"Cooperative","Influence":0.395792,"Allegiance":"Independent","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","MyReputation":-6.0,"ActiveStates":[{"State":"War"}]},{"Name":"Nova Paresa","FactionState":"War","Government":"Patronage","Influence":0.395792,"Allegiance":"Empire","Happiness":"$Faction_HappinessBand2;","Happiness_Localised":"Happy","SquadronFaction":true,"MyReputation":63.045399,"ActiveStates":[{"State":"War"}]}],"SystemFaction":{"Name":"Nova Paresa","FactionState":"War"},"Conflicts":[{"WarType":"war","Status":"active","Faction1":{"Name":"Sapii allied","Stake":"Barmin Installation","WonDays":0},"Faction2":{"Name":"Nova Paresa","Stake":"Rabinowitz Colony","WonDays":0}}]}
+{"timestamp":"2022-12-09T14:33:05Z","event":"ReceiveText","From":"Barmin Installation","Message":"$STATION_NoFireZone_entered;","Message_Localised":"No fire zone entered.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:36:52Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_EndPatrol02;","Message_Localised":"Requesting docking clearance, Control.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:39:54Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_StartPatrol01;","Message_Localised":"Patrol craft checking in. Pre-flight checks complete, I'm heading out.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:42:02Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_EndPatrol04;","Message_Localised":"Negative, Tower, I'm bingo on fuel, RTB.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:42:05Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_EndPatrol02;","Message_Localised":"Requesting docking clearance, Control.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:45:23Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_StartPatrol01;","Message_Localised":"Patrol craft checking in. Pre-flight checks complete, I'm heading out.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:45:51Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_StartPatrol04;","Message_Localised":"I'm away, heading to patrol route alpha now.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:46:22Z","event":"RedeemVoucher","Type":"CombatBond","Amount":17406041,"Faction":"Nova Paresa"}
+{"timestamp":"2022-12-09T14:49:17Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_EndPatrol02;","Message_Localised":"Requesting docking clearance, Control.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:49:43Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_EndPatrol05;","Message_Localised":"Patrol completed, Command, I'm heading home.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:52:32Z","event":"ReceiveText","From":"$ShipName_Police_Independent;","From_Localised":"System Authority Vessel","Message":"$Police_StartPatrol01;","Message_Localised":"Patrol craft checking in. Pre-flight checks complete, I'm heading out.","Channel":"npc"}
+{"timestamp":"2022-12-09T14:52:34Z","event":"Embark","SRV":false,"Taxi":true,"Multicrew":false,"StarSystem":"Kazahua","SystemAddress":2871050905001,"Body":"Kazahua 4 a","BodyID":5,"OnStation":false,"OnPlanet":true}
+{"timestamp":"2022-12-09T14:53:29Z","event":"SupercruiseEntry","Taxi":true,"Multicrew":false,"StarSystem":"Kazahua","SystemAddress":2871050905001}
+{"timestamp":"2022-12-09T14:58:16Z","event":"DropshipDeploy","StarSystem":"Kazahua","SystemAddress":2871050905001,"Body":"Kazahua 2","BodyID":2,"OnStation":false,"OnPlanet":true}
+{"timestamp":"2022-12-09T14:59:38Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:00:02Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:00:12Z","event":"FactionKillBond","Reward":39642,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:00:33Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:00:45Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:01:07Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:01:11Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough06;","Message_Localised":"On patrol. Scanning for hostiles.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:02:12Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:02:21Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:02:24Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:02:32Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:02:42Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:02:45Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:02:50Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough09;","Message_Localised":"This is a routine patrol. There's nothing to worry about.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:04:03Z","event":"FactionKillBond","Reward":39642,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:04:03Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough06;","Message_Localised":"On patrol. Scanning for hostiles.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:04:09Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:04:13Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:04:25Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:05:06Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough06;","Message_Localised":"On patrol. Scanning for hostiles.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:05:10Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough10;","Message_Localised":"System sweep in operation.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:05:19Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough06;","Message_Localised":"On patrol. Scanning for hostiles.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:05:22Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:05:35Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:05:44Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:06:11Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:06:22Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough08;","Message_Localised":"Patrol waypoint reached. Scanning.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:06:27Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:06:27Z","event":"FactionKillBond","Reward":39642,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:06:39Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:06:44Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough09;","Message_Localised":"This is a routine patrol. There's nothing to worry about.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:06:50Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:07:03Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:07:11Z","event":"FactionKillBond","Reward":39642,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:07:15Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:07:26Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:08:20Z","event":"FactionKillBond","Reward":52500,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:08:26Z","event":"FactionKillBond","Reward":65358,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:08:29Z","event":"ReceiveText","From":"$ShipName_Military_Independent;","From_Localised":"System Defence Force","Message":"$Military_Passthrough07;","Message_Localised":"No need to worry, the navy is here.","Channel":"npc"}
+{"timestamp":"2022-12-09T15:08:33Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:08:47Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:08:48Z","event":"FactionKillBond","Reward":87362,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:09:00Z","event":"FactionKillBond","Reward":39642,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:09:00Z","event":"FactionKillBond","Reward":39642,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:09:08Z","event":"FactionKillBond","Reward":39642,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:09:20Z","event":"FactionKillBond","Reward":78777,"AwardingFaction":"Nova Paresa","VictimFaction":"Sapii allied"}
+{"timestamp":"2022-12-09T15:09:46Z","event":"Shutdown"}

EDPlayerJournalTests/legacy-transaction.txt

@@ -0,0 +1,7 @@
+{ "timestamp":"2022-02-06T16:36:53Z", "event":"Fileheader", "part":1, "language":"English/UK", "gameversion":"3.8.0.1102", "build":"r280672/r0 " }
+{ "timestamp":"2022-02-06T18:10:26Z", "event":"FSDJump", "Taxi":false, "Multicrew":false, "StarSystem":"Akualanu", "SystemAddress":5069805856169, "StarPos":[63.78125,-128.50000,3.00000], "SystemAllegiance":"Empire", "SystemEconomy":"$economy_Tourism;", "SystemEconomy_Localised":"Tourism", "SystemSecondEconomy":"$economy_HighTech;", "SystemSecondEconomy_Localised":"High Tech", "SystemGovernment":"$government_Patronage;", "SystemGovernment_Localised":"Patronage", "SystemSecurity":"$SYSTEM_SECURITY_low;", "SystemSecurity_Localised":"Low Security", "Population":787019, "Body":"Akualanu A", "BodyID":1, "BodyType":"Star", "Powers":[ "A. Lavigny-Duval" ], "PowerplayState":"Exploited", "JumpDist":40.001, "FuelUsed":4.849240, "FuelLevel":22.573641, "Factions":[ { "Name":"Akualanu United & Co", "FactionState":"War", "Government":"Corporate", "Influence":0.158000, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand3;", "Happiness_Localised":"Discontented", "MyReputation":100.000000, "RecoveringStates":[ { "State":"InfrastructureFailure", "Trend":0 } ], "ActiveStates":[ { "State":"Lockdown" }, { "State":"Famine" }, { "State":"War" } ] }, { "Name":"Alacagui Holdings", "FactionState":"War", "Government":"Corporate", "Influence":0.086000, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":55.000000, "RecoveringStates":[ { "State":"PirateAttack", "Trend":0 } ], "ActiveStates":[ { "State":"War" } ] }, { "Name":"Left Party of Akualanu", "FactionState":"War", "Government":"Communism", "Influence":0.086000, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand3;", "Happiness_Localised":"Discontented", "MyReputation":95.899399, "RecoveringStates":[ { "State":"InfrastructureFailure", "Trend":0 } ], "ActiveStates":[ { "State":"Lockdown" }, { "State":"Famine" }, { "State":"War" } ] }, { "Name":"Cartel of Akualanu", "FactionState":"Famine", "Government":"Anarchy", "Influence":0.028000, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand2;", "Happiness_Localised":"Happy", "MyReputation":29.040001, "RecoveringStates":[ { "State":"InfrastructureFailure", "Trend":0 } ], "ActiveStates":[ { "State":"Famine" } ] }, { "Name":"Revolutionary Akualanu Liberals", "FactionState":"Bust", "Government":"Democracy", "Influence":0.085000, "Allegiance":"Independent", "Happiness":"$Faction_HappinessBand3;", "Happiness_Localised":"Discontented", "MyReputation":43.093700, "PendingStates":[ { "State":"Lockdown", "Trend":0 } ], "ActiveStates":[ { "State":"InfrastructureFailure" }, { "State":"Bust" } ] }, { "Name":"Conservatives of Cockaigne", "FactionState":"War", "Government":"Dictatorship", "Influence":0.138000, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand3;", "Happiness_Localised":"Discontented", "MyReputation":70.000000, "ActiveStates":[ { "State":"CivilUnrest" }, { "State":"InfrastructureFailure" }, { "State":"War" } ] }, { "Name":"Nova Paresa", "FactionState":"Investment", "Government":"Patronage", "Influence":0.419000, "Allegiance":"Empire", "Happiness":"$Faction_HappinessBand1;", "Happiness_Localised":"Elated", "SquadronFaction":true, "MyReputation":100.000000, "ActiveStates":[ { "State":"Investment" }, { "State":"CivilLiberty" } ] } ], "SystemFaction":{ "Name":"Nova Paresa", "FactionState":"Investment" }, "Conflicts":[ { "WarType":"war", "Status":"active", "Faction1":{ "Name":"Akualanu United & Co", "Stake":"Konig Institution", "WonDays":0 }, "Faction2":{ "Name":"Conservatives of Cockaigne", "Stake":"", "WonDays":1 } }, { "WarType":"war", "Status":"active", "Faction1":{ "Name":"Alacagui Holdings", "Stake":"Ware Cultivation Facility", "WonDays":2 }, "Faction2":{ "Name":"Left Party of Akualanu", "Stake":"", "WonDays":2 } } ] }
+{ "timestamp":"2022-02-06T18:13:30Z", "event":"Docked", "StationName":"Hughes Vista", "StationType":"Coriolis", "Taxi":false, "Multicrew":false, "StarSystem":"Akualanu", "SystemAddress":5069805856169, "MarketID":3222969088, "StationFaction":{ "Name":"Nova Paresa", "FactionState":"Investment" }, "StationGovernment":"$government_Patronage;", "StationGovernment_Localised":"Patronage", "StationAllegiance":"Empire", "StationServices":[ "dock", "autodock", "commodities", "contacts", "exploration", "missions", "outfitting", "crewlounge", "rearm", "refuel", "repair", "shipyard", "tuning", "engineer", "missionsgenerated", "facilitator", "flightcontroller", "stationoperations", "powerplay", "searchrescue", "stationMenu", "shop", "livery", "socialspace", "bartender", "vistagenomics", "pioneersupplies", "apexinterstellar", "frontlinesolutions" ], "StationEconomy":"$economy_Tourism;", "StationEconomy_Localised":"Tourism", "StationEconomies":[ { "Name":"$economy_Tourism;", "Name_Localised":"Tourism", "Proportion":1.000000 } ], "DistFromStarLS":78.917615, "LandingPads":{ "Small":13, "Medium":16, "Large":8 } }
+{ "timestamp":"2022-11-25T09:52:28Z", "event":"FactionKillBond", "Reward":24000000, "AwardingFaction":"$faction_PilotsFederation;", "AwardingFaction_Localised":"Pilots' Federation", "VictimFaction":"$faction_Thargoid;", "VictimFaction_Localised":"Thargoids" }
+{ "timestamp":"2022-11-21T15:56:08Z", "event":"MarketSell", "MarketID":3222176256, "Type":"silver", "Count":224, "SellPrice":40996, "TotalSale":9183104, "AvgPricePaid":34311 }
+{ "timestamp":"2022-02-06T16:36:53Z", "event":"Fileheader", "part":1, "language":"English/UK", "Odyssey":true, "gameversion":"4.0.0.1102", "build":"r280672/r0 " }
+{ "timestamp":"2022-02-06T18:17:44Z", "event":"SellOrganicData", "MarketID":3222969088, "BioData":[ { "Genus":"$Codex_Ent_Stratum_Genus_Name;", "Genus_Localised":"Stratum", "Species":"$Codex_Ent_Stratum_07_Name;", "Species_Localised":"Stratum Tectonicas", "Value":806300, "Bonus":0 }, { "Genus":"$Codex_Ent_Aleoids_Genus_Name;", "Genus_Localised":"Aleoida", "Species":"$Codex_Ent_Aleoids_05_Name;", "Species_Localised":"Aleoida Gravis", "Value":596500, "Bonus":0 } ] }

EliteBGS/.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

EliteBGS/.gitignore

@@ -0,0 +1,364 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Oo]ut/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+/site

EliteBGS/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

EliteBGS/App.xaml

@@ -0,0 +1,17 @@
+<Application x:Class="EliteBGSApplication"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:EliteBGS"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
+                <!-- Theme setting -->
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

EliteBGS/App.xaml.cs

@@ -0,0 +1,11 @@
+using ControlzEx.Theming;
+using System.Windows;
+
+namespace EliteBGS {
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class EliteBGSApplication : Application
+    {
+    }
+}

EliteBGS/CHANGELOG.md

@@ -0,0 +1,310 @@
+# EliteBGS changelog
+
+## 0.4.3 on 18.09.2024
+
+* Add possibility to post log reports to Discord webhooks.
+  Logs are automatically split to fit discord length, and you can choose the
+  name of the Commander to post it as. There are some restrictions, so for
+  ultra long logs the one line log format might be necessary.
+* Fix cartographics data value by igonring `TotalEarnings`. Total earnings
+  is the same as `BaseValue`, except any percentages taken by crew members
+  is deducted. Actual total value is `BaseValue` plus `Bonus`.
+
+## 0.4.2 on 02.05.2024
+
+* Add a bot header for all generated logs that shows the tool version, as
+  well as the name of of the log format used. This makes it easier for bots
+  to parse these logs. Since the different formats have become popular, its
+  always good to make it easier for bots to parse the logs.
+
+## 0.4.1 on 28.04.2024
+
+* Filter out vouchers that are redeemed twice, due to bulk turn-in. If you
+  redeem a singular voucher for value X, and then redeem the rest of your
+  vouchers - say KWS vouchers - in bulk, the first voucher of value X will
+  appear again in the logs. It appears twice in the logs, but only counts
+  once.
+* Add the market name to the trading log entries.
+
+## 0.4.0 on 13.04.2024
+
+* Change layout of the results into System -> Faction -> Transaction.
+  Many people who contribute *a lot* of things to the BGS have preferred such
+  a layout to find the right things to post to various discord guilds/threads.
+* Sort all systems in the new overview by name. It just makes them easier to
+  find when there are a lot of entries.
+* Add a button to deselect/select all buttons.
+
+## 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.
+* Glaive has been renamed to "Hunter" since Scythe has the same bounty
+  and they cannot be distinguished.
+* Mission influence can now also be negative. Failed missions now properly
+  report the amount of negative influence given to a faction.
+* Mission secondary influences now also support negative influences. This
+  for example happens if you take a mission to murder another faction's
+  civlians, which causes negative INF.
+
+## 0.3.4 on 18.06.2023
+
+* Added possibility to specify allied, as well as enemy captain and correspondent.
+* Added date range, and tool version to standard log format.
+* Added new English mission names.
+
+## 0.3.3 on 15.05.2023
+
+* Added payout for the Thargoid Glaive.
+* Added payout and support for the Thargoid Revenant.
+* Added more English mission names.
+* Ship and AX combat zones can now be detected through a new event, which
+  allows the tool to properly determine the difficulty. Combat zone outcome,
+  additional objectives, or the name of the factions fighting are still guess
+  work however.
+* Fixed a bug where newly added factions to a system weren't properly
+  recognised. Thanks to Shakaka.
+* Added option to ignore FleetCarrier actions.
+* Added an "Open in Explorer" button to journal locations.
+
+## 0.3.2 on 19.04.2023
+
+* Orthrus payout has been adapted to 14.02 values.
+* Old Thargoid payout values have been removed, so very old logs now no
+  longer parse correctly. The old value clashed with new ones, making
+  detection of interceptor kills difficult.
+* Fixed a problem regarding the proper detection of station owner, and
+  thus for whom the tool attributed market buy and market sell.
+* Added GUI options to ignore some less important BGS entries.
+* One line report has changed to show summaries
+* Summaries have been streamlined:
+  * semi-colons now separate entries
+  * missing BGS actions (like S&R) have received a summary
+  * Trade has been renamed to "Sold" and "Bought"
+  * Sold now shows tons of cargo sold, plus profit if available
+  * Bought shows tons of cargo bought
+
+## 0.3.1 on 26.02.2023
+
+* Fixed: AX combat zones caused crashes with the summary.
+* Fixed: Summaries for thargoid kills didn't render probably.
+
+## 0.3.0 on 26.02.2023
+
+* Move to MahApps toolkit, which replaces extended toolkit.
+* Introduce themes (by MahApps) including dark mode.
+* Add summary to the two bigger BGS log types.
+* Remove organic data from BGS tool, as it has been confirmed that
+  it does not contribute to the BGS.
+* Add a few more English mission names.
+
+## 0.2.6 on 04.02.2023
+
+* Update Post 14.02 Thargoid bounties
+* Just summarise failed missions by on-foot and ship, instead of a detailed view
+* Add some more English mission names
+* Move code hosting to [CodeBerg](https://codeberg.org/)
+
+## 0.2.5 on 20.12.2022
+
+* Repaired mission fails.
+* Added support for Missions entry.
+
+## 0.2.4 on 18.12.2022
+
+* Fixed bug with organic data.
+* Fixed bug in mission format.
+* You can now select also a time when filtering transactions.
+* Added a button to toggle all children on and off at once.
+* Date in Nova Navy discord log is now UTC.
+* Added a divider so you can rescale the objectives and the log to a preferred aspect ratio.
+
+## 0.2.3 on 11.12.2022
+
+* Fixed detection of medium ground combat zones.
+* Improve detection of things done near or around a new day. The tool should not properly
+  pick up missions done the previous day, and completed at the selected day.
+* Add support for ground combat zones when done using Frontier Solutions (DropshipDeploy).
+* Add more mission names for Thargoid war.
+* Relogs in an on foot combat zone are now properly detected.
+
+## 0.2.2 on 07.12.2022
+
+* Orthrus interceptor payout changed to U14.1 values.
+* Detection of AX combat zones has been improved.
+* All thargoid war missions now contribute to the system.
+* Thargoid combat zones go to "Very High".
+* Passenger missions show amount of people rescued.
+
+## 0.2.1 on 03.12.2022
+
+* Add support for Thargoid combat zones.
+* Make some missions "system related", meaning they are sorted into an objective with just
+  the system name. This makes sense for contributions for towards a system goal, rather than
+  a faction goal - like Thargoid wars.
+* Fixed a bug about the visibility of war zone side objectives. 
+
+## 0.2.0 on 29.11.2022
+
+* Moved project to .NET 7.0
+* Added an experimental combat zone detector. Since there is no dedicated entry in the journal
+  for a combat zone, this code will do a lot of guessing.
+* Add thargoid kills and thargoid vouchers.
+* Add a warning if something has been done in E:D Legacy.
+* Fixed a bug were on foot murders were not properly recognised.
+* "On Foot" combat zones are now called Ground Combat Zones.
+* GUI has been reworked, all functions are now near the relevant items.
+
+## 0.1.7 on 09.11.2022
+
+* Fixed a bug related to total amount of credits gained by turning in organic data.
+* Changed UI to have report, and objectives on the same page.
+* Report now automatically updates when objectives and entries are selected, deselected or removed.
+* Removed manual adding of objectives.
+
+## 0.1.6 on 24.09.2022
+
+* Fixed datetime format.
+
+## 0.1.5 on 24.08.2022
+
+* Added some mission names.
+* Updated README regarding Update 13.
+
+## 0.1.4 on 24.07.2022
+
+* Fixed hour display with entires (now in 24 hour format).
+* Allow adding combat zones regardless of whether an objective is selected, or an
+  entry. If an entry is selected simply use its objective instead.
+* Add timestamp to combat zone wins.
+
+## 0.1.3 on 07.06.2022
+
+* Fixed a bug where entries in non-rated journal files were not properly picked up.
+* Remove EDDB database usage. This feature could block the tool if it failed to convert
+  the JSON to something more usable, downloads took forever, and the tool itself could
+  run out of memory loading and converting JSON from EDDB. With automatic objective
+  detection this tool is no longer really needed.
+
+## 0.1.2 on 06.04.2022
+
+* If you remove an item the tree items stay collapsed/expanded. (thanks CMDR NeedX).
+* Fixed a bug where the program would crash if you opened the manual log entry
+  window twice (thanks CMDR NeedX).
+* Fixed a bug regarding organic data not being properly recognised in logs.
+* Date and time when the entry has been added to the overview.
+  * The actual entry is now semi-bold to distinguish it from the date time.
+* You can now select which item should appear in the final log, and which shouldn't.
+
+## 0.1.1 on 15.03.2022
+
+* Update tool to work with the new journal filenames introduced in Update 11.
+
+## 0.1.0 on 27.02.2022
+
+* Final release without beta in front of it.
+* Several new mission names for the XML.
+* A few small fixes towards the Discord log formatting.
+
+## 0.1.0-beta14 on 26.02.2022
+
+* Missions that give out no influence whatsoever apparently exist. Here the strategy
+  is to add them to the list anyway, and warn the user that this might happen because
+  of conflicts.
+
+## 0.1.0-beta13 on 24.02.2022
+
+* Missions that give no influence are now properly shown again. A warning is also
+  displayed on why there is no influence there (spoiler alert: conflicts).
+* Missions that give influence to an unknown faction are still ignored, but there is
+  now a warning about it.
+* Added a few new mission names to the XML.
+
+## 0.1.0-beta12 on 18.02.2022
+
+* Failed missions now properly show up where they were accepted, instead of where they
+  were failed.
+
+## 0.1.0-beta11 on 16.02.2022
+
+* Fixed a bug in which mission influence was assigned to the wrong station, system
+  and faction. But now the log entry for accepting a mission must be within the given
+  range.
+* Stop complaining about missing objective files.
+* Add a few more mission names to the XML.
+
+## 0.1.0-beta10 on 12.02.2022
+
+* Added search and rescue.
+* For mourders try to determine the faction of the victim. The CommitCrime event
+  lists the faction that issues the bounty, and not the faction of the victim.
+* Vouchers are now properly treated. Each individual voucher is assigned a separate
+  objective, if the target faction for said voucher is present in the system.
+
+## 0.1.0-beta9 on 07.02.2022
+
+* Added Vista Genomics to the reports.
+
+## 0.1.0-beta8 on 29.01.2022
+
+* Fixed a bug where influence was wrongly counted for missions were both the
+  main beneficiary, and the secondary beneficiary are the same faction.
+* Tightened selection of which entry goes to which objective.
+
+## 0.1.0-beta7 on 27.01.2022
+
+* Added murders, since they give negative INF for the target faction.
+* Cargo is now collated for the NONA discord template.
+* Empty secondary influences no longer show up.
+* Market buying is not part of the BGS since Update 10.
+* Remove decimal point unless absolutely necessary.
+* Fixed log file template regarding failed missions.
+* Support missions were the source and target are both the same faction, but in
+  different systems. Here both systems should be listed in the BGS list.
+
+## 0.1.0-beta6 on 22.01.2022
+
+* Month names should now always be in English in the NONA log format.
+* Add influence support (by secondary mission objectives) to the log format.
+* Remember last used discord log template.
+* Add support for SellExplorationData journal entry.
+* Improve credit formatting.
+
+## 0.1.0-beta5 on 21.01.2022
+
+* Missions that affect more than one faction now properly show that in the list.
+* Cargo sold now shows a better name for the commodity (if available in journal).
+* Added more mission names.
+* Mission names are now part of an XML file.
+* Added licence file with GPLv3.
+
+## 0.1.0-beta4 on 13.01.2022
+
+* Fixed a bug in date/time selection. It no longer uses the start date as start and end.
+
+## 0.1.0-beta3 on 12.01.2022
+
+* Collated failed missions into a single entry with a counter
+* Added failed missions to Nova Navy log template
+* Detect trade profit/loss
+* Allow adjusting trade profit/loss with a new window
+
+## 0.1.0-beta2 on 09.01.2022
+
+* Adding combat zones has been repaired
+
+## 0.1.0-beta1 on 07.01.2022
+
+* Initial release

EliteBGS/DiscordLogGenerator.cs

@@ -0,0 +1,262 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text;
+using EliteBGS.LogGenerator;
+using System.Reflection;
+
+namespace EliteBGS;
+
+public class DiscordLogGenerator {
+    protected List<LogFormatter> formatters = new List<LogFormatter>() {
+        new MissionFormat(),
+        new MurderFormat(),
+        new VoucherFormat(),
+        new ThargoidFormatter(),
+        new CombatZoneFormat(),
+        new KillBondsFormat(),
+        new CartographicsFormat(),
+        new MicroResourcesFormat(),
+        new MarketBuyFormat(),
+        new CargoSoldFormatter(),
+        new VistaGenomicsFormat(),
+        new SearchAndRescueFormat(),
+    };
+
+    protected virtual string GetToolVersion() {
+        Version v = Assembly.GetCallingAssembly().GetName().Version;
+        string ver;
+        if (v == null) {
+            ver = "v?.?.?";
+        } else {
+            ver = "v" + v.ToString(3);
+        }
+        return string.Format("EliteBGS {0}", ver);
+    }
+
+    protected virtual DateTime? GetDateOfEarliestEntry(Objective objective) {
+        var it = objective
+            .Transactions
+            .OrderBy(x => x.CompletedAtDateTime)
+            .FirstOrDefault()
+            ;
+        if (it != null) {
+            return it.CompletedAtDateTime;
+        }
+        return null;
+    }
+
+    protected virtual DateTime? GetDateOfLatestEntry(Objective objective) {
+        var it = objective
+            .Transactions
+            .OrderByDescending(x => x.CompletedAtDateTime)
+            .FirstOrDefault()
+            ;
+        if (it != null) {
+            return it.CompletedAtDateTime;
+        }
+        return null;
+    }
+
+    protected virtual string GenerateSummary(Objective objective) {
+        StringBuilder sb = new StringBuilder();
+
+        foreach (var formatter in formatters) {
+            string summary = "";
+
+            try {
+                summary = formatter.GenerateSummary(objective);
+            } catch (NotImplementedException) {
+            }
+
+            if (string.IsNullOrEmpty(summary)) {
+                continue;
+            }
+
+            if (sb.Length > 0) {
+                sb.Append("; ");
+            }
+
+            sb.Append(summary);
+        }
+
+        return sb.ToString();
+    }
+
+    protected virtual string GenerateHeader() {
+        return "";
+    }
+
+    protected virtual string GenerateFooter() {
+        return "\n";
+    }
+
+    protected virtual string GenerateObjectiveHeader(Objective objective) {
+        StringBuilder log = new StringBuilder();
+
+        string location;
+
+        if (!string.IsNullOrEmpty(objective.System) && !string.IsNullOrEmpty(objective.Faction)) {
+            location = string.Format("{0}, {1}", objective.System, objective.Faction);
+        } else if (!string.IsNullOrEmpty(objective.System)) {
+            location = objective.System;
+        } else {
+            location = "Unknown Location";
+        }
+
+        int legacycount = objective.Transactions
+                .Where(x => x.IsLegacy)
+                .Count()
+                ;
+
+        string summary = GenerateSummary(objective);
+
+        var earliest = GetDateOfEarliestEntry(objective);
+        var latest = GetDateOfLatestEntry(objective);
+        if (earliest != null && latest != null) {
+            log.AppendFormat("**Date:** {0} - {1}\n",
+                GetDateOfEarliestEntry(objective),
+                GetDateOfLatestEntry(objective)
+                );
+        }
+        log.AppendFormat("**Target:** {0}\n", location);
+        if (!string.IsNullOrEmpty(summary)) {
+            log.AppendFormat("**Summary:** {0}\n", summary);
+        }
+        if (legacycount > 0) {
+            log.AppendFormat("**Warning:** Some actions were performed on ED Legacy\n");
+        }
+        log.AppendLine("```");
+
+        return log.ToString();
+    }
+
+    protected virtual string GenerateObjectiveFooter(Objective objective) {
+        return "```\n";
+    }
+
+    /// <summary>
+    /// Is called to do final adjustments to the log body of a given objective.
+    /// </summary>
+    /// <param name="objective">Objective in question.</param>
+    /// <param name="log">Final log as generated.</param>
+    /// <returns>The transformed log.</returns>
+    protected virtual string TransformFinalLogForObjective(Objective objective, string log) {
+        return log;
+    }
+
+    public virtual string Name {
+        get { return "GenericLog"; }
+    }
+
+    protected virtual string BotHeader() {
+        var sb = new StringBuilder();
+        sb.AppendFormat("**Bot-Header:** {0}; {1}\n", GetToolVersion(), this.Name);
+        return sb.ToString();
+    }
+
+    public virtual string GenerateDiscordLog(Report report) {
+        StringBuilder log = new StringBuilder();
+
+        if (report == null) {
+            return "";
+        }
+
+        var objectives = report.Objectives
+            .Where(x => x.IsEnabled && x.Transactions.Count() > 0)
+            ;
+
+        if (objectives == null || objectives.Count() <= 0) {
+            return "";
+        }
+
+        log.AppendFormat("{0}", BotHeader());
+        log.AppendFormat("{0}", GenerateHeader());
+
+        foreach (Objective objective in objectives) {
+            StringBuilder objlog = new StringBuilder();
+
+            log.AppendFormat("{0}", GenerateObjectiveHeader(objective));
+
+            foreach (LogFormatter formatter in formatters) {
+                string text = formatter.GenerateLog(objective);
+                text = text.Trim();
+                if (!string.IsNullOrEmpty(text)) {
+                    objlog.AppendFormat("{0}\n\n", text);
+                }
+            }
+
+            string finallog = objlog.ToString().Trim();
+            finallog = TransformFinalLogForObjective(objective, finallog);
+
+            log.AppendFormat("{0}\n", finallog);
+
+            log.AppendFormat("{0}", GenerateObjectiveFooter(objective));
+        }
+
+        log.AppendFormat("{0}", GenerateFooter());
+
+        return log.ToString().Trim();
+    }
+
+    public virtual string[] SplitLog(string log, int maxcount = 2000) {
+        throw new NotImplementedException();
+    }
+
+    protected string[] SplitLogWithHeader(string log, string header, int maxcount = 2000) {
+        string[] lines = log.Split("\n");
+        List<string> chunks = new();
+        string chunk = string.Empty;
+
+        // Optimisation
+        if (log.Length <= maxcount) {
+            return new string[] { log };
+        }
+
+        // First split the log into its headers
+        // skip first bot header line
+        for (int i = 1; i < lines.Length; i++) {
+            string line = lines[i];
+
+            if (line.StartsWith(header) && !string.IsNullOrEmpty(chunk)) {
+                chunks.Add(chunk.Trim());
+                chunk = string.Empty;
+            }
+
+            chunk = chunk + "\n" + line;
+        }
+
+        int curchunk = 0;
+        string botheader = BotHeader().Trim() + "\n";
+        // Leave room for botheader and some leeway
+        int maxlength = (2000 - botheader.Length - 10);
+
+        // Then try to collate chunks
+        for (curchunk = 0; curchunk < chunks.Count; ++curchunk) {
+            int count = chunks[curchunk].Length;
+            while (count < maxlength && (curchunk+1) < chunks.Count) {
+                count += chunks[curchunk + 1].Length + 2;
+                if (count < maxlength) {
+                    chunks[curchunk] += "\n";
+                    chunks[curchunk] += chunks[curchunk + 1];
+                    chunks.RemoveAt(curchunk + 1);
+                }
+            }
+        }
+
+        // Readd bott headers
+        for (int i = 0; i < chunks.Count; i++) {
+            chunks[i] = chunks[i].Insert(0, botheader);
+        }
+
+        // Now finally check if any one chunk is bigger than max length
+        for (int i = 0; i < chunks.Count; i++) {
+            if (chunks[i].Length > maxcount) {
+                throw new ApplicationException(
+                    string.Format("a chunk turned out bigger than {0}", maxcount));
+            }
+        }
+
+        return chunks.ToArray();
+    }
+}

EliteBGS/DiscordPoster.cs

@@ -0,0 +1,32 @@
+using EliteBGS.Util;
+using System;
+using System.Text;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+
+namespace EliteBGS;
+
+public class DiscordPoster {
+    public static readonly int DiscordLimit = 2000;
+
+    public static void PostToDiscord(DiscordWebhook webhook, string log, string username = "EDBGS") {
+        JsonObject obj = new();
+        obj.Add("content", log);
+        obj.Add("username", username);
+
+        using (var client = new HttpClient()) {
+            var content = new StringContent(obj.ToString(), Encoding.UTF8, "application/json");
+            var response = client.PostAsync(webhook.Webhook, content);
+            if (response == null) {
+                throw new Exception("failed to post content to Discord webhook");
+            }
+            response.Wait();
+            var resp = response.Result;
+            if (!resp.IsSuccessStatusCode) {
+                throw new Exception(string.Format(
+                    "failed to post content to webhook {0}: {1} / {2}",
+                    webhook.Name, resp.StatusCode, resp.Content.ToString()));
+            }
+        }
+    }
+}

EliteBGS/EliteBGS - Backup.csproj

@@ -0,0 +1,86 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <Version>0.2.6</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>EliteBGSApplication</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Salus.ico</ApplicationIcon>
+    <Title>BGS reporting and logging tool for Elite:Dangerous</Title>
+    <Authors>nola</Authors>
+    <Copyright>Copyright 2019 by Florian Stinglmayr</Copyright>
+    <RepositoryUrl>https://git.aror.org/florian/EDBGS</RepositoryUrl>
+    <PackageTags>ED;Elite Dangerous;BGS</PackageTags>
+    <PackageProjectUrl>https://bgs.n0la.org</PackageProjectUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Resource Include="main-page.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <None Update="README.md">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Update="docs\CHANGELOG.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="docs\main-page.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="LICENCE.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Salus.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="logo_v4.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EliteBGS.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="EliteBGS.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EDPlayerJournal\EDPlayerJournal.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+</Project>

EliteBGS/EliteBGS.csproj

@@ -0,0 +1,83 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <Version>0.4.3</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>EliteBGSApplication</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Salus.ico</ApplicationIcon>
+    <Title>BGS reporting and logging tool for Elite:Dangerous</Title>
+    <Authors>nola</Authors>
+    <Copyright>Copyright 2019 by Florian Stinglmayr</Copyright>
+    <RepositoryUrl>https://codeberg.org/nola/EDBGS</RepositoryUrl>
+    <PackageTags>ED;Elite Dangerous;BGS</PackageTags>
+    <PackageProjectUrl>https://salusinvicta.org/bgstool/</PackageProjectUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <Description>Elite: Dangerous BGS logging and reporting tool
+</Description>
+    <PackageIcon>logo_v5.png</PackageIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="main-page.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="main-page.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <None Update="logo_v5.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Update="README.md">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Update="CHANGELOG.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="LICENCE.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Salus.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MahApps.Metro" Version="2.4.10" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EDPlayerJournal\EDPlayerJournal.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+</Project>

EliteBGS/EliteBGS.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31205.134
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EliteBGS", "EliteBGS.csproj", "{73BFB315-C808-40E7-8D69-B651F875880C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{73BFB315-C808-40E7-8D69-B651F875880C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73BFB315-C808-40E7-8D69-B651F875880C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73BFB315-C808-40E7-8D69-B651F875880C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73BFB315-C808-40E7-8D69-B651F875880C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {40F4B1BD-FC53-485B-9AEE-3357B375CED2}
+	EndGlobalSection
+EndGlobal

EliteBGS/GenericDiscordLog.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Windows.Documents;
+
+namespace EliteBGS;
+
+public class GenericDiscordLog : DiscordLogGenerator {
+    public override string ToString() {
+        return "Generic";
+    }
+
+    public override string Name {
+        get { return "Generic"; }
+    }
+
+    public override string[] SplitLog(string log, int maxcount = 2000) {
+        return SplitLogWithHeader(log, "**Date:**", maxcount);
+    }
+}

EliteBGS/LICENCE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

EliteBGS/LoadEntriesWindow.xaml

@@ -0,0 +1,40 @@
+<Window x:Class="EliteBGS.LoadEntriesWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:EliteBGS"
+        mc:Ignorable="d"
+        Title="Load Entries" Height="450" Width="600">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Label Content="Use this text field to manually load JSON events into the application." Grid.Row="0" Grid.Column="1"/>
+        <TextBox x:Name="Lines" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap" Grid.Row="1" Height="Auto" Grid.Column="0" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Visible" />
+        <Grid Grid.Column="1" Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Button x:Name="Load" Content="Load Entries" Grid.Row="0" Margin="5,5,5,5" Height="Auto" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Click="Load_Click" />
+            <Button x:Name="LoadFile" Content="Load File" Grid.Row="0" Margin="5,5,5,5" Height="Auto" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Click="LoadFile_Click" />
+            <Button x:Name="DeleteUnimportant" Content="Remove Unimportant" Grid.Row="0" Margin="5,5,5,5" Height="Auto" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" Click="DeleteUnimportant_Click" />
+            <Button x:Name="Clear" Content="Clear" Grid.Row="0" Height="Auto" Margin="5,5,5,5" Grid.Column="4" Click="Clear_Click" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Grid>
+    </Grid>
+</Window>

EliteBGS/LoadEntriesWindow.xaml.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows;
+using Microsoft.Win32;
+using EDPlayerJournal.Entries;
+using EliteBGS.Util;
+using EDPlayerJournal.BGS;
+
+namespace EliteBGS;
+
+/// <summary>
+/// Interaction logic for LoadEntriesWindow.xaml
+/// </summary>
+public partial class LoadEntriesWindow : Window {
+    public delegate void EntriesLoadedDelegate(List<Entry> entries);
+
+    public event EntriesLoadedDelegate EntriesLoaded;
+
+    Config config = new Config();
+
+    public LoadEntriesWindow() {
+        InitializeComponent();
+    }
+
+    private void Load_Click(object sender, RoutedEventArgs e) {
+        string lines = Lines.Text.Trim();
+        if (lines.Length <= 0) {
+            return;
+        }
+
+        try {
+            List<Entry> entries = new List<Entry>();
+
+            foreach (string line in lines.Split('\n')) {
+                if (string.IsNullOrEmpty(line)) {
+                    continue;
+                }
+                Entry entry = Entry.Parse(line);
+                entries.Add(entry);
+            }
+
+            if (entries.Count > 0) {
+                EntriesLoaded?.Invoke(entries);
+            }
+        } catch (Exception exception) {
+            MessageBox.Show(string.Format("There was an error while parsing the JSON: {0}",
+                exception.ToString()));
+        }
+    }
+
+    private void Clear_Click(object sender, RoutedEventArgs e) {
+        Lines.Clear();
+    }
+
+    private void LoadFile_Click(object sender, RoutedEventArgs e) {
+        OpenFileDialog dialog = new OpenFileDialog();
+
+        dialog.DefaultExt = ".log";
+        dialog.Filter = "Log files (*.log)|*.log|All files (*.*)|*";
+
+        var location = AppConfig.DefaultJournalLocation;
+        if (Directory.Exists(location)) {
+            dialog.InitialDirectory = location;
+        }
+
+        bool result = dialog.ShowDialog(this) ?? false;
+        if (!result) {
+            return;
+        }
+
+        try {
+            using (FileStream stream = File.OpenRead(dialog.FileName)) {
+                using (StreamReader reader = new StreamReader(stream)) {
+                    Lines.Text = reader.ReadToEnd();
+                }
+            }
+        } catch (Exception) {
+        }
+    }
+
+    private void DeleteUnimportant_Click(object sender, RoutedEventArgs e) {
+        string lines = Lines.Text.Trim();
+        if (lines.Length <= 0) {
+            return;
+        }
+
+        TransactionParser parser = new();
+
+        try {
+            List<Entry> entries = new List<Entry>();
+
+            foreach (string line in lines.Split('\n')) {
+                if (string.IsNullOrEmpty(line)) {
+                    continue;
+                }
+                Entry entry = Entry.Parse(line);
+                if (parser.IsRelevant(entry)) {
+                    entries.Add(entry);
+                }
+            }
+
+            if (entries.Count <= 0) {
+                return;
+            }
+
+            string[] text = entries
+                .ConvertAll(x => x.JSON.ToString(Newtonsoft.Json.Formatting.None))
+                .ToArray()
+                ;
+            Lines.Text = string.Join("\n", text).Trim();
+        } catch (Exception exception) {
+            MessageBox.Show(string.Format("There was an error while parsing the JSON: {0}",
+                exception.ToString()));
+        }
+    }
+}

EliteBGS/LogGenerator/CargoSoldFormatter.cs

@@ -0,0 +1,77 @@
+using System.Linq;
+using System.Text;
+using System.Windows.Documents;
+using EDPlayerJournal;
+using EDPlayerJournal.BGS;
+
+namespace EliteBGS.LogGenerator;
+
+public class CargoSoldFormatter : LogFormatter {
+    public string GenerateLog(Objective objective) {
+        StringBuilder builder = new StringBuilder();
+        SellCargo[] sold = objective.EnabledOfType<SellCargo>().ToArray();
+
+        if (sold == null || sold.Length <= 0) {
+            return "";
+        }
+
+
+        // This groups everything together by cargo sold, and then by market sold to.
+        //  Dictionary<string Cargo, Dictionary<string Market, { Market, Amount, Profit }> >
+        var entries = sold.GroupBy(x => x.Cargo,
+                                   (key, cargos) => new {
+                                       Cargo = key,
+                                       Markets = cargos.GroupBy(y => y.Market,
+                                                           (market, markets) => new {
+                                                               Market = market,
+                                                               Amount = markets.Sum(x => x.Amount),
+                                                               Profit = markets.Sum(x => x.Profit)
+                                                           })
+                                   }
+                                   )
+                          ;
+
+        foreach (var cargo in entries) {
+            foreach (var market in cargo.Markets) {
+                builder.AppendFormat("Sold {0} {1} to the {2}",
+                        market.Amount,
+                        cargo.Cargo,
+                        market.Market
+                    );
+
+                if (market.Profit != 0) {
+                    builder.AppendFormat(" ({0} {1})",
+                        Credits.FormatCredits(market.Profit),
+                        market.Profit < 0 ? "loss" : "profit"
+                        );
+                }
+
+                builder.Append("\n");
+            }
+        }
+
+        builder.AppendFormat("\n");
+
+        return builder.ToString();
+    }
+
+    public string GenerateSummary(Objective objective) {
+        SellCargo[] sold = objective.EnabledOfType<SellCargo>().ToArray();
+        long totalProfit = sold.Sum(x => x.Profit);
+        long tons = sold.Sum(x => x.Amount);
+
+        if (tons <= 0) {
+            return "";
+        }
+
+        StringBuilder builder = new();
+
+        builder.Append("Sold: ");
+        builder.AppendFormat("{0}t", tons);
+        if (totalProfit >= 100000) {
+            builder.AppendFormat(", {0} profit", Credits.FormatMillions(totalProfit));
+        }
+
+        return builder.ToString();
+    }
+}

EliteBGS/LogGenerator/CartographicsFormat.cs

@@ -0,0 +1,33 @@
+using System.Linq;
+using EDPlayerJournal;
+using EDPlayerJournal.BGS;
+
+namespace EliteBGS.LogGenerator;
+
+public class CartographicsFormat : LogFormatter {
+    public string GenerateLog(Objective objective) {
+        var total = objective.EnabledOfType<Cartographics>();
+        var pages = total.Count();
+        long sum = total.Sum(x => x.TotalSum);
+
+        if (pages <= 0 || sum <= 0) {
+            return "";
+        }
+
+        return string.Format("Sold {0} page(s) worth of universal cartographics\n" +
+                             "(Total value: {1})\n\n",
+                             pages, Credits.FormatCredits(sum)
+                             );
+    }
+
+    public string GenerateSummary(Objective objective) {
+        Cartographics[] sold = objective.EnabledOfType<Cartographics>().ToArray();
+        long totalProfit = sold.Sum(x => x.TotalSum);
+
+        if (totalProfit >= 100000) {
+            return string.Format("Explo: {0}", Credits.FormatMillions(totalProfit));
+        }
+
+        return "";
+    }
+}