From b9d77baed950b04a386dfd3ba4ddfed33414253b Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Tue, 3 Jul 2018 19:23:39 +0100 Subject: [PATCH] Ship loadout no longer derived from cAPI --- config.py | 6 +++--- prefs.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.py b/config.py index 04dba42f..594b1ecc 100644 --- a/config.py +++ b/config.py @@ -97,11 +97,11 @@ class Config: OUT_MKT_TD = 4 OUT_MKT_CSV = 8 OUT_SHIP = 16 - OUT_SHIP_EDS = 16 # Replaced by OUT_SHIP + # OUT_SHIP_EDS = 16 # Replaced by OUT_SHIP # OUT_SYS_FILE = 32 # No longer supported # OUT_STAT = 64 # No longer available - OUT_SHIP_CORIOLIS = 128 # Replaced by OUT_SHIP - OUT_STATION_ANY = OUT_MKT_EDDN|OUT_MKT_TD|OUT_MKT_CSV|OUT_SHIP|OUT_SHIP_EDS|OUT_SHIP_CORIOLIS + # OUT_SHIP_CORIOLIS = 128 # Replaced by OUT_SHIP + OUT_STATION_ANY = OUT_MKT_EDDN|OUT_MKT_TD|OUT_MKT_CSV # OUT_SYS_EDSM = 256 # Now a plugin # OUT_SYS_AUTO = 512 # Now always automatic OUT_MKT_MANUAL = 1024 diff --git a/prefs.py b/prefs.py index 115e7ad9..18d6d073 100644 --- a/prefs.py +++ b/prefs.py @@ -147,7 +147,7 @@ class PreferencesDialog(tk.Toplevel): self.out_td = tk.IntVar(value = (output & config.OUT_MKT_TD ) and 1) self.out_td_button = nb.Checkbutton(outframe, text=_('Market data in Trade Dangerous format file'), variable=self.out_td, command=self.outvarchanged) self.out_td_button.grid(columnspan=2, padx=BUTTONX, sticky=tk.W) - self.out_ship= tk.IntVar(value = (output & (config.OUT_SHIP|config.OUT_SHIP_EDS|config.OUT_SHIP_CORIOLIS) and 1)) + self.out_ship= tk.IntVar(value = (output & config.OUT_SHIP and 1)) self.out_ship_button = nb.Checkbutton(outframe, text=_('Ship loadout'), variable=self.out_ship, command=self.outvarchanged) # Output setting self.out_ship_button.grid(columnspan=2, padx=BUTTONX, pady=(5,0), sticky=tk.W) self.out_auto = tk.IntVar(value = 0 if output & config.OUT_MKT_MANUAL else 1) # inverted