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':