From 9ff3327ff738310a801302521448fb4603c7a2cc Mon Sep 17 00:00:00 2001
From: David Muckle <dvdmuckle@dvdmuckle.xyz>
Date: Thu, 20 Feb 2025 19:17:50 -0500
Subject: [PATCH] Add code to track PP2.0 rank, merits, etc

---
 monitor.py       | 14 ++++++++++++++
 plugins/inara.py |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/monitor.py b/monitor.py
index badc4c71..e37e77c1 100644
--- a/monitor.py
+++ b/monitor.py
@@ -179,6 +179,13 @@ class EDLogs(FileSystemEventHandler):
             'StationName':        None,
 
             'NavRoute':           None,
+            'Powerplay':      {
+                'Power':          None,
+                'Rank':           None,
+                'Merits':         None,
+                'Votes':          None,
+                'TimePledged':    None,
+            },
         }
 
     def start(self, root: 'tkinter.Tk') -> bool:  # noqa: CCR001
@@ -1839,6 +1846,13 @@ class EDLogs(FileSystemEventHandler):
                 # There should be a `Backpack` event as you 'come to' in the
                 # new location, so no need to zero out BackPack here.
 
+            elif event_type == 'powerplay':
+                self.state['Powerplay']['Power'] = entry.get('Power', '')
+                self.state['Powerplay']['Rank'] = entry.get('Rank', 0)
+                self.state['Powerplay']['Merits'] = entry.get('Merits', 0)
+                self.state['Powerplay']['Votes'] = entry.get('Votes', 0)
+                self.state['Powerplay']['TimePledged'] = entry.get('TimePledged', 0)
+
             return entry
 
         except Exception as ex:
diff --git a/plugins/inara.py b/plugins/inara.py
index f2c9830e..b48609f0 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -548,6 +548,10 @@ def journal_entry(  # noqa: C901, CCR001
                 power_defect_data = {'powerName': entry["ToPower"], 'rankValue': 1}
                 new_add_event('setCommanderRankPower', entry['timestamp'], power_defect_data)
 
+            elif event_name == 'Powerplay':
+                power_data = {'powerName': entry["Power"], 'rankValue': entry["Rank"], 'meritsValue': entry["Merits"]}
+                new_add_event('setCommanderRankPower', entry['timestamp'], power_data)
+
             # Ship change
             if event_name == 'Loadout' and this.shipswap:
                 this.loadout = make_loadout(state)