From a0e65e0bd8bf8e22d2cd41378a258c62f81c1d78 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Fri, 25 Mar 2016 03:51:17 +0000 Subject: [PATCH] Don't send Planetary Approach Suite to EDDN --- outfitting.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/outfitting.py b/outfitting.py index 77ce8881..a9701256 100644 --- a/outfitting.py +++ b/outfitting.py @@ -250,8 +250,7 @@ def lookup(module, ship_map, entitled=False): # return None # Shouldn't be listing player-specific paid stuff in outfitting, other than Horizons - elif not entitled and module.get('sku') and module['sku'] != 'ELITE_HORIZONS_V_PLANETARY_LANDINGS': - # raise AssertionError('%s: Unexpected sku "%s"' % (module['id'], module['sku'])) + elif not entitled and module.get('sku') and (module['sku'] != 'ELITE_HORIZONS_V_PLANETARY_LANDINGS' or name[1] == 'planetapproachsuite'): return None # Hardpoints - e.g. Hpt_Slugshot_Fixed_Medium @@ -332,12 +331,12 @@ def lookup(module, ship_map, entitled=False): new['enabled'], new['priority'] = module['on'], module['priority'] # priority is zero-based # Entitlements - if not entitled or not module.get('sku'): + if not module.get('sku'): pass elif module['sku'].startswith('ELITE_SPECIFIC_V_POWER'): new['entitlement'] = 'powerplay' - elif module['sku'] != 'ELITE_HORIZONS_V_PLANETARY_LANDINGS': - assert False, '%s: Unknown sku "%s"' % (module['id'], module['sku']) + else: + assert module['sku'] == 'ELITE_HORIZONS_V_PLANETARY_LANDINGS', '%s: Unknown sku "%s"' % (module['id'], module['sku']) # Extra module data key = (new['name'], 'ship' in new and companion.ship_map.get(name[0]) or None, new['class'], new['rating'])