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

Merge pull request #1307 from EDCD/fix/1259/eddn-horizons-flag

Browse Source 
EDDN: Fix `horizons` flag for CAPI-sourced data
This commit is contained in:
Athanasius 2021-10-17 15:35:12 +01:00 committed by GitHub
commit ee272fdeba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/eddn.py
View File

@ -46,6 +46,8 @@ class This:
# Track if we're on foot # Track if we're on foot
self.on_foot = False self.on_foot = False
# Horizons ?
self.horizons = False
# Running under Odyssey? # Running under Odyssey?
self.odyssey = False self.odyssey = False
@ -1165,8 +1167,9 @@ def journal_entry( # noqa: C901, CCR001
this.on_foot = state['OnFoot'] this.on_foot = state['OnFoot']
# Note if we're under Odyssey # Note if we're under Horizons and/or Odyssey
# The only event this is already in is `LoadGame` which isn't sent to EDDN. # The only event these are already in is `LoadGame` which isn't sent to EDDN.
this.horizons = entry['horizons'] = state['Horizons']
this.odyssey = entry['odyssey'] = state['Odyssey'] this.odyssey = entry['odyssey'] = state['Odyssey']
# Track location # Track location
@ -1392,6 +1395,22 @@ def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY
:param ships: Ships available at the docked station. :param ships: Ships available at the docked station.
:return: bool - True if the Cmdr has Horizons access. :return: bool - True if the Cmdr has Horizons access.
""" """
# First check the Journal-sourced flag
# NB: This assumes game currently running, rather than "old
# journal file". `LoadGame` determines monitor.cmdr, which determines
# the account used for CAPI, so it *should* match.
#
# For this to be wrong, the user would have had to have, e.g.:
#
# 1. Logged into Cmdr in Horizons/Odyssey, then back out again.
# 2. Logged into Cmdr in base game, either on another machine, or
# have removed the Journal file after.
# 3. Re-run EDMC and triggered a manual CAPI update.
#
# This seems unlikely.
if this.horizons:
return True
economies_colony = False economies_colony = False
modules_horizons = False modules_horizons = False
ship_horizons = False ship_horizons = False