Merge pull request #2498 from klightspeed/develop-corsair

[Minor] Add Corsair, Panther Clipper Mk II, Type-11 Prospector

edmc_data.py

@@ -479,7 +479,8 @@ ship_name_map = {
     'belugaliner':                  'Beluga Liner',
     'cobramkiii':                   'Cobra MkIII',
     'cobramkiv':                    'Cobra MkIV',
-    'cobramkv':                     'Cobra MkV',
+    'cobramkv':                     'Cobra Mk V',
+    'corsair':                      'Corsair',
     'clipper':                      'Panther Clipper',
     'cutter':                       'Imperial Cutter',
     'diamondback':                  'Diamondback Scout',
@@ -501,9 +502,11 @@ ship_name_map = {
     'independent_fighter':          'Taipan Fighter',
     'krait_mkii':                   'Krait MkII',
     'krait_light':                  'Krait Phantom',
+    'lakonminer':                   'Type-11 Prospector',
     'mamba':                        'Mamba',
     'mandalay':                     'Mandalay',
     'orca':                         'Orca',
+    'panthermkii':                  'Panther Clipper Mk II',
     'python':                       'Python',
     'python_nx':                    'Python Mk II',
     'scout':                        'Taipan Fighter',

modules.json

@@ -119,6 +119,21 @@
     "cobramkv_armour_reactive": {
         "mass": 27
     },
+    "corsair_armour_grade1": {
+        "mass": 0
+    },
+    "corsair_armour_grade2": {
+        "mass": 32
+    },
+    "corsair_armour_grade3": {
+        "mass": 63
+    },
+    "corsair_armour_mirrored": {
+        "mass": 63
+    },
+    "corsair_armour_reactive": {
+        "mass": 63
+    },
     "cutter_armour_grade1": {
         "mass": 0
     },
@@ -671,6 +686,9 @@
     "hpt_mininglaser_turret_small": {
         "mass": 2
     },
+    "hpt_miningtoolv2_fixed_large": {
+        "mass": 8
+    },
     "hpt_missing_hardpoint": {
         "mass": 0
     },
@@ -2289,6 +2307,12 @@
         "fuelmul": 0.012,
         "fuelpower": 2.9
     },
+    "int_largecargorack_size7_class1": {
+        "mass": 0
+    },
+    "int_largecargorack_size8_class1": {
+        "mass": 0
+    },
     "int_lifesupport_size1_class1": {
         "mass": 1.3
     },
@@ -2503,6 +2527,9 @@
     "int_multidronecontrol_mining_size3_class3": {
         "mass": 10
     },
+    "int_multidronecontrol_miningv2_size5_class5": {
+        "mass": 64
+    },
     "int_multidronecontrol_operations_size3_class3": {
         "mass": 10
     },
@@ -3427,6 +3454,21 @@
     "krait_mkii_armour_reactive": {
         "mass": 67
     },
+    "lakonminer_armour_grade1": {
+        "mass": 0
+    },
+    "lakonminer_armour_grade2": {
+        "mass": 32
+    },
+    "lakonminer_armour_grade3": {
+        "mass": 63
+    },
+    "lakonminer_armour_mirrored": {
+        "mass": 63
+    },
+    "lakonminer_armour_reactive": {
+        "mass": 63
+    },
     "mamba_armour_grade1": {
         "mass": 0
     },
@@ -3472,6 +3514,21 @@
     "orca_armour_reactive": {
         "mass": 87
     },
+    "panthermkii_armour_grade1": {
+        "mass": 0
+    },
+    "panthermkii_armour_grade2": {
+        "mass": 75
+    },
+    "panthermkii_armour_grade3": {
+        "mass": 150
+    },
+    "panthermkii_armour_mirrored": {
+        "mass": 150
+    },
+    "panthermkii_armour_reactive": {
+        "mass": 150
+    },
     "python_armour_grade1": {
         "mass": 0
     },

monitor.py

@@ -722,7 +722,7 @@ class EDLogs(FileSystemEventHandler):
                         cap = module['Item'].split('size')
                         cap = cap[1].split('_')
                         cap = 2 ** int(cap[0])
-                        ship = ship_name_map[entry["Ship"]]
+                        ship = ship_name_map.get(entry["Ship"], entry["Ship"])
                         fuel = {'Main': cap, 'Reserve': ships[ship]['reserveFuelCapacity']}
                         data_dict.update({"FuelCapacity": fuel})
                 data_dict.update({

ships.json

@@ -39,10 +39,14 @@
         "hullMass": 210,
         "reserveFuelCapacity": 0.51
     },
-    "Cobra MkV": {
+    "Cobra Mk V": {
         "hullMass": 150,
         "reserveFuelCapacity": 0.49
     },
+    "Corsair": {
+        "hullMass": 265,
+        "reserveFuelCapacity": 0.41
+    },
     "Diamondback Explorer": {
         "hullMass": 260,
         "reserveFuelCapacity": 0.52
@@ -123,6 +127,10 @@
         "hullMass": 290,
         "reserveFuelCapacity": 0.79
     },
+    "Panther Clipper Mk II": {
+        "hullMass": 1200,
+        "reserveFuelCapacity": 1.11
+    },
     "Python": {
         "hullMass": 350,
         "reserveFuelCapacity": 0.83
@@ -139,6 +147,10 @@
         "hullMass": 1200,
         "reserveFuelCapacity": 0.77
     },
+    "Type-11 Prospector": {
+        "hullMass": 320,
+        "reserveFuelCapacity": 0.6
+    },
     "Type-6 Transporter": {
         "hullMass": 155,
         "reserveFuelCapacity": 0.39