ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-19 02:17:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2392 from dvdmuckle/powerplay-journals-update

Browse Source 
Update powerplay tracking to account for new journal events
This commit is contained in:
David Sangrey 2025-04-01 01:34:25 +01:00 committed by GitHub
commit 6594052671
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monitor.py
View File

@ -1855,6 +1855,12 @@ class EDLogs(FileSystemEventHandler):
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
except Exception as ex:

9
plugins/inara.py
View File

@ -552,6 +552,15 @@ 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)