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

Send correct opponentName for Interdicted and Interdiction events

Browse Source 
Fixes #459
This commit is contained in:
Jonathan Harris 2019-10-02 18:50:06 +01:00
parent 8c2775f6d8
commit e9a23c67dc
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/inara.py
View File

@ -613,20 +613,25 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
add_event('addCommanderCombatDeath', entry['timestamp'], data) add_event('addCommanderCombatDeath', entry['timestamp'], data)
elif entry['event'] == 'Interdicted': elif entry['event'] == 'Interdicted':
add_event('addCommanderCombatInterdicted', entry['timestamp'], data = OrderedDict([('starsystemName', system),
OrderedDict([('starsystemName', system), ('isPlayer', entry['IsPlayer']),
('opponentName', entry['Interdictor']), ('isSubmit', entry['Submitted']),
('isPlayer', entry['IsPlayer']), ])
('isSubmit', entry['Submitted']), if 'Interdictor' in entry:
])) data['opponentName'] = entry['Interdictor']
elif 'Faction' in entry:
data['opponentName'] = entry['Faction']
elif 'Power' in entry:
data['opponentName'] = entry['Power']
add_event('addCommanderCombatInterdicted', entry['timestamp'], data)
elif entry['event'] == 'Interdiction': elif entry['event'] == 'Interdiction':
data = OrderedDict([('starsystemName', system), data = OrderedDict([('starsystemName', system),
('isPlayer', entry['IsPlayer']), ('isPlayer', entry['IsPlayer']),
('isSuccess', entry['Success']), ('isSuccess', entry['Success']),
]) ])
if 'Interdictor' in entry: if 'Interdicted' in entry:
data['opponentName'] = entry['Interdictor'] data['opponentName'] = entry['Interdicted']
elif 'Faction' in entry: elif 'Faction' in entry:
data['opponentName'] = entry['Faction'] data['opponentName'] = entry['Faction']
elif 'Power' in entry: elif 'Power' in entry: