From be3bceb880bf800ecc3d0e731252df4192baab6e Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 10:51:18 +0100
Subject: [PATCH 01/14] make sure missions read as 0 INF if no INF was
 generated

---
 EliteBGS/LogGenerator/MissionFormat.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/EliteBGS/LogGenerator/MissionFormat.cs b/EliteBGS/LogGenerator/MissionFormat.cs
index c92e539..ea70637 100644
--- a/EliteBGS/LogGenerator/MissionFormat.cs
+++ b/EliteBGS/LogGenerator/MissionFormat.cs
@@ -64,6 +64,7 @@ public class MissionFormat : LogFormatter {
         Dictionary<string, ulong> passengers = new();
         StringBuilder output = new StringBuilder();
         long total_influence = 0;
+        bool hadmissions = false;
 
         var missions = objective.EnabledOfType<MissionCompleted>();
         var support = objective.EnabledOfType<InfluenceSupport>();
@@ -85,6 +86,7 @@ public class MissionFormat : LogFormatter {
 
             ++collated[m.MissionName][m.Influence];
 
+            hadmissions = true;
             total_influence += m.Influence.Length;
 
             if (m.AcceptedEntry != null &&
@@ -121,19 +123,23 @@ public class MissionFormat : LogFormatter {
             output.Append(failedlog);
             output.Append("\n");
         }
+        if (failed.Count > 0) {
+            hadmissions = true;
+        }
         total_influence += failed.Sum(x => x.InfluenceAmount);
 
         foreach (InfluenceSupport inf in support) {
             output.Append(inf.ToString());
             output.Append("\n");
+            hadmissions = true;
             total_influence += inf.Influence.InfluenceAmount;
         }
 
-        if (support.Count() > 0) {
+        if (support.Count > 0) {
             output.Append("\n");
         }
 
-        if (total_influence != 0) {
+        if (hadmissions) {
             output.AppendFormat("Total Influence: {0}", total_influence);
         }
 
@@ -141,6 +147,10 @@ public class MissionFormat : LogFormatter {
     }
 
     public string GenerateSummary(Objective objective) {
+        bool hadmissions = objective
+            .EnabledOfType<MissionCompleted>()
+            .Count > 0
+            ;
         long influence = objective
             .EnabledOfType<MissionCompleted>()
             .Sum(x => x.Influence.Length)
@@ -154,7 +164,7 @@ public class MissionFormat : LogFormatter {
             .Sum(x => x.InfluenceAmount)
             ;
 
-        if (influence == 0 && support == 0 && failed == 0) {
+        if (influence == 0 && support == 0 && failed == 0 && !hadmissions) {
             return "";
         }
 

From 912e8b602f98687753e1f524c97ea6a31ae2c9a3 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 11:17:43 +0100
Subject: [PATCH 02/14] add support for power combat zones in parsing

---
 EDPlayerJournal/BGS/CombatZone.cs             |  7 +++++
 .../BGS/TransactionParserContext.cs           | 27 +++++++++++++++----
 EDPlayerJournal/CombatZones.cs                |  5 ++++
 EDPlayerJournal/Instances.cs                  | 16 ++++++++++-
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/EDPlayerJournal/BGS/CombatZone.cs b/EDPlayerJournal/BGS/CombatZone.cs
index 4f6d8ed..18bb10e 100644
--- a/EDPlayerJournal/BGS/CombatZone.cs
+++ b/EDPlayerJournal/BGS/CombatZone.cs
@@ -92,6 +92,13 @@ public class CombatZone : Transaction {
         get { return string.Compare(Type, CombatZones.AXCombatZone) == 0; }
     }
 
+    /// <summary>
+    /// Returns true if it is a power combat zone
+    /// </summary>
+    public bool IsPower {
+        get { return string.Compare(Type, CombatZones.PowerCombatZone) == 0; }
+    }
+
     public override int CompareTo(Transaction? obj) {
         if (obj == null || obj.GetType() != typeof(CombatZone)) {
             return -1;
diff --git a/EDPlayerJournal/BGS/TransactionParserContext.cs b/EDPlayerJournal/BGS/TransactionParserContext.cs
index 22b3e51..49c8cb4 100644
--- a/EDPlayerJournal/BGS/TransactionParserContext.cs
+++ b/EDPlayerJournal/BGS/TransactionParserContext.cs
@@ -128,16 +128,29 @@ internal class TransactionParserContext {
         Settlement = null;
     }
 
+    private bool HadCombatZone() {
+        if (CurrentInstanceType != null &&
+            Instances.IsInstance(CurrentInstanceType, Instances.PowerWarzoneMedium)) {
+            return true;
+        }
+
+        if (HighestCombatBond == null &&
+            LastRecordedAwardingFaction == null &&
+            HaveSeenAXWarzoneNPC == false &&
+            CurrentInstanceType == null) {
+            return false;
+        }
+
+        return true;
+    }
+
     public void DiscernCombatZone(TransactionList transactions, Entry e) {
         string? grade = CombatZones.DifficultyLow;
         string cztype;
         ulong highest = HighestCombatBond ?? 0;
         string? faction = LastRecordedAwardingFaction;
 
-        if (HighestCombatBond == null &&
-            LastRecordedAwardingFaction == null &&
-            HaveSeenAXWarzoneNPC == false &&
-            CurrentInstanceType == null) {
+        if (!HadCombatZone()) {
             return;
         }
 
@@ -157,7 +170,8 @@ internal class TransactionParserContext {
                 return;
             }
             if (LastRecordedAwardingFaction == null && 
-                Instances.IsHumanWarzone(CurrentInstanceType)) {
+                (Instances.IsHumanWarzone(CurrentInstanceType) || 
+                 Instances.IsPowerWarzone(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.",
@@ -187,6 +201,9 @@ internal class TransactionParserContext {
             } else if (Instances.IsInstance(CurrentInstanceType, Instances.WarzoneThargoidVeryHigh)) {
                 cztype = CombatZones.AXCombatZone;
                 grade = CombatZones.DifficultyVeryHigh;
+            } else if (Instances.IsInstance(CurrentInstanceType, Instances.PowerWarzoneMedium)) {
+                cztype = CombatZones.PowerCombatZone;
+                grade = CombatZones.DifficultyMedium;
             } else {
                 transactions.AddIncomplete(new CombatZone(),
                     "Unknown conflict zone difficulty",
diff --git a/EDPlayerJournal/CombatZones.cs b/EDPlayerJournal/CombatZones.cs
index 3c59477..4888f41 100644
--- a/EDPlayerJournal/CombatZones.cs
+++ b/EDPlayerJournal/CombatZones.cs
@@ -14,6 +14,11 @@ public class CombatZones {
     /// </summary>
     public static readonly string ShipCombatZone = "Ship";
 
+    /// <summary>
+    /// Power combat zones, new in Ascendancy update.
+    /// </summary>
+    public static readonly string PowerCombatZone = "Power";
+
     /// <summary>
     /// AX combat zone
     /// </summary>
diff --git a/EDPlayerJournal/Instances.cs b/EDPlayerJournal/Instances.cs
index c9068d0..1587425 100644
--- a/EDPlayerJournal/Instances.cs
+++ b/EDPlayerJournal/Instances.cs
@@ -18,6 +18,11 @@ public class Instances {
     /// </summary>
     public static readonly string WarzoneHigh = "$Warzone_PointRace_High";
 
+    /// <summary>
+    /// Medium power play conflict zone, new in PP 2.0 Ascendancy update
+    /// </summary>
+    public static readonly string PowerWarzoneMedium = "$Warzone_Powerplay_Med";
+
     /// <summary>
     /// Low Thargoid combat zone
     /// </summary>
@@ -52,8 +57,17 @@ public class Instances {
             ;
     }
 
+    public static bool IsPowerWarzone(string type) {
+        return
+            IsInstance(type, PowerWarzoneMedium)
+            ;
+    }
+
     public static bool IsWarzone(string type) {
-        return IsHumanWarzone(type) || IsThargoidWarzone(type);
+        return IsHumanWarzone(type) || 
+            IsThargoidWarzone(type) || 
+            IsPowerWarzone(type)
+            ;
     }
 
     public static bool IsInstance(string type, string instance) {

From 4fe77e6946dc9cd04bf6d72822cc72e34865bb2a Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 11:18:01 +0100
Subject: [PATCH 03/14] add support for power combat zones in UI

---
 EliteBGS/MainWindow.xaml    |  1 +
 EliteBGS/MainWindow.xaml.cs | 11 +++++++++++
 EliteBGS/Objective.cs       |  4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/EliteBGS/MainWindow.xaml b/EliteBGS/MainWindow.xaml
index 4412c87..f6f26e6 100644
--- a/EliteBGS/MainWindow.xaml
+++ b/EliteBGS/MainWindow.xaml
@@ -121,6 +121,7 @@
                             <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"/>
+                            <Button Content="Power" x:Name="Power" Click="Power_Click"/>
                         </StackPanel>
                     </Expander>
                 </StackPanel>
diff --git a/EliteBGS/MainWindow.xaml.cs b/EliteBGS/MainWindow.xaml.cs
index 5983d66..d5a7ca0 100644
--- a/EliteBGS/MainWindow.xaml.cs
+++ b/EliteBGS/MainWindow.xaml.cs
@@ -476,6 +476,16 @@ public partial class MainWindow : MetroWindow {
         RefreshView();
     }
 
+    private void Power_Click(object sender, RoutedEventArgs e) {
+        CombatZone transaction = GetTransaction<CombatZone>(sender);
+        if (transaction == null) {
+            return;
+        }
+
+        transaction.Type = CombatZones.PowerCombatZone;
+        RefreshView();
+    }
+
     private void Thargoid_Click(object sender, RoutedEventArgs e) {
         CombatZone transaction = GetTransaction<CombatZone>(sender);
         if (transaction == null) {
@@ -713,4 +723,5 @@ public partial class MainWindow : MetroWindow {
     private void PostToAll_Click(object sender, RoutedEventArgs e) {
         PostToDiscordWebhook(Config.Global.Webhooks);
     }
+
 }
diff --git a/EliteBGS/Objective.cs b/EliteBGS/Objective.cs
index 755ce7f..f728d22 100644
--- a/EliteBGS/Objective.cs
+++ b/EliteBGS/Objective.cs
@@ -59,7 +59,9 @@ public class UITransaction : INotifyPropertyChanged {
                 return Visibility.Hidden;
             }
 
-            if (string.Compare(combat.Type, CombatZones.ShipCombatZone) == 0) {
+            // Both normal and power combat zones have special objectives
+            if (string.Compare(combat.Type, CombatZones.ShipCombatZone) == 0 ||
+                string.Compare(combat.Type, CombatZones.PowerCombatZone) == 0) {
                 return Visibility.Visible;
             }
 

From 8a92cac02a77b83638be43a69fe9adaf45dcec11 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 11:31:46 +0100
Subject: [PATCH 04/14] add support for SelfDestruct

---
 EDPlayerJournal/Entries/Entry.cs             | 1 +
 EDPlayerJournal/Entries/Events.cs            | 1 +
 EDPlayerJournal/Entries/SelfDestructEntry.cs | 5 +++++
 3 files changed, 7 insertions(+)
 create mode 100644 EDPlayerJournal/Entries/SelfDestructEntry.cs

diff --git a/EDPlayerJournal/Entries/Entry.cs b/EDPlayerJournal/Entries/Entry.cs
index c4fa681..0d96f2a 100644
--- a/EDPlayerJournal/Entries/Entry.cs
+++ b/EDPlayerJournal/Entries/Entry.cs
@@ -42,6 +42,7 @@ public class Entry {
         { Events.ReceiveText, typeof(ReceiveTextEntry) },
         { Events.RedeemVoucher, typeof(RedeemVoucherEntry) },
         { Events.SearchAndRescue, typeof(SearchAndRescueEntry) },
+        { Events.SelfDestruct, typeof(SelfDestructEntry) },
         { Events.SellExplorationData, typeof(SellExplorationDataEntry) },
         { Events.SellMicroResources, typeof(SellMicroResourcesEntry) },
         { Events.SellOrganicData, typeof(SellOrganicDataEntry) },
diff --git a/EDPlayerJournal/Entries/Events.cs b/EDPlayerJournal/Entries/Events.cs
index d9b2fb6..e75e6fd 100644
--- a/EDPlayerJournal/Entries/Events.cs
+++ b/EDPlayerJournal/Entries/Events.cs
@@ -32,6 +32,7 @@ public class Events {
     public static readonly string ReceiveText = "ReceiveText";
     public static readonly string RedeemVoucher = "RedeemVoucher";
     public static readonly string SearchAndRescue = "SearchAndRescue";
+    public static readonly string SelfDestruct = "SelfDestruct";
     public static readonly string SellExplorationData = "SellExplorationData";
     public static readonly string SellMicroResources = "SellMicroResources";
     public static readonly string SellOrganicData = "SellOrganicData";
diff --git a/EDPlayerJournal/Entries/SelfDestructEntry.cs b/EDPlayerJournal/Entries/SelfDestructEntry.cs
new file mode 100644
index 0000000..79f723b
--- /dev/null
+++ b/EDPlayerJournal/Entries/SelfDestructEntry.cs
@@ -0,0 +1,5 @@
+namespace EDPlayerJournal.Entries {
+    public class SelfDestructEntry : Entry {
+        // Has no data
+    }
+}

From 2c6eb9190a50d452fd2292e5e2c5131257d95b1d Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 11:32:04 +0100
Subject: [PATCH 05/14] count conflict zones you SelfDestruct out of

---
 EDPlayerJournal/BGS/TransactionParser.cs        | 16 ++++++++++++++--
 EDPlayerJournal/BGS/TransactionParserContext.cs |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/EDPlayerJournal/BGS/TransactionParser.cs b/EDPlayerJournal/BGS/TransactionParser.cs
index f8d0c1d..32c7bb6 100644
--- a/EDPlayerJournal/BGS/TransactionParser.cs
+++ b/EDPlayerJournal/BGS/TransactionParser.cs
@@ -581,14 +581,25 @@ internal class ReceiveTextParser : ITransactionParserPart {
     }
 }
 
+internal class SelfDestructParser : ITransactionParserPart {
+    public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
+        context.SelfDestruct = true;
+    }
+}
+
 internal class DiedParser : ITransactionParserPart {
     public void Parse(Entry entry, TransactionParserContext context, TransactionParserOptions options, TransactionList transactions) {
         // Death only matters in ship. On foot you can just redeploy with the dropship.
         if (context.IsOnFoot) {
             return;
         }
-        // You can't complete a combat zone if you die in it. Others might keep it open
-        // for you, but still you will not have completed it unless you jump back in.
+        if (context.SelfDestruct != null && context.SelfDestruct == true) {
+            // Some people just suicide to fast track back to stations after a CZ,
+            // especially since combat bonds don't disappear on death. So count the CZ
+            // on self destruct
+            context.DiscernCombatZone(transactions, entry);
+            context.SelfDestruct = null;
+        }
         context.ResetCombatZone();
         // Dying also moves you back to another instance
         context.LeftInstance();
@@ -630,6 +641,7 @@ public class TransactionParser {
         { Events.ReceiveText, new ReceiveTextParser() },
         { Events.RedeemVoucher, new RedeemVoucherParser() },
         { Events.SearchAndRescue, new SearchAndRescueParser() },
+        { Events.SelfDestruct, new SelfDestructParser() },
         { Events.SellExplorationData, new SellExplorationDataParser() },
         { Events.SellMicroResources, new SellMicroResourcesParser() },
         { Events.SellOrganicData, new SellOrganicDataParser() },
diff --git a/EDPlayerJournal/BGS/TransactionParserContext.cs b/EDPlayerJournal/BGS/TransactionParserContext.cs
index 49c8cb4..94647fa 100644
--- a/EDPlayerJournal/BGS/TransactionParserContext.cs
+++ b/EDPlayerJournal/BGS/TransactionParserContext.cs
@@ -62,6 +62,8 @@ internal class TransactionParserContext {
     public bool HaveSeenAlliedCorrespondent { get; set; } = false;
     public bool HaveSeenEnemyCorrespondent { get; set; } = false;
 
+    public bool? SelfDestruct { get; set; } = null;
+
     /// <summary>
     /// Current Odyssey settlement.
     /// </summary>

From 1da6f41ec8a33a2f0ad6f3c4b93cacbd0665a056 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 11:43:24 +0100
Subject: [PATCH 06/14] update changelog

---
 EliteBGS/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/EliteBGS/CHANGELOG.md b/EliteBGS/CHANGELOG.md
index 18ea6e8..ddd6a75 100644
--- a/EliteBGS/CHANGELOG.md
+++ b/EliteBGS/CHANGELOG.md
@@ -1,5 +1,10 @@
 # EliteBGS changelog
 
+## 0.4.4 on ??.??.202?
+
+* Add support for Power Conflict Zones
+* Show no inf as "Zero INF", so the Nova Navy bot can parse it properly
+
 ## 0.4.3 on 18.09.2024
 
 * Add possibility to post log reports to Discord webhooks.

From cdbca10f2d549cba1c894f417a84530de25e411a Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 12:14:36 +0100
Subject: [PATCH 07/14] add support for Powerplay message

---
 EDPlayerJournal/Entries/Entry.cs          |  1 +
 EDPlayerJournal/Entries/Events.cs         |  1 +
 EDPlayerJournal/Entries/PowerplayEntry.cs | 32 +++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 EDPlayerJournal/Entries/PowerplayEntry.cs

diff --git a/EDPlayerJournal/Entries/Entry.cs b/EDPlayerJournal/Entries/Entry.cs
index 0d96f2a..cd703a1 100644
--- a/EDPlayerJournal/Entries/Entry.cs
+++ b/EDPlayerJournal/Entries/Entry.cs
@@ -39,6 +39,7 @@ public class Entry {
         { Events.Missions, typeof(MissionsEntry) },
         { Events.MultiSellExplorationData, typeof(MultiSellExplorationDataEntry) },
         { Events.Music, typeof(MusicEntry) },
+        { Events.Powerplay, typeof(PowerplayEntry) },
         { Events.ReceiveText, typeof(ReceiveTextEntry) },
         { Events.RedeemVoucher, typeof(RedeemVoucherEntry) },
         { Events.SearchAndRescue, typeof(SearchAndRescueEntry) },
diff --git a/EDPlayerJournal/Entries/Events.cs b/EDPlayerJournal/Entries/Events.cs
index e75e6fd..649eff2 100644
--- a/EDPlayerJournal/Entries/Events.cs
+++ b/EDPlayerJournal/Entries/Events.cs
@@ -29,6 +29,7 @@ public class Events {
     public static readonly string Missions = "Missions";
     public static readonly string MultiSellExplorationData = "MultiSellExplorationData";
     public static readonly string Music = "Music";
+    public static readonly string Powerplay = "Powerplay";
     public static readonly string ReceiveText = "ReceiveText";
     public static readonly string RedeemVoucher = "RedeemVoucher";
     public static readonly string SearchAndRescue = "SearchAndRescue";
diff --git a/EDPlayerJournal/Entries/PowerplayEntry.cs b/EDPlayerJournal/Entries/PowerplayEntry.cs
new file mode 100644
index 0000000..22d9fc1
--- /dev/null
+++ b/EDPlayerJournal/Entries/PowerplayEntry.cs
@@ -0,0 +1,32 @@
+using System.Reflection;
+
+namespace EDPlayerJournal.Entries {
+    public class PowerplayEntry : Entry {
+        /// <summary>
+        /// Name of the power
+        /// </summary>
+        public string Power { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Player rank
+        /// </summary>
+        public int Rank { get; set; } = 0;
+
+        /// <summary>
+        /// Current merits of the player
+        /// </summary>
+        public long Merits { get; set; } = 0;
+
+        /// <summary>
+        /// Time pledged (in seconds?)
+        /// </summary>
+        public long TimePledged { get; set; } = 0;
+
+        protected override void Initialise() {
+            Power = JSON.Value<string>("Power") ?? string.Empty;
+            Rank = JSON.Value<int?>("Rank") ?? 0;
+            Merits = JSON.Value<long?>("Merits") ?? 0;
+            TimePledged = JSON.Value<long?>("TimePledged") ?? 0;
+        }
+    }
+}

From aeaa6b5220babfe172c44b3a246ebd4aed11f29a Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 13:30:31 +0100
Subject: [PATCH 08/14] add preliminary support for merits gained

---
 EDPlayerJournal/BGS/MeritsGained.cs           | 25 ++++++++++++++++
 .../BGS/Parsers/PowerplayParser.cs            | 29 +++++++++++++++++++
 EDPlayerJournal/BGS/TransactionParser.cs      |  1 +
 .../BGS/TransactionParserContext.cs           | 10 +++++++
 4 files changed, 65 insertions(+)
 create mode 100644 EDPlayerJournal/BGS/MeritsGained.cs
 create mode 100644 EDPlayerJournal/BGS/Parsers/PowerplayParser.cs

diff --git a/EDPlayerJournal/BGS/MeritsGained.cs b/EDPlayerJournal/BGS/MeritsGained.cs
new file mode 100644
index 0000000..872b018
--- /dev/null
+++ b/EDPlayerJournal/BGS/MeritsGained.cs
@@ -0,0 +1,25 @@
+using EDPlayerJournal.Entries;
+
+namespace EDPlayerJournal.BGS;
+
+public class MeritsGained : Transaction {
+    public MeritsGained() { }
+
+    public MeritsGained(Entry entry) {
+        Entries.Add(entry);
+    }
+
+    /// <summary>
+    /// Number of merits gained
+    /// </summary>
+    public long Merits { get; set; } = 0;
+
+    /// <summary>
+    /// For what power those merits were gained
+    /// </summary>
+    public string Power { get; set; } = string.Empty;
+
+    public override string ToString() {
+        return string.Format("{0} Merits gained for {1}", Merits, Power);
+    }
+}
diff --git a/EDPlayerJournal/BGS/Parsers/PowerplayParser.cs b/EDPlayerJournal/BGS/Parsers/PowerplayParser.cs
new file mode 100644
index 0000000..2550628
--- /dev/null
+++ b/EDPlayerJournal/BGS/Parsers/PowerplayParser.cs
@@ -0,0 +1,29 @@
+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) {
+            transactions.Add(new MeritsGained(entry) {
+                Merits = ((long)(context.CurrentMerits - context.LastMerits)),
+                Power = p.Power,
+                System = context.CurrentSystem,
+                Faction = p.Power,
+            });
+        }
+
+        context.LastMerits = context.CurrentMerits;
+    }
+}
diff --git a/EDPlayerJournal/BGS/TransactionParser.cs b/EDPlayerJournal/BGS/TransactionParser.cs
index 32c7bb6..e34240a 100644
--- a/EDPlayerJournal/BGS/TransactionParser.cs
+++ b/EDPlayerJournal/BGS/TransactionParser.cs
@@ -638,6 +638,7 @@ public class TransactionParser {
         { Events.Missions, new MissionsParser() },
         { Events.MultiSellExplorationData, new MultiSellExplorationDataParser() },
         { Events.Music, new MusicParser() },
+        { Events.Powerplay, new PowerplayParser() },
         { Events.ReceiveText, new ReceiveTextParser() },
         { Events.RedeemVoucher, new RedeemVoucherParser() },
         { Events.SearchAndRescue, new SearchAndRescueParser() },
diff --git a/EDPlayerJournal/BGS/TransactionParserContext.cs b/EDPlayerJournal/BGS/TransactionParserContext.cs
index 94647fa..04a0f22 100644
--- a/EDPlayerJournal/BGS/TransactionParserContext.cs
+++ b/EDPlayerJournal/BGS/TransactionParserContext.cs
@@ -69,6 +69,16 @@ internal class TransactionParserContext {
     /// </summary>
     public string? Settlement { get; set; } = null;
 
+    /// <summary>
+    /// Current Merits
+    /// </summary>
+    public long? CurrentMerits { get; set; } = null;
+
+    /// <summary>
+    /// Merits from last login
+    /// </summary>
+    public long? LastMerits { get; set; } = null;
+
     /// <summary>
     /// Returns true if the current session is legacy
     /// </summary>

From 29056966413862e30a0a74b14b58ab440fa3aa7d Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 13:33:49 +0100
Subject: [PATCH 09/14] add option to ignore powerplay for now

---
 EDPlayerJournal/BGS/Parsers/PowerplayParser.cs | 14 ++++++++------
 EDPlayerJournal/BGS/TransactionParser.cs       |  6 ++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/EDPlayerJournal/BGS/Parsers/PowerplayParser.cs b/EDPlayerJournal/BGS/Parsers/PowerplayParser.cs
index 2550628..a808f23 100644
--- a/EDPlayerJournal/BGS/Parsers/PowerplayParser.cs
+++ b/EDPlayerJournal/BGS/Parsers/PowerplayParser.cs
@@ -16,12 +16,14 @@ internal class PowerplayParser : ITransactionParserPart {
         context.CurrentMerits = p.Merits;
  
         if (context.LastMerits != context.CurrentMerits) {
-            transactions.Add(new MeritsGained(entry) {
-                Merits = ((long)(context.CurrentMerits - context.LastMerits)),
-                Power = p.Power,
-                System = context.CurrentSystem,
-                Faction = p.Power,
-            });
+            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;
diff --git a/EDPlayerJournal/BGS/TransactionParser.cs b/EDPlayerJournal/BGS/TransactionParser.cs
index e34240a..47f86d1 100644
--- a/EDPlayerJournal/BGS/TransactionParser.cs
+++ b/EDPlayerJournal/BGS/TransactionParser.cs
@@ -16,6 +16,12 @@ public class TransactionParserOptions {
     /// </summary>
     public bool IgnoreInfluenceSupport { get; set; } = false;
 
+    /// <summary>
+    /// Whether we ignore power play and merits gained for now. Support for this
+    /// is experimental at the moment, so that is why it ist `true`.
+    /// </summary>
+    public bool IgnorePowerplay { get; set; } = true;
+
     /// <summary>
     /// Whether to ignore market buy. Buying from a market gives a small amount
     /// of INF if it is sold to a high demand market, but generally one buys from

From d9dd2cc524c7db2f7da2ffb95490892194967b1a Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 13:40:25 +0100
Subject: [PATCH 10/14] add option to ignore power play to UI

---
 EliteBGS/MainWindow.xaml    | 2 ++
 EliteBGS/MainWindow.xaml.cs | 7 ++++++-
 EliteBGS/Util/AppConfig.cs  | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/EliteBGS/MainWindow.xaml b/EliteBGS/MainWindow.xaml
index f6f26e6..fff5493 100644
--- a/EliteBGS/MainWindow.xaml
+++ b/EliteBGS/MainWindow.xaml
@@ -262,6 +262,7 @@
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
@@ -270,6 +271,7 @@
                             <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="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" />
+                            <mah:ToggleSwitch x:Name="NoPowerplay" Grid.Row="3" Grid.ColumnSpan="2" Content="Ignore Powerplay Merits" Toggled="NoPowerplay_Toggled" />
                         </Grid>
                     </GroupBox>
                     <GroupBox Header="Discord Webhooks" Grid.Row="3" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="3" Margin="0,5,0,0">
diff --git a/EliteBGS/MainWindow.xaml.cs b/EliteBGS/MainWindow.xaml.cs
index d5a7ca0..66499d9 100644
--- a/EliteBGS/MainWindow.xaml.cs
+++ b/EliteBGS/MainWindow.xaml.cs
@@ -64,6 +64,7 @@ public partial class MainWindow : MetroWindow {
         this.NoInfluenceSupport.IsOn = Config.Global.IgnoreInfluenceSupport;
         this.NoMarketBuy.IsOn = Config.Global.IgnoreMarketBuy;
         this.NoFleetCarrier.IsOn = Config.Global.IgnoreFleetCarrier;
+        this.NoPowerplay.IsOn = Config.Global.IgnorePowerplay;
 
         // Apply theme
         try {
@@ -182,6 +183,7 @@ public partial class MainWindow : MetroWindow {
             options.IgnoreInfluenceSupport = Config.Global.IgnoreInfluenceSupport;
             options.IgnoreMarketBuy = Config.Global.IgnoreMarketBuy;
             options.IgnoreFleetCarrierFaction = Config.Global.IgnoreFleetCarrier;
+            options.IgnorePowerplay = Config.Global.IgnorePowerplay;
 
             List<Transaction> transactions = parser.Parse(entries, options);
 
@@ -583,6 +585,10 @@ public partial class MainWindow : MetroWindow {
         Config.Global.IgnoreFleetCarrier = this.NoFleetCarrier.IsOn;
     }
 
+    private void NoPowerplay_Toggled(object sender, RoutedEventArgs e) {
+        Config.Global.IgnorePowerplay = this.NoPowerplay.IsOn;
+    }
+
     private void OpenInExplorer_Click(object sender, RoutedEventArgs e) {
         try {
             Process.Start(new ProcessStartInfo(Config.Global.JournalLocation) {
@@ -723,5 +729,4 @@ public partial class MainWindow : MetroWindow {
     private void PostToAll_Click(object sender, RoutedEventArgs e) {
         PostToDiscordWebhook(Config.Global.Webhooks);
     }
-
 }
diff --git a/EliteBGS/Util/AppConfig.cs b/EliteBGS/Util/AppConfig.cs
index cec6dfa..3b26745 100644
--- a/EliteBGS/Util/AppConfig.cs
+++ b/EliteBGS/Util/AppConfig.cs
@@ -67,6 +67,11 @@ public class AppConfig {
     /// </summary>
     public bool IgnoreFleetCarrier { get; set; } = true;
 
+    /// <summary>
+    /// Ignore power play?
+    /// </summary>
+    public bool IgnorePowerplay { get; set; } = true;
+
     /// <summary>
     /// List of Webhooks configured
     /// </summary>

From 88b770e5ec93ff0767b072120d363c62dd7735e7 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 13:52:17 +0100
Subject: [PATCH 11/14] add format for merits gained in log

---
 EliteBGS/DiscordLogGenerator.cs             |  1 +
 EliteBGS/LogGenerator/MeritsGainedFormat.cs | 50 +++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 EliteBGS/LogGenerator/MeritsGainedFormat.cs

diff --git a/EliteBGS/DiscordLogGenerator.cs b/EliteBGS/DiscordLogGenerator.cs
index d941366..22a23ed 100644
--- a/EliteBGS/DiscordLogGenerator.cs
+++ b/EliteBGS/DiscordLogGenerator.cs
@@ -21,6 +21,7 @@ public class DiscordLogGenerator {
         new CargoSoldFormatter(),
         new VistaGenomicsFormat(),
         new SearchAndRescueFormat(),
+        new MeritsGainedFormat(),
     };
 
     protected virtual string GetToolVersion() {
diff --git a/EliteBGS/LogGenerator/MeritsGainedFormat.cs b/EliteBGS/LogGenerator/MeritsGainedFormat.cs
new file mode 100644
index 0000000..d0148f3
--- /dev/null
+++ b/EliteBGS/LogGenerator/MeritsGainedFormat.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using EDPlayerJournal;
+using EDPlayerJournal.BGS;
+
+namespace EliteBGS.LogGenerator;
+
+public class MeritsGainedFormat : LogFormatter {
+    public string GenerateLog(Objective objective) {
+        var builder = new StringBuilder();
+
+        var merits = objective
+            .EnabledOfType<MeritsGained>()
+            .GroupBy(x => x.Power)
+            .ToDictionary(x => x.Key, x => x.Sum(x => x.Merits))
+            ;
+
+        if (merits == null || merits.Count == 0) {
+            return "";
+        }
+
+        foreach (var merit in merits) {
+            builder.AppendFormat("{0} merits gained for {1}\n", merit.Value, merit.Key);
+        }
+
+        return builder.ToString().Trim();
+    }
+
+    public string GenerateSummary(Objective objective) {
+        var builder = new StringBuilder();
+
+        var merits = objective
+            .EnabledOfType<MeritsGained>()
+            .GroupBy(x => x.Power)
+            .ToDictionary(x => x.Key, x => x.Sum(x => x.Merits))
+            ;
+
+        if (merits == null || merits.Count == 0) {
+            return "";
+        }
+
+        foreach (var merit in merits) {
+            builder.AppendFormat("MRT: {0}, {1}; ", merit.Key, merit.Value);
+        }
+
+        return builder.ToString().Trim();
+    }
+}

From 9d8f0c1b9a8c46cf68cb0591fb9ed13c7b634ba5 Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 13:55:03 +0100
Subject: [PATCH 12/14] strip out tailing semi-colon

---
 EliteBGS/LogGenerator/MeritsGainedFormat.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EliteBGS/LogGenerator/MeritsGainedFormat.cs b/EliteBGS/LogGenerator/MeritsGainedFormat.cs
index d0148f3..564394a 100644
--- a/EliteBGS/LogGenerator/MeritsGainedFormat.cs
+++ b/EliteBGS/LogGenerator/MeritsGainedFormat.cs
@@ -45,6 +45,6 @@ public class MeritsGainedFormat : LogFormatter {
             builder.AppendFormat("MRT: {0}, {1}; ", merit.Key, merit.Value);
         }
 
-        return builder.ToString().Trim();
+        return builder.ToString().Trim().TrimEnd(';');
     }
 }

From eaa4bda09822a90310320f9f1a098840d909968f Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Thu, 14 Nov 2024 14:08:36 +0100
Subject: [PATCH 13/14] update changelog

---
 EliteBGS/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/EliteBGS/CHANGELOG.md b/EliteBGS/CHANGELOG.md
index ddd6a75..681cbe6 100644
--- a/EliteBGS/CHANGELOG.md
+++ b/EliteBGS/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * Add support for Power Conflict Zones
 * Show no inf as "Zero INF", so the Nova Navy bot can parse it properly
+* Add support for MeritsGained, but disable it for now, as the player
+  journal is massively lacking in terms of Powerplay 2.0 support.
 
 ## 0.4.3 on 18.09.2024
 

From 2acb63025ce1b79baaca0055120f0e78f8cc01ec Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Mon, 18 Nov 2024 09:07:50 +0100
Subject: [PATCH 14/14] remove backup file

---
 EliteBGS/EliteBGS - Backup.csproj | 86 -------------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 EliteBGS/EliteBGS - Backup.csproj

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