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

Merge pull request from EDCD/fix/1401/inara-current-assets-including-fc

Browse Source 
inara: Utilise Statistics Current_Wealth for commanderAssets
This commit is contained in:
Athanasius 2022-01-20 18:14:42 +00:00 committed by GitHub
commit d6be32f7c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions

21
plugins/inara.py

@ -737,17 +737,24 @@ def journal_entry( # noqa: C901, CCR001
logger.debug('Adding events', exc_info=e)
return str(e)
# Send credits and stats to Inara on startup only - otherwise may be out of date
# We want to utilise some Statistics data, so don't setCommanderCredits here
if event_name == 'LoadGame':
new_add_event(
'setCommanderCredits',
entry['timestamp'],
{'commanderCredits': state['Credits'], 'commanderLoan': state['Loan']}
)
this.lastcredits = state['Credits']
elif event_name == 'Statistics':
inara_data = {
'commanderCredits': state['Credits'],
'commanderLoan': state['Loan'],
}
if entry.get('Bank_Account') is not None:
if entry['Bank_Account'].get('Current_Wealth') is not None:
inara_data['commanderAssets'] = entry['Bank_Account']['Current_Wealth']
new_add_event(
'setCommanderCredits',
entry['timestamp'],
inara_data
)
new_add_event('setCommanderGameStatistics', entry['timestamp'], state['Statistics']) # may be out of date
# Selling / swapping ships