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

Check for and use `isThargoid` flag

Browse Source 
- Check and use ``isThargoid`` flag for Interdiction events.
- Also updates the Paranoia check to also work in case of missing and not just empty parameter.
This commit is contained in:
Phoebe 2024-02-25 15:20:14 +01:00
parent cb437dd9a4
commit af3b9d250a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/inara.py
View File

@ -1019,8 +1019,11 @@ def journal_entry( # noqa: C901, CCR001
elif 'Power' in entry: elif 'Power' in entry:
data['opponentName'] = entry['Power'] data['opponentName'] = entry['Power']
elif 'IsThargoid' in entry and entry['IsThargoid']:
data['opponentName'] = 'Thargoid'
# Paranoia in case of e.g. Thargoid activity not having complete data # Paranoia in case of e.g. Thargoid activity not having complete data
if data['opponentName'] == "": if 'opponentName' not in data or data['opponentName'] == "":
logger.warning('Dropping addCommanderCombatInterdicted message because opponentName came out as ""') logger.warning('Dropping addCommanderCombatInterdicted message because opponentName came out as ""')
else: else:
@ -1042,8 +1045,13 @@ def journal_entry( # noqa: C901, CCR001
elif 'Power' in entry: elif 'Power' in entry:
data['opponentName'] = entry['Power'] data['opponentName'] = entry['Power']
# Shouldn't be needed here as Interdiction events can't target Thargoids (yet)
# but done just in case of future changes or so
elif 'IsThargoid' in entry and entry['IsThargoid']:
data['opponentName'] = 'Thargoid'
# Paranoia in case of e.g. Thargoid activity not having complete data # Paranoia in case of e.g. Thargoid activity not having complete data
if data['opponentName'] == "": if 'opponentName' not in data or data['opponentName'] == "":
logger.warning('Dropping addCommanderCombatInterdiction message because opponentName came out as ""') logger.warning('Dropping addCommanderCombatInterdiction message because opponentName came out as ""')
else: else: