From e9a23c67dc64bc6a5d7f468fd6e38d44e282ea68 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Wed, 2 Oct 2019 18:50:06 +0100 Subject: [PATCH] Send correct opponentName for Interdicted and Interdiction events Fixes #459 --- plugins/inara.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index 0303e288..bed8692b 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -613,20 +613,25 @@ def journal_entry(cmdr, is_beta, system, station, entry, state): add_event('addCommanderCombatDeath', entry['timestamp'], data) elif entry['event'] == 'Interdicted': - add_event('addCommanderCombatInterdicted', entry['timestamp'], - OrderedDict([('starsystemName', system), - ('opponentName', entry['Interdictor']), - ('isPlayer', entry['IsPlayer']), - ('isSubmit', entry['Submitted']), - ])) + data = OrderedDict([('starsystemName', system), + ('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': data = OrderedDict([('starsystemName', system), ('isPlayer', entry['IsPlayer']), ('isSuccess', entry['Success']), ]) - if 'Interdictor' in entry: - data['opponentName'] = entry['Interdictor'] + if 'Interdicted' in entry: + data['opponentName'] = entry['Interdicted'] elif 'Faction' in entry: data['opponentName'] = entry['Faction'] elif 'Power' in entry: