add merits to the log

EDPlayerJournal/BGS/Parsers/PowerplayMeritsParser.cs

@@ -0,0 +1,31 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS.Parsers;
+
+internal class PowerplayMeritsParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        PowerplayMeritsEntry? e = entry as PowerplayMeritsEntry;
+        if (e == null) {
+            throw new ApplicationException("not a valid PowerplayMerits entry");
+        }
+
+        MeritsGained? transaction = null;
+
+        transaction = transactions
+            .OfType<MeritsGained>()
+            .Where(x => x.System == context.CurrentSystem &&
+                        x.Power == e.Power)
+            .FirstOrDefault()
+            ;
+        if (transaction == null) {
+            transaction = new MeritsGained(e) {
+                System = context.CurrentSystem,
+                Power = e.Power,
+                Faction = e.Power,
+            };
+            transactions.Add(transaction);
+        } else {
+            transaction.Entries.Add(e);
+        }
+    }
+}

EDPlayerJournal/BGS/Parsers/PowerplayParser.cs

@@ -1,31 +0,0 @@
-using EDPlayerJournal.Entries;
-
-namespace EDPlayerJournal.BGS.Parsers;
-
-internal class PowerplayParser : ITransactionParserPart {
-    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
-        PowerplayEntry? p = entry as PowerplayEntry;
-        if (p == null) {
-            return;
-        }
-
-        if (context.LastMerits == null) {
-            context.LastMerits = p.Merits;
-        }
-
-        context.CurrentMerits = p.Merits;
- 
-        if (context.LastMerits != context.CurrentMerits) {
-            if (!options.IgnorePowerplay) {
-                transactions.Add(new MeritsGained(entry) {
-                    Merits = ((long)(context.CurrentMerits - context.LastMerits)),
-                    Power = p.Power,
-                    System = context.CurrentSystem,
-                    Faction = p.Power,
-                });
-            }
-        }
-
-        context.LastMerits = context.CurrentMerits;
-    }
-}