change site to new version number

If a factions expands or retreats into a system we see, we won't pick it up if we remain with old data.

EDPlayerJournal/BGS/Parsers/MarketBuyParser.cs

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

EDPlayerJournal/BGS/Parsers/MarketSellParser.cs

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

EDPlayerJournal/BGS/Parsers/MultiSellExplorationDataParser.cs

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

EDPlayerJournal/BGS/Parsers/SellExplorationDataParser.cs

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

EDPlayerJournal/BGS/Parsers/SellOrganicDataParser.cs

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

EDPlayerJournal/BGS/Parsers/SupercruiseDestinationDropParser.cs

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

EDPlayerJournal/BGS/TransactionParser.cs

@@ -1,4 +1,5 @@
-using EDPlayerJournal.Entries;
+using EDPlayerJournal.BGS.Parsers;
+using EDPlayerJournal.Entries;
 
 namespace EDPlayerJournal.BGS;
 
@@ -22,6 +23,11 @@ public class TransactionParserOptions {
     /// disabled.
     /// </summary>
     public bool IgnoreMarketBuy { get; set; } = false;
+
+    /// <summary>
+    /// Whether we should ignore things done for the fleet carrier faction.
+    /// </summary>
+    public bool IgnoreFleetCarrierFaction { get; set; } = true;
 }
 
 public class TransactionList : List<Transaction> {
@@ -35,7 +41,7 @@ public class TransactionList : List<Transaction> {
 /// by itself generate any transactions. Location is the best information gatherer here
 /// as we are getting controlling faction, system factions, address and station name.
 /// </summary>
-internal class LocationParser : TransactionParserPart {
+internal class LocationParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         LocationEntry? entry = e as LocationEntry;
         if (entry == null) {
@@ -65,14 +71,13 @@ internal class LocationParser : TransactionParserPart {
             context.StationOwner = null;
         }
 
-        if (!context.SystemFactions.ContainsKey(entry.StarSystem) &&
+        if (entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
-            entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
             context.SystemFactions[entry.StarSystem] = entry.SystemFactions;
         }
     }
 }
 
-internal class FSDJumpParser : TransactionParserPart {
+internal class FSDJumpParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         FSDJumpEntry? entry = e as FSDJumpEntry;
         if (entry == null) {
@@ -89,6 +94,8 @@ internal class FSDJumpParser : TransactionParserPart {
         context.DiscernCombatZone(transactions, e);
         context.ResetCombatZone();
 
+        context.LeftInstance();
+
         context.CurrentSystem = entry.StarSystem;
         context.CurrentSystemAddress = entry.SystemAddress;
 
@@ -98,14 +105,13 @@ internal class FSDJumpParser : TransactionParserPart {
             context.ControllingFaction = entry.SystemFaction;
         }
 
-        if (!context.SystemFactions.ContainsKey(entry.StarSystem) &&
+        if (entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
-            entry.SystemFactions != null && entry.SystemFactions.Count > 0) {
             context.SystemFactions[entry.StarSystem] = entry.SystemFactions;
         }
     }
 }
 
-internal class DockedParser : TransactionParserPart {
+internal class DockedParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         DockedEntry? entry = e as DockedEntry;
         if (entry == null) {
@@ -135,7 +141,7 @@ internal class DockedParser : TransactionParserPart {
 /// With ship targeted we might find out to which faction a given NPC belonged. This is
 /// useful later when said NPC gets killed or murdered.
 /// </summary>
-internal class ShipTargetedParser : TransactionParserPart {
+internal class ShipTargetedParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         ShipTargetedEntry? entry = e as ShipTargetedEntry;
         if (entry == null) {
@@ -170,7 +176,7 @@ internal class ShipTargetedParser : TransactionParserPart {
 /// Commit crime can result in a transaction, especially if the crime committed is
 /// murder.
 /// </summary>
-internal class CommitCrimeParser : TransactionParserPart {
+internal class CommitCrimeParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         CommitCrimeEntry? entry = e as CommitCrimeEntry;
         if (entry == null) {
@@ -226,7 +232,7 @@ internal class CommitCrimeParser : TransactionParserPart {
     }
 }
 
-internal class MissionsParser : TransactionParserPart {
+internal class MissionsParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         MissionsEntry? missions = entry as MissionsEntry;
 
@@ -255,7 +261,7 @@ internal class MissionsParser : TransactionParserPart {
     }
 }
 
-internal class MissionAcceptedParser : TransactionParserPart {
+internal class MissionAcceptedParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         MissionAcceptedEntry? entry = e as MissionAcceptedEntry;
         if (entry == null) {
@@ -281,7 +287,7 @@ internal class MissionAcceptedParser : TransactionParserPart {
     }
 }
 
-internal class MissionCompletedParser : TransactionParserPart {
+internal class MissionCompletedParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         MissionCompletedEntry? entry = e as MissionCompletedEntry;
         if (entry == null || entry.Mission == null) {
@@ -396,7 +402,7 @@ internal class MissionCompletedParser : TransactionParserPart {
     }
 }
 
-internal class MissionFailedParser : TransactionParserPart {
+internal class MissionFailedParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         Mission? mission;
         Location? accepted_location;
@@ -451,84 +457,7 @@ internal class MissionFailedParser : TransactionParserPart {
     }
 }
 
-internal class SellExplorationDataParser : TransactionParserPart {
+internal class RedeemVoucherParser : ITransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
-        SellExplorationDataEntry? entry = e as SellExplorationDataEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        if (context.StationOwner == null) {
-            transactions.AddIncomplete(
-                new Cartographics(),
-                "Could not discern the station owner for cartographics sell.",
-                e);
-            return;
-        }
-
-        transactions.Add(new Cartographics(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.StationOwner,
-            IsLegacy = context.IsLegacy,
-        });
-    }
-}
-
-internal class SellOrganicDataParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
-        // If exo biology is ignored, simply do nothing
-        if (options.IgnoreExoBiology) {
-            return;
-        }
-
-        SellOrganicDataEntry? entry = e as SellOrganicDataEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        if (context.StationOwner == null) {
-            transactions.AddIncomplete(
-                new OrganicData(),
-                "Could not discern the station owner for organic data sell.",
-                e);
-            return;
-        }
-
-        transactions.Add(new OrganicData(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.StationOwner,
-            IsLegacy = context.IsLegacy,
-        });
-    }
-}
-
-internal class MultiSellExplorationDataParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
-        MultiSellExplorationDataEntry? entry = e as MultiSellExplorationDataEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        if (context.StationOwner == null) {
-            transactions.AddIncomplete(
-                new Cartographics(),
-                "Could not discern the station owner for cartographics sell.",
-                e);
-            return;
-        }
-
-        transactions.Add(new Cartographics(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.StationOwner,
-            IsLegacy = context.IsLegacy,
-        });
-    }
-}
-
-internal class RedeemVoucherParser : TransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         RedeemVoucherEntry? entry = e as RedeemVoucherEntry;
         if (entry == null) {
@@ -585,7 +514,7 @@ internal class RedeemVoucherParser : TransactionParserPart {
     }
 }
 
-internal class SellMicroResourcesParser : TransactionParserPart {
+internal class SellMicroResourcesParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         SellMicroResourcesEntry? entry = e as SellMicroResourcesEntry;
         if (entry == null) {
@@ -609,7 +538,7 @@ internal class SellMicroResourcesParser : TransactionParserPart {
     }
 }
 
-internal class SearchAndRescueParser : TransactionParserPart {
+internal class SearchAndRescueParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         SearchAndRescueEntry? entry = e as SearchAndRescueEntry;
         if (entry == null) {
@@ -633,78 +562,7 @@ internal class SearchAndRescueParser : TransactionParserPart {
     }
 }
 
-internal class MarketBuyParser : TransactionParserPart {
+internal class FactionKillBondParser : ITransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
-        MarketBuyEntry? entry = e as MarketBuyEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        context.BoughtCargo(entry.Type, entry.BuyPrice);
-
-        // We still want the information on buy price for profit,
-        // but if the option is on, we don't care for parsing it
-        // further.
-        // TODO: might be wise to split this parser into two; one for
-        //       determining profit, the other for the BGS information
-        if (options.IgnoreMarketBuy) {
-            return;
-        }
-
-        if (context.StationOwner == null) {
-            transactions.AddIncomplete(
-                new OrganicData(),
-                "Could not discern the station owner for market buy.",
-                e);
-            return;
-        }
-
-        transactions.Add(new BuyCargo(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.StationOwner,
-            IsLegacy = context.IsLegacy,
-        });
-    }
-}
-
-internal class MarketSellParser : TransactionParserPart {
-    public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
-        long profit = 0;
-
-        if (context.StationOwner == null) {
-            transactions.AddIncomplete(
-                new OrganicData(),
-                "Could not discern the station owner market sell.",
-                e);
-            return;
-        }
-
-        MarketSellEntry? entry = e as MarketSellEntry;
-        if (entry == null) {
-            throw new NotImplementedException();
-        }
-
-        if (entry.Type == null) {
-            throw new InvalidJournalEntryException("market sell contains no cargo type");
-        }
-
-        if (context.BuyCost.ContainsKey(entry.Type)) {
-            long avg = context.BuyCost[entry.Type];
-            profit = (long)entry.TotalSale - (avg * entry.Count);
-        }
-
-        transactions.Add(new SellCargo(entry) {
-            System = context.CurrentSystem,
-            Station = context.CurrentStation,
-            Faction = context.StationOwner,
-            Profit = profit,
-            IsLegacy = context.IsLegacy,
-        });
-    }
-}
-
-internal class FactionKillBondParser : TransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         FactionKillBondEntry? entry = e as FactionKillBondEntry;
         if (entry == null) {
@@ -737,7 +595,7 @@ internal class FactionKillBondParser : TransactionParserPart {
     }
 }
 
-internal class EmbarkDisembarkParser : TransactionParserPart {
+internal class EmbarkDisembarkParser : ITransactionParserPart {
     public void Parse(Entry e, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         if (e.Is(Events.Embark)) {
             context.IsOnFoot = false;
@@ -747,23 +605,27 @@ internal class EmbarkDisembarkParser : TransactionParserPart {
     }
 }
 
-internal class SupercruiseEntryParser : TransactionParserPart {
+internal class SupercruiseEntryParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         // After a super cruise entry we are no longer on foot.
         context.IsOnFoot = false;
         context.DiscernCombatZone(transactions, entry);
         context.ResetCombatZone();
+        // Supercruise entry means you left the current local instance
+        context.LeftInstance();
     }
 }
 
-internal class ShutdownParser : TransactionParserPart {
+internal class ShutdownParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         context.DiscernCombatZone(transactions, entry);
         context.ResetCombatZone();
+        // Shutdown (logout) means you left the instance
+        context.LeftInstance();
     }
 }
 
-internal class CapShipBondParser : TransactionParserPart {
+internal class CapShipBondParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         if (entry.GetType() != typeof(CapShipBondEntry)) {
             return;
@@ -773,7 +635,7 @@ internal class CapShipBondParser : TransactionParserPart {
     }
 }
 
-internal class FileHeaderParser : TransactionParserPart {
+internal class FileHeaderParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         FileHeaderEntry? fileheader = entry as FileHeaderEntry;
 
@@ -785,7 +647,7 @@ internal class FileHeaderParser : TransactionParserPart {
     }
 }
 
-internal class ReceiveTextParser : TransactionParserPart {
+internal class ReceiveTextParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         ReceiveTextEntry? receivetext = entry as ReceiveTextEntry;
 
@@ -803,22 +665,24 @@ internal class ReceiveTextParser : TransactionParserPart {
     }
 }
 
-internal class DiedParser : TransactionParserPart {
+internal class DiedParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         // You can't complete a combat zone if you die in it. Others might keep it open
         // for you, but still you will not have completed it unless you jump back in.
         context.ResetCombatZone();
+        // Dying also moves you back to another instance
+        context.LeftInstance();
     }
 }
 
-internal class DropshipDeployParser : TransactionParserPart {
+internal class DropshipDeployParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         // On drop ship deploy we are now on foot
         context.IsOnFoot = true;
     }
 }
 
-internal class CommanderParser : TransactionParserPart {
+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.
@@ -828,7 +692,7 @@ internal class CommanderParser : TransactionParserPart {
 }
 
 public class TransactionParser {
-    private static Dictionary<string, TransactionParserPart> ParserParts { get; } = new()
+    private static Dictionary<string, ITransactionParserPart> ParserParts { get; } = new()
     {
         { Events.CapShipBond, new CapShipBondParser() },
         { Events.Commander, new CommanderParser() },
@@ -857,6 +721,7 @@ public class TransactionParser {
         { Events.SellOrganicData, new SellOrganicDataParser() },
         { Events.ShipTargeted, new ShipTargetedParser() },
         { Events.Shutdown, new ShutdownParser() },
+        { Events.SupercruiseDestinationDrop, new SupercruiseDestinationDropParser() },
         { Events.SupercruiseEntry, new SupercruiseEntryParser() },
     };
 
@@ -894,7 +759,7 @@ public class TransactionParser {
                 continue;
             }
 
-            TransactionParserPart transactionParserPart = ParserParts[entry.Event];
+            ITransactionParserPart transactionParserPart = ParserParts[entry.Event];
             transactionParserPart.Parse(entry, context, options, transactions);
         }
 

EDPlayerJournal/BGS/TransactionParserContext.cs

@@ -33,6 +33,13 @@ internal class TransactionParserContext {
     /// </summary>
     public bool IsOnFoot { get; set; } = false;
 
+    /// <summary>
+    /// Type of the current instance after a SupercruiseDestinationDropEntry.
+    /// This is null if there is no current instance, or the current instance
+    /// is not known.
+    /// </summary>
+    public string? CurrentInstanceType { get; set; } = null;
+
     /// <summary>
     /// Last faction that awarded the player with combat bonds.
     /// </summary>
@@ -100,6 +107,14 @@ internal class TransactionParserContext {
     /// </summary>
     public Dictionary<string, long> BuyCost = new();
 
+    /// <summary>
+    /// Called when the player leaves an instance, either through logout, FSD jump or
+    /// supercruise instance.
+    /// </summary>
+    public void LeftInstance() {
+        CurrentInstanceType = null;
+    }
+
     public void DiscernCombatZone(TransactionList transactions, Entry e) {
         string? grade = CombatZones.DifficultyLow;
         string cztype;
@@ -108,7 +123,8 @@ internal class TransactionParserContext {
 
         if (HighestCombatBond == null &&
             LastRecordedAwardingFaction == null &&
-            HaveSeenAXWarzoneNPC == false) {
+            HaveSeenAXWarzoneNPC == false &&
+            CurrentInstanceType == null) {
             return;
         }
 
@@ -123,6 +139,47 @@ internal class TransactionParserContext {
             } else {
                 grade = CombatZones.DifficultyLow;
             }
+        } else if (CurrentInstanceType != null) {
+            if (!Instances.IsWarzone(CurrentInstanceType)) {
+                return;
+            }
+            if (LastRecordedAwardingFaction == null && 
+                Instances.IsHumanWarzone(CurrentInstanceType)) {
+                transactions.AddIncomplete(new CombatZone(), 
+                    "Could not discern for whom you fought for, " +
+                    "as it seems you haven't killed anyone in the ship combat zone.",
+                    e);
+                return;
+            }
+            // If we have information about the current instance being a warship use that
+            // information to determine the warzone.
+            if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneLow)) {
+                cztype = CombatZones.ShipCombatZone;
+                grade = CombatZones.DifficultyLow;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneMedium)) {
+                cztype = CombatZones.ShipCombatZone;
+                grade = CombatZones.DifficultyMedium;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneHigh)) {
+                cztype = CombatZones.ShipCombatZone;
+                grade = CombatZones.DifficultyHigh;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidLow)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyLow;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidMedium)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyMedium;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidHigh)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyHigh;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidVeryHigh)) {
+                cztype = CombatZones.AXCombatZone;
+                grade = CombatZones.DifficultyVeryHigh;
+            } else {
+                transactions.AddIncomplete(new CombatZone(),
+                    "Unknown conflict zone difficulty",
+                    e);
+                return;
+            }
         } else if (ShipKills > 0 && !IsOnFoot) {
             // Ship combat zones can be identified by the amount of kills
             if (ShipKills > 20) {

EDPlayerJournal/BGS/TransactionParserPart.cs

@@ -2,7 +2,7 @@
 
 namespace EDPlayerJournal.BGS;
 
-internal interface TransactionParserPart {
+internal interface ITransactionParserPart {
     /// <summary>
     /// Parse a given entry of the entry type specified when declaring to implement this
     /// interface. You must add your transaction to the passed list in case you did have

EDPlayerJournal/EnglishMissionNames.cs

@@ -52,8 +52,9 @@ public class EnglishMissionNames {
         {"Mission_Delivery_Retreat_name", "Delivery (Retreat)"},
         {"Mission_DeliveryWing_name", "Delivery (Wing)"},
         {"Mission_DeliveryWing_War_name", "Delivery (Wing) (War)"},
-        {"MISSION_Disable_name", "Disable Surface Installation" },
+        {"Mission_Disable_BLOPS_Expansion_name", "Disable Surface Installation (Expansion) (Black Ops)" },
         {"MISSION_Disable_BLOPS_name", "Disable Surface Installation (Black Ops)" },
+        {"MISSION_Disable_name", "Disable Surface Installation" },
         {"MISSION_Hack_name", "Hack Surface Installation" },
         {"Mission_Hack_BLOPS_Boom_name", "Hack Surface Installation (Boom)"},
         {"Mission_Hack_BLOPS_Elections_name", "Hack Surface Installation (Elections)"},
@@ -127,6 +128,7 @@ public class EnglishMissionNames {
         {"Mission_TW_Massacre_Medusa_Plural_name", "Kill Medusas" },
         {"Mission_TW_Massacre_Medusa_Singular_name", "Kill Medusa" },
         {"Mission_TW_Massacre_Scout_Plural_name", "Kill Scouts" },
+        {"Mission_TW_OnFoot_Reboot_Occupied_MB_name", "Reboot Settlement (Thargoid)" },
         {"Mission_TW_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/Entry.cs

@@ -44,6 +44,7 @@ public class Entry {
         { Events.SellOrganicData, typeof(SellOrganicDataEntry) },
         { Events.ShieldState, typeof(ShieldStateEntry) },
         { Events.ShipTargeted, typeof(ShipTargetedEntry) },
+        { Events.SupercruiseDestinationDrop, typeof(SupercruiseDestinationDropEntry) },
         { Events.SupercruiseEntry, typeof(SupercruiseEntryEntry) },
         { Events.SupercruiseExit, typeof(SupercruiseExitEntry) },
         { Events.UnderAttack, typeof(UnderAttackEntry) },

EDPlayerJournal/Entries/Events.cs

@@ -35,6 +35,7 @@ public class Events {
     public static readonly string ShieldState = "ShieldState";
     public static readonly string ShipTargeted = "ShipTargeted";
     public static readonly string Shutdown = "Shutdown";
+    public static readonly string SupercruiseDestinationDrop = "SupercruiseDestinationDrop";
     public static readonly string SupercruiseEntry = "SupercruiseEntry";
     public static readonly string SupercruiseExit = "SupercruiseExit";
     public static readonly string UnderAttack = "UnderAttack";

EDPlayerJournal/Entries/SupercruiseDestinationDropEntry.cs

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

EDPlayerJournal/Faction.cs

@@ -55,6 +55,11 @@ public class Factions {
     /// </summary>
     public static string Thargoid = "Thargoids";
 
+    /// <summary>
+    /// The faction the fleet carriers use.
+    /// </summary>
+    public static string FleetCarrier = "FleetCarrier";
+
     public static bool IsPilotsFederation(string? name) {
         if (name == null) {
             return false;

EDPlayerJournal/Instances.cs

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

EDPlayerJournal/Thargoid.cs

@@ -8,6 +8,11 @@ public enum ThargoidVessel {
     Basilisk = 4,
     Medusa = 5,
     Hydra = 6,
+    Glaive = 7,
+    /// <summary>
+    /// Thargoid drone
+    /// </summary>
+    Revenant = 8,
 }
 
 public class Thargoid {
@@ -15,8 +20,11 @@ public class Thargoid {
 
     public static Dictionary<ulong, ThargoidVessel> VesselPayout { get; } = new() {
         // Up to date values ever since 14.02
+        {    25000, ThargoidVessel.Revenant },
         {    65000, ThargoidVessel.Scout },
         {    75000, ThargoidVessel.Scout },
+        // New in Update 15
+        {  4500000, ThargoidVessel.Glaive },
         {  6500000, ThargoidVessel.Cyclops },
         { 20000000, ThargoidVessel.Basilisk },
         //{ 25000000, ThargoidVessel.Orthrus },
@@ -39,12 +47,14 @@ public class Thargoid {
 
     public static Dictionary<ThargoidVessel, string?> VesselNames { get; } = new() {
         { ThargoidVessel.Unknown, null },
-        { ThargoidVessel.Scout, "Thargoid Scout" },
+        { ThargoidVessel.Revenant, "Revenant" },
+        { ThargoidVessel.Scout, "Scout" },
         { ThargoidVessel.Orthrus, "Orthrus" },
         { ThargoidVessel.Cyclops, "Cyclops" },
         { ThargoidVessel.Basilisk, "Basilisk" },
         { ThargoidVessel.Medusa, "Medusa" },
         { ThargoidVessel.Hydra, "Hydra" },
+        { ThargoidVessel.Glaive, "Glaive" },
     };
 
     public static ThargoidVessel GetVesselByPayout(ulong payout) {

EliteBGS/EliteBGS.csproj

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

EliteBGS/LogGenerator/MarketBuyFormat.cs

@@ -12,6 +12,6 @@ public class MarketBuyFormat : GenericFormat<BuyCargo> {
         if (tons <= 0) {
             return "";
         }
-        return string.Format("Bought: {0}t bought", tons);
+        return string.Format("Bought: {0}t", tons);
     }
 }

EliteBGS/LogGenerator/MurderFormat.cs

@@ -1,9 +1,7 @@
-using EDPlayerJournal.BGS;
+using EDPlayerJournal;
-using System.Collections.Generic;
+using EDPlayerJournal.BGS;
 using System.Text;
-using System;
 using System.Linq;
-using EDPlayerJournal;
 
 namespace EliteBGS.LogGenerator;
 
@@ -36,14 +34,14 @@ public class MurderFormat : LogFormatter {
                     type = "person";
                 }
             }
-            builder.AppendFormat("Murdered {0} {1} (Bounties: {2}, Fines: {3})",
+            long bounties = log.Value.Sum(x => x.Bounties);
+            builder.AppendFormat("Murdered {0} {1} (Bounties: {2})\n",
                 log.Value.Count, type,
-                log.Value.Sum(x => x.Bounties),
+                Credits.FormatMillions(bounties)
-                log.Value.Sum(x => x.Fines)
                 );
         }
 
-        return builder.ToString();
+        return builder.ToString().Trim();
     }
 
     public string GenerateSummary(Objective objective) {

EliteBGS/LogGenerator/ThargoidFormatter.cs

@@ -37,8 +37,9 @@ public class ThargoidFormatter : LogFormatter {
             return "";
         }
 
+        int drones = kills.Where(x => x.ThargoidType == ThargoidVessel.Revenant).Count();
         int scouts = kills.Where(x => x.ThargoidType == ThargoidVessel.Scout).Count();
-        int interceptors = kills.Count - scouts;
+        int interceptors = kills.Count - scouts - drones;
 
         StringBuilder builder = new StringBuilder();
 
@@ -48,10 +49,16 @@ public class ThargoidFormatter : LogFormatter {
         }
         if (scouts > 0) {
             if (interceptors > 0) {
-                builder.Append(" + ");
+                builder.Append(", ");
             }
             builder.AppendFormat("{0} SCT", scouts);
         }
+        if (drones > 0) {
+            if (interceptors > 0 || scouts > 0) {
+                builder.Append(", ");
+            }
+            builder.AppendFormat("{0} DRN", drones);
+        }
 
         return builder.ToString();
     }

EliteBGS/MainWindow.xaml

@@ -182,10 +182,13 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
                             <Label Content="Location on disk for the player journal. There is usually no need to change this setting." Grid.Row="0" Grid.ColumnSpan="2" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.08,0.496"/>
                             <TextBox x:Name="journallocation" IsReadOnly="true" Text="" Grid.Row="1" Grid.Column="0" Margin="5,0,5,10" TextWrapping="Wrap" />
                             <Button x:Name="browsejournallocation" Content="Browse" Grid.Row="1" Grid.Column="1" Margin="0,0,0,0" Width="Auto" VerticalAlignment="Top" HorizontalAlignment="Left" Click="browsejournallocation_Click"/>
+                            <Button x:Name="OpenInExplorer" Content="Open Folder" Grid.Row="1" Grid.Column="2" Margin="5,0,0,0" Width="Auto" VerticalAlignment="Top" HorizontalAlignment="Left" Click="OpenInExplorer_Click" />
                         </Grid>
                     </GroupBox>
                     <GroupBox Header="Theme Colour" Height="Auto" Grid.Row="1" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="3" Margin="0,5,0,0">
@@ -213,9 +216,9 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <mah:ToggleSwitch x:Name="NoInfluenceSupport" Grid.Row="1" Grid.ColumnSpan="2" Content="Ignore secondary influence support given out by certain missions" Toggled="NoInfluenceSupport_Toggled"/>
+                            <mah:ToggleSwitch x:Name="NoInfluenceSupport" Grid.Row="0" Grid.ColumnSpan="2" Content="Ignore secondary influence support given out by certain missions" Toggled="NoInfluenceSupport_Toggled"/>
-                            <mah:ToggleSwitch x:Name="NoMarketBuy" Grid.Row="2" Grid.ColumnSpan="2" Content="Ignore commodities bought at stations" Toggled="NoMarketBuy_Toggled"/>
+                            <mah:ToggleSwitch x:Name="NoMarketBuy" Grid.Row="1" Grid.ColumnSpan="2" Content="Ignore commodities bought at stations" Toggled="NoMarketBuy_Toggled"/>
-
+                            <mah:ToggleSwitch x:Name="NoFleetCarrier" Grid.Row="2" Grid.ColumnSpan="2" Content="Ignore transactions done on a Fleet Carrier" Toggled="NoFleetCarrier_Toggled" />
                         </Grid>
                     </GroupBox>
                 </Grid>

EliteBGS/MainWindow.xaml.cs

@@ -60,6 +60,7 @@ public partial class MainWindow : MetroWindow {
 
         this.NoInfluenceSupport.IsOn = Config.Global.IgnoreInfluenceSupport;
         this.NoMarketBuy.IsOn = Config.Global.IgnoreMarketBuy;
+        this.NoFleetCarrier.IsOn = Config.Global.IgnoreFleetCarrier;
 
         // Apply theme
         try {
@@ -173,6 +174,7 @@ public partial class MainWindow : MetroWindow {
 
             options.IgnoreInfluenceSupport = Config.Global.IgnoreInfluenceSupport;
             options.IgnoreMarketBuy = Config.Global.IgnoreMarketBuy;
+            options.IgnoreFleetCarrierFaction = Config.Global.IgnoreFleetCarrier;
 
             List<Transaction> transactions = parser.Parse(entries, options);
 
@@ -536,4 +538,17 @@ public partial class MainWindow : MetroWindow {
     private void NoMarketBuy_Toggled(object sender, RoutedEventArgs e) {
         Config.Global.IgnoreMarketBuy = this.NoMarketBuy.IsOn;
     }
+
+    private void NoFleetCarrier_Toggled(object sender, RoutedEventArgs e) {
+        Config.Global.IgnoreFleetCarrier = this.NoFleetCarrier.IsOn;
+    }
+
+    private void OpenInExplorer_Click(object sender, RoutedEventArgs e) {
+        try {
+            Process.Start(new ProcessStartInfo(Config.Global.JournalLocation) {
+                UseShellExecute = true,
+            });
+        } catch (Exception) {
+        }
+    }
 }

EliteBGS/Properties/AssemblyInfo.cs

@@ -51,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.1.1.0")]
+[assembly: AssemblyVersion("0.3.3.0")]
-[assembly: AssemblyFileVersion("0.1.1.0")]
+[assembly: AssemblyFileVersion("0.3.3.0")]

EliteBGS/Util/AppConfig.cs

@@ -58,6 +58,11 @@ namespace EliteBGS.Util {
         /// </summary>
         public bool IgnoreMarketBuy { get; set; } = false;
 
+        /// <summary>
+        /// Whether to ignore fleet carrier stuff when parsing.
+        /// </summary>
+        public bool IgnoreFleetCarrier { get; set; } = true;
+
         [JsonIgnore]
         public string FullTheme {
             get { return Theme + "." + Colour; }

EliteBGS/docs/CHANGELOG.md

@@ -1,5 +1,19 @@
 # EliteBGS changelog
 
+## 0.3.3 on 15.05.2023
+
+* Added payout for the Thargoid Glaive.
+* Added payout and support for the Thargoid Revenant.
+* Added more English mission names.
+* Ship and AX combat zones can now be detected through a new event, which
+  allows the tool to properly determine the difficulty. Combat zone outcome,
+  additional objectives, or the name of the factions fighting are still guess
+  work however.
+* Fixed a bug where newly added factions to a system weren't properly
+  recognised. Thanks to Shakaka.
+* Added option to ignore FleetCarrier actions.
+* Added an "Open in Explorer" button to journal locations.
+
 ## 0.3.2 on 19.04.2023
 
 * Orthrus payout has been adapted to 14.02 values.

EliteBGS/docs/faq.md

@@ -68,6 +68,9 @@ The time span you specify must include the day where you accepted the mission,
 as well as the day where you failed the mission. Otherwise the tool cannot handle
 that failed mission.
 
+Prior to update 15 missions only failed once you dismissed them from your transaction
+tab. With update 15, this behaviour should be fixed.
+
 ### The tool complains about missing factions for an NPC I murdered.
 
 The player journal only tells the faction that issued the bounty upon murder, and

EliteBGS/docs/index.md

@@ -20,13 +20,13 @@ command line:
 winget install Microsoft.DotNet.DesktopRuntime.7
 ```
 
-You can download the **latest** version **0.3.2** 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.2.zip](https://bgs.n0la.org/elitebgs-0.3.2.zip)
+* [https://bgs.n0la.org/elitebgs-0.3.3.zip](https://bgs.n0la.org/elitebgs-0.3.3.zip)
 
 ## Old Versions