From 2b4c8280c3d786138e4383f1b1627ff50eeb941f Mon Sep 17 00:00:00 2001 From: David Muckle Date: Mon, 24 Mar 2025 20:08:50 -0400 Subject: [PATCH 1/2] Update powerplay tracking to account for new journal events --- monitor.py | 6 ++++++ plugins/inara.py | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/monitor.py b/monitor.py index e37e77c1..e821c317 100644 --- a/monitor.py +++ b/monitor.py @@ -1852,6 +1852,12 @@ class EDLogs(FileSystemEventHandler): self.state['Powerplay']['Merits'] = entry.get('Merits', 0) self.state['Powerplay']['Votes'] = entry.get('Votes', 0) self.state['Powerplay']['TimePledged'] = entry.get('TimePledged', 0) + + elif event_type == 'powerplaymerits': + self.state['Powerplay']['Merits'] = entry.get('TotalMerits', 0) + + elif event_type == 'powerplayrank': + self.state['Powerplay']['Rank'] = entry.get('Rank', 0) return entry diff --git a/plugins/inara.py b/plugins/inara.py index b48609f0..dbbefb98 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -552,6 +552,14 @@ def journal_entry( # noqa: C901, CCR001 power_data = {'powerName': entry["Power"], 'rankValue': entry["Rank"], 'meritsValue': entry["Merits"]} new_add_event('setCommanderRankPower', entry['timestamp'], power_data) + elif event_name == 'PowerplayMerits': + power_data = {'powerName': state["Powerplay"]["Power"], 'rankValue': state["Powerplay"]["Rank"], 'meritsValue': entry["TotalMerits"]} + new_add_event('setCommanderRankPower', entry['timestamp'], power_data) + + elif event_name == 'PowerplayRank': + power_data = {'powerName': entry["Power"], 'rankValue': entry["Rank"]} + new_add_event('setCommanderRankPower', entry['timestamp'], power_data) + # Ship change if event_name == 'Loadout' and this.shipswap: this.loadout = make_loadout(state) From 749ae939b5059f05f3b6e3f92cf03cdf57c1e92a Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Mon, 31 Mar 2025 20:31:23 -0400 Subject: [PATCH 2/2] [Minor] Flake8 Linter Run --- monitor.py | 2 +- plugins/inara.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/monitor.py b/monitor.py index e821c317..4a554217 100644 --- a/monitor.py +++ b/monitor.py @@ -1852,7 +1852,7 @@ class EDLogs(FileSystemEventHandler): self.state['Powerplay']['Merits'] = entry.get('Merits', 0) self.state['Powerplay']['Votes'] = entry.get('Votes', 0) self.state['Powerplay']['TimePledged'] = entry.get('TimePledged', 0) - + elif event_type == 'powerplaymerits': self.state['Powerplay']['Merits'] = entry.get('TotalMerits', 0) diff --git a/plugins/inara.py b/plugins/inara.py index dbbefb98..6c243172 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -553,7 +553,8 @@ def journal_entry( # noqa: C901, CCR001 new_add_event('setCommanderRankPower', entry['timestamp'], power_data) elif event_name == 'PowerplayMerits': - power_data = {'powerName': state["Powerplay"]["Power"], 'rankValue': state["Powerplay"]["Rank"], 'meritsValue': entry["TotalMerits"]} + power_data = {'powerName': state["Powerplay"]["Power"], 'rankValue': state["Powerplay"]["Rank"], + 'meritsValue': entry["TotalMerits"]} new_add_event('setCommanderRankPower', entry['timestamp'], power_data) elif event_name == 'PowerplayRank':