EDPlayerJournal/BGS/Cartographics.cs

@@ -35,10 +35,10 @@ public class Cartographics : Transaction {
             /* add multi sell and normal ones together */
             long total =
                 Entries.OfType<MultiSellExplorationDataEntry>()
-                .Sum(x => x.Total)
+                .Sum(x => x.TotalEarnings)
                 +
                 Entries.OfType<SellExplorationDataEntry>()
-                .Sum(x => x.Total)
+                .Sum(x => x.TotalEarnings)
                 ;
             return total;
         }

EDPlayerJournal/BGS/CombatZone.cs

@@ -19,36 +19,20 @@ public class CombatZone : Transaction {
     public bool? SpecOps { get; set; }
 
     /// <summary>
-    /// Whether allied captain objective was won
+    /// Whether captain was won
     /// </summary>
-    public bool? AlliedCaptain { get; set; }
+    public bool? Captain { get; set; }
 
     /// <summary>
-    /// Whether enemy captain objective was won
+    /// Whether correspondent objective was won
     /// </summary>
-    public bool? EnemyCaptain { get; set; }
+    public bool? Correspondent { 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>
@@ -57,14 +41,7 @@ public class CombatZone : Transaction {
             if (IsGround) {
                 return 0;
             }
-            return new List<bool?>() { 
+            return new List<bool?>() { SpecOps, Captain, Correspondent, CapitalShip }
-                SpecOps, 
-                AlliedCaptain,
-                EnemyCaptain,
-                AlliedCorrespondent,
-                EnemyCorrespondent,
-                CapitalShip 
-            }
                 .Where(x => x != null && x == true)
                 .Count()
                 ;

EDPlayerJournal/BGS/InfluenceSupport.cs

@@ -9,7 +9,7 @@ namespace EDPlayerJournal.BGS;
 /// faction to another. Both sometimes gain influence.
 /// </summary>
 public class InfluenceSupport : Transaction {
-    public MissionInfluence? Influence { get; set; } = null;
+    public string Influence { get; set; } = "";
 
     /// <summary>
     /// Relevant mission completed entry
@@ -46,7 +46,7 @@ public class InfluenceSupport : Transaction {
 
         builder.AppendFormat("Influence gained from \"{0}\": \"{1}\"",
             missionname,
-            Influence == null ? "NONE" : Influence.TrendAdjustedInfluence
+            string.IsNullOrEmpty(Influence) ? "NONE" : Influence
             );
 
         return builder.ToString();

EDPlayerJournal/BGS/MissionCompleted.cs

@@ -38,14 +38,7 @@ public class MissionCompleted : Transaction {
                 return "";
             }
 
-            return string.Join("",
+            return (CompletedEntry.Mission.GetInfluenceForFaction(Faction, SystemAddress) ?? "");
-                CompletedEntry
-                .Mission
-                .GetInfluenceForFaction(Faction, SystemAddress)
-                .Select(x => x.Influence)
-                .ToArray()
-                )
-                ;
         }
     }
 
@@ -77,10 +70,8 @@ public class MissionCompleted : Transaction {
         var influence = CompletedEntry.Mission.GetInfluenceForFaction(Faction, SystemAddress);
 
         builder.AppendFormat("{0}", MissionName);
-        if (influence != null && influence.Length > 0) {
+        if (influence != "") {
-            builder.AppendFormat(", Influence: {0}", 
+            builder.AppendFormat(", Influence: {0}", influence);
-                influence.Select(x => x.InfluenceAmount).Sum()
-                );
         }
 
         return builder.ToString();

EDPlayerJournal/BGS/MissionFailed.cs

@@ -13,21 +13,6 @@ public class MissionFailed : Transaction {
         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;
-            }
-        }
-    }
-
     public override int CompareTo(Transaction? other) {
         if (other == null || other.GetType() != typeof(MissionFailed)) {
             return -1;

EDPlayerJournal/BGS/Parsers/ApproachSettlementParser.cs

@@ -1,15 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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/MusicParser.cs

@@ -1,17 +0,0 @@
-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

@@ -1,84 +0,0 @@
-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/ShipTargetedParser.cs

@@ -1,65 +0,0 @@
-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/SellCargo.cs

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

EDPlayerJournal/BGS/TransactionParser.cs

@@ -28,14 +28,6 @@ public class TransactionParserOptions {
     /// Whether we should ignore things done for the fleet carrier faction.
     /// </summary>
     public bool IgnoreFleetCarrierFaction { get; set; } = true;
-
-    /// <summary>
-    /// 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 bool FilterDoubleRedeemVouchers { get; set; } = true;
 }
 
 public class TransactionList : List<Transaction> {
@@ -145,6 +137,41 @@ internal class DockedParser : ITransactionParserPart {
     }
 }
 
+/// <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);
+        }
+
+        // We have seen a captain?
+        if (NPCs.IsWarzoneCaptain(entry.PilotName)) {
+            context.HaveSeenCaptain = true;
+        }
+
+        // Spec ops?
+        if (NPCs.IsSpecOps(entry.PilotName)) {
+            context.HaveSeenSpecOps = true;
+        }
+
+        // Correspondent?
+        if (NPCs.IsWarzoneCorrespondent(entry.PilotName)) {
+            context.HaveSeenCorrespondent = true;
+        }
+    }
+}
+
 /// <summary>
 /// Commit crime can result in a transaction, especially if the crime committed is
 /// murder.
@@ -306,20 +333,20 @@ internal class MissionCompletedParser : ITransactionParserPart {
                     if (context.CurrentSystemAddress == null) {
                         continue;
                     }
-                    other.Value.Add(context.CurrentSystemAddress.Value, new MissionInfluence());
+                    other.Value.Add(context.CurrentSystemAddress.Value, "");
                     // 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, new MissionInfluence());
+                    other.Value.Add(accepted_location.SystemAddress, "");
 
                     // 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, new MissionInfluence());
+                        other.Value.Add(context.CurrentSystemAddress.Value, "");
                     }
                 }
             }
@@ -430,6 +457,63 @@ internal class MissionFailedParser : ITransactionParserPart {
     }
 }
 
+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) {
+                transactions.Add(new Vouchers(entry) {
+                    System = context.CurrentSystem,
+                    Station = context.CurrentStation,
+                    Faction = relevantFaction,
+                    ControllingFaction = context.ControllingFaction,
+                    IsLegacy = context.IsLegacy,
+                });
+            }
+        }
+    }
+}
+
 internal class SellMicroResourcesParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         SellMicroResourcesEntry? entry = e as SellMicroResourcesEntry;
@@ -583,10 +667,6 @@ internal class ReceiveTextParser : ITransactionParserPart {
 
 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();
@@ -602,12 +682,19 @@ internal class DropshipDeployParser : ITransactionParserPart {
     }
 }
 
+internal class CommanderParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        // 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();
+    }
+}
+
 public class TransactionParser {
     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() },
@@ -626,7 +713,6 @@ public class TransactionParser {
         { Events.MissionFailed, new MissionFailedParser() },
         { Events.Missions, new MissionsParser() },
         { Events.MultiSellExplorationData, new MultiSellExplorationDataParser() },
-        { Events.Music, new MusicParser() },
         { Events.ReceiveText, new ReceiveTextParser() },
         { Events.RedeemVoucher, new RedeemVoucherParser() },
         { Events.SearchAndRescue, new SearchAndRescueParser() },
@@ -660,11 +746,6 @@ public class TransactionParser {
         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();
@@ -682,9 +763,6 @@ public class TransactionParser {
             transactionParserPart.Parse(entry, context, options, transactions);
         }
 
-        // Copy out list of commanders seen
-        Commanders = context.Commanders;
-
         return transactions.ToList();
     }
 }

EDPlayerJournal/BGS/TransactionParserContext.cs

@@ -3,11 +3,6 @@
 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>
@@ -56,16 +51,9 @@ internal class TransactionParserContext {
     public ulong? HighestCombatBond { get; set; }
 
     public bool HaveSeenCapShip { get; set; } = false;
-    public bool HaveSeenAlliedCaptain { get; set; } = false;
+    public bool HaveSeenCaptain { get; set; } = false;
-    public bool HaveSeenEnemyCaptain { get; set; } = false;
     public bool HaveSeenSpecOps { get; set; } = false;
-    public bool HaveSeenAlliedCorrespondent { get; set; } = false;
+    public bool HaveSeenCorrespondent { 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
@@ -125,7 +113,6 @@ internal class TransactionParserContext {
     /// </summary>
     public void LeftInstance() {
         CurrentInstanceType = null;
-        Settlement = null;
     }
 
     public void DiscernCombatZone(TransactionList transactions, Entry e) {
@@ -205,14 +192,10 @@ internal class TransactionParserContext {
             if (HaveSeenCapShip) {
                 grade = CombatZones.DifficultyHigh;
             } else {
-                int warzoneNpcs = new List<bool>() { 
+                int warzoneNpcs = new List<bool>() { HaveSeenCaptain, HaveSeenCorrespondent, HaveSeenSpecOps }
-                    HaveSeenEnemyCaptain, 
+                                    .Where(x => x == true)
-                    HaveSeenEnemyCorrespondent, 
+                                    .Count()
-                    HaveSeenSpecOps 
+                                    ;
-                }
-                .Where(x => x == true)
-                .Count()
-                ;
 
                 if (warzoneNpcs >= 1 && grade == CombatZones.DifficultyLow) {
                     grade = CombatZones.DifficultyMedium;
@@ -234,16 +217,13 @@ internal class TransactionParserContext {
             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,
+            Correspondent = HaveSeenCorrespondent ? true : null,
-            AlliedCorrespondent = HaveSeenAlliedCorrespondent ? true : null,
+            Captain = HaveSeenCaptain ? true : null,
-            EnemyCaptain = HaveSeenEnemyCaptain ? true : null,
-            AlliedCaptain = HaveSeenAlliedCaptain ? true : null,
         };
         zone.Entries.Add(e);
         transactions.Add(zone);
@@ -266,10 +246,8 @@ internal class TransactionParserContext {
     public void ResetCombatZone() {
         HighestCombatBond = null;
         HaveSeenCapShip = false;
-        HaveSeenAlliedCaptain = false;
+        HaveSeenCaptain = false;
-        HaveSeenEnemyCaptain = false;
+        HaveSeenCorrespondent = false;
-        HaveSeenAlliedCorrespondent = false;
-        HaveSeenEnemyCorrespondent = false;
         HaveSeenSpecOps = false;
         LastRecordedAwardingFaction = null;
         OnFootKills = 0;

EDPlayerJournal/BGS/Vouchers.cs

@@ -13,6 +13,16 @@ public class Vouchers : Transaction {
         Entries.Add(e);
     }
 
+    public override bool SystemContribution {
+        get {
+            if (Faction == Factions.PilotsFederation && Type == "Combat Bond") {
+                return true;
+            }
+
+            return false;
+        }
+    }
+
     public long TotalSum {
         get {
             if (Faction == null) {

EDPlayerJournal/Credits.cs

@@ -44,6 +44,6 @@ public class Credits {
             return string.Format("{0:0.00}M", millions);
         }
 
-        return string.Format("{0}", amount);
+        return "";
     }
 }

EDPlayerJournal/EnglishMissionNames.cs

@@ -107,7 +107,6 @@ public class EnglishMissionNames {
         {"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)"},
@@ -130,8 +129,6 @@ public class EnglishMissionNames {
         {"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)" },

EDPlayerJournal/Entries/ApproachSettlementEntry.cs

@@ -1,48 +0,0 @@
-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/CarrierJump.cs

@@ -1,44 +0,0 @@
-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,13 +8,4 @@ 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/Entry.cs

@@ -12,10 +12,8 @@ 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) },
@@ -38,7 +36,6 @@ 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) },
@@ -66,15 +63,7 @@ public class Entry {
     public static Entry? Parse(string journalline) {
         using (JsonReader reader = new JsonTextReader(new StringReader(journalline))) {
             reader.DateParseHandling = DateParseHandling.None;
-            JObject? json = null;
+            var json = JObject.Load(reader);
-            try {
-                json = JObject.Load(reader);
-            } catch (Exception e) {
-                throw new InvalidJournalEntryException(
-                    "invalid JSON journal entry: " + journalline,
-                    e
-                    );
-            }
             if (json == null) {
                 return null;
             }

EDPlayerJournal/Entries/Events.cs

@@ -1,10 +1,8 @@
 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";
@@ -28,7 +26,6 @@ public class Events {
     public static readonly string MissionRedirected = "MissionRedirected";
     public static readonly string Missions = "Missions";
     public static readonly string MultiSellExplorationData = "MultiSellExplorationData";
-    public static readonly string Music = "Music";
     public static readonly string ReceiveText = "ReceiveText";
     public static readonly string RedeemVoucher = "RedeemVoucher";
     public static readonly string SearchAndRescue = "SearchAndRescue";

EDPlayerJournal/Entries/MultiSellExplorationDataEntry.cs

@@ -1,23 +1,8 @@
-namespace EDPlayerJournal.Entries;
+namespace EDPlayerJournal.Entries; 
-
 public class MultiSellExplorationDataEntry : Entry {
     protected override void Initialise() {
-        TotalEarnings = JSON.Value<long?>("TotalEarnings") ?? 0;
+        TotalEarnings = (JSON.Value<int?>("TotalEarnings") ?? 0);
-        BaseValue = JSON.Value<long?>("BaseValue") ?? 0;
-        Bonus = JSON.Value<long?>("Bonus") ?? 0;
     }
 
-    public long Total {
+    public int TotalEarnings { get; set; } = 0;
-        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

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

EDPlayerJournal/Entries/SellExplorationDataEntry.cs

@@ -6,17 +6,8 @@ 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/JournalException.cs

@@ -6,7 +6,6 @@
 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,11 +17,6 @@ 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);
 
@@ -130,19 +125,14 @@ public class JournalFile : IComparable<JournalFile>
         }
 
         entries.Clear();
-        Errors.Clear();
+        foreach(var line in lines) {
-        foreach (var line in lines) {
             // Skip empty lines
             if (line.Trim().Length == 0) {
                 continue;
             }
-            try {
+            Entry? entry = Entry.Parse(line);
-                Entry? entry = Entry.Parse(line);
+            if (entry != null) {
-                if (entry != null) {
+                entries.Add(entry);
-                    entries.Add(entry);
-                }
-            } catch (Exception ex) {
-                Errors.Add(ex);
             }
         }
     }

EDPlayerJournal/Mission.cs

@@ -36,31 +36,6 @@ 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();
 
@@ -419,29 +394,27 @@ 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 MissionInfluence[]? GetInfluenceForFaction(string faction, ulong systemaddr) {
+    public string? 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)
+            .Select(x => x.Influence)
             .ToArray()
             ;
 
         if (results == null || results.Length == 0) {
-            return new MissionInfluence[0];
+            return null;
         }
 
-        return results;
+        return string.Join("", results);
     }
 
     /// <summary>
     /// A convenient Dictionary containing all influences given out by faction,
-    /// then by system address and then by influence handed out. Influence can
+    /// then by system address and then by influence handed out.
-    /// be either a series of "+" for positive influence, or "-" for negative
-    /// influence.
     /// </summary>
-    public Dictionary<string, Dictionary<ulong, MissionInfluence>> Influences {
+    public Dictionary<string, Dictionary<ulong, string>> Influences {
         get {
             return FactionEffects
                 .Where(x => x.Faction != null)
@@ -449,10 +422,7 @@ public class Mission : IComparable<Mission> {
                     x => (x.Faction ?? string.Empty),
                     x => x.Influences
                             .Where(x => x.SystemAddress != null)
-                            .ToDictionary(
+                            .ToDictionary(x => (x.SystemAddress ?? 0), x => x.Influence)
-                                x => (x.SystemAddress ?? 0), 
-                                x => x
-                                )
                     );
         }
     }

EDPlayerJournal/PlayerJournal.cs

@@ -22,12 +22,6 @@ 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

@@ -8,16 +8,11 @@ public enum ThargoidVessel {
     Basilisk = 4,
     Medusa = 5,
     Hydra = 6,
-    // Includes Glaive and Scythe
+    Glaive = 7,
-    Hunter = 7,
     /// <summary>
     /// Thargoid drone
     /// </summary>
     Revenant = 8,
-    /// <summary>
-    /// New thargoid drone in U17
-    /// </summary>
-    Banshee = 9,
 }
 
 public class Thargoid {
@@ -28,10 +23,8 @@ public class Thargoid {
         {    25000, ThargoidVessel.Revenant },
         {    65000, ThargoidVessel.Scout },
         {    75000, ThargoidVessel.Scout },
-        // New in Update 17
-        {   100000, ThargoidVessel.Banshee },
         // New in Update 15
-        {  4500000, ThargoidVessel.Hunter },
+        {  4500000, ThargoidVessel.Glaive },
         {  6500000, ThargoidVessel.Cyclops },
         { 20000000, ThargoidVessel.Basilisk },
         //{ 25000000, ThargoidVessel.Orthrus },
@@ -53,7 +46,7 @@ public class Thargoid {
     };
 
     public static Dictionary<ThargoidVessel, string?> VesselNames { get; } = new() {
-        { ThargoidVessel.Unknown, "(Unknown)" },
+        { ThargoidVessel.Unknown, null },
         { ThargoidVessel.Revenant, "Revenant" },
         { ThargoidVessel.Scout, "Scout" },
         { ThargoidVessel.Orthrus, "Orthrus" },
@@ -61,8 +54,7 @@ public class Thargoid {
         { ThargoidVessel.Basilisk, "Basilisk" },
         { ThargoidVessel.Medusa, "Medusa" },
         { ThargoidVessel.Hydra, "Hydra" },
-        { ThargoidVessel.Hunter, "Hunter" },
+        { ThargoidVessel.Glaive, "Glaive" },
-        { ThargoidVessel.Banshee, "Banshee" },
     };
 
     public static ThargoidVessel GetVesselByPayout(ulong payout) {

EDPlayerJournalTests/MissionTest.cs

@@ -59,9 +59,9 @@ public class MissionTest {
         Assert.IsTrue(e.IsEmptyFaction);
         Assert.AreEqual(e.Faction, string.Empty);
 
-        var influence = m.GetInfluenceForFaction("", 251012319587UL);
+        string? influence = m.GetInfluenceForFaction("", 251012319587UL);
         Assert.IsNotNull(influence);
-        Assert.AreEqual(influence[0].Influence, "+");
+        Assert.AreEqual(influence, "+");
 
         e = m.FactionEffects[1];
         Assert.AreEqual(e.Faction, "Social LHS 6103 Confederation");
@@ -101,25 +101,22 @@ public class MissionTest {
 
         Assert.AreEqual(effect.Reputation, "++");
 
-        var influence = m.GetInfluenceForFaction("Salus Imperial Society", 1865919973739UL);
+        string? influence;
-        Assert.IsNotNull(influence);
+
-        Assert.IsTrue(influence.Length > 0);
+        influence = m.GetInfluenceForFaction("Salus Imperial Society", 1865919973739UL);
-        Assert.AreEqual(influence[0].Influence, "++");
+        Assert.AreEqual(influence, "++");
 
         influence = m.GetInfluenceForFaction("Salus Imperial Society", 1733186884306UL);
-        Assert.IsNotNull(influence);
+        Assert.AreEqual(influence, "++");
-        Assert.IsTrue(influence.Length > 0);
-        Assert.AreEqual(influence[0].Influence, "++");
 
         influence = m.GetInfluenceForFaction("Saelishi Saxons", 1733186884306UL);
-        Assert.IsNotNull(influence);
+        Assert.IsNull(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].Influence, "++");
+        Assert.AreEqual(m.Influences["Salus Imperial Society"][1865919973739UL], "++");
-        Assert.AreEqual(m.Influences["Salus Imperial Society"][1733186884306UL].Influence, "++");
+        Assert.AreEqual(m.Influences["Salus Imperial Society"][1733186884306UL], "++");
     }
 
     [TestMethod]

EDPlayerJournalTests/TestTransactionParser.cs

@@ -19,13 +19,7 @@ public class TestTransactionParser {
             return;
         }
 
-        var options = new TransactionParserOptions() {
+        List<Transaction>? transactions = parser.Parse(entries);
-            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);
 
@@ -150,14 +144,7 @@ public class TestTransactionParser {
             return;
         }
 
-        var options = new TransactionParserOptions() {
+        List<Transaction>? transactions = parser.Parse(entries);
-            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/ThargoidKills.cs

@@ -22,17 +22,14 @@ public class ThargoidKills {
         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.AreEqual(transactions[0].ThargoidType, EDPlayerJournal.ThargoidVessel.Scout);
 
         Assert.IsInstanceOfType(transactions[1], typeof(ThargoidKill), "result is not of type ThargoidKill");
-        Assert.AreEqual(transactions[1].ThargoidType, EDPlayerJournal.ThargoidVessel.Unknown);
+        Assert.AreEqual(transactions[1].ThargoidType, EDPlayerJournal.ThargoidVessel.Basilisk);
 
         Assert.IsInstanceOfType(transactions[2], typeof(ThargoidKill), "result is not of type ThargoidKill");
-        Assert.AreEqual(transactions[2].ThargoidType, EDPlayerJournal.ThargoidVessel.Unknown);
+        Assert.AreEqual(transactions[2].ThargoidType, EDPlayerJournal.ThargoidVessel.Scout);
     }
 
     [TestMethod]

EDPlayerJournalTests/double-vouchers-2.txt

@@ -1,7 +0,0 @@
-{"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}]}

EliteBGS/DiscordLogGenerator.cs

@@ -3,13 +3,13 @@ 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 FailedMissionFormat(),
         new MurderFormat(),
         new VoucherFormat(),
         new ThargoidFormatter(),
@@ -23,41 +23,6 @@ public class DiscordLogGenerator {
         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();
 
@@ -111,17 +76,10 @@ public class DiscordLogGenerator {
 
         string summary = GenerateSummary(objective);
 
-        var earliest = GetDateOfEarliestEntry(objective);
+        log.AppendFormat("**Date:** {0}\n", DateTime.Now.ToString("dd/MM/yyyy"));
-        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);
+            log.AppendFormat("**Summary**: {0}\n", summary);
         }
         if (legacycount > 0) {
             log.AppendFormat("**Warning:** Some actions were performed on ED Legacy\n");
@@ -145,16 +103,6 @@ public class DiscordLogGenerator {
         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();
 
@@ -170,7 +118,6 @@ public class DiscordLogGenerator {
             return "";
         }
 
-        log.AppendFormat("{0}", BotHeader());
         log.AppendFormat("{0}", GenerateHeader());
 
         foreach (Objective objective in objectives) {
@@ -198,65 +145,4 @@ public class DiscordLogGenerator {
 
         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

@@ -1,32 +0,0 @@
-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.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <Version>0.4.3</Version>
+    <Version>0.3.3</Version>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
@@ -18,15 +18,12 @@
     <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>
+    <PackageProjectUrl>https://bgs.n0la.org</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>
@@ -40,10 +37,15 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Update="CHANGELOG.md">
+    <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>
@@ -53,12 +55,12 @@
     <Resource Include="Salus.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.4.10" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.9" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
   </ItemGroup>
   <ItemGroup>

EliteBGS/GenericDiscordLog.cs

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

EliteBGS/LoadEntriesWindow.xaml.cs

@@ -60,7 +60,7 @@ public partial class LoadEntriesWindow : Window {
         dialog.DefaultExt = ".log";
         dialog.Filter = "Log files (*.log)|*.log|All files (*.*)|*";
 
-        var location = AppConfig.DefaultJournalLocation;
+        var location = config.Global.DefaultJournalLocation;
         if (Directory.Exists(location)) {
             dialog.InitialDirectory = location;
         }

EliteBGS/LogGenerator/CombatZoneFormat.cs

@@ -10,7 +10,7 @@ class CombatZoneFormat : LogFormatter {
         var logs = objective
             .EnabledOfType<CombatZone>()
             .OrderBy(x => (CombatZones.DifficultyRank(x.Grade) ?? 0))
-            .GroupBy(x => new { x.Type, x.Grade, x.Settlement })
+            .GroupBy(x => new { x.Type, x.Grade })
             .ToDictionary(x => x.Key, x => x.ToList())
             ;
         StringBuilder builder = new StringBuilder();
@@ -23,11 +23,6 @@ class CombatZoneFormat : LogFormatter {
             int optionals = log.Value
                                 .Sum(x => x.OptionalObjectivesCompleted)
                                 ;
-            var settlements = log.Value
-                                .Select(x => x.Settlement)
-                                .Distinct()
-                                ;
-            string settl = string.Join(", ", settlements);
             if (!string.IsNullOrEmpty(log.Key.Grade)) {
                 builder.AppendFormat("Won {0}x {1} {2} Combat Zone(s)",
                     log.Value.Count,
@@ -44,9 +39,6 @@ class CombatZoneFormat : LogFormatter {
             if (optionals > 0) {
                 builder.AppendFormat(" (with {0} optional objectives)", optionals);
             }
-            if (!string.IsNullOrEmpty(settl)) {
-                builder.AppendFormat(" (at {0})", settl);
-            }
             builder.Append("\n");
         }
 

EliteBGS/LogGenerator/FailedMissionFormat.cs

@@ -0,0 +1,60 @@
+using System.Linq;
+using System.Text;
+using EDPlayerJournal.BGS;
+
+namespace EliteBGS.LogGenerator;
+
+public class FailedMissionFormat : LogFormatter {
+    public string GenerateLog(Objective objective) {
+        var missions = objective.EnabledOfType<MissionFailed>();
+
+        if (missions.Count <= 0) {
+            return "";
+        }
+
+        StringBuilder builder = new StringBuilder();
+
+        var grouping = missions
+                        .GroupBy(x => x.Mission.IsOnFoot)
+                        ;
+
+        foreach (var group in grouping) {
+            int amount = group.Count();
+
+            if (group.Key) {
+                builder.AppendFormat("Failed {0} On Foot Mission(s)\n", amount);
+            } else {
+                builder.AppendFormat("Failed {0} Ship Mission(s)\n", amount);
+            }
+        }
+
+        return builder.ToString().Trim();
+    }
+
+    public string GenerateSummary(Objective objective) {
+        var missions = objective.EnabledOfType<MissionFailed>();
+
+        if (missions.Count <= 0) {
+            return "";
+        }
+
+        StringBuilder sb = new();
+
+        int onFootFails = missions.Where(x => x.Mission.IsOnFoot).Count();
+        int shipFails = missions.Where(x => !x.Mission.IsOnFoot).Count();
+
+        sb.Append("Fails: ");
+        if (onFootFails > 0) {
+            sb.AppendFormat("{0} Ground", onFootFails);
+        }
+
+        if (shipFails > 0) {
+            if (onFootFails > 0) {
+                sb.Append(", ");
+            }
+            sb.AppendFormat("{0} Ship", shipFails);
+        }
+
+        return sb.ToString();
+    }
+}

EliteBGS/LogGenerator/MissionFormat.cs

@@ -6,72 +6,17 @@ using EDPlayerJournal.BGS;
 namespace EliteBGS.LogGenerator;
 
 public class MissionFormat : LogFormatter {
-    private string GenerateFailedLog(Objective objective) {
-        var missions = objective.EnabledOfType<MissionFailed>();
-
-        if (missions.Count <= 0) {
-            return "";
-        }
-
-        StringBuilder builder = new StringBuilder();
-
-        var grouping = missions
-                        .GroupBy(x => x.Mission.IsOnFoot)
-                        ;
-
-        foreach (var group in grouping) {
-            int amount = group.Count();
-
-            if (group.Key) {
-                builder.AppendFormat("Failed {0} On Foot Mission(s)\n", amount);
-            } else {
-                builder.AppendFormat("Failed {0} Ship Mission(s)\n", amount);
-            }
-        }
-
-        return builder.ToString().Trim();
-    }
-
-    private string GenerateFailedSummary(Objective objective) {
-        var missions = objective.EnabledOfType<MissionFailed>();
-
-        if (missions.Count <= 0) {
-            return "";
-        }
-
-        StringBuilder sb = new();
-
-        int onFootFails = missions.Where(x => x.Mission.IsOnFoot).Count();
-        int shipFails = missions.Where(x => !x.Mission.IsOnFoot).Count();
-
-        sb.Append("Fails: ");
-        if (onFootFails > 0) {
-            sb.AppendFormat("{0} Ground", onFootFails);
-        }
-
-        if (shipFails > 0) {
-            if (onFootFails > 0) {
-                sb.Append(", ");
-            }
-            sb.AppendFormat("{0} Ship", shipFails);
-        }
-
-        return sb.ToString();
-    }
-
     public string GenerateLog(Objective objective) {
         Dictionary<string, Dictionary<string, int>> collated = new();
         Dictionary<string, ulong> passengers = new();
         StringBuilder output = new StringBuilder();
-        long total_influence = 0;
+        int total_influence = 0;
 
         var missions = objective.EnabledOfType<MissionCompleted>();
         var support = objective.EnabledOfType<InfluenceSupport>();
-        var failed = objective.EnabledOfType<MissionFailed>();
 
         if ((missions == null || missions.Count == 0) &&
-            (support == null || support.Count == 0) &&
+            (support == null || support.Count == 0)) {
-            (failed == null || failed.Count == 0)) {
             return "";
         }
 
@@ -115,25 +60,17 @@ public class MissionFormat : LogFormatter {
 
         output.Append("\n");
 
-        // Handle failed missions, and add them to the log and influence tally
-        string failedlog = GenerateFailedLog(objective);
-        if (!string.IsNullOrEmpty(failedlog)) {
-            output.Append(failedlog);
-            output.Append("\n");
-        }
-        total_influence += failed.Sum(x => x.InfluenceAmount);
-
         foreach (InfluenceSupport inf in support) {
             output.Append(inf.ToString());
             output.Append("\n");
-            total_influence += inf.Influence.InfluenceAmount;
+            total_influence += inf.Influence.Length;
         }
 
         if (support.Count() > 0) {
             output.Append("\n");
         }
 
-        if (total_influence != 0) {
+        if (total_influence > 0) {
             output.AppendFormat("Total Influence: {0}", total_influence);
         }
 
@@ -147,24 +84,13 @@ public class MissionFormat : LogFormatter {
             ;
         long support = objective
             .EnabledOfType<InfluenceSupport>()
-            .Sum(x => x.Influence.InfluenceAmount)
+            .Sum(x => x.Influence.Length)
-            ;
-        long failed = objective
-            .EnabledOfType<MissionFailed>()
-            .Sum(x => x.InfluenceAmount)
             ;
 
-        if (influence == 0 && support == 0 && failed == 0) {
+        if (influence + support <= 0) {
             return "";
         }
 
-        string failedsummary = GenerateFailedSummary(objective);
+        return string.Format("INF: {0}", influence + support);
-        string summary = string.Format("INF: {0}", influence + support + failed);
-
-        if (!string.IsNullOrEmpty(failedsummary)) {
-            string.Join("; ", summary, failedsummary);
-        }
-
-        return summary;
     }
 }

EliteBGS/MainWindow.xaml

@@ -5,137 +5,19 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:EliteBGS"
-        xmlns:Util="clr-namespace:EliteBGS.Util"
+        xmlns:Util="clr-namespace:EliteBGS.Util" d:DataContext="{d:DesignInstance Type=Util:AppConfig}" x:Name="window" x:Class="EliteBGS.MainWindow"
-        d:DataContext="{d:DesignInstance Type=Util:AppConfig}"
-        x:Name="window"
-        x:Class="EliteBGS.MainWindow"
         mc:Ignorable="d"
-        Title="Elite: Dangerous BGS Helper" Height="620" Width="950" Icon="Salus.ico"  Closing="window_Closing"
+        Title="Elite: Dangerous BGS Helper" Height="520" Width="950" Icon="Salus.ico"  Closing="window_Closing">
-    >
     <Window.Resources>
-        <local:MinusFortyFiveConverter x:Key="MinusFortyFiveConverter" />
         <Style x:Key="StretchingTreeViewStyle" TargetType="TreeViewItem" BasedOn="{StaticResource {x:Type TreeViewItem}}">
             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         </Style>
-
+        <local:MinusFortyFiveConverter x:Key="MinusFortyFiveConverter" />
-        <local:Report x:Key="ObjectivesBasedOnSystem" />
-        <Util:Config x:Key="Config" />
-
-        <DataTemplate DataType="{x:Type Util:DiscordWebhook}">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="Name: " Grid.Column="0" Margin="2,0,0,0"/>
-                <TextBox Text="{Binding Name}" Grid.Column="1"/>
-
-                <TextBlock Text="Webhook URL: " Grid.Column="2" Margin="2,0,0,0"/>
-                <TextBox Text="{Binding Webhook}" Grid.Column="3"/>
-            </Grid>
-        </DataTemplate>
-
-        <HierarchicalDataTemplate DataType="{x:Type local:SystemObjectives}" ItemsSource="{Binding Path=Objectives}">
-            <Grid
-                 HorizontalAlignment="Stretch"
-                 Width="{Binding ActualWidth, ElementName=entries, Converter={StaticResource MinusFortyFiveConverter}}"
-                >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,2,0,2">
-                    <CheckBox Focusable="False" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center"/>
-                    <TextBlock Text="System: " Margin="2,0,0,0"/>
-                    <TextBlock Text="{Binding SystemName}" FontWeight="DemiBold"/>
-                </StackPanel>
-            </Grid>
-        </HierarchicalDataTemplate>
-
-        <HierarchicalDataTemplate DataType="{x:Type local:Objective}"
-                                  ItemsSource="{Binding Path=UITransactions}"
-                                  ItemContainerStyle="{StaticResource StretchingTreeViewStyle}">
-            <Grid
-                                     HorizontalAlignment="Stretch"
-                                     Width="{Binding ActualWidth, ElementName=entries, Converter={StaticResource MinusFortyFiveConverter}}"
-                                    >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,2,0,2">
-                    <CheckBox Focusable="False" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center"/>
-                    <TextBlock Text="Faction: " Margin="2,0,0,0"/>
-                    <TextBlock Text="{Binding Faction}" FontWeight="DemiBold"/>
-                </StackPanel>
-                <Separator Visibility="Hidden" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" />
-                <StackPanel Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
-                    <ToggleButton x:Name="ToggleAll" Content="Toggle All" Click="ToggleAll_Click" IsChecked="True" IsThreeState="False"/>
-                    <Separator Margin="2,0,2,0" />
-                    <Button x:Name="AddCombatZone" Content="Add Combat Zone" Click="AddCombatZone_Click" />
-                </StackPanel>
-            </Grid>
-        </HierarchicalDataTemplate>
-
-        <DataTemplate DataType="{x:Type local:UITransaction}">
-            <!-- This will stretch out the width of the item-->
-            <Grid Initialized="Transaction_Initialized"
-                                            HorizontalAlignment="Left"
-                                            Width="{Binding ActualWidth, ElementName=entries, Converter={StaticResource MinusFortyFiveConverter}}"
-                                            Margin="0,2,0,2"
-                                            >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Center">
-                    <CheckBox Focusable="False" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center"/>
-                    <TextBlock Text="{Binding CompletedAt}" Margin="2,0,2,0" HorizontalAlignment="Right" TextAlignment="Center"/>
-                    <TextBlock Text="{Binding Name}" FontWeight="DemiBold" TextAlignment="Center"/>
-                </StackPanel>
-                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" x:Name="CombatZone" Visibility="{Binding IsCombatZone}">
-                    <Expander Header="Optional Objectives" Visibility="{Binding IsShipCombatZone}">
-                        <StackPanel Orientation="Vertical">
-                            <ToggleButton x:Name="CapitalShip" Margin="2,0,2,0" Content="Capital Ship" IsChecked="{Binding HasCapitalShip, Mode=TwoWay}" IsThreeState="False"/>
-                            <ToggleButton x:Name="AlliedCaptain" Margin="2,0,2,0" Content="Allied Captain" IsChecked="{Binding HasAlliedCaptain, Mode=TwoWay}" IsThreeState="False"/>
-                            <ToggleButton x:Name="EnemyCaptain" Margin="2,0,2,0" Content="Enemy Captain" IsChecked="{Binding HasEnemyCaptain, Mode=TwoWay}" IsThreeState="False"/>
-                            <ToggleButton x:Name="AlliedCorrespondent" Margin="2,0,2,0" Content="Allied Correspondent" IsChecked="{Binding HasAlliedCorrespondent, Mode=TwoWay}" IsThreeState="False"/>
-                            <ToggleButton x:Name="EnemyCorrespondent" Margin="2,0,2,0" Content="Enemy Correspondent" IsChecked="{Binding HasEnemyCorrespondent, Mode=TwoWay}" IsThreeState="False"/>
-                            <ToggleButton x:Name="SpecOps" Margin="2,0,2,0" Content="Spec Ops" IsChecked="{Binding HasSpecOps, Mode=TwoWay}" IsThreeState="False"/>
-                        </StackPanel>
-                    </Expander>
-                    <Expander Header="Difficulty">
-                        <StackPanel Orientation="Vertical">
-                            <Button x:Name="Low" Content="Low" Click="Low_Click"/>
-                            <Button x:Name="Med" Content="Med" Click="Med_Click"/>
-                            <Button x:Name="High" Content="High" Click="High_Click"/>
-                            <Button x:Name="VeryHigh" Content="Very High" Click="VeryHigh_Click" />
-                        </StackPanel>
-                    </Expander>
-                    <Expander Header="Type">
-                        <StackPanel Orientation="Vertical">
-                            <Button Content="Ground" x:Name="Ground" Click="Ground_Click"/>
-                            <Button Content="Ship" x:Name="Ship" Click="Ship_Click"/>
-                            <Button Content="AX" x:Name="Thargoid" Click="Thargoid_Click"/>
-                        </StackPanel>
-                    </Expander>
-                </StackPanel>
-                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" x:Name="SellCargo" Visibility="{Binding IsSellCargo}">
-                    <TextBlock Text="Adjust Profit: " TextAlignment="Center" />
-                    <TextBox x:Name="Profit" MinWidth="80" HorizontalContentAlignment="Right" Text="{Binding Profit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" LostFocus="Profit_LostFocus" KeyUp="Profit_KeyUp"/>
-                </StackPanel>
-            </Grid>
-        </DataTemplate>
-
     </Window.Resources>
     <mah:MetroWindow.RightWindowCommands>
         <mah:WindowCommands ShowSeparators="False">
             <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,5,0">
-                <Hyperlink x:Name="URL" NavigateUri="https://salusinvicta.org/bgstool/" RequestNavigate="URL_RequestNavigate">Homepage</Hyperlink>
+                <Hyperlink x:Name="URL" NavigateUri="https://bgs.n0la.org/" RequestNavigate="URL_RequestNavigate">Homepage</Hyperlink>
             </TextBlock>
             <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,15,0">
                 <Hyperlink x:Name="SRC" NavigateUri="https://codeberg.org/nola/EDBGS" RequestNavigate="URL_RequestNavigate">Source</Hyperlink>
@@ -181,24 +63,93 @@
                         <Button x:Name="GenerateDiscord" Content="Generate Discord Report" VerticalAlignment="Stretch" Margin="0,0,0,0" VerticalContentAlignment="Center" Click="GenerateDiscord_Click"/>
                         <Separator />
                         <ComboBox x:Name="LogType" VerticalAlignment="Stretch" Margin="0,3,0,3" Width="140" SelectionChanged="LogType_SelectionChanged" />
-                        <Separator />
-                        <CheckBox x:Name="SelectAll" Content="Select All" IsChecked="True" Click="SelectAll_Click"/>
-                        <Separator />
-                        <Label Content="Post log as" VerticalAlignment="Center" Margin="0,3,0,3" />
-                        <ComboBox x:Name="Commanders" VerticalAlignment="Stretch" Margin="0,3,0,3" Width="180" />
-                        <Label Content="to" VerticalAlignment="Center" Margin="0,3,0,3" />
-                        <mah:DropDownButton x:Name="PostToDiscord" Content="Discord" />
                     </ToolBar>
                     <TreeView CheckBox.Checked="TreeView_CheckBox_Updated"
                               CheckBox.Unchecked="TreeView_CheckBox_Updated"
                               x:Name="entries" Margin="0,0,0,0"
-                              Grid.ColumnSpan="3"
+                              Grid.ColumnSpan="3" Grid.Row="2"
-                              Grid.Row="2"
                               KeyUp="entries_KeyUp"
                               HorizontalAlignment="Stretch"
                               HorizontalContentAlignment="Stretch"
-                              ItemsSource="{Binding Source={StaticResource ObjectivesBasedOnSystem}}"
                               >
+                        <TreeView.ItemTemplate>
+                            <HierarchicalDataTemplate DataType="{x:Type local:Objective}" ItemsSource="{Binding UITransactions}" ItemContainerStyle="{StaticResource StretchingTreeViewStyle}">
+                                <Grid
+                                     HorizontalAlignment="Stretch"
+                                     Width="{Binding ActualWidth, ElementName=entries, Converter={StaticResource MinusFortyFiveConverter}}"
+                                    >
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,2,0,2">
+                                        <CheckBox Focusable="False" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center"/>
+                                        <TextBlock Text="System: " Visibility="{Binding HasSystem}" Margin="2,0,0,0"/>
+                                        <TextBlock Text="{Binding System}" FontWeight="DemiBold" Visibility="{Binding HasSystem}"/>
+                                        <TextBlock Text="Faction: " Visibility="{Binding HasFaction}" Margin="2,0,0,0"/>
+                                        <TextBlock Text="{Binding Faction}" FontWeight="DemiBold" Visibility="{Binding HasFaction}"/>
+                                    </StackPanel>
+                                    <Separator Visibility="Hidden" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" />
+                                    <StackPanel Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+                                        <ToggleButton x:Name="ToggleAll" Content="Toggle All" Click="ToggleAll_Click" IsChecked="True" IsThreeState="False"/>
+                                        <Separator Margin="2,0,2,0" />
+                                        <Button x:Name="AddCombatZone" Content="Add Combat Zone" Click="AddCombatZone_Click" />
+                                    </StackPanel>
+                                </Grid>
+                                <HierarchicalDataTemplate.ItemTemplate>
+                                    <HierarchicalDataTemplate>
+                                        <!-- This will stretch out the width of the item-->
+                                        <Grid Initialized="Transaction_Initialized"
+                                              HorizontalAlignment="Left"
+                                              Width="{Binding ActualWidth, ElementName=entries, Converter={StaticResource MinusFortyFiveConverter}}"
+                                              Margin="0,2,0,2"
+                                              >
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="Auto"/>
+                                            </Grid.ColumnDefinitions>
+                                            <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+                                                <CheckBox Focusable="False" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center"/>
+                                                <TextBlock Text="{Binding CompletedAt}" Margin="2,0,2,0" HorizontalAlignment="Right" TextAlignment="Center"/>
+                                                <TextBlock Text="{Binding Name}" FontWeight="DemiBold" TextAlignment="Center"/>
+                                            </StackPanel>
+                                            <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" x:Name="CombatZone" Visibility="{Binding IsCombatZone}">
+                                                <Expander Header="Optional Objectives" Visibility="{Binding IsShipCombatZone}">
+                                                    <StackPanel Orientation="Vertical">
+                                                        <ToggleButton x:Name="CapitalShip" Margin="2,0,2,0" Content="Capital Ship" IsChecked="{Binding HasCapitalShip, Mode=TwoWay}" IsThreeState="False"/>
+                                                        <ToggleButton x:Name="Captain" Margin="2,0,2,0" Content="Captain" IsChecked="{Binding HasCaptain, Mode=TwoWay}" IsThreeState="False"/>
+                                                        <ToggleButton x:Name="Correspondent" Margin="2,0,2,0" Content="Correspondent" IsChecked="{Binding HasCorrespondent, Mode=TwoWay}" IsThreeState="False"/>
+                                                        <ToggleButton x:Name="SpecOps" Margin="2,0,2,0" Content="Spec Ops" IsChecked="{Binding HasSpecOps, Mode=TwoWay}" IsThreeState="False"/>
+                                                    </StackPanel>
+                                                </Expander>
+                                                <Expander Header="Difficulty">
+                                                    <StackPanel Orientation="Vertical">
+                                                        <Button x:Name="Low" Content="Low" Click="Low_Click"/>
+                                                        <Button x:Name="Med" Content="Med" Click="Med_Click"/>
+                                                        <Button x:Name="High" Content="High" Click="High_Click"/>
+                                                        <Button x:Name="VeryHigh" Content="Very High" Click="VeryHigh_Click" />
+                                                    </StackPanel>
+                                                </Expander>
+                                                <Expander Header="Type">
+                                                    <StackPanel Orientation="Vertical">
+                                                        <Button Content="Ground" x:Name="Ground" Click="Ground_Click"/>
+                                                        <Button Content="Ship" x:Name="Ship" Click="Ship_Click"/>
+                                                        <Button Content="AX" x:Name="Thargoid" Click="Thargoid_Click"/>
+                                                    </StackPanel>
+                                                </Expander>
+                                            </StackPanel>
+                                            <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" x:Name="SellCargo" Visibility="{Binding IsSellCargo}">
+                                                <TextBlock Text="Adjust Profit: " TextAlignment="Center" />
+                                                <TextBox x:Name="Profit" MinWidth="80" HorizontalContentAlignment="Right" Text="{Binding Profit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" LostFocus="Profit_LostFocus" KeyUp="Profit_KeyUp"/>
+                                            </StackPanel>
+                                        </Grid>
+                                    </HierarchicalDataTemplate>
+                                </HierarchicalDataTemplate.ItemTemplate>
+                            </HierarchicalDataTemplate>
+                        </TreeView.ItemTemplate>
                         <TreeView.ItemContainerStyle>
                             <Style TargetType="TreeViewItem">
                                 <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
@@ -215,7 +166,6 @@
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
@@ -271,35 +221,6 @@
                             <mah:ToggleSwitch x:Name="NoFleetCarrier" Grid.Row="2" Grid.ColumnSpan="2" Content="Ignore transactions done on a Fleet Carrier" Toggled="NoFleetCarrier_Toggled" />
                         </Grid>
                     </GroupBox>
-                    <GroupBox Header="Discord Webhooks" Grid.Row="3" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="3" Margin="0,5,0,0">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <DataGrid x:Name="Webhooks"
-                                      Grid.Row="0"
-                                      ItemsSource="{Binding Webhooks}"
-                                      AutoGenerateColumns="False"
-                                      ScrollViewer.CanContentScroll="True"
-                                      ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                      ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                      MaxHeight="100"
-                                      MinHeight="100"
-                                      KeyUp="Webhooks_KeyUp"
-                                      CellEditEnding="Webhooks_CellEditEnding"
-                                      >
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"/>
-                                    <DataGridTextColumn Header="Webhook URL" Binding="{Binding Webhook}" Width="*"/>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                            <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="5,10,5,0">
-                                <Button x:Name="AddWebHook" Content="Add" Click="AddWebHook_Click"/>
-                                <Button x:Name="RemoveWebHook" Content="Remove" Click="RemoveWebHook_Click" />
-                            </StackPanel>
-                        </Grid>
-                    </GroupBox>
                 </Grid>
             </TabItem>
             <TabItem Header="Event Log">

EliteBGS/MainWindow.xaml.cs

@@ -32,8 +32,8 @@ public partial class MainWindow : MetroWindow {
     private LoadEntriesWindow loadentries = null;
 
     private static readonly List<DiscordLogGenerator> logtypes = new List<DiscordLogGenerator>() {
-        new GenericDiscordLog(),
         new NonaDiscordLog(),
+        new GenericDiscordLog(),
         new OneLineDiscordLog(),
     };
 
@@ -46,9 +46,6 @@ public partial class MainWindow : MetroWindow {
             /* ignored */
         }
 
-        Webhooks.ItemsSource = Config.Global.Webhooks;
-        RefreshPostMenu();
-
         foreach (DiscordLogGenerator type in logtypes) {
             LogType.Items.Add(type);
         }
@@ -110,10 +107,6 @@ public partial class MainWindow : MetroWindow {
             //{ "HouseSalus", Color.FromRgb(0xBC, 0x94, 0x39) },
             { "HouseSalus", Color.FromRgb(0xED, 0xDA, 0x70) },
             { "NovaNavy", Color.FromRgb(0xA1, 0xA4, 0xDB) },
-            // Official Red of the Polish Flag
-            { "PolskaGurom", Color.FromRgb(0xD4, 0x21, 0x3D) },
-            // Official Blue in the Armenian Flag
-            { "ArmeniaBlue", Color.FromRgb(0x00, 0x33, 0xA0) },
         };
 
         foreach (var colourtheme in colorThemes) {
@@ -185,11 +178,6 @@ public partial class MainWindow : MetroWindow {
 
             List<Transaction> transactions = parser.Parse(entries, options);
 
-            Commanders.ItemsSource = parser.Commanders;
-            if (Commanders.Items.Count > 0) {
-                Commanders.SelectedIndex = 0;
-            }
-
             // Filter the transactions down to the given time frame
             transactions = transactions
                 .Where(t => t.CompletedAtDateTime >= start && t.CompletedAtDateTime <= end)
@@ -204,7 +192,7 @@ public partial class MainWindow : MetroWindow {
             transactions.RemoveAll(x => incompletes.Contains(x));
 
             report = new Report(transactions);
-            this.entries.ItemsSource = report.SystemObjectives;
+            this.entries.ItemsSource = report.Objectives;
         } catch (Exception exception) {
             Log("Something went terribly wrong while parsing the E:D player journal.");
             Log("Please send this to CMDR Hekateh:");
@@ -245,12 +233,6 @@ public partial class MainWindow : MetroWindow {
 
             HandleEntries(entries, start, end);
             GenerateLog();
-
-            var errors = journal.AllErrors;
-            foreach (var error in errors) {
-                Log("An error has occured in the Journal file, please send this to CMDR Hekateh:");
-                Log(error.ToString());
-            }
         } catch (Exception exception) {
             Log("Something went terribly wrong while parsing the E:D player journal.");
             Log("Please send this to CMDR Hekateh:");
@@ -283,27 +265,15 @@ public partial class MainWindow : MetroWindow {
         object obj = entries.SelectedItem;
         bool removed = false;
 
-        if (obj.GetType() == typeof(SystemObjectives)) {
+        if (obj.GetType() == typeof(Objective)) {
-            removed = report.SystemObjectives.Remove(obj as SystemObjectives);
+            removed = report.Objectives.Remove(obj as Objective);
-        } else if (obj.GetType() == typeof(Objective)) {
-            report
-                .SystemObjectives
-                .ForEach(x => {
-                    if (x.Objectives.Remove(obj as Objective)) {
-                        removed = true;
-                    }
-                });
         } else if (obj.GetType() == typeof(UITransaction) ||
-                   obj.GetType().IsSubclassOf(typeof(UITransaction))) {
+            obj.GetType().IsSubclassOf(typeof(UITransaction))) {
-            report
+            foreach (Objective parent in report.Objectives) {
-                .SystemObjectives
+                if (parent.UITransactions.Remove(obj as UITransaction)) {
-                .SelectMany(x => 
+                    removed = true;
-                    x.Objectives
+                }
-                    .Where(x => x.UITransactions.Contains(obj as UITransaction))
+            }
-                    )
-                .ToList()
-                .ForEach(x => removed = x.UITransactions.Remove(obj as UITransaction))
-                ;
         }
 
         if (removed) {
@@ -581,136 +551,4 @@ public partial class MainWindow : MetroWindow {
         } catch (Exception) {
         }
     }
-
-    private void SelectAll_Click(object sender, RoutedEventArgs e) {
-        if (report == null) {
-            return;
-        }
-        report.SystemObjectives.ForEach(t => { t.IsEnabled = (bool)SelectAll.IsChecked; });
-    }
-
-    private void AddWebHook_Click(object sender, RoutedEventArgs e) {
-        Config.Global.Webhooks.Add(new DiscordWebhook {
-            Name = "Discord Server Name",
-            Webhook = "..."
-        });
-        Webhooks.Items.Refresh();
-        RefreshPostMenu();
-    }
-
-    private void RemoveWebHook_Click(object sender, RoutedEventArgs e) {
-        if (Webhooks.SelectedItems.Count <= 0) {
-            return;
-        }
-
-        var selection = Webhooks.SelectedItems
-            .OfType<DiscordWebhook>()
-            .ToList()
-            ;
-        foreach (var item in selection) {
-            Config.Global.Webhooks.Remove(item);
-        }
-        Webhooks.Items.Refresh();
-        RefreshPostMenu();
-    }
-
-    private void Webhooks_KeyUp(object sender, KeyEventArgs e) {
-        DataGridCell cell = e.OriginalSource as DataGridCell;
-        /* We also get keypresses from DataGridCells that are currently
-         * editing their content. Filter those out. We don't want to delete
-         * the row when the user presses DEL while editing the cells content
-         */
-        if (cell == null || cell.IsEditing) {
-            return;
-        }
-        if (e.Key == Key.Delete) {
-            RemoveWebHook_Click(this, new RoutedEventArgs());
-        }
-    }
-
-    private void Webhooks_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e) {
-        try {
-            Config.SaveGlobal();
-        } catch (Exception) { }
-        e.Cancel = false;
-        RefreshPostMenu();
-    }
-
-    private void RefreshPostMenu() {
-        MenuItem menu;
-        PostToDiscord.Items.Clear();
-        if (Config.Global.Webhooks.Count <= 0) {
-            PostToDiscord.IsEnabled = false;
-        } else {
-            PostToDiscord.IsEnabled = true;
-            foreach (var item in Config.Global.Webhooks) {
-                menu = new MenuItem();
-                menu.Header = item.Name;
-                menu.Click += DiscordWebhook_Click;
-                PostToDiscord.Items.Add(menu);
-            }
-            PostToDiscord.Items.Add(new Separator());
-
-            menu = new MenuItem();
-            menu.Header = "All";
-            menu.Click += PostToAll_Click;
-            PostToDiscord.Items.Add(menu);
-        }
-    }
-
-    private void PostToDiscordWebhook(IEnumerable<DiscordWebhook> hooks) {
-        if (string.IsNullOrEmpty(DiscordLog.Text)) {
-            return;
-        }
-
-        DiscordLogGenerator discord = LogType.SelectedItem as DiscordLogGenerator;
-        string[] chunks;
-
-        try {
-            chunks = discord.SplitLog(DiscordLog.Text);
-        } catch (Exception) {
-            MessageBox.Show(
-                "The log could not be split into discord appropriate length.\n" +
-                "This happens with the bigger logs formats if you do lots of things in one system.\n" +
-                "Try posting the log in the OneLine format.",
-                "Sorry!", MessageBoxButton.OK, MessageBoxImage.Error
-                );
-            return;
-        }
-
-        string commander = "EDBGS";
-        if (Commanders.SelectedIndex >= 0) {
-            commander = Commanders.SelectedItem.ToString();
-        }
-
-        foreach (var hook in hooks) {
-            try {
-                foreach (var chunk in chunks) {
-                    DiscordPoster.PostToDiscord(hook, chunk, commander);
-                }
-                Log(string.Format("successfully posted to discord webhook `{0}`", hook.Name));
-            } catch (Exception ex) {
-                Log(string.Format("failed to post to discord webhook `{0}`: {1}",
-                    hook.Name, ex.Message));
-            }
-        }
-    }
-
-    private void DiscordWebhook_Click(object sender, RoutedEventArgs e) {
-        MenuItem item = sender as MenuItem;
-        if (item == null) {
-            return;
-        }
-        DiscordWebhook hook = Config.Global.Webhooks
-            .Find(x => string.Compare(x.Name, item.Header.ToString()) == 0)
-            ;
-        if (hook == null) {
-            return;
-        }
-        PostToDiscordWebhook(new DiscordWebhook[] { hook });
-    }
-
-    private void PostToAll_Click(object sender, RoutedEventArgs e) {
-        PostToDiscordWebhook(Config.Global.Webhooks);
-    }
 }

EliteBGS/MinusFortyFiveConverter.cs

@@ -8,7 +8,7 @@ public class MinusFortyFiveConverter : IValueConverter {
     /// <inheritdoc/>
     public object Convert(
         object value, Type targetType, object parameter, CultureInfo culture) {
-        return (double)value - 110;
+        return (double)value - 80;
     }
 
     /// <inheritdoc/>

EliteBGS/NonaDiscordLog.cs

@@ -7,12 +7,6 @@ using System.Linq;
 namespace EliteBGS.BGS;
 
 public class NonaDiscordLog : DiscordLogGenerator {
-    protected override string BotHeader() {
-        var sb = new StringBuilder();
-        sb.AppendFormat(":robot: `Bot-Header:` {0}; {1}\n", GetToolVersion(), this.Name);
-        return sb.ToString();
-    }
-
     private string FormatDate() {
         CultureInfo cultureInfo = CultureInfo.InvariantCulture;
         StringBuilder date = new StringBuilder();
@@ -85,14 +79,6 @@ public class NonaDiscordLog : DiscordLogGenerator {
     }
 
     public override string ToString() {
-        return "Nova Navy";
+        return "Nova Navy Log";
-    }
-
-    public override string Name {
-        get { return "NovaNavy"; }
-    }
-
-    public override string[] SplitLog(string log, int maxcount = 2000) {
-        return SplitLogWithHeader(log, ":clock2: `Date:`", maxcount);
     }
 }

EliteBGS/Objective.cs

@@ -120,14 +120,14 @@ public class UITransaction : INotifyPropertyChanged {
         }
     }
 
-    public bool HasEnemyCaptain {
+    public bool HasCaptain {
         get {
             CombatZone combat = Transaction as CombatZone;
             if (combat == null) {
                 return false;
             }
 
-            return combat.EnemyCaptain ?? false;
+            return combat.Captain ?? false;
         }
         set {
             CombatZone combat = Transaction as CombatZone;
@@ -135,18 +135,18 @@ public class UITransaction : INotifyPropertyChanged {
                 return;
             }
 
-            combat.EnemyCaptain = value;
+            combat.Captain = value;
         }
     }
 
-    public bool HasAlliedCaptain {
+    public bool HasCorrespondent {
         get {
             CombatZone combat = Transaction as CombatZone;
             if (combat == null) {
                 return false;
             }
 
-            return combat.AlliedCaptain ?? false;
+            return combat.Correspondent ?? false;
         }
         set {
             CombatZone combat = Transaction as CombatZone;
@@ -154,45 +154,7 @@ public class UITransaction : INotifyPropertyChanged {
                 return;
             }
 
-            combat.AlliedCaptain = value;
+            combat.Correspondent = value;
-        }
-    }
-
-    public bool HasEnemyCorrespondent {
-        get {
-            CombatZone combat = Transaction as CombatZone;
-            if (combat == null) {
-                return false;
-            }
-
-            return combat.EnemyCorrespondent ?? false;
-        }
-        set {
-            CombatZone combat = Transaction as CombatZone;
-            if (combat == null) {
-                return;
-            }
-
-            combat.EnemyCorrespondent = value;
-        }
-    }
-
-    public bool HasAlliedCorrespondent {
-        get {
-            CombatZone combat = Transaction as CombatZone;
-            if (combat == null) {
-                return false;
-            }
-
-            return combat.AlliedCorrespondent ?? false;
-        }
-        set {
-            CombatZone combat = Transaction as CombatZone;
-            if (combat == null) {
-                return;
-            }
-
-            combat.AlliedCorrespondent = value;
         }
     }
 
@@ -242,7 +204,7 @@ public class UITransaction : INotifyPropertyChanged {
 }
 
 public class Objective : IComparable<Objective> {
-    public bool IsEnabled { get; set; } = true;
+    public bool IsEnabled { get; set; }
 
     public List<UITransaction> UITransactions { get; } = new List<UITransaction>();
 

EliteBGS/OneLineDiscordLog.cs

@@ -1,9 +1,6 @@
 using EliteBGS.LogGenerator;
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Windows.Documents;
 
 namespace EliteBGS;
 
@@ -28,30 +25,6 @@ public class OneLineDiscordLog : DiscordLogGenerator {
         return "";
     }
 
-    public override string[] SplitLog(string log, 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 };
-        }
-
-        for (int i = 0; i < lines.Length; i++) {
-            string line = lines[i];
-            if ((chunk.Length + line.Length) > maxcount || i == lines.Length - 1) {
-                chunks.Add(chunk.Trim());
-                chunk = string.Empty;
-                chunk = chunk.Insert(0, BotHeader()).Trim();
-            } else {
-                chunk = chunk + "\n" + line;
-            }
-        }
-
-        return chunks.ToArray();
-    }
-
     public override string GenerateDiscordLog(Report report) {
         StringBuilder log = new StringBuilder();
 
@@ -67,8 +40,6 @@ public class OneLineDiscordLog : DiscordLogGenerator {
             return "";
         }
 
-        log.AppendFormat("{0}", BotHeader());
-
         foreach (Objective objective in objectives) {
             log.AppendFormat("{0}", GenerateObjectiveHeader(objective));
 
@@ -89,10 +60,6 @@ public class OneLineDiscordLog : DiscordLogGenerator {
     }
 
     public override string ToString() {
-        return "One Line";
+        return "One Line Report";
-    }
-
-    public override string Name {
-        get { return "OneLine"; }
     }
 }

EliteBGS/Properties/AssemblyInfo.cs

@@ -1,4 +1,6 @@
 using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -49,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.3.0")]
+[assembly: AssemblyVersion("0.3.3.0")]
-[assembly: AssemblyFileVersion("0.4.3.0")]
+[assembly: AssemblyFileVersion("0.3.3.0")]

EliteBGS/README.md

@@ -7,7 +7,7 @@ been parsed, you may then generate a BGS report you can copy/paste into Discord.
 
 Source code is available at [https://codeberg.org/nola/edbgs](https://codeberg.org/nola/edbgs).
 
-Binary downloads can be found here: [https://salusinvicta.org/bgstool/](https://salusinvicta.org/bgstool/).
+Binary downloads can be found here: [https://bgs.n0la.org/](https://bgs.n0la.org/).
 
 ## How To
 

EliteBGS/Report.cs

@@ -1,38 +1,10 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
 using EDPlayerJournal.BGS;
 
 namespace EliteBGS;
 
-public class SystemObjectives : INotifyPropertyChanged, IComparable<SystemObjectives> {
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private bool isenabled = true;
-
-    public bool IsEnabled {
-        get { return isenabled; }
-        set {
-            isenabled = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("IsEnabled"));
-        } 
-    }
-
-    public bool IsExpanded { get; set; } = false;
-
-    public string SystemName { get; set; } = string.Empty;
-
-    public List<Objective> Objectives { get; set; } = new();
-
-    public int CompareTo(SystemObjectives other) {
-        if (other == null) return 1;
-        return string.Compare(SystemName, other.SystemName, StringComparison.OrdinalIgnoreCase);
-    }
-}
-
 public class Report {
-    public List<SystemObjectives> SystemObjectives { get; set; } = new();
+    public List<Objective> Objectives { get; set; } = new List<Objective>();
 
     public Report() { }
 
@@ -40,35 +12,29 @@ public class Report {
         Populate(transactions);
     }
 
-    public List<Objective> Objectives {
-        get {
-            return SystemObjectives
-                .Where(t => t.IsEnabled)
-                .SelectMany(x => x.Objectives)
-                .ToList()
-                ;
-        }
-    }
-
     private void Populate(List<Transaction> transactions) {
         if (transactions == null || transactions.Count == 0) {
             return;
         }
 
         foreach (Transaction t in transactions) {
-            var o = SystemObjectives.Find(x => string.Compare(x.SystemName, t.System) == 0);
+            Objective o;
-            if (o == null) {
+            if (t.SystemContribution) {
-                o = new SystemObjectives() { SystemName = t.System };
+                o = Objectives.Find(x => x.Matches(t.System));
-                SystemObjectives.Add(o);
+            } else {
+                o = Objectives.Find(x => x.Matches(t.System, t.Faction));
             }
-            var objective = o.Objectives.Find(x => x.Matches(t.System, t.Faction));
-            if (objective == null) {
-                objective = new Objective() { Faction = t.Faction, System = t.System };
-                o.Objectives.Add(objective);
-            }
-            objective.UITransactions.Add(new UITransaction(t));
-        }
 
-        SystemObjectives.Sort();
+            if (o == null) {
+                if (t.SystemContribution) {
+                    o = new Objective() { System = t.System };
+                } else {
+                    o = new Objective() { Faction = t.Faction, System = t.System };
+                }
+                Objectives.Add(o);
+            }
+
+            o.UITransactions.Add(new UITransaction(t));
+        }
     }
 }

EliteBGS/Util/AppConfig.cs

@@ -1,79 +1,71 @@
 using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.ComponentModel;
 
-namespace EliteBGS.Util;
+namespace EliteBGS.Util {
+    public class AppConfig {
+        private static readonly string default_journal_location = "%UserProfile%\\Saved Games\\Frontier Developments\\Elite Dangerous";
+        private string journal_location = default_journal_location;
+        public string DefaultJournalLocation => default_journal_location;
+        private string colour = "Amber";
+        private string theme = "Dark";
 
-public class AppConfig {
+        public string LastUsedDiscordTemplate { get; set; }
-    private static readonly string default_journal_location = "%UserProfile%\\Saved Games\\Frontier Developments\\Elite Dangerous";
-    private string journal_location = default_journal_location;
-    private string colour = "Amber";
-    private string theme = "Dark";
 
-    public static string DefaultJournalLocation => default_journal_location;
+        public string JournalLocation {
-
+            get {
-    public string LastUsedDiscordTemplate { get; set; }
+                if (journal_location == null) {
-
+                    return DefaultJournalLocation;
-    public string JournalLocation {
+                }
-        get {
+                return journal_location;
-            if (journal_location == null) {
-                return DefaultJournalLocation;
             }
-            return journal_location;
+            set {
-        }
+                journal_location = value;
-        set {
-            journal_location = value;
-        }
-    }
-
-    public string Theme {
-        get {
-            return theme;
-        }
-        set {
-            if (string.IsNullOrEmpty(value)) {
-                theme = "Dark";
-            } else {
-                theme = value;
             }
         }
-    }
 
-    public string Colour {
+        public string Theme {
-        get {
+            get {
-            return colour;
+                return theme;
-        }
+            }
-        set {
+            set {
-            if (string.IsNullOrEmpty(value)) {
+                if (string.IsNullOrEmpty(value)) {
-                colour = "Blue";
+                    theme = "Dark";
-            } else {
+                } else {
-                colour = value;
+                    theme = value;
+                }
             }
         }
-    }
 
-    /// <summary>
+        public string Colour {
-    /// Whether we ignore influence support scenarios form parsing.
+            get {
-    /// </summary>
+                return colour;
-    public bool IgnoreInfluenceSupport { get; set; } = false;
+            }
+            set {
+                if (string.IsNullOrEmpty(value)) {
+                    colour = "Blue";
+                } else {
+                    colour = value;
+                }
+            }
+        }
 
-    /// <summary>
+        /// <summary>
-    /// Whether we ignore market buy entries during parsing.
+        /// Whether we ignore influence support scenarios form parsing.
-    /// </summary>
+        /// </summary>
-    public bool IgnoreMarketBuy { get; set; } = false;
+        public bool IgnoreInfluenceSupport { get; set; } = false;
 
-    /// <summary>
+        /// <summary>
-    /// Whether to ignore fleet carrier stuff when parsing.
+        /// Whether we ignore market buy entries during parsing.
-    /// </summary>
+        /// </summary>
-    public bool IgnoreFleetCarrier { get; set; } = true;
+        public bool IgnoreMarketBuy { get; set; } = false;
 
-    /// <summary>
+        /// <summary>
-    /// List of Webhooks configured
+        /// Whether to ignore fleet carrier stuff when parsing.
-    /// </summary>
+        /// </summary>
-    public List<DiscordWebhook> Webhooks { get; set; } = new List<DiscordWebhook>();
+        public bool IgnoreFleetCarrier { get; set; } = true;
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public string FullTheme {
+        public string FullTheme {
-        get { return Theme + "." + Colour; }
+            get { return Theme + "." + Colour; }
+        }
     }
 }

EliteBGS/Util/Config.cs

@@ -2,7 +2,6 @@
 using System.Text;
 using System.IO;
 using Newtonsoft.Json;
-using System.ComponentModel;
 
 namespace EliteBGS.Util {
     public class Config {

EliteBGS/Util/DiscordWebhook.cs

@@ -1,13 +0,0 @@
-namespace EliteBGS.Util;
-
-public class DiscordWebhook {
-    /// <summary>
-    /// Webhook URL
-    /// </summary>
-    public string Webhook { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Human readable name for easier identification
-    /// </summary>
-    public string Name { get; set; } = string.Empty;
-}

EliteBGS/docs/CHANGELOG.md

@@ -1,70 +1,5 @@
 # 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.

EliteBGS/docs/faq.md

@@ -75,7 +75,7 @@ tab. With update 15, this behaviour should be fixed.
 
 The player journal only tells the faction that issued the bounty upon murder, and
 not the faction of the NPC killed. The tool has to fetch that from you scanning the
-ship. If you didn't fully scan the ship before murdering it, the tool won't know
+hip. If you didn't fully scan the ship before murdering it, the tool won't know
 the faction of the NPC.
 
 ### Why does cartography data, and sold cargo show up for the wrong faction, but for the right station/system?

EliteBGS/docs/index.md

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

EliteBGS/mkdocs.yml

@@ -0,0 +1,15 @@
+site_name: EliteBGS
+
+markdown_extensions:
+    - pymdownx.snippets:
+          check_paths: true
+
+theme:
+    name: lumen
+
+nav:
+    - Overview: 'index.md'
+    - "Detailed Description": 'description.md'
+    - "Combat Zones": 'combatzones.md'
+    - FAQ: 'faq.md'
+    - Changelog: 'CHANGELOG.md'

README.md

@@ -3,7 +3,7 @@
 EDBGS is a project containing the EliteBGS BGS application. It also contains the dotnet
 class library EDPlayerJournal, which reads and parses Elite Dangerous player journals.
 
-See [https://salusinvicta.org/bgstool/](https://salusinvicta.org/bgstool/) for further details.
+See [https://bgs.n0la.org/](https://bgs.n0la.org) for further details.
 
 The tool helps with creating BGS reports for squadrons that support factions in
 Elite: Dangerous that can be copy and pasted into a Discord server. It finds all BGS