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

Correctly handle death by station

Browse Source
This commit is contained in:
Jonathan Harris 2017-11-10 00:37:22 +00:00
parent 9e10ccfa00
commit 6445b6f8c8
1 changed files with 5 additions and 9 deletions

14
plugins/inara.py

@ -365,16 +365,12 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
# Combat
if entry['event'] == 'Died':
data = OrderedDict([ ('starsystemName', system) ])
if 'Killers' in entry:
add_event('addCommanderCombatDeath', entry['timestamp'],
OrderedDict([('starsystemName', system),
('wingOpponentNames', [x['Name'] for x in entry['Killers']]),
]))
else:
add_event('addCommanderCombatDeath', entry['timestamp'],
OrderedDict([('starsystemName', system),
('opponentName', entry['KillerName']),
]))
data['wingOpponentNames'] = [x['Name'] for x in entry['Killers']]
elif 'KillerName' in entry:
data['opponentName'] = entry['KillerName']
add_event('addCommanderCombatDeath', entry['timestamp'], data)
elif entry['event'] == 'Interdicted':
add_event('addCommanderCombatInterdicted', entry['timestamp'],