Handle some more 3.0 modules

coriolis.py

@@ -170,6 +170,9 @@ if __name__ == "__main__":
                     modules[key] = { 'mass': m.get('mass', 0) }	# Some modules don't have mass
 
     # 3.0 additions not yet present in coriolis-data
+    for k in modules.keys():
+        if k[0] == 'Module Reinforcement Package':
+            modules[('Meta Alloy Hull Reinforcement',) + k[1:]] = modules[k]
     modules[('Decontamination Limpet Controller', None, '1', 'E')] = {'mass': 1.3}
     modules[('Decontamination Limpet Controller', None, '3', 'E')] = {'mass': 2}
     modules[('Decontamination Limpet Controller', None, '5', 'E')] = {'mass': 20}
@@ -179,6 +182,16 @@ if __name__ == "__main__":
     modules[('Recon Limpet Controller', None, '5', 'E')] = {'mass': 20}
     modules[('Recon Limpet Controller', None, '7', 'E')] = {'mass': 128}
     modules[('Research Limpet Controller', None, '1', 'E')] = {'mass': 1.3}
+    modules[('Guardian Power Plant', None, '2', 'A')] = {'mass': 1.5}
+    modules[('Guardian Power Plant', None, '3', 'A')] = {'mass': 2.9}
+    modules[('Guardian Power Plant', None, '4', 'A')] = {'mass': 5.9}
+    modules[('Guardian Power Plant', None, '5', 'A')] = {'mass': 11.7}
+    modules[('Guardian Power Plant', None, '6', 'A')] = {'mass': 23.4}
+    modules[('Guardian Power Plant', None, '7', 'A')] = {'mass': 46.8}
+    modules[('Guardian Power Plant', None, '8', 'A')] = {'mass': 93.6}
+    modules[('Bi-Weave Shield Generator', None, '8', 'C')] = {'mass': 160}
+    modules[('Enzyme Missile Rack', None, '2', 'B')] = {'mass': 4}
+    modules[('Remote Release Flechette Launcher', None, '2', 'B')] = {'mass': 4}
 
     modules = OrderedDict([(k,modules[k]) for k in sorted(modules)])	# sort for easier diffing
     cPickle.dump(modules, open('modules.p', 'wb'))

outfitting.py

@@ -25,10 +25,14 @@ weapon_map = {
     'beamlaser'                      : 'Beam Laser',
     ('beamlaser','heat')             : 'Retributor Beam Laser',
     'cannon'                         : 'Cannon',
+    'causticmissile'                 : 'Enzyme Missile Rack',
     'drunkmissilerack'               : 'Pack-Hound Missile Rack',
     'dumbfiremissilerack'            : 'Missile Rack',
     ('dumbfiremissilerack', 'lasso') : 'Rocket Propelled FSD Disruptor',
     'flakmortar'                     : 'Remote Release Flak Launcher',
+    'flechettelauncher'              : 'Remote Release Flechette Launcher',
+    ('guardian', 'gausscannon')      : 'Guardian Gauss Cannon',
+    ('guardian', 'plasmalauncher')   : 'Guardian Plasma Charger',
     'minelauncher'                   : 'Mine Launcher',
     ('minelauncher','impulse')       : 'Shock Mine Launcher',
     'mininglaser'                    : 'Mining Laser',
@@ -51,6 +55,7 @@ missiletype_map = {
     'advancedtorppylon'   : 'Seeker',
     'atdumbfiremissile'   : 'Dumbfire',
     'basicmissilerack'    : 'Seeker',
+    'causticmissile'      : 'Dumbfire',
     'drunkmissilerack'    : 'Swarm',
     'dumbfiremissilerack' : 'Dumbfire',
 }
@@ -106,11 +111,17 @@ weaponrating_map = {
     'hpt_cannon_turret_small': 'F',
     'hpt_cannon_turret_medium': 'E',
     'hpt_cannon_turret_large': 'D',
+    'hpt_causticmissile_fixed_medium': 'B',
     'hpt_drunkmissilerack_fixed_medium': 'B',
     'hpt_dumbfiremissilerack_fixed_small': 'B',
     'hpt_dumbfiremissilerack_fixed_medium': 'B',
     'hpt_flakmortar_fixed_medium': 'B',
     'hpt_flakmortar_turret_medium': 'B',
+    'hpt_flechettelauncher_fixed_medium': 'B',
+    'hpt_flechettelauncher_turret_medium': 'B',
+    'hpt_guardian_gausscannon_fixed_medium': 'A',	# guess
+    'hpt_guardian_plasmalauncher_fixed_medium': 'A',	# guess
+    'hpt_guardian_plasmalauncher_turret_medium': 'A',	# guess
     'hpt_minelauncher_fixed_small': 'I',
     'hpt_minelauncher_fixed_medium': 'I',
     'hpt_mininglaser_fixed_small': 'D',
@@ -237,12 +248,12 @@ standard_map = {
     'engine'                : 'Thrusters',
     ('engine','fast')       : 'Enhanced Performance Thrusters',
     'fueltank'              : 'Fuel Tank',
+    'guardianpowerplant'    : 'Guardian Power Plant',
     'hyperdrive'            : 'Frame Shift Drive',
     'lifesupport'           : 'Life Support',
     # 'planetapproachsuite' : handled separately
     'powerdistributor'      : 'Power Distributor',
     'powerplant'            : 'Power Plant',
-    ('powerplant', 'highheatweight') : 'Enhanced Power Plant',	# Not seen
     'sensors'               : 'Sensors',
 }
 
@@ -257,6 +268,7 @@ internal_map = {
     'fuelscoop'                  : 'Fuel Scoop',
     'fueltransfer'               : 'Fuel Transfer Limpet Controller',
     'hullreinforcement'          : 'Hull Reinforcement Package',
+    'metaalloyhullreinforcement' : 'Meta Alloy Hull Reinforcement',
     'modulereinforcement'        : 'Module Reinforcement Package',
     'passengercabin'             : 'Passenger Cabin',
     'prospector'                 : 'Prospector Limpet Controller',
@@ -393,6 +405,8 @@ def lookup(module, ship_map, entitled=False):
 
         if len(name) < 4 and name[1] == 'unkvesselresearch':	# Hack! No size or class.
             (new['class'], new['rating']) = ('1', 'E')
+        elif len(name) < 4 and name[1] == 'guardianpowerplant':	# Hack! No class.
+            (new['class'], new['rating']) = (str(name[2][4:]), 'A')
         else:
             if not name[2].startswith('size') or not name[3].startswith('class'): raise AssertionError('%s: Unknown class/rating "%s/%s"' % (module['id'], name[2], name[3]))
             new['class'] = str(name[2][4:])