Update modules

coriolis-data

@@ -1 +1 @@
-Subproject commit 35473b30d391975dc4a00e0ab2dc0e8611cce268
+Subproject commit e9417ea417690006db18ab649ed6f2384ea12416

coriolis.py

@@ -14,12 +14,20 @@ import companion
 
 
 if __name__ == "__main__":
+
+    def add(modules, name, attributes):
+        assert name not in modules or modules[name] == attributes, '%s: %s!=%s' % (name, modules.get(name), attributes)
+        assert name not in modules, name
+        modules[name] = attributes
+
+
     data = json.load(open('coriolis-data/dist/index.json'))
 
     # Map Coriolis's names to names displayed in the in-game shipyard
     coriolis_ship_map = {
         'Cobra Mk III' : 'Cobra MkIII',
         'Cobra Mk IV'  : 'Cobra MkIV',
+        'Krait Mk II'  : 'Krait MkII',
         'Viper'        : 'Viper MkIII',
         'Viper Mk IV'  : 'Viper MkIV',
     }
@@ -66,33 +74,32 @@ if __name__ == "__main__":
                     modules[key] = { 'mass': m.get('mass', 0) }	# Some modules don't have mass
 
     # 3.0 / 3.1 additions not yet present in coriolis-data
-    for k in modules.keys():
+    add(modules, 'hpt_causticmissile_fixed_medium', {'mass': 4})
-        if k.startswith('int_hullreinforcement_'):
+    add(modules, 'hpt_flechettelauncher_fixed_medium', {'mass': 4})
-            modules['int_guardianhullreinforcement_' + k[22:]] = modules[k]
+    add(modules, 'hpt_flechettelauncher_turret_medium', {'mass': 4})
-            modules['int_metaalloyhullreinforcement_' + k[22:]] = modules[k]
+    add(modules, 'hpt_guardian_plasmalauncher_fixed_large', {'mass': 8})
-            modules['int_guardianmodulereinforcement_' + k[22:]] = modules[k]
+    add(modules, 'hpt_guardian_plasmalauncher_turret_large', {'mass': 8})
-    modules['hpt_causticmissile_fixed_medium'] = {'mass': 4}
+    add(modules, 'hpt_guardian_shardcannon_turret_medium', {'mass': 4})
-    modules['hpt_flechettelauncher_fixed_medium'] = {'mass': 4}
+    add(modules, 'hpt_guardian_shardcannon_turret_large', {'mass': 8})
-    modules['hpt_flechettelauncher_turret_medium'] = {'mass': 4}
+    add(modules, 'hpt_plasmashockcannon_fixed_medium', {'mass': 4})
-    modules['hpt_guardian_plasmalauncher_fixed_medium'] = {'mass': 4}
+    add(modules, 'hpt_plasmashockcannon_gimbal_large', {'mass': 8})	# ???
-    modules['hpt_guardian_plasmalauncher_fixed_large'] = {'mass': 8}
+    add(modules, 'hpt_plasmashockcannon_turret_medium', {'mass': 4})
-    modules['hpt_guardian_plasmalauncher_turret_medium'] = {'mass': 4}
+    add(modules, 'hpt_plasmashockcannon_turret_large', {'mass': 8})	# ???
-    modules['hpt_guardian_plasmalauncher_turret_large'] = {'mass': 8}
+    add(modules, 'int_dronecontrol_decontamination_size1_class1', {'mass': 1.3})
-    modules['hpt_guardian_shardcannon_fixed_medium'] = {'mass': 4}
+    add(modules, 'int_dronecontrol_decontamination_size3_class1', {'mass': 2})
-    modules['hpt_guardian_shardcannon_fixed_large'] = {'mass': 8}
+    add(modules, 'int_dronecontrol_decontamination_size5_class1', {'mass': 20})
-    modules['hpt_guardian_shardcannon_turret_medium'] = {'mass': 4}
+    add(modules, 'int_dronecontrol_decontamination_size7_class1', {'mass': 128})
-    modules['hpt_guardian_shardcannon_turret_large'] = {'mass': 8}
+    add(modules, 'int_dronecontrol_unkvesselresearch', {'mass': 1.3})
-    modules['hpt_plasmashockcannon_fixed_medium'] = {'mass': 4}
+    add(modules, 'int_metaalloyhullreinforcement_size1_class1', { 'mass': 2 })
-    modules['hpt_plasmashockcannon_fixed_large'] = {'mass': 8}	# ???
+    add(modules, 'int_metaalloyhullreinforcement_size1_class2', { 'mass': 2 })	# anomaly
-    modules['hpt_plasmashockcannon_gimbal_medium'] = {'mass': 4}
+    add(modules, 'int_metaalloyhullreinforcement_size2_class1', { 'mass': 4 })
-    modules['hpt_plasmashockcannon_gimbal_large'] = {'mass': 8}	# ???
+    add(modules, 'int_metaalloyhullreinforcement_size2_class2', { 'mass': 2 })
-    modules['hpt_plasmashockcannon_turret_medium'] = {'mass': 4}
+    add(modules, 'int_metaalloyhullreinforcement_size3_class1', { 'mass': 8 })
-    modules['hpt_plasmashockcannon_turret_large'] = {'mass': 8}	# ???
+    add(modules, 'int_metaalloyhullreinforcement_size3_class2', { 'mass': 4 })
-    modules['int_dronecontrol_decontamination_size1_class1'] = {'mass': 1.3}
+    add(modules, 'int_metaalloyhullreinforcement_size4_class1', { 'mass': 16 })
-    modules['int_dronecontrol_decontamination_size3_class1'] = {'mass': 2}
+    add(modules, 'int_metaalloyhullreinforcement_size4_class2', { 'mass': 8 })
-    modules['int_dronecontrol_decontamination_size5_class1'] = {'mass': 20}
+    add(modules, 'int_metaalloyhullreinforcement_size5_class1', { 'mass': 32 })
-    modules['int_dronecontrol_decontamination_size7_class1'] = {'mass': 128}
+    add(modules, 'int_metaalloyhullreinforcement_size5_class2', { 'mass': 16 })
-    modules['int_dronecontrol_unkvesselresearch'] = {'mass': 1.3}
 
     modules = OrderedDict([(k,modules[k]) for k in sorted(modules)])	# sort for easier diffing
     cPickle.dump(modules, open('modules.p', 'wb'))

outfitting.py

@@ -337,16 +337,11 @@ def lookup(module, ship_map, entitled=False):
         new['class'] = '1'
         new['rating'] = 'I'
 
-    # Skip uninteresting stuff
+    # Skip uninteresting stuff - no longer present in ED 3.1 cAPI data
     elif name[0] in ['bobble', 'decal', 'nameplate', 'paintjob', 'enginecustomisation', 'weaponcustomisation'] or name[1].startswith('shipkit') :
         return None
 
-    # Skip PP-specific modules in outfitting which have an sku like ELITE_SPECIFIC_V_POWER_100100
+    # Shouldn't be listing player-specific paid stuff or broker/powerplay-specific modules in outfitting, other than Horizons
-    # Arghh - Bi-Weave Shield generators are incorrectly listed as 'powerplay' !
-    # elif 'category' in module and module['category'].lower() == 'powerplay':
-    #     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':
         return None
 
@@ -448,11 +443,8 @@ def lookup(module, ship_map, entitled=False):
     # Entitlements
     if not module.get('sku'):
         pass
-    elif module['sku'].startswith('ELITE_SPECIFIC_V_POWER'):
-        new['entitlement'] = 'powerplay'
     else:
-        assert module['sku'] == 'ELITE_HORIZONS_V_PLANETARY_LANDINGS', '%s: Unknown sku "%s"' % (module['id'], module['sku'])
+        new['entitlement'] = module['sku']
-        new['entitlement'] = 'horizons'
 
     # Extra module data
     if module['name'].endswith('_free'):