Merge branch 'release/2.2.0'

Advanced Plasma Accelerator with 2.2 data
Cytoscrambler with 2.1 data
Pack-Hound with 2.1 data

.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+    "env": {},
+    "extends": "eslint:recommended",
+    "rules": {
+        "indent": [2, 4],
+        "linebreak-style": [2, "unix"],
+        "quotes": [2, "single"],
+        "semi": [2, "always"]
+    }
+};

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 node_modules/*
 *.log
-
+.idea

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/cmmcleod/coriolis-data.svg?branch=master)](https://travis-ci.org/cmmcleod/coriolis-data)
+[![Build Status](https://travis-ci.org/EDCD/coriolis-data.svg?branch=master)](https://travis-ci.org/EDCD/coriolis-data)
 # Coriolis Data Files
 
 JSON Data modelling Elite Dangerous ships and components.

modules/hardpoints/beam_laser.json

@@ -1,17 +1,270 @@
 {
   "bl": [
-    { "id": "0u", "edID": 128049430, "eddbID": 843, "grp": "bl", "class": 3, "rating": "C", "cost": 1177600, "mass": 8, "power": 1.8, "mount": "F", "type": "T", "damage": 6, "armourpen": "A", "rof": null, "dps": 5, "mjdps" : 30.33, "mjeps" : 5.65, "thermload": 5 },
-    { "id": "0v", "edID": 128049434, "eddbID": 846, "grp": "bl", "class": 3, "rating": "C", "cost": 2396160, "mass": 8, "power": 1.78, "mount": "G", "type": "T", "damage": 6, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 24.00, "mjeps" : 5.59, "thermload": 6 },
-    { "id": "0o", "edID": 128049437, "eddbID": 849, "grp": "bl", "class": 3, "rating": "D", "cost": 19399600, "mass": 8, "power": 1.68, "mount": "T", "type": "T", "damage": 5, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 14.44, "mjeps" : 3.54, "thermload": 4 },
-
-    { "id": "0r", "edID": 128049429, "eddbID": 842, "grp": "bl", "class": 2, "rating": "D", "cost": 299520, "mass": 4, "power": 1.12, "mount": "F", "type": "T", "damage": 5, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 19.38, "mjeps" : 3.42, "thermload": 4 },
-    { "id": "0s", "edID": 128049433, "eddbID": 845, "grp": "bl", "class": 2, "rating": "D", "cost": 500600, "mass": 4, "power": 1.1, "mount": "G", "type": "T", "damage": 5, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 13.85, "mjeps" : 3.26, "thermload": 4 },
-    { "id": "0t", "edID": 128049436, "eddbID": 848, "grp": "bl", "class": 2, "rating": "E", "cost": 2099900, "mass": 4, "power": 1.03, "mount": "T", "type": "T", "damage": 4, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 8.95, "mjeps" : 2.10, "thermload": 3 },
-
-    { "id": "10", "edID": 128049428, "eddbID": 841, "grp": "bl", "class": 1, "rating": "E", "cost": 37430, "mass": 2, "power": 0.69, "mount": "F", "type": "T", "damage": 4, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 11.61, "mjeps" : 2.16, "thermload": 3 },
-    { "id": "0p", "edID": 128049432, "eddbID": 844, "grp": "bl", "class": 1, "rating": "E", "cost": 74650, "mass": 2, "power": 0.67, "mount": "G", "type": "T", "damage": 4, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 8.70, "mjeps" : 2.05, "thermload": 3 },
-    { "id": "0q", "edID": 128049435, "eddbID": 847, "grp": "bl", "class": 1, "rating": "F", "cost": 500000, "mass": 2, "power": 0.63, "mount": "T", "type": "T", "damage": 3, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 5.49, "mjeps" : 1.29, "thermload": 2 },
-
-    { "id": "b0", "eddbID": 1476, "grp": "bl", "name": "Retributor", "class": 1, "rating": "E", "cost": 56150, "mass": 2, "power": 0.69, "mount": "F", "type": "T", "damage": 0, "armourpen": "A", "rof": null, "dps": 3, "thermload": 1 }
+    {
+      "armourpen": 60,
+      "breachdps": 33.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 2396160,
+      "dps": 41.4,
+      "edID": 128049431,
+      "eddbID": 1540,
+      "eps": 9.1,
+      "grp": "bl",
+      "hps": 9.9,
+      "id": "0w",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "power": 2.9,
+      "range": 3000,
+      "rating": "A",
+      "type": "T"
+    },
+    {
+      "armourpen": 60,
+      "breachdps": 26.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 8746160,
+      "dps": 32.7,
+      "edID": 128681994,
+      "eddbID": 1544,
+      "eps": 8.99,
+      "grp": "bl",
+      "hps": 10.6,
+      "id": "0x",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "power": 2.86,
+      "range": 3000,
+      "rating": "A",
+      "type": "T"
+    },
+    {
+      "armourpen": 50,
+      "breachdps": 20.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 1177600,
+      "dps": 25.8,
+      "edID": 128049430,
+      "eddbID": 843,
+      "eps": 5.67,
+      "grp": "bl",
+      "hps": 7.2,
+      "id": "0u",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "power": 1.8,
+      "range": 3000,
+      "rating": "C",
+      "type": "T"
+    },
+    {
+      "armourpen": 50,
+      "breachdps": 16.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 2396160,
+      "dps": 20.3,
+      "edID": 128049434,
+      "eddbID": 846,
+      "eps": 5.58,
+      "grp": "bl",
+      "hps": 7.6,
+      "id": "0v",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "power": 1.78,
+      "range": 3000,
+      "rating": "C",
+      "type": "T"
+    },
+    {
+      "armourpen": 50,
+      "breachdps": 11.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 19399600,
+      "dps": 14.4,
+      "edID": 128049437,
+      "eddbID": 849,
+      "eps": 3.51,
+      "grp": "bl",
+      "hps": 5.1,
+      "id": "0o",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "power": 1.68,
+      "range": 3000,
+      "rating": "D",
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 12.8,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 299520,
+      "dps": 16,
+      "edID": 128049429,
+      "eddbID": 842,
+      "eps": 3.51,
+      "grp": "bl",
+      "hps": 5.1,
+      "id": "0r",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "power": 1.12,
+      "range": 3000,
+      "rating": "D",
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 10,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 500600,
+      "dps": 12.5,
+      "edID": 128049433,
+      "eddbID": 845,
+      "eps": 3.44,
+      "grp": "bl",
+      "hps": 5.3,
+      "id": "0s",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "power": 1.1,
+      "range": 3000,
+      "rating": "D",
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 7.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 2099900,
+      "dps": 8.8,
+      "edID": 128049436,
+      "eddbID": 848,
+      "eps": 2.16,
+      "grp": "bl",
+      "hps": 3.5,
+      "id": "0t",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "power": 1.03,
+      "range": 3000,
+      "rating": "E",
+      "type": "T"
+    },
+    {
+      "armourpen": 18,
+      "breachdps": 7.9,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "cost": 37430,
+      "dps": 9.8,
+      "edID": 128049428,
+      "eddbID": 841,
+      "eps": 2.16,
+      "grp": "bl",
+      "hps": 3.5,
+      "id": "10",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.69,
+      "range": 3000,
+      "rating": "E",
+      "type": "T"
+    },
+    {
+      "armourpen": 18,
+      "breachdps": 6.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "cost": 74650,
+      "dps": 7.7,
+      "edID": 128049432,
+      "eddbID": 844,
+      "eps": 2.11,
+      "grp": "bl",
+      "hps": 3.7,
+      "id": "0p",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "G",
+      "power": 0.67,
+      "range": 3000,
+      "rating": "E",
+      "type": "T"
+    },
+    {
+      "armourpen": 18,
+      "breachdps": 4.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "cost": 500000,
+      "dps": 5.4,
+      "edID": 128049435,
+      "eddbID": 847,
+      "eps": 1.32,
+      "grp": "bl",
+      "hps": 2.4,
+      "id": "0q",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "power": 0.63,
+      "range": 3000,
+      "rating": "F",
+      "type": "T"
+    },
+    {
+      "armourpen": 18,
+      "breachdps": 3.9,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "cost": 56150,
+      "dps": 4.9,
+      "edID": 128671346,
+      "eddbID": 1476,
+      "eps": 2.8,
+      "grp": "bl",
+      "hps": 2.7,
+      "id": "b0",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "name": "Retributor",
+      "power": 0.69,
+      "pp": "Edmund Mahon",
+      "range": 3000,
+      "rating": "E",
+      "type": "T"
+    }
   ]
-}
+}

modules/hardpoints/burst_laser.json

@@ -1,17 +1,306 @@
 {
   "ul": [
-    { "id": "14", "edID": 128049402, "eddbID": 834, "grp": "ul", "class": 3, "rating": "D", "cost": 140400, "mass": 8, "power": 1.66, "mount": "F", "type": "T", "damage": 4, "armourpen": "B", "rof": 1, "dps": 4, "mjdps" : 24.97, "mjeps" : 3.52, "ssdam" : 27.85, "thermload": 1 },
-    { "id": "15", "edID": 128049406, "eddbID": 837, "grp": "ul", "class": 3, "rating": "E", "cost": 281600, "mass": 8, "power": 1.65, "mount": "G", "type": "T", "damage": 3, "armourpen": "A", "rof": 1.2, "dps": 4, "mjdps" : 18.56, "mjeps" : 3.27, "ssdam" : 18.56, "thermload": 1 },
-    { "id": "16", "edID": 128049409, "eddbID": 840, "grp": "ul", "class": 3, "rating": "E", "cost": 800400, "mass": 8, "power": 1.57, "mount": "T", "type": "T", "damage": 3, "armourpen": "A", "rof": 0.9, "dps": 4, "mjdps" : 8.78, "mjeps" : 1.69, "ssdam" : 9.45, "thermload": 1 },
-
-    { "id": "7h", "edID": 128049401, "eddbID": 833, "grp": "ul", "class": 2, "rating":"E", "cost": 23000, "mass": 4, "power":1.05, "mount":"F", "type":"T", "damage": 3, "armourpen":"A", "rof":1.3, "dps": 4, "thermload": 1 },
-    { "id": "7i", "edID": 128049405, "eddbID": 836, "grp": "ul", "class": 2, "rating":"F", "cost": 48500, "mass": 4, "power":1.04, "mount":"G", "type":"T", "damage": 3, "armourpen":"A", "rof":1.5, "dps": 4, "thermload": 1 },
-    { "id": "7j", "edID": 128049408, "eddbID": 839, "grp": "ul", "class": 2, "rating":"F", "cost": 162800, "mass": 4, "power":0.98, "mount":"T", "type":"T", "damage": 2, "armourpen":"A", "rof":1.1, "dps": 3, "thermload": 1 },
-
-    { "id": "11", "edID": 128049400, "eddbID": 832, "grp": "ul", "class": 1, "rating": "F", "cost": 4400, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "mjdps" : 9.94, "mjeps" : 1.40, "ssdam" : 6.45, "thermload": 1 },
-    { "id": "12", "edID": 128049404, "eddbID": 835, "grp": "ul", "class": 1, "rating": "G", "cost": 8600, "mass": 2, "power": 0.64, "mount": "G", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.7, "dps": 3, "mjdps" : 7.95, "mjeps" : 1.40, "ssdam" : 4.53, "thermload": 1 },
-    { "id": "13", "edID": 128049407, "eddbID": 838, "grp": "ul", "class": 1, "rating": "G", "cost": 52800, "mass": 2, "power": 0.6, "mount": "T", "type": "T", "damage": 1, "armourpen": "B", "rof": 1.3, "dps": 2, "mjdps" : 2.98, "mjeps" : 0.63, "ssdam" : 2.24, "thermload": 1 },
-
-    { "id": "cy", "edID": 128671449, "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", "class": 1, "rating": "F", "cost": 8800, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "thermload": 1 }
+    {
+      "armourpen": 65,
+      "breachdps": 28,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 3,
+      "class": 4,
+      "cost": 281600,
+      "dps": 32.3,
+      "edID": 128049403,
+      "eddbID": 1549,
+      "eps": 5.936,
+      "grp": "ul",
+      "hps": 7.2,
+      "id": "7s",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "power": 2.58,
+      "range": 3000,
+      "rating": "E",
+      "rof": 1.6,
+      "type": "T"
+    },
+    {
+      "armourpen": 65,
+      "breachdps": 21.63,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 5,
+      "class": 4,
+      "cost": 1245600,
+      "dps": 25.9,
+      "edID": 128727920,
+      "eddbID": 1550,
+      "eps": 5.712,
+      "grp": "ul",
+      "hps": 6.93,
+      "id": "7t",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "power": 2.59,
+      "range": 3000,
+      "rating": "E",
+      "rof": 2.1,
+      "type": "T"
+    },
+    {
+      "armourpen": 52,
+      "breachdps": 10.53,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 7,
+      "class": 3,
+      "cost": 140400,
+      "dps": 20.8,
+      "edID": 128049402,
+      "eddbID": 834,
+      "eps": 3.753,
+      "grp": "ul",
+      "hps": 4.59,
+      "id": "14",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "power": 1.66,
+      "range": 3000,
+      "rating": "D",
+      "rof": 2.7,
+      "type": "T"
+    },
+    {
+      "armourpen": 52,
+      "breachdps": 14.08,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 9,
+      "class": 3,
+      "cost": 281600,
+      "dps": 16.6,
+      "edID": 128049406,
+      "eddbID": 837,
+      "eps": 3.712,
+      "grp": "ul",
+      "hps": 4.48,
+      "id": "15",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "power": 1.65,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.2,
+      "type": "T"
+    },
+    {
+      "armourpen": 52,
+      "breachdps": 5.58,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 11,
+      "class": 3,
+      "cost": 800400,
+      "dps": 11,
+      "edID": 128049409,
+      "eddbID": 840,
+      "eps": 1.913,
+      "grp": "ul",
+      "hps": 2.48,
+      "id": "16",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "power": 1.57,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.1,
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 11.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 11,
+      "class": 2,
+      "cost": 23000,
+      "dps": 13,
+      "edID": 128049401,
+      "eddbID": 833,
+      "eps": 2.331,
+      "grp": "ul",
+      "hps": 2.96,
+      "id": "7h",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "F",
+      "power": 1.05,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.7,
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 8.82,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 13,
+      "class": 2,
+      "cost": 48500,
+      "dps": 10.3,
+      "edID": 128049405,
+      "eddbID": 836,
+      "eps": 2.31,
+      "grp": "ul",
+      "hps": 2.94,
+      "id": "7i",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "G",
+      "power": 1.04,
+      "range": 3000,
+      "rating": "F",
+      "rof": 4.2,
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 3.51,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 15,
+      "class": 2,
+      "cost": 162800,
+      "dps": 6.8,
+      "edID": 128049408,
+      "eddbID": 839,
+      "eps": 1.209,
+      "grp": "ul",
+      "hps": 1.56,
+      "id": "7j",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "T",
+      "power": 0.98,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.9,
+      "type": "T"
+    },
+    {
+      "armourpen": 20,
+      "breachdps": 7.05,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 15,
+      "class": 1,
+      "cost": 4400,
+      "dps": 8.1,
+      "edID": 128049400,
+      "eddbID": 832,
+      "eps": 1.457,
+      "grp": "ul",
+      "hps": 1.88,
+      "id": "11",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.65,
+      "range": 3000,
+      "rating": "F",
+      "rof": 4.7,
+      "type": "T"
+    },
+    {
+      "armourpen": 20,
+      "breachdps": 5.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 17,
+      "class": 1,
+      "cost": 8600,
+      "dps": 6.4,
+      "edID": 128049404,
+      "eddbID": 835,
+      "eps": 1.4,
+      "grp": "ul",
+      "hps": 1.6,
+      "id": "12",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "G",
+      "power": 0.64,
+      "range": 3000,
+      "rating": "G",
+      "rof": 5.3,
+      "type": "T"
+    },
+    {
+      "armourpen": 20,
+      "breachdps": 1.92,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 19,
+      "class": 1,
+      "cost": 52800,
+      "dps": 4.2,
+      "edID": 128049407,
+      "eddbID": 838,
+      "eps": 0.768,
+      "grp": "ul",
+      "hps": 0.96,
+      "id": "13",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "power": 0.6,
+      "range": 3000,
+      "rating": "G",
+      "rof": 4.8,
+      "type": "T"
+    },
+    {
+      "armourpen": 1,
+      "breachdps": 15.25,
+      "breachmax": 0,
+      "breachmin": 0,
+      "burst": 8,
+      "burstrof": 20,
+      "class": 1,
+      "cost": 8800,
+      "dps": 18.3,
+      "edID": 128671449,
+      "eddbID": 1477,
+      "eps": 3.05,
+      "grp": "ul",
+      "hps": 2.29,
+      "id": "cy",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "name": "Cytoscrambler",
+      "power": 0.8,
+      "pp": "Archon Delaine",
+      "range": 600,
+      "rating": "F",
+      "rof": 7.6,
+      "type": "T"
+    }
   ]
-}
+}

modules/hardpoints/cannon.json

@@ -1,18 +1,301 @@
 {
   "c": [
-    { "id": "1q", "edID": 128049441, "eddbID": 853, "grp": "c", "class": 4, "rating": "B", "cost": 2700800, "mass": 16, "power": 0.92, "mount": "F", "type": "K", "damage": 9, "armourpen": "A", "rof": 0.4, "dps": 5, "thermload": 2, "clip": 5, "mjdps": 8.13, "ssdam" : 37.13, "ammo": 100, "ammocost": 20 },
-    { "id": "1r", "edID": 128049444, "eddbID": 856, "grp": "c", "class": 4, "rating": "B", "cost": 5401600, "mass": 16, "power": 1.03, "mount": "G", "type": "K", "damage": 8, "armourpen": "A", "rof": 0.4, "dps": 4, "thermload": 2, "clip": 5, "mjdps": 10.97, "ssdam" : 30.94, "ammo": 100, "ammocost": 20 },
-
-    { "id": "1n", "edID": 128049440, "eddbID": 852, "grp": "c", "class": 3, "rating": "C", "cost": 675200, "mass": 8, "power": 0.67, "mount": "F", "type": "K", "damage": 7, "armourpen": "A", "rof": 0.4, "dps": 4, "thermload": 2, "clip": 5, "mjdps": 8.13, "ssdam" : 22.28, "ammo": 100, "ammocost": 20 },
-    { "id": "1o", "edID": 128671120, "eddbID": 1383, "grp": "c", "class": 3, "rating": "C", "cost": 1350400, "mass": 8, "power": 0.75, "mount": "G", "type": "K", "damage": 7, "armourpen": "A", "rof": 0.4, "dps": 4, "thermload": 1, "clip": 5, "mjdps" : 7.95, "ssdam" : 21.04, "ammo": 100, "ammocost": 20 },
-    { "id": "1p", "edID": 128049447, "eddbID": 859, "grp": "c", "class": 3, "rating": "D", "cost": 16204800, "mass": 8, "power": 0.64, "mount": "T", "type": "K", "damage": 6, "armourpen": "A", "rof": 0.3, "dps": 4, "thermload": 1, "clip": 5, "mjdps" : 3.58, "ssdam" : 12.38, "ammo": 100, "ammocost": 20 },
-
-    { "id": "1k", "edID": 128049439, "eddbID": 851, "grp": "c", "class": 2, "rating": "D", "cost": 168430, "mass": 4, "power": 0.49, "mount": "F", "type": "K", "damage": 6, "armourpen": "A", "rof": 0.5, "dps": 4, "thermload": 1, "clip": 5, "mjdps" : 6.00, "ssdam" : 15.47, "ammo": 100, "ammocost": 20 },
-    { "id": "1l", "edID": 128049443, "eddbID": 855, "grp": "c", "class": 2, "rating": "D", "cost": 337600, "mass": 4, "power": 0.54, "mount": "G", "type": "K", "damage": 6, "armourpen": "A", "rof": 0.5, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 6.24, "ssdam" : 15.47, "ammo": 100, "ammocost": 20 },
-    { "id": "1m", "edID": 128049446, "eddbID": 858, "grp": "c", "class": 2, "rating": "E", "cost": 4051200, "mass": 4, "power": 0.45, "mount": "T", "type": "K", "damage": 5, "armourpen": "A", "rof": 0.3, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 2.41, "ssdam" : 7.74, "ammo": 100, "ammocost": 20 },
-
-    { "id": "1h", "edID": 128049438, "eddbID": 850, "grp": "c", "class": 1, "rating": "D", "cost": 21100, "mass": 2, "power": 0.34, "mount": "F", "type": "K", "damage": 5, "armourpen": "A", "rof": 0.5, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 4.00, "ssdam" : 9.59, "ammo": 100, "ammocost": 20 },
-    { "id": "1i", "edID": 128049442, "eddbID": 854, "grp": "c", "class": 1, "rating": "E", "cost": 42200, "mass": 2, "power": 0.38, "mount": "G", "type": "K", "damage": 5, "armourpen": "A", "rof": 0.5, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 3.80, "ssdam" : 8.97, "ammo": 100, "ammocost": 20 },
-    { "id": "1j", "edID": 128049445, "eddbID": 857, "grp": "c", "class": 1, "rating": "F", "cost": 506400, "mass": 2, "power": 0.32, "mount": "T", "type": "K", "damage": 4, "armourpen": "A", "rof": 0.4, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 1.35, "ssdam" : 4.13, "ammo": 100, "ammocost": 20 }
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 25.28,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 4,
+      "clip": 5,
+      "cost": 2700800,
+      "dps": 25.3,
+      "edID": 128049441,
+      "eddbID": 853,
+      "eps": 0.644,
+      "grp": "c",
+      "hps": 1.92,
+      "id": "1q",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "power": 0.92,
+      "range": 4500,
+      "rating": "B",
+      "reload": 5,
+      "rof": 0.4,
+      "speed": 900,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 16.92,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 4,
+      "clip": 5,
+      "cost": 5401600,
+      "dps": 19.7,
+      "edID": 128049444,
+      "eddbID": 856,
+      "eps": 0.688,
+      "grp": "c",
+      "hps": 1.76,
+      "id": "1r",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "power": 1.03,
+      "range": 4500,
+      "rating": "B",
+      "reload": 4,
+      "rof": 0.4,
+      "speed": 750,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 16.92,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 3,
+      "clip": 5,
+      "cost": 675200,
+      "dps": 18.7,
+      "edID": 128049440,
+      "eddbID": 852,
+      "eps": 0.428,
+      "grp": "c",
+      "hps": 1.28,
+      "id": "1n",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "power": 0.67,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 0.4,
+      "speed": 959,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 30.9,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 3,
+      "clip": 5,
+      "cost": 1350400,
+      "dps": 14.3,
+      "edID": 128671120,
+      "eddbID": 1383,
+      "eps": 0.456,
+      "grp": "c",
+      "hps": 1.16,
+      "id": "1o",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "power": 0.75,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 0.4,
+      "speed": 800,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 10.04,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 3,
+      "clip": 5,
+      "cost": 16204800,
+      "dps": 9.7,
+      "edID": 128049447,
+      "eddbID": 859,
+      "eps": 0.212,
+      "grp": "c",
+      "hps": 0.64,
+      "id": "1p",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "power": 0.64,
+      "range": 4000,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.4,
+      "speed": 800,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 14,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 168430,
+      "dps": 13.6,
+      "edID": 128049439,
+      "eddbID": 851,
+      "eps": 0.35,
+      "grp": "c",
+      "hps": 1.05,
+      "id": "1k",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "power": 0.49,
+      "range": 3500,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.5,
+      "speed": 1051,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 101.5,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 337600,
+      "dps": 10.3,
+      "edID": 128049443,
+      "eddbID": 855,
+      "eps": 0.375,
+      "grp": "c",
+      "hps": 0.95,
+      "id": "1l",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "power": 0.54,
+      "range": 3500,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.5,
+      "speed": 875,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 6.52,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 4051200,
+      "dps": 6.9,
+      "edID": 128049446,
+      "eddbID": 858,
+      "eps": 0.136,
+      "grp": "c",
+      "hps": 0.4,
+      "id": "1m",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "power": 0.45,
+      "range": 3500,
+      "rating": "E",
+      "reload": 4,
+      "rof": 0.4,
+      "speed": 875,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 8.55,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 1,
+      "clip": 5,
+      "cost": 21100,
+      "dps": 9,
+      "edID": 128049438,
+      "eddbID": 850,
+      "eps": 0.23,
+      "grp": "c",
+      "hps": 0.7,
+      "id": "1h",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.34,
+      "range": 3000,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.5,
+      "speed": 1200,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 35,
+      "breachdps": 6.6,
+      "breachmax": 0.9,
+      "breachmin": 0.6,
+      "class": 1,
+      "clip": 5,
+      "cost": 42200,
+      "dps": 7.2,
+      "edID": 128049442,
+      "eddbID": 854,
+      "eps": 0.24,
+      "grp": "c",
+      "hps": 0.65,
+      "id": "1i",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "G",
+      "power": 0.38,
+      "range": 3000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 0.5,
+      "speed": 1000,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 90,
+      "breachdps": 4.24,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 1,
+      "clip": 5,
+      "cost": 506400,
+      "dps": 4.8,
+      "edID": 128049445,
+      "eddbID": 857,
+      "eps": 0.088,
+      "grp": "c",
+      "hps": 0.28,
+      "id": "1j",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "power": 0.32,
+      "range": 3000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 0.4,
+      "speed": 1000,
+      "type": "K"
+    }
   ]
 }

modules/hardpoints/cargo_scanner.json

@@ -1,9 +1,79 @@
 {
   "cs": [
-    { "id": "0d", "edID": 128662520, "eddbID": 1227, "grp": "cs", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2, "time": 10 },
-    { "id": "0c", "edID": 128662521, "eddbID": 1228, "grp": "cs", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2.5, "time": 10 },
-    { "id": "0b", "edID": 128662522, "eddbID": 1229, "grp": "cs", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3, "time": 10 },
-    { "id": "0a", "edID": 128662523, "eddbID": 1230, "grp": "cs", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3.5, "time": 10 },
-    { "id": "09", "edID": 128662524, "eddbID": 1231, "grp": "cs", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4, "time": 10 }
+    {
+      "angle": 15,
+      "class": 0,
+      "cost": 13540,
+      "edID": 128662520,
+      "eddbID": 1227,
+      "grp": "cs",
+      "id": "0d",
+      "integrity": 32,
+      "mass": 1.3,
+      "power": 0.2,
+      "range": 2000,
+      "rating": "E",
+      "time": 10
+    },
+    {
+      "angle": 15,
+      "class": 0,
+      "cost": 40630,
+      "edID": 128662521,
+      "eddbID": 1228,
+      "grp": "cs",
+      "id": "0c",
+      "integrity": 24,
+      "mass": 1.3,
+      "power": 0.4,
+      "range": 2500,
+      "rating": "D",
+      "time": 10
+    },
+    {
+      "angle": 15,
+      "class": 0,
+      "cost": 121900,
+      "edID": 128662522,
+      "eddbID": 1229,
+      "grp": "cs",
+      "id": "0b",
+      "integrity": 40,
+      "mass": 1.3,
+      "power": 0.8,
+      "range": 3000,
+      "rating": "C",
+      "time": 10
+    },
+    {
+      "angle": 15,
+      "class": 0,
+      "cost": 365700,
+      "edID": 128662523,
+      "eddbID": 1230,
+      "grp": "cs",
+      "id": "0a",
+      "integrity": 56,
+      "mass": 1.3,
+      "power": 1.6,
+      "range": 3500,
+      "rating": "B",
+      "time": 10
+    },
+    {
+      "angle": 15,
+      "class": 0,
+      "cost": 1097100,
+      "edID": 128662524,
+      "eddbID": 1231,
+      "grp": "cs",
+      "id": "09",
+      "integrity": 48,
+      "mass": 1.3,
+      "power": 3.2,
+      "range": 4000,
+      "rating": "A",
+      "time": 10
+    }
   ]
-}
+}

modules/hardpoints/countermeasures.json

@@ -1,8 +1,84 @@
 {
   "cm": [
-    { "id": "00", "edID": 128049513, "eddbID": 884, "grp": "cm", "name": "Chaff Launcher", "class": 0, "rating": "I", "cost": 8500, "mass": 1.3, "power": 0.2, "passive": 1, "armourpen": "F", "thermload": 2, "clip": 1, "ammo": 10, "ammocost": 30 },
-    { "id": "01", "edID": 128049516, "eddbID": 885, "grp": "cm", "name": "Electronic Countermeasure", "class": 0, "rating": "F", "cost": 12500, "mass": 1.3, "power": 0.2, "range": 3, "chargeup": 4, "activepower": 4, "cooldown": 10 },
-    { "id": "02", "edID": 128049519, "eddbID": 886, "grp": "cm", "name": "Heat Sink Launcher", "class": 0, "rating": "I", "cost": 3500, "mass": 1.3, "power": 0.2, "passive": 1, "armourpen": "F", "thermload": 0, "clip": 1, "ammo": 3, "ammocost": 25 },
-    { "id": "03", "edID": 128049522, "eddbID": 887, "grp": "cm", "name": "Point Defence", "class": 0, "rating": "I", "cost": 18550, "mass": 0.5, "power": 0.2, "passive": 1, "armourpen": "F", "thermload": 1, "clip": 50, "ammo": 10000, "ammocost": 1 }
+    {
+      "ammo": 10,
+      "class": 0,
+      "clip": 1,
+      "cost": 8500,
+      "duration": 20,
+      "edID": 128049513,
+      "eddbID": 884,
+      "eps": 4,
+      "grp": "cm",
+      "hps": 4,
+      "id": "00",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Chaff Launcher",
+      "passive": 1,
+      "power": 0.2,
+      "rating": "I",
+      "reload": 10
+    },
+    {
+      "activepower": 4,
+      "chargeup": 4,
+      "class": 0,
+      "cooldown": 10,
+      "cost": 12500,
+      "edID": 128049516,
+      "eddbID": 885,
+      "grp": "cm",
+      "id": "01",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Electronic Countermeasure",
+      "power": 0.2,
+      "range": 3000,
+      "rating": "F"
+    },
+    {
+      "ammo": 2,
+      "class": 0,
+      "clip": 1,
+      "cost": 3500,
+      "duration": 10,
+      "edID": 128049519,
+      "eddbID": 886,
+      "eps": 0.4,
+      "grp": "cm",
+      "id": "02",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Heat Sink Launcher",
+      "passive": 1,
+      "power": 0.2,
+      "rating": "I",
+      "reload": 10,
+      "rof": 0.2
+    },
+    {
+      "ammo": 10000,
+      "burst": 4,
+      "burstrof": 15,
+      "class": 0,
+      "clip": 50,
+      "cost": 18550,
+      "edID": 128049522,
+      "eddbID": 887,
+      "grp": "cm",
+      "id": "03",
+      "integrity": 20,
+      "jitter": 1.5,
+      "mass": 0.5,
+      "name": "Point Defence",
+      "passive": 1,
+      "power": 0.2,
+      "rating": "I",
+      "reload": 0,
+      "rof": 10,
+      "speed": 1000,
+      "type": "K"
+    }
   ]
 }

modules/hardpoints/fragment_cannon.json

@@ -1,17 +1,287 @@
 {
   "fc": [
-    { "id": "1t", "edID": 128049450, "eddbID": 862, "grp": "fc", "class": 3, "rating": "C", "cost": 1167360, "mass": 8, "power": 1.02, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.5, "dps": 10, "thermload": 1, "clip": 3, "mjdps": 15.19, "ssdam" : 28.36, "ammo": 90, "ammocost": 50 },
-    { "id": "1u", "edID": 128671321, "eddbID": 1454, "grp": "fc", "class": 3, "rating": "C", "cost": 1751040, "mass": 8, "power": 1.55, "mount": "G", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.8, "dps": 10, "thermload": 1, "clip": 3, "mjdps" : 12.77, "ssdam" : 23.21, "ammo": 90, "ammocost": 50 },
-    { "id": "1v", "edID": 128671322, "eddbID": 1455, "grp": "fc", "class": 3, "rating": "C", "cost": 5836800, "mass": 8, "power": 1.29, "mount": "T", "type": "K", "damage": 2, "armourpen": "A", "rof": 3.3, "dps": 9, "thermload": 1, "clip": 3, "mjdps" : 6.85, "ssdam" : 12.89, "ammo": 90, "ammocost": 50 },
-
-    { "id": "1s", "edID": 128049449, "eddbID": 861, "grp": "fc", "class": 2, "rating": "A", "cost": 291840, "mass": 4, "power": 0.74, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 5, "dps": 9, "thermload": 1, "clip": 3, "mjdps" : 9.50, "ssdam" : 18.05, "ammo": 90, "ammocost": 50 },
-    { "id": "7e", "edID": 128049452, "eddbID": 864, "grp": "fc", "class": 2, "rating": "D", "cost": 437800, "mass": 4, "power": 1.03, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.3, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90, "ammocost": 50 },
-    { "id": "7f", "edID": 128049454, "eddbID": 866, "grp": "fc", "class": 2, "rating": "D", "cost": 1459200, "mass": 4, "power": 0.79, "mount": "T", "type": "K", "damage": 2, "armourpen": "A", "rof": 3.7, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90, "ammocost": 50 },
-
-    { "id": "20", "edID": 128049448, "eddbID": 860, "grp": "fc", "class": 1, "rating": "E", "cost": 36000, "mass": 2, "power": 0.45, "mount": "F", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.5, "dps": 8, "thermload": 1, "clip": 3, "mjdps" : 5.53, "ssdam" : 10.31, "ammo": 90, "ammocost": 50 },
-    { "id": "21", "edID": 128049451, "eddbID": 863, "grp": "fc", "class": 1, "rating": "E", "cost": 54720, "mass": 2, "power": 0.59, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.8, "dps": 7, "thermload": 1, "clip": 3, "mjdps" : 3.58, "ssdam" : 6.45, "ammo": 90, "ammocost": 50 },
-    { "id": "22", "edID": 128049453, "eddbID": 865, "grp": "fc", "class": 1, "rating": "E", "cost": 182400, "mass": 2, "power": 0.42, "mount": "T", "type": "K", "damage": 1, "armourpen": "A", "rof": 4, "dps": 6, "thermload": 1, "clip": 3, "mjdps" : 2.11, "ssdam" : 3.87, "ammo": 90, "ammocost": 50 },
-
-    { "id": "pa", "edID": 128671343, "eddbID": 1478, "grp": "fc", "name": "Pacifier", "class": 3, "rating": "C", "cost": 1400830, "mass": 8, "power": 1.02, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.5, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90 }
+    {
+      "ammo": 90,
+      "armourpen": 52,
+      "breachdps": 189,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 3,
+      "cost": 1167360,
+      "dps": 113.8,
+      "edID": 128049450,
+      "eddbID": 862,
+      "eps": 30.78,
+      "grp": "fc",
+      "hps": 59.4,
+      "id": "1t",
+      "integrity": 80,
+      "jitter": 0.5,
+      "mass": 8,
+      "mount": "F",
+      "power": 1.02,
+      "range": 2000,
+      "rating": "C",
+      "reload": 5,
+      "rof": 4.5,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 52,
+      "breachdps": 167.04,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 3,
+      "cost": 1751040,
+      "dps": 184.6,
+      "edID": 128671321,
+      "eddbID": 1454,
+      "eps": 46.66,
+      "grp": "fc",
+      "hps": 80.64,
+      "id": "1u",
+      "integrity": 80,
+      "jitter": 0.5,
+      "mass": 8,
+      "mount": "G",
+      "power": 1.55,
+      "range": 2000,
+      "rating": "C",
+      "reload": 5,
+      "rof": 4.8,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 52,
+      "breachdps": 110.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 3,
+      "cost": 5836800,
+      "dps": 122.9,
+      "edID": 128671322,
+      "eddbID": 1455,
+      "eps": 17.76,
+      "grp": "fc",
+      "hps": 33.6,
+      "id": "1v",
+      "integrity": 80,
+      "jitter": 0.5,
+      "mass": 8,
+      "mount": "T",
+      "power": 1.29,
+      "range": 2000,
+      "rating": "C",
+      "reload": 5,
+      "rof": 4,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 35,
+      "breachdps": 138,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 3,
+      "cost": 291840,
+      "dps": 122.9,
+      "edID": 128049449,
+      "eddbID": 861,
+      "eps": 22.2,
+      "grp": "fc",
+      "hps": 42,
+      "id": "1s",
+      "integrity": 80,
+      "jitter": 0.5,
+      "mass": 4,
+      "mount": "F",
+      "power": 0.74,
+      "range": 2000,
+      "rating": "A",
+      "reload": 5,
+      "rof": 5,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 35,
+      "breachdps": 114.48,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 3,
+      "cost": 437800,
+      "dps": 153.6,
+      "edID": 128049452,
+      "eddbID": 864,
+      "eps": 31.6,
+      "grp": "fc",
+      "hps": 50.88,
+      "id": "7e",
+      "integrity": 80,
+      "jitter": 0.5,
+      "mass": 4,
+      "mount": "G",
+      "power": 1.03,
+      "range": 2000,
+      "rating": "D",
+      "reload": 5,
+      "rof": 5.3,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 35,
+      "breachdps": 67.08,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 3,
+      "cost": 1459200,
+      "dps": 123.2,
+      "edID": 128049454,
+      "eddbID": 866,
+      "eps": 10.84,
+      "grp": "fc",
+      "hps": 20.64,
+      "id": "7f",
+      "integrity": 80,
+      "jitter": 0.5,
+      "mass": 4,
+      "mount": "T",
+      "power": 0.79,
+      "range": 2000,
+      "rating": "D",
+      "reload": 5,
+      "rof": 3.7,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 20,
+      "breachdps": 87.36,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 3,
+      "cost": 36000,
+      "dps": 95.3,
+      "edID": 128049448,
+      "eddbID": 860,
+      "eps": 14.112,
+      "grp": "fc",
+      "hps": 26.88,
+      "id": "20",
+      "integrity": 40,
+      "jitter": 0.5,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.45,
+      "range": 2000,
+      "rating": "E",
+      "reload": 5,
+      "rof": 5.6,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 20,
+      "breachdps": 63.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 3,
+      "cost": 54720,
+      "dps": 71.3,
+      "edID": 128049451,
+      "eddbID": 863,
+      "eps": 18.408,
+      "grp": "fc",
+      "hps": 28.32,
+      "id": "21",
+      "integrity": 40,
+      "jitter": 0.5,
+      "mass": 2,
+      "mount": "G",
+      "power": 0.59,
+      "range": 2000,
+      "rating": "E",
+      "reload": 5,
+      "rof": 5.9,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": 20,
+      "breachdps": 34.56,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 3,
+      "cost": 182400,
+      "dps": 39.4,
+      "edID": 128049453,
+      "eddbID": 865,
+      "eps": 6.72,
+      "grp": "fc",
+      "hps": 13.44,
+      "id": "22",
+      "integrity": 40,
+      "jitter": 0.5,
+      "mass": 2,
+      "mount": "T",
+      "power": 0.42,
+      "range": 2000,
+      "rating": "E",
+      "reload": 5,
+      "rof": 4.8,
+      "roundspershot": 12,
+      "speed": 667,
+      "type": "K"
+    },
+    {
+      "ammo": 90,
+      "armourpen": "A",
+      "class": 3,
+      "clip": 3,
+      "cost": 1400830,
+      "damage": 3,
+      "dps": 9,
+      "edID": 128671343,
+      "eddbID": 1478,
+      "grp": "fc",
+      "id": "pa",
+      "mass": 8,
+      "mount": "F",
+      "name": "Pacifier",
+      "power": 1.02,
+      "pp": "Zachary Hudson",
+      "rating": "C",
+      "rof": 4.5,
+      "thermload": 1,
+      "type": "K"
+    }
   ]
 }

modules/hardpoints/frame_shift_wake_scanner.json

@@ -1,9 +1,74 @@
 {
   "ws": [
-    { "id": "0i", "edID": 128662525, "eddbID": 1232, "grp": "ws", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2, "time": 10 },
-    { "id": "0h", "edID": 128662526, "eddbID": 1233, "grp": "ws", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2.5, "time": 10 },
-    { "id": "0g", "edID": 128662527, "eddbID": 1234, "grp": "ws", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3, "time": 10 },
-    { "id": "0f", "edID": 128662528, "eddbID": 1235, "grp": "ws", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3.5, "time": 10 },
-    { "id": "0e", "edID": 128662529, "eddbID": 1236, "grp": "ws", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4, "time": 10 }
+    {
+      "class": 0,
+      "cost": 13540,
+      "edID": 128662525,
+      "eddbID": 1232,
+      "grp": "ws",
+      "id": "0i",
+      "integrity": 32,
+      "mass": 1.3,
+      "power": 0.2,
+      "range": 2000,
+      "rating": "E",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 40630,
+      "edID": 128662526,
+      "eddbID": 1233,
+      "grp": "ws",
+      "id": "0h",
+      "integrity": 24,
+      "mass": 1.3,
+      "power": 0.4,
+      "range": 2500,
+      "rating": "D",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 121900,
+      "edID": 128662527,
+      "eddbID": 1234,
+      "grp": "ws",
+      "id": "0g",
+      "integrity": 40,
+      "mass": 1.3,
+      "power": 0.8,
+      "range": 3000,
+      "rating": "C",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 365700,
+      "edID": 128662528,
+      "eddbID": 1235,
+      "grp": "ws",
+      "id": "0f",
+      "integrity": 56,
+      "mass": 1.3,
+      "power": 1.6,
+      "range": 3500,
+      "rating": "B",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 1097100,
+      "edID": 128662529,
+      "eddbID": 1236,
+      "grp": "ws",
+      "id": "0e",
+      "integrity": 48,
+      "mass": 1.3,
+      "power": 3.2,
+      "range": 4000,
+      "rating": "A",
+      "time": 10
+    }
   ]
-}
+}

modules/hardpoints/kill_warrant_scanner.json

@@ -1,9 +1,74 @@
 {
   "kw": [
-    { "id": "0n", "edID": 128662530, "eddbID": 1237, "grp": "kw", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2, "time": 10 },
-    { "id": "0m", "edID": 128662531, "eddbID": 1238, "grp": "kw", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2.5, "time": 10 },
-    { "id": "0l", "edID": 128662532, "eddbID": 1239, "grp": "kw", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3, "time": 10 },
-    { "id": "0k", "edID": 128662533, "eddbID": 1240, "grp": "kw", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3.5, "time": 10 },
-    { "id": "0j", "edID": 128662534, "eddbID": 1241, "grp": "kw", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4, "time": 10 }
+    {
+      "class": 0,
+      "cost": 13540,
+      "edID": 128662530,
+      "eddbID": 1237,
+      "grp": "kw",
+      "id": "0n",
+      "integrity": 32,
+      "mass": 1.3,
+      "power": 0.2,
+      "range": 2000,
+      "rating": "E",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 40630,
+      "edID": 128662531,
+      "eddbID": 1238,
+      "grp": "kw",
+      "id": "0m",
+      "integrity": 24,
+      "mass": 1.3,
+      "power": 0.4,
+      "range": 2500,
+      "rating": "D",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 121900,
+      "edID": 128662532,
+      "eddbID": 1239,
+      "grp": "kw",
+      "id": "0l",
+      "integrity": 40,
+      "mass": 1.3,
+      "power": 0.8,
+      "range": 3000,
+      "rating": "C",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 365700,
+      "edID": 128662533,
+      "eddbID": 1240,
+      "grp": "kw",
+      "id": "0k",
+      "integrity": 56,
+      "mass": 1.3,
+      "power": 1.6,
+      "range": 3500,
+      "rating": "B",
+      "time": 10
+    },
+    {
+      "class": 0,
+      "cost": 1097100,
+      "edID": 128662534,
+      "eddbID": 1241,
+      "grp": "kw",
+      "id": "0j",
+      "integrity": 48,
+      "mass": 1.3,
+      "power": 3.2,
+      "range": 4000,
+      "rating": "A",
+      "time": 10
+    }
   ]
-}
+}

modules/hardpoints/mine_launcher.json

@@ -1,7 +1,79 @@
 {
   "nl": [
-    { "id": "2j", "edID": 128049500, "eddbID": 880, "grp": "nl", "class": 1, "rating": "I", "cost": 24260, "mass": 2, "power": 0.4, "mount": "F", "type": "E", "armourpen": "C", "thermload": 2, "clip": 1, "ammo": 24, "ammocost": 209 },
-    { "id": "2k", "edID": 128049501, "eddbID": 881, "grp": "nl", "class": 2, "rating": "I", "cost": 294080, "mass": 4, "power": 0.4, "mount": "F", "type": "E", "armourpen": "C", "thermload": 3, "clip": 3, "ammo": 24, "ammocost": 209 },
-    { "id": "kp", "edID": 128671448, "eddbID": 1523, "grp": "nl", "name":"Shock Mine Launcher", "class": 1, "rating": "I", "cost": 36400, "mass": 2, "power": 0.4, "mount": "F", "type": "E", "armourpen": "C", "thermload": 2, "clip": 1, "ammo": 24, "ammocost": 209 }
+    {
+      "ammo": 36,
+      "armourpen": 60,
+      "breachdps": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 1,
+      "clip": 3,
+      "cost": 24260,
+      "dps": 44,
+      "edID": 128049500,
+      "eddbID": 880,
+      "eps": 0,
+      "grp": "nl",
+      "hps": 5,
+      "id": "2j",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.4,
+      "rating": "I",
+      "reload": 2,
+      "rof": 1,
+      "type": "ET"
+    },
+    {
+      "ammo": 36,
+      "armourpen": 60,
+      "breachdps": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 2,
+      "clip": 3,
+      "cost": 294080,
+      "dps": 44,
+      "edID": 128049501,
+      "eddbID": 881,
+      "eps": 0,
+      "grp": "nl",
+      "hps": 7.5,
+      "id": "2k",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "power": 0.4,
+      "rating": "I",
+      "reload": 2,
+      "rof": 1,
+      "type": "ET"
+    },
+    {
+      "ammo": 36,
+      "armourpen": "C",
+      "breachdps": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 1,
+      "clip": 3,
+      "cost": 36400,
+      "dps": 32,
+      "edID": 128671448,
+      "eddbID": 1523,
+      "grp": "nl",
+      "hps": 5,
+      "id": "kp",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "name": "Shock Mine Launcher",
+      "power": 0.4,
+      "rating": "I",
+      "reload": 2,
+      "rof": 1,
+      "type": "ET"
+    }
   ]
 }

modules/hardpoints/mining_laser.json

@@ -1,7 +1,62 @@
 {
   "ml": [
-    { "id": "2l", "edID": 128049525, "eddbID": 888, "grp": "ml", "class": 1, "rating": "D", "cost": 6800, "mass": 2, "power": 0.5, "mount": "F", "armourpen": "D", "thermload": 3 },
-    { "id": "2m", "edID": 128049526, "eddbID": 889, "grp": "ml", "class": 2, "rating": "D", "cost": 22580, "mass": 2, "power": 0.75, "mount": "F", "armourpen": "D", "thermload": 5 },
-    { "id": "ml", "eddbID": 1479, "grp": "ml", "name": "Mining Lance", "class": 1, "rating": "D", "cost": 13600, "mass": 2, "power": 0.7, "mount": "F", "type": "T", "damage": 3, "dps": 3, "armourpen": "D", "thermload": 3 }
+    {
+      "armourpen": 18,
+      "breachdps": 0.3,
+      "breachmax": 0.2,
+      "breachmin": 0.1,
+      "class": 1,
+      "cost": 6800,
+      "dps": 2,
+      "edID": 128049525,
+      "eddbID": 888,
+      "eps": 1.5,
+      "grp": "ml",
+      "hps": 2,
+      "id": "2l",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.5,
+      "rating": "D"
+    },
+    {
+      "armourpen": 18,
+      "breachdps": 0.6,
+      "breachmax": 0.2,
+      "breachmin": 0.1,
+      "class": 2,
+      "cost": 22580,
+      "dps": 4,
+      "edID": 128049526,
+      "eddbID": 889,
+      "eps": 3,
+      "grp": "ml",
+      "hps": 4,
+      "id": "2m",
+      "integrity": 51,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.75,
+      "rating": "D"
+    },
+    {
+      "armourpen": "D",
+      "class": 1,
+      "cost": 13600,
+      "damage": 3,
+      "dps": 3,
+      "eddbID": 1479,
+      "grp": "ml",
+      "id": "ml",
+      "mass": 2,
+      "mount": "F",
+      "name": "Mining Lance",
+      "power": 0.7,
+      "pp": "Zemina Torval",
+      "rating": "D",
+      "thermload": 3,
+      "type": "T"
+    }
   ]
-}
+}

modules/hardpoints/missile_rack.json

@@ -1,9 +1,171 @@
 {
   "mr": [
-    { "id": "2f", "edID": 128666725, "eddbID": 1327, "grp": "mr", "class": 2, "rating": "B", "cost": 240400, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 7, "armourpen": "F", "rof": 2.5, "dps": 8, "thermload": 3, "clip": 12, "ammo": 24, "mjdps": 1.72, "ssdam" : 3.87, "missile": "D", "ammocost": 500 },
-    { "id": "2g", "edID": 128049493, "eddbID": 879, "grp": "mr", "class": 2, "rating": "B", "cost": 512400, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 6, "armourpen": "F", "rof": 0.3, "dps": 3, "thermload": 3, "clip": 6, "ammo": 18, "mjdps": 0.57, "ssdam" : 2.58, "missile": "S", "ammocost": 666.67 },
-    { "id": "2d", "edID": 128666724, "eddbID": 1326, "grp": "mr", "class": 1, "rating": "B", "cost": 32180, "mass": 2, "power": 0.4, "mount": "F", "type": "E", "damage": 7, "armourpen": "F", "rof": 2.5, "dps": 8, "thermload": 3, "clip": 8, "ammo": 16, "mjdps": 1.63, "ssdam" : 3.87, "missile": "D", "ammocost": 500 },
-    { "id": "2e", "edID": 128049492, "eddbID": 878, "grp": "mr", "class": 1, "rating": "B", "cost": 72600, "mass": 2, "power": 0.6, "mount": "F", "type": "E", "damage": 6, "armourpen": "F", "rof": 0.3, "dps": 3, "thermload": 3, "clip": 6, "ammo": 6, "mjdps": 0.57, "ssdam" : 2.58, "missile": "S", "ammocost": 666.67 },
-    { "id": "Ph", "eddbID": 1480, "grp": "mr", "name": "Pack-Hound", "class": 2, "rating": "B", "cost": 768600, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 3, "armourpen": "F", "rof": 0.5, "dps": 4, "thermload": 3, "clip": 12, "ammo": 120, "missile": "S" }
+    {
+      "ammo": 48,
+      "armourpen": 60,
+      "breachdps": 4.8,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 2,
+      "clip": 12,
+      "cost": 190227,
+      "dps": 25,
+      "eddbID": 1559,
+      "eps": 0.12,
+      "grp": "mr",
+      "hps": 1.08,
+      "id": "1z",
+      "integrity": 51,
+      "mass": 4,
+      "missile": "D",
+      "mount": "F",
+      "name": "Rocket Propelled FSD Disruptor",
+      "power": 1.2,
+      "pp": "Yuri Grom",
+      "rating": "B",
+      "rof": 0.5,
+      "speed": 750,
+      "type": "E"
+    },
+    {
+      "ammo": 48,
+      "armourpen": 60,
+      "breachdps": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 2,
+      "clip": 12,
+      "cost": 240400,
+      "dps": 25,
+      "edID": 128666725,
+      "eddbID": 1327,
+      "eps": 0.12,
+      "grp": "mr",
+      "hps": 1.8,
+      "id": "2f",
+      "integrity": 51,
+      "mass": 4,
+      "missile": "D",
+      "mount": "F",
+      "power": 1.2,
+      "rating": "B",
+      "reload": 5,
+      "roundspershot": 1,
+      "speed": 750,
+      "type": "E"
+    },
+    {
+      "ammo": 18,
+      "armourpen": 60,
+      "breachdps": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 2,
+      "clip": 6,
+      "cost": 512400,
+      "dps": 13.3,
+      "edID": 128049493,
+      "eddbID": 879,
+      "eps": 0.07,
+      "grp": "mr",
+      "hps": 1.08,
+      "id": "2g",
+      "integrity": 51,
+      "mass": 4,
+      "missile": "S",
+      "mount": "F",
+      "power": 1.2,
+      "rating": "B",
+      "reload": 12,
+      "roundspershot": 1,
+      "speed": 625,
+      "type": "E"
+    },
+    {
+      "ammo": 16,
+      "armourpen": 60,
+      "breachdps": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 1,
+      "clip": 8,
+      "cost": 32180,
+      "dps": 25,
+      "edID": 128666724,
+      "eddbID": 1326,
+      "eps": 0.12,
+      "grp": "mr",
+      "hps": 1.8,
+      "id": "2d",
+      "integrity": 40,
+      "mass": 2,
+      "missile": "D",
+      "mount": "F",
+      "power": 0.4,
+      "rating": "B",
+      "reload": 5,
+      "rof": 0.5,
+      "roundspershot": 1,
+      "speed": 750,
+      "type": "E"
+    },
+    {
+      "ammo": 6,
+      "armourpen": 60,
+      "breachdps": 0,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 1,
+      "clip": 6,
+      "cost": 72600,
+      "dps": 13.3,
+      "edID": 128049492,
+      "eddbID": 878,
+      "eps": 0.07,
+      "grp": "mr",
+      "hps": 1.08,
+      "id": "2e",
+      "integrity": 40,
+      "mass": 2,
+      "missile": "S",
+      "mount": "F",
+      "power": 0.6,
+      "rating": "B",
+      "reload": 12,
+      "rof": 0.3,
+      "roundspershot": 1,
+      "speed": 625,
+      "type": "E"
+    },
+    {
+      "ammo": 120,
+      "armourpen": 60,
+      "breachdps": 3.6,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 2,
+      "clip": 12,
+      "cost": 768600,
+      "dps": 72,
+      "edID": 128671344,
+      "eddbID": 1480,
+      "eps": 0.48,
+      "grp": "mr",
+      "hps": 7.2,
+      "id": "Ph",
+      "integrity": 51,
+      "mass": 4,
+      "missile": "S",
+      "mount": "F",
+      "name": "Pack-Hound",
+      "power": 1.2,
+      "pp": "Li Yong-Rui",
+      "rating": "B",
+      "reload": 5,
+      "rof": 2,
+      "roundspershot": 4,
+      "speed": 600,
+      "type": "E"
+    }
   ]
 }

modules/hardpoints/multi_cannon.json

@@ -1,13 +1,305 @@
 {
   "mc": [
-    { "id": "26", "edID": 128049456, "eddbID": 868, "grp": "mc", "class": 2, "rating": "E", "cost": 38000, "mass": 4, "power": 0.46, "mount": "F", "type": "K", "damage": 2, "armourpen": "A", "rof": 7, "dps": 4, "thermload": 1, "clip": 90, "mjdps" : 6.02, "ssdam" : 1.20, "ammo": 2100, "ammocost": 1 },
-    { "id": "27", "edID": 128049460, "eddbID": 870, "grp": "mc", "class": 2, "rating": "F", "cost": 57000, "mass": 4, "power": 0.64, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 7.5, "dps": 4, "thermload": 1, "clip": 90, "mjdps" : 5.59, "ssdam" : 1.03, "ammo": 2100, "ammocost": 1 },
-    { "id": "28", "edID": 128049463, "eddbID": 872, "grp": "mc", "class": 2, "rating": "F", "cost": 1292800, "mass": 4, "power": 0.5, "mount": "T", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.3, "dps": 3, "thermload": 1, "clip": 90, "mjdps" : 2.15, "ssdam" : 0.52, "ammo": 2100, "ammocost": 1 },
-
-    { "id": "23", "edID": 128049455, "eddbID": 867, "grp": "mc", "class": 1, "rating": "F", "cost": 9500, "mass": 2, "power": 0.28, "mount": "F", "type": "K", "damage": 2, "armourpen": "A", "rof": 8, "dps": 3, "thermload": 1, "clip": 90, "mjdps" : 3.75, "ssdam" : 0.69, "ammo": 2100, "ammocost": 1 },
-    { "id": "24", "edID": 128049459, "eddbID": 869, "grp": "mc", "class": 1, "rating": "G", "cost": 14250, "mass": 2, "power": 0.37, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 8.5, "dps": 3, "thermload": 1, "clip": 90, "mjdps" : 2.03, "ssdam" : 0.34, "ammo": 2100, "ammocost": 1 },
-    { "id": "25", "edID": 128049462, "eddbID": 871, "grp": "mc", "class": 1, "rating": "G", "cost": 81600, "mass": 2, "power": 0.26, "mount": "T", "type": "K", "damage": 0, "armourpen": "A", "rof": 6, "dps": 2, "thermload": 1, "clip": 90, "mjdps" : 1.54, "ssdam" : 0.34, "ammo": 2100, "ammocost": 1 },
-
-    { "id": "e0", "eddbID": 1481, "grp": "mc", "name": "Enforcer", "class": 1, "rating": "F", "cost": 13980, "mass": 2, "power": 0.28, "mount": "F", "type": "K", "damage": 4, "armourpen": "A", "rof": 4.3, "dps": 4, "thermload": 1, "clip": 60, "ammo": 1000 }
+    {
+      "ammo": 2100,
+      "armourpen": 68,
+      "breachdps": 25.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 90,
+      "cost": 1177600,
+      "dps": 28,
+      "edID": 128049458,
+      "eddbID": 1542,
+      "eps": 1.44,
+      "grp": "mc",
+      "hps": 2.4,
+      "id": "7n",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "power": 0.73,
+      "range": 4000,
+      "rating": "A",
+      "reload": 4,
+      "rof": 3,
+      "roundspershot": 2,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 68,
+      "breachdps": 21.08,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 90,
+      "cost": 6377600,
+      "dps": 23.3,
+      "edID": 128681996,
+      "eddbID": 1546,
+      "eps": 2.516,
+      "grp": "mc",
+      "hps": 3.4,
+      "id": "7o",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "power": 1.22,
+      "range": 4000,
+      "rating": "A",
+      "reload": 4,
+      "rof": 3.4,
+      "roundspershot": 2,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 54,
+      "breachdps": 20.65,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 90,
+      "cost": 140400,
+      "dps": 23.1,
+      "edID": 128049457,
+      "eddbID": 1541,
+      "eps": 1.062,
+      "grp": "mc",
+      "hps": 1.77,
+      "id": "7k",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "power": 0.64,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 5.9,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 54,
+      "breachdps": 17.42,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 90,
+      "cost": 578436,
+      "dps": 18.9,
+      "edID": 128049461,
+      "eddbID": 1543,
+      "eps": 1.675,
+      "grp": "mc",
+      "hps": 2.01,
+      "id": "7l",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "power": 0.97,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 6.7,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 37,
+      "breachdps": 14.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 38000,
+      "dps": 15.6,
+      "edID": 128049456,
+      "eddbID": 868,
+      "eps": 0.781,
+      "grp": "mc",
+      "hps": 1.42,
+      "id": "26",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "power": 0.46,
+      "range": 4000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 7.1,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 37,
+      "breachdps": 11.55,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 57000,
+      "dps": 12.6,
+      "edID": 128049460,
+      "eddbID": 870,
+      "eps": 1.078,
+      "grp": "mc",
+      "hps": 1.54,
+      "id": "27",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "power": 0.64,
+      "range": 4000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 7.7,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 37,
+      "breachdps": 6.82,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 1292800,
+      "dps": 7.3,
+      "edID": 128049463,
+      "eddbID": 872,
+      "eps": 0.372,
+      "grp": "mc",
+      "hps": 0.62,
+      "id": "28",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "power": 0.5,
+      "range": 4000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 6.2,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 22,
+      "breachdps": 7.7,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 90,
+      "cost": 9500,
+      "dps": 8.6,
+      "edID": 128049455,
+      "eddbID": 867,
+      "eps": 0.462,
+      "grp": "mc",
+      "hps": 0.77,
+      "id": "23",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.28,
+      "range": 4000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 7.7,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 22,
+      "breachdps": 5.8,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 90,
+      "cost": 14250,
+      "dps": 6.8,
+      "edID": 128049459,
+      "eddbID": 869,
+      "eps": 0.58,
+      "grp": "mc",
+      "hps": 0.83,
+      "id": "24",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "G",
+      "power": 0.37,
+      "range": 4000,
+      "rating": "G",
+      "reload": 4,
+      "rof": 8.3,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "armourpen": 22,
+      "breachdps": 3.55,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 90,
+      "cost": 81600,
+      "dps": 4,
+      "edID": 128049462,
+      "eddbID": 871,
+      "eps": 0.213,
+      "grp": "mc",
+      "hps": 0,
+      "id": "25",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "power": 0.26,
+      "range": 4000,
+      "rating": "G",
+      "reload": 4,
+      "rof": 7.1,
+      "roundspershot": 1,
+      "speed": 1600,
+      "type": "K"
+    },
+    {
+      "ammo": 1000,
+      "armourpen": "A",
+      "class": 1,
+      "clip": 60,
+      "cost": 13980,
+      "damage": 4,
+      "dps": 4,
+      "eddbID": 1481,
+      "grp": "mc",
+      "id": "e0",
+      "mass": 2,
+      "mount": "F",
+      "name": "Enforcer",
+      "power": 0.28,
+      "pp": "Pranav Antal",
+      "rating": "F",
+      "rof": 4.3,
+      "thermload": 1,
+      "type": "K"
+    }
   ]
 }

modules/hardpoints/plasma_accelerator.json

@@ -1,8 +1,118 @@
 {
   "pa": [
-    { "id": "1g", "edID": 128049465, "eddbID": 873, "grp": "pa", "class": 2, "rating": "C", "cost": 834200, "mass": 4, "power": 1.43, "mount": "F", "type": "T", "damage": 7, "armourpen": "A", "rof": 0.3, "dps": 4, "thermload": 10, "clip": 5, "mjdps" : 6.89, "ssdam" : 27.85, "ammo": 100, "ammocost": 200 },
-    { "id": "2b", "edID": 128049466, "eddbID": 874, "grp": "pa", "class": 3, "rating": "B", "cost": 3051200, "mass": 8, "power": 1.97, "mount": "F", "type": "TK", "damage": 9, "armourpen": "A", "rof": 0.3, "dps": 4, "thermload": 8, "clip": 5, "mjdps" : 20.98, "ssdam" : 92.82, "ammo": 100, "ammocost": 200 },
-    { "id": "2c", "edID": 128049467, "eddbID": 875, "grp": "pa", "class": 4, "rating": "A", "cost": 13793600, "mass": 16, "power": 2.63, "mount": "F", "type": "TK", "damage": 10, "armourpen": "A", "rof": 0.3, "dps": 5, "thermload": 10, "clip": 5, "mjdps" : 25.55, "ssdam" : 123.76, "ammo": 100, "ammocost": 200 },
-    { "id": "Ap", "eddbID": 1482, "grp": "pa", "name": "Advanced Plasma Accelerator", "class": 3, "rating": "B", "cost": 4119120, "mass": 8, "power": 1.97, "mount": "F", "type": "TK", "damage": 8, "armourpen": "A", "rof": 1.67, "dps": 4, "thermload": 4, "clip": 20, "ammo": 300, "ammocost": 67 }
+    {
+      "ammo": 100,
+      "armourpen": 85,
+      "breachdps": 30.62,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 5,
+      "cost": 13793600,
+      "dps": 30,
+      "edID": 128049467,
+      "eddbID": 875,
+      "eps": 6.312,
+      "grp": "pa",
+      "hps": 8.85,
+      "id": "2c",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "power": 2.63,
+      "range": 3500,
+      "rating": "A",
+      "reload": 8,
+      "rof": 0.3,
+      "roundspershot": 1,
+      "speed": 875,
+      "type": "KT"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 70,
+      "breachdps": 20.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 5,
+      "cost": 3051200,
+      "dps": 23.2,
+      "edID": 128049466,
+      "eddbID": 874,
+      "eps": 4.08,
+      "grp": "pa",
+      "hps": 6.54,
+      "id": "2b",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "power": 1.97,
+      "range": 3500,
+      "rating": "B",
+      "reload": 8,
+      "rof": 0.3,
+      "roundspershot": 1,
+      "speed": 875,
+      "type": "KT"
+    },
+    {
+      "ammo": 100,
+      "armourpen": 55,
+      "breachdps": 13.26,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 5,
+      "cost": 834200,
+      "dps": 17.2,
+      "edID": 128049465,
+      "eddbID": 873,
+      "eps": 2.595,
+      "grp": "pa",
+      "hps": 4.68,
+      "id": "1g",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "power": 1.43,
+      "range": 3500,
+      "rating": "C",
+      "reload": 8,
+      "rof": 0.3,
+      "roundspershot": 1,
+      "speed": 875,
+      "type": "KT"
+    },
+    {
+      "ammo": 300,
+      "armourpen": 70,
+      "breachdps": 22.48,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 20,
+      "cost": 4119120,
+      "dps": 27.5,
+      "edID": 128671339,
+      "eddbID": 1482,
+      "eps": 4.4,
+      "grp": "pa",
+      "hps": 8.8,
+      "id": "Ap",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "name": "Advanced Plasma Accelerator",
+      "power": 1.97,
+      "pp": "Denton Patreus",
+      "range": 3500,
+      "rating": "B",
+      "reload": 8,
+      "rof": 0.8,
+      "roundspershot": 1,
+      "speed": 875,
+      "type": "KT"
+    }
   ]
 }

modules/hardpoints/pulse_laser.json

@@ -1,17 +1,276 @@
 {
   "pl": [
-    { "id": "1d", "edID": 128049383, "eddbID": 825, "grp": "pl", "class": 3, "rating": "D", "cost": 70400, "mass": 8, "power": 0.9, "mount": "F", "type": "T", "damage": 4, "armourpen": "A", "rof": 3, "dps": 4, "mjdps" : 21.62, "mjeps" : 2.86, "ssdam" : 7.07, "thermload": 1 },
-    { "id": "1e", "edID": 128049387, "eddbID": 828, "grp": "pl", "class": 3, "rating": "E", "cost": 140600, "mass": 8, "power": 0.92, "mount": "G", "type": "T", "damage": 3, "armourpen": "A", "rof": 3.2, "dps": 4, "mjdps" : 18.28, "mjeps" : 2.98, "ssdam" : 5.59, "thermload": 1 },
-    { "id": "1f", "edID": 128049390, "eddbID": 831, "grp": "pl", "class": 3, "rating": "F", "cost": 400400, "mass": 8, "power": 0.89, "mount": "T", "type": "T", "damage": 3, "armourpen": "A", "rof": 2.3, "dps": 3, "mjdps" : 7.05, "mjeps" : 1.24, "ssdam" : 3.15, "thermload": 1 },
-
-    { "id": "1a", "edID": 128049382, "eddbID": 824, "grp": "pl", "class": 2, "rating": "E", "cost": 17600, "mass": 4, "power": 0.6, "mount": "F", "type": "T", "damage": 3, "armourpen": "A", "rof": 3.4, "dps": 3, "mjdps" : 14.29, "mjeps" : 1.89, "ssdam" : 4.20, "thermload": 1 },
-    { "id": "1b", "edID": 128049386, "eddbID": 827, "grp": "pl", "class": 2, "rating": "F", "cost": 35400, "mass": 4, "power": 0.6, "mount": "G", "type": "T", "damage": 3, "armourpen": "A", "rof": 3.6, "dps": 3, "mjdps" : 11.62, "mjeps" : 1.89, "ssdam" : 3.24, "thermload": 1 },
-    { "id": "1c", "edID": 128049389, "eddbID": 830, "grp": "pl", "class": 2, "rating": "F", "cost": 132800, "mass": 4, "power": 0.58, "mount": "T", "type": "T", "damage": 2, "armourpen": "A", "rof": 2.5, "dps": 3, "mjdps" : 4.72, "mjeps" : 0.83, "ssdam" : 1.86, "thermload": 1 },
-
-    { "id": "17", "edID": 128049381, "eddbID": 823, "grp": "pl", "class": 1, "rating": "F", "cost": 2200, "mass": 2, "power": 0.39, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 3.8, "dps": 3, "mjdps" : 9.35, "mjeps" : 1.24, "ssdam" : 2.48, "thermload": 1 },
-    { "id": "18", "edID": 128049385, "eddbID": 826, "grp": "pl", "class": 1, "rating": "G", "cost": 6600, "mass": 2, "power": 0.39, "mount": "G", "type": "T", "damage": 2, "armourpen": "A", "rof": 4, "dps": 3, "mjdps" : 7.30, "mjeps" : 1.19, "ssdam" : 1.88, "thermload": 1 },
-    { "id": "19", "edID": 128049388, "eddbID": 829, "grp": "pl", "class": 1, "rating": "G", "cost": 26000, "mass": 2, "power": 0.38, "mount": "T", "type": "T", "damage": 2, "armourpen": "A", "rof": 2.8, "dps": 2, "mjdps" : 2.90, "mjeps" : 0.51, "ssdam" : 1.07, "thermload": 1 },
-
-    { "id": "PL", "eddbID": 1483, "grp": "pl", "name": "Disruptor", "class": 2, "rating": "E", "cost": 26400, "mass": 4, "power": 0.7, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 2, "thermload": 1 }
+    {
+      "armourpen": 65,
+      "breachdps": 22.62,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 177600,
+      "dps": 26.9,
+      "edID": 128049384,
+      "eddbID": 1539,
+      "eps": 4.264,
+      "grp": "pl",
+      "hps": 4.16,
+      "id": "7q",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "power": 1.33,
+      "range": 3000,
+      "rating": "A",
+      "rof": 2.6,
+      "type": "T"
+    },
+    {
+      "armourpen": 65,
+      "breachdps": 18.48,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 877600,
+      "dps": 21.7,
+      "edID": 128681995,
+      "eddbID": 1545,
+      "eps": 4.368,
+      "grp": "pl",
+      "hps": 4.48,
+      "id": "7r",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "power": 1.37,
+      "range": 3000,
+      "rating": "A",
+      "rof": 2.8,
+      "type": "T"
+    },
+    {
+      "armourpen": 52,
+      "breachdps": 15.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 70400,
+      "dps": 18.1,
+      "edID": 128049383,
+      "eddbID": 825,
+      "eps": 2.88,
+      "grp": "pl",
+      "hps": 3,
+      "id": "1d",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "power": 0.9,
+      "range": 3000,
+      "rating": "D",
+      "rof": 3,
+      "type": "T"
+    },
+    {
+      "armourpen": 52,
+      "breachdps": 12.48,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 140600,
+      "dps": 14.8,
+      "edID": 128049387,
+      "eddbID": 828,
+      "eps": 2.944,
+      "grp": "pl",
+      "hps": 2.88,
+      "id": "1e",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "power": 0.92,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.2,
+      "type": "T"
+    },
+    {
+      "armourpen": 52,
+      "breachdps": 8.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 400400,
+      "dps": 9.5,
+      "edID": 128049390,
+      "eddbID": 831,
+      "eps": 1.512,
+      "grp": "pl",
+      "hps": 1.62,
+      "id": "1f",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "power": 0.89,
+      "range": 3000,
+      "rating": "F",
+      "rof": 2.7,
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 10.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 17600,
+      "dps": 12.1,
+      "edID": 128049382,
+      "eddbID": 824,
+      "eps": 1.904,
+      "grp": "pl",
+      "hps": 2.04,
+      "id": "1a",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "power": 0.6,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.4,
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 8.28,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 35400,
+      "dps": 9.6,
+      "edID": 128049386,
+      "eddbID": 827,
+      "eps": 1.944,
+      "grp": "pl",
+      "hps": 1.8,
+      "id": "1b",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "power": 0.6,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.6,
+      "type": "T"
+    },
+    {
+      "armourpen": 35,
+      "breachdps": 5.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 132800,
+      "dps": 6.2,
+      "edID": 128049389,
+      "eddbID": 830,
+      "eps": 1,
+      "grp": "pl",
+      "hps": 0.9,
+      "id": "1c",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "power": 0.58,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3,
+      "type": "T"
+    },
+    {
+      "armourpen": 20,
+      "breachdps": 6.46,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "cost": 2200,
+      "dps": 7.9,
+      "edID": 128049381,
+      "eddbID": 823,
+      "eps": 1.254,
+      "grp": "pl",
+      "hps": 1.14,
+      "id": "17",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 0.39,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.8,
+      "type": "T"
+    },
+    {
+      "armourpen": 20,
+      "breachdps": 5.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "cost": 6600,
+      "dps": 6.2,
+      "edID": 128049385,
+      "eddbID": 826,
+      "eps": 1.24,
+      "grp": "pl",
+      "hps": 1.2,
+      "id": "18",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "G",
+      "power": 0.39,
+      "range": 3000,
+      "rating": "G",
+      "rof": 4,
+      "type": "T"
+    },
+    {
+      "armourpen": 20,
+      "breachdps": 3.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "cost": 26000,
+      "dps": 4,
+      "edID": 128049388,
+      "eddbID": 829,
+      "eps": 0.627,
+      "grp": "pl",
+      "hps": 6.6,
+      "id": "19",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "power": 0.38,
+      "range": 3000,
+      "rating": "G",
+      "rof": 3.3,
+      "type": "T"
+    },
+    {
+      "armourpen": "A",
+      "class": 2,
+      "cost": 26400,
+      "damage": 2,
+      "dps": 2,
+      "eddbID": 1483,
+      "grp": "pl",
+      "id": "PL",
+      "mass": 4,
+      "mount": "F",
+      "name": "Disruptor",
+      "power": 0.7,
+      "pp": "Felicia Winters",
+      "rating": "E",
+      "rof": 1.6,
+      "thermload": 1,
+      "type": "T"
+    }
   ]
-}
+}

modules/hardpoints/rail_gun.json

@@ -1,7 +1,78 @@
 {
   "rg": [
-    { "id": "29", "edID": 128049488, "eddbID": 876, "grp": "rg", "class": 1, "rating": "D", "cost": 51600, "mass": 2, "power": 1.15, "mount": "F", "type": "TK", "damage": 6, "armourpen": "A", "rof": 0.6, "dps": 4, "thermload": 7, "clip": 1, "mjdps" : 13.75, "ssdam" : 24.75, "ammo": 30, "ammocost": 200 },
-    { "id": "2a", "edID": 128049489, "eddbID": 877, "grp": "rg", "class": 2, "rating": "B", "cost": 412800, "mass": 4, "power": 1.63, "mount": "F", "type": "TK", "damage": 7, "armourpen": "A", "rof": 0.5, "dps": 4, "thermload": 10, "clip": 1, "mjdps" : 21.66, "ssdam" : 43.32, "ammo": 30, "ammocost": 200 },
-    { "id": "ih", "edID": 128671341, "eddbID": 1484, "grp": "rg", "name": "Imperial Hammer", "class": 2, "rating": "B", "cost": 619200, "mass": 4, "power": 1.63, "mount": "F", "type": "TK", "damage": 5, "armourpen": "A", "rof": 0.6, "dps": 5, "thermload": 3, "clip": 3, "ammo": 90 }
+    {
+      "ammo": 30,
+      "armourpen": 30,
+      "breachdps": 35.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 1,
+      "clip": 1,
+      "cost": 51600,
+      "dps": 37,
+      "edID": 128049488,
+      "eddbID": 876,
+      "eps": 4.3,
+      "grp": "rg",
+      "hps": 28.48,
+      "id": "29",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "power": 1.15,
+      "range": 3000,
+      "rating": "D",
+      "reload": 1,
+      "rof": 1.6,
+      "type": "KT"
+    },
+    {
+      "ammo": 30,
+      "armourpen": 48,
+      "breachdps": 47.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 1,
+      "cost": 412800,
+      "dps": 50,
+      "edID": 128049489,
+      "eddbID": 877,
+      "eps": 6.132,
+      "grp": "rg",
+      "hps": 36,
+      "id": "2a",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "power": 1.63,
+      "range": 3000,
+      "rating": "B",
+      "reload": 1,
+      "rof": 1.2,
+      "type": "KT"
+    },
+    {
+      "ammo": 90,
+      "armourpen": "A",
+      "class": 2,
+      "clip": 3,
+      "cost": 619200,
+      "damage": 5,
+      "dps": 5,
+      "edID": 128671341,
+      "eddbID": 1484,
+      "grp": "rg",
+      "id": "ih",
+      "mass": 4,
+      "mount": "F",
+      "name": "Imperial Hammer",
+      "power": 1.63,
+      "pp": "Arissa Lavigny-Duval",
+      "rating": "B",
+      "rof": 0.6,
+      "thermload": 3,
+      "type": "KT"
+    }
   ]
 }

modules/hardpoints/shield_booster.json

@@ -1,9 +1,74 @@
 {
   "sb": [
-    { "id": "08", "edID": 128668532, "eddbID": 1368, "grp": "sb", "class": 0, "rating": "E", "cost": 10000, "mass": 0.5, "power": 0.2, "passive": 1, "shieldmul": 0.04 },
-    { "id": "07", "edID": 128668533, "eddbID": 1369, "grp": "sb", "class": 0, "rating": "D", "cost": 23000, "mass": 1, "power": 0.5, "passive": 1, "shieldmul": 0.08 },
-    { "id": "06", "edID": 128668534, "eddbID": 1370, "grp": "sb", "class": 0, "rating": "C", "cost": 53000, "mass": 2, "power": 0.7, "passive": 1, "shieldmul": 0.12 },
-    { "id": "05", "edID": 128668535, "eddbID": 1371, "grp": "sb", "class": 0, "rating": "B", "cost": 122000, "mass": 3, "power": 1, "passive": 1, "shieldmul": 0.16 },
-    { "id": "04", "edID": 128668536, "eddbID": 1372, "grp": "sb", "class": 0, "rating": "A", "cost": 281000, "mass": 3.5, "power": 1.2, "passive": 1, "shieldmul": 0.2 }
+    {
+      "class": 0,
+      "cost": 10000,
+      "edID": 128668532,
+      "eddbID": 1368,
+      "grp": "sb",
+      "id": "08",
+      "integrity": 25,
+      "mass": 0.5,
+      "passive": 1,
+      "power": 0.2,
+      "rating": "E",
+      "shieldmul": 0.04
+    },
+    {
+      "class": 0,
+      "cost": 23000,
+      "edID": 128668533,
+      "eddbID": 1369,
+      "grp": "sb",
+      "id": "07",
+      "integrity": 35,
+      "mass": 1,
+      "passive": 1,
+      "power": 0.5,
+      "rating": "D",
+      "shieldmul": 0.08
+    },
+    {
+      "class": 0,
+      "cost": 53000,
+      "edID": 128668534,
+      "eddbID": 1370,
+      "grp": "sb",
+      "id": "06",
+      "integrity": 40,
+      "mass": 2,
+      "passive": 1,
+      "power": 0.7,
+      "rating": "C",
+      "shieldmul": 0.12
+    },
+    {
+      "class": 0,
+      "cost": 122000,
+      "edID": 128668535,
+      "eddbID": 1371,
+      "grp": "sb",
+      "id": "05",
+      "integrity": 45,
+      "mass": 3,
+      "passive": 1,
+      "power": 1,
+      "rating": "B",
+      "shieldmul": 0.16
+    },
+    {
+      "class": 0,
+      "cost": 281000,
+      "edID": 128668536,
+      "eddbID": 1372,
+      "grp": "sb",
+      "id": "04",
+      "integrity": 48,
+      "mass": 3.5,
+      "passive": 1,
+      "power": 1.2,
+      "rating": "A",
+      "shieldmul": 0.2
+    }
   ]
-}
+}

modules/hardpoints/torpedo_pylon.json

@@ -1,7 +1,58 @@
 {
   "tp": [
-    { "id": "2h", "edID": 128049509, "eddbID": 882, "grp": "tp", "class": 1, "rating": "I", "cost": 11200, "mass": 2, "power": 0.4, "mount": "F", "armourpen": "C", "thermload": 10, "clip": 1, "ammo": 0, "ammocost": 15000, "missile": "S" },
-    { "id": "2i", "edID": 128049510, "eddbID": 883, "grp": "tp", "class": 2, "rating": "I", "cost": 44800, "mass": 4, "power": 0.4, "mount": "F", "armourpen": "C", "thermload": 10, "clip": 2, "ammo": 0, "ammocost": 15000, "missile": "S" }
+    {
+      "ammo": 1,
+      "armourpen": 10000,
+      "breachdps": 60,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 1,
+      "clip": 1,
+      "cost": 11200,
+      "dps": 120,
+      "edID": 128049509,
+      "eddbID": 882,
+      "eps": 0,
+      "grp": "tp",
+      "hps": 45,
+      "id": "2h",
+      "integrity": 40,
+      "mass": 2,
+      "missile": "S",
+      "mount": "F",
+      "power": 0.4,
+      "rating": "I",
+      "reload": 5,
+      "rof": 1,
+      "speed": 250,
+      "type": "E"
+    },
+    {
+      "ammo": 2,
+      "armourpen": 10000,
+      "breachdps": 60,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 1,
+      "cost": 44800,
+      "dps": 120,
+      "edID": 128049510,
+      "eddbID": 883,
+      "eps": 0,
+      "grp": "tp",
+      "hps": 50,
+      "id": "2i",
+      "integrity": 51,
+      "mass": 4,
+      "missile": "S",
+      "mount": "F",
+      "power": 0.4,
+      "rating": "I",
+      "reload": 5,
+      "rof": 1,
+      "speed": 250,
+      "type": "E"
+    }
   ]
 }
-

modules/index.js

@@ -6,7 +6,8 @@ module.exports = {
     ls: require('./standard/life_support').ls,
     pd: require('./standard/power_distributor').pd,
     s: require('./standard/sensors').s,
-    ft: require('./standard/fuel_tank').ft
+    ft: require('./standard/fuel_tank').ft,
+    pas: require('./standard/planetary_approach_suite').pas
   },
   hardpoints: {
     pl: require('./hardpoints/pulse_laser').pl,
@@ -33,6 +34,7 @@ module.exports = {
     cr: require('./internal/cargo_rack').cr,
     cc: require('./internal/collector_limpet_controllers').cc,
     dc: require('./internal/docking_computer').dc,
+    fh: require('./internal/fighter_hangar').fh,
     fi: require('./internal/frame_shift_drive_interdictor').fi,
     fs: require('./internal/fuel_scoop').fs,
     ft: require('./internal/internal_fuel_tank').ft,
@@ -42,6 +44,10 @@ module.exports = {
     pv: require('./internal/planetary_vehicle_hanger').pv,
     psg: require('./internal/pristmatic_shield_generator').psg,
     pc: require('./internal/prospector_limpet_controllers').pc,
+    pce: require('./internal/economy_passenger_cabin').pce,
+    pci: require('./internal/business_passenger_cabin').pci,
+    pcm: require('./internal/first_passenger_cabin').pcm,
+    pcq: require('./internal/luxury_passenger_cabin').pcq,
     rf: require('./internal/refinery').rf,
     sc: require('./internal/scanner').sc,
     scb: require('./internal/shield_cell_bank').scb,

modules/internal/auto_field_maintenance_unit.json

@@ -1,51 +1,524 @@
 {
   "am": [
-    { "id": "1f", "edID": 128667605, "eddbID": 1335, "grp": "am", "class": 8, "rating": "E", "cost": 612220, "power": 1.8, "ammo": 10000, "repair": 120, "ammocost": 1 },
-    { "id": "1e", "edID": 128667613, "eddbID": 1343, "grp": "am", "class": 8, "rating": "D", "cost": 1836660, "power": 2.4, "ammo": 9000, "repair": 144, "ammocost": 1 },
-    { "id": "1d", "edID": 128667621, "eddbID": 1351, "grp": "am", "class": 8, "rating": "C", "cost": 5509980, "power": 3, "ammo": 10000, "repair": 200, "ammocost": 1 },
-    { "id": "1c", "edID": 128667629, "eddbID": 1359, "grp": "am", "class": 8, "rating": "B", "cost": 16529940, "power": 3.45, "ammo": 12000, "repair": 276, "ammocost": 1 },
-    { "id": "1b", "edID": 128667637, "eddbID": 1367, "grp": "am", "class": 8, "rating": "A", "cost": 49589820, "power": 4.2, "ammo": 11000, "repair": 308, "ammocost": 1 },
-
-    { "id": "1a", "edID": 128667604, "eddbID": 1334, "grp": "am", "class": 7, "rating": "E", "cost": 340120, "power": 1.58, "ammo": 8700, "repair": 104.4, "ammocost": 1 },
-    { "id": "19", "edID": 128667612, "eddbID": 1342, "grp": "am", "class": 7, "rating": "D", "cost": 1020370, "power": 2.1, "ammo": 7800, "repair": 124.8, "ammocost": 1 },
-    { "id": "18", "edID": 128667620, "eddbID": 1350, "grp": "am", "class": 7, "rating": "C", "cost": 3061100, "power": 2.63, "ammo": 8700, "repair": 174, "ammocost": 1 },
-    { "id": "17", "edID": 128667628, "eddbID": 1358, "grp": "am", "class": 7, "rating": "B", "cost": 9183300, "power": 3.02, "ammo": 10400, "repair": 239.2, "ammocost": 1 },
-    { "id": "16", "edID": 128667636, "eddbID": 1366, "grp": "am", "class": 7, "rating": "A", "cost": 27549900, "power": 3.68, "ammo": 9600, "repair": 268.8, "ammocost": 1 },
-
-    { "id": "15", "edID": 128667603, "eddbID": 1333, "grp": "am", "class": 6, "rating": "E", "cost": 188960, "power": 1.4, "ammo": 7400, "repair": 88.8, "ammocost": 1 },
-    { "id": "14", "edID": 128667611, "eddbID": 1341, "grp": "am", "class": 6, "rating": "D", "cost": 566870, "power": 1.86, "ammo": 6700, "repair": 107.2, "ammocost": 1 },
-    { "id": "13", "edID": 128667619, "eddbID": 1349, "grp": "am", "class": 6, "rating": "C", "cost": 1700610, "power": 2.33, "ammo": 7400, "repair": 148, "ammocost": 1 },
-    { "id": "12", "edID": 128667627, "eddbID": 1357, "grp": "am", "class": 6, "rating": "B", "cost": 5101830, "power": 2.67, "ammo": 8900, "repair": 204.7, "ammocost": 1 },
-    { "id": "11", "edID": 128667635, "eddbID": 1365, "grp": "am", "class": 6, "rating": "A", "cost": 15305500, "power": 3.26, "ammo": 8100, "repair": 226.8, "ammocost": 1 },
-
-    { "id": "10", "edID": 128667602, "eddbID": 1332, "grp": "am", "class": 5, "rating": "E", "cost": 104980, "power": 1.17, "ammo": 6100, "repair": 73.2, "ammocost": 1 },
-    { "id": "0v", "edID": 128667610, "eddbID": 1340, "grp": "am", "class": 5, "rating": "D", "cost": 314930, "power": 1.56, "ammo": 5500, "repair": 88, "ammocost": 1 },
-    { "id": "0u", "edID": 128667618, "eddbID": 1348, "grp": "am", "class": 5, "rating": "C", "cost": 944780, "power": 1.95, "ammo": 6100, "repair": 122, "ammocost": 1 },
-    { "id": "0t", "edID": 128667626, "eddbID": 1356, "grp": "am", "class": 5, "rating": "B", "cost": 2834350, "power": 2.24, "ammo": 7300, "repair": 167.9, "ammocost": 1 },
-    { "id": "0s", "edID": 128667634, "eddbID": 1364, "grp": "am", "class": 5, "rating": "A", "cost": 8503060, "power": 2.73, "ammo": 6700, "repair": 187.6, "ammocost": 1 },
-
-    { "id": "0r", "edID": 128667601, "eddbID": 1331, "grp": "am", "class": 4, "rating": "E", "cost": 58320, "power": 0.99, "ammo": 4900, "repair": 58.8, "ammocost": 1 },
-    { "id": "0q", "edID": 128667609, "eddbID": 1339, "grp": "am", "class": 4, "rating": "D", "cost": 174960, "power": 1.32, "ammo": 4400, "repair": 70.4, "ammocost": 1 },
-    { "id": "0p", "edID": 128667617, "eddbID": 1347, "grp": "am", "class": 4, "rating": "C", "cost": 524880, "power": 1.65, "ammo": 4900, "repair": 98, "ammocost": 1 },
-    { "id": "0o", "edID": 128667625, "eddbID": 1355, "grp": "am", "class": 4, "rating": "B", "cost": 1574640, "power": 1.9, "ammo": 5900, "repair": 135.7, "ammocost": 1 },
-    { "id": "0n", "edID": 128667633, "eddbID": 1363, "grp": "am", "class": 4, "rating": "A", "cost": 4723920, "power": 2.31, "ammo": 5400, "repair": 151.2, "ammocost": 1 },
-
-    { "id": "0m", "edID": 128667600, "eddbID": 1330, "grp": "am", "class": 3, "rating": "E", "cost": 32400, "power": 0.81, "ammo": 3600, "repair": 43.2, "ammocost": 1 },
-    { "id": "0l", "edID": 128667608, "eddbID": 1338, "grp": "am", "class": 3, "rating": "D", "cost": 97200, "power": 1.08, "ammo": 3200, "repair": 51.2, "ammocost": 1 },
-    { "id": "0k", "edID": 128667616, "eddbID": 1346, "grp": "am", "class": 3, "rating": "C", "cost": 291600, "power": 1.35, "ammo": 3600, "repair": 72, "ammocost": 1 },
-    { "id": "0j", "edID": 128667624, "eddbID": 1354, "grp": "am", "class": 3, "rating": "B", "cost": 874800, "power": 1.55, "ammo": 4300, "repair": 98.9, "ammocost": 1 },
-    { "id": "0i", "edID": 128667632, "eddbID": 1362, "grp": "am", "class": 3, "rating": "A", "cost": 2624400, "power": 1.89, "ammo": 4000, "repair": 112, "ammocost": 1 },
-
-    { "id": "0h", "edID": 128667599, "eddbID": 1329, "grp": "am", "class": 2, "rating": "E", "cost": 18000, "power": 0.68, "ammo": 2300, "repair": 27.6, "ammocost": 1 },
-    { "id": "0g", "edID": 128667607, "eddbID": 1337, "grp": "am", "class": 2, "rating": "D", "cost": 54000, "power": 0.9, "ammo": 2100, "repair": 33.6, "ammocost": 1 },
-    { "id": "0f", "edID": 128667615, "eddbID": 1345, "grp": "am", "class": 2, "rating": "C", "cost": 162000, "power": 1.13, "ammo": 2300, "repair": 46, "ammocost": 1 },
-    { "id": "0e", "edID": 128667623, "eddbID": 1353, "grp": "am", "class": 2, "rating": "B", "cost": 486000, "power": 1.29, "ammo": 2800, "repair": 64.4, "ammocost": 1 },
-    { "id": "0d", "edID": 128667631, "eddbID": 1361, "grp": "am", "class": 2, "rating": "A", "cost": 1458000, "power": 1.58, "ammo": 2500, "repair": 70, "ammocost": 1 },
-
-    { "id": "0c", "edID": 128667598, "eddbID": 1328, "grp": "am", "class": 1, "rating": "E", "cost": 10000, "power": 0.54, "ammo": 1000, "repair": 12, "ammocost": 1 },
-    { "id": "0b", "edID": 128667606, "eddbID": 1336, "grp": "am", "class": 1, "rating": "D", "cost": 30000, "power": 0.72, "ammo": 900, "repair": 14.4, "ammocost": 1 },
-    { "id": "0a", "edID": 128667614, "eddbID": 1344, "grp": "am", "class": 1, "rating": "C", "cost": 90000, "power": 0.9, "ammo": 1000, "repair": 20, "ammocost": 1 },
-    { "id": "09", "edID": 128667622, "eddbID": 1352, "grp": "am", "class": 1, "rating": "B", "cost": 270000, "power": 1.04, "ammo": 1200, "repair": 27.6, "ammocost": 1 },
-    { "id": "08", "edID": 128667630, "eddbID": 1360, "grp": "am", "class": 1, "rating": "A", "cost": 810000, "power": 1.26, "ammo": 1100, "repair": 30.8, "ammocost": 1 }
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 612220,
+      "edID": 128667605,
+      "eddbID": 1335,
+      "grp": "am",
+      "id": "1f",
+      "power": 1.8,
+      "rating": "E",
+      "repair": 120
+    },
+    {
+      "ammo": 9000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 1836660,
+      "edID": 128667613,
+      "eddbID": 1343,
+      "grp": "am",
+      "id": "1e",
+      "power": 2.4,
+      "rating": "D",
+      "repair": 144
+    },
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 5509980,
+      "edID": 128667621,
+      "eddbID": 1351,
+      "grp": "am",
+      "id": "1d",
+      "power": 3,
+      "rating": "C",
+      "repair": 200
+    },
+    {
+      "ammo": 12000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 16529940,
+      "edID": 128667629,
+      "eddbID": 1359,
+      "grp": "am",
+      "id": "1c",
+      "power": 3.45,
+      "rating": "B",
+      "repair": 276
+    },
+    {
+      "ammo": 11000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 49589820,
+      "edID": 128667637,
+      "eddbID": 1367,
+      "grp": "am",
+      "id": "1b",
+      "power": 4.2,
+      "rating": "A",
+      "repair": 308
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 340120,
+      "edID": 128667604,
+      "eddbID": 1334,
+      "grp": "am",
+      "id": "1a",
+      "power": 1.58,
+      "rating": "E",
+      "repair": 104.4
+    },
+    {
+      "ammo": 7800,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 1020370,
+      "edID": 128667612,
+      "eddbID": 1342,
+      "grp": "am",
+      "id": "19",
+      "power": 2.1,
+      "rating": "D",
+      "repair": 124.8
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 3061100,
+      "edID": 128667620,
+      "eddbID": 1350,
+      "grp": "am",
+      "id": "18",
+      "power": 2.63,
+      "rating": "C",
+      "repair": 174
+    },
+    {
+      "ammo": 10400,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 9183300,
+      "edID": 128667628,
+      "eddbID": 1358,
+      "grp": "am",
+      "id": "17",
+      "power": 3.02,
+      "rating": "B",
+      "repair": 239.2
+    },
+    {
+      "ammo": 9600,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 27549900,
+      "edID": 128667636,
+      "eddbID": 1366,
+      "grp": "am",
+      "id": "16",
+      "power": 3.68,
+      "rating": "A",
+      "repair": 268.8
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 188960,
+      "edID": 128667603,
+      "eddbID": 1333,
+      "grp": "am",
+      "id": "15",
+      "power": 1.4,
+      "rating": "E",
+      "repair": 88.8
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 566870,
+      "edID": 128667611,
+      "eddbID": 1341,
+      "grp": "am",
+      "id": "14",
+      "power": 1.86,
+      "rating": "D",
+      "repair": 107.2
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 1700610,
+      "edID": 128667619,
+      "eddbID": 1349,
+      "grp": "am",
+      "id": "13",
+      "power": 2.33,
+      "rating": "C",
+      "repair": 148
+    },
+    {
+      "ammo": 8900,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 5101830,
+      "edID": 128667627,
+      "eddbID": 1357,
+      "grp": "am",
+      "id": "12",
+      "power": 2.67,
+      "rating": "B",
+      "repair": 204.7
+    },
+    {
+      "ammo": 8100,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 15305500,
+      "edID": 128667635,
+      "eddbID": 1365,
+      "grp": "am",
+      "id": "11",
+      "power": 3.26,
+      "rating": "A",
+      "repair": 226.8
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 104980,
+      "edID": 128667602,
+      "eddbID": 1332,
+      "grp": "am",
+      "id": "10",
+      "power": 1.17,
+      "rating": "E",
+      "repair": 73.2
+    },
+    {
+      "ammo": 5500,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 314930,
+      "edID": 128667610,
+      "eddbID": 1340,
+      "grp": "am",
+      "id": "0v",
+      "power": 1.56,
+      "rating": "D",
+      "repair": 88
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 944780,
+      "edID": 128667618,
+      "eddbID": 1348,
+      "grp": "am",
+      "id": "0u",
+      "power": 1.95,
+      "rating": "C",
+      "repair": 122
+    },
+    {
+      "ammo": 7300,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 2834350,
+      "edID": 128667626,
+      "eddbID": 1356,
+      "grp": "am",
+      "id": "0t",
+      "power": 2.24,
+      "rating": "B",
+      "repair": 167.9
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 8503060,
+      "edID": 128667634,
+      "eddbID": 1364,
+      "grp": "am",
+      "id": "0s",
+      "power": 2.73,
+      "rating": "A",
+      "repair": 187.6
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 58320,
+      "edID": 128667601,
+      "eddbID": 1331,
+      "grp": "am",
+      "id": "0r",
+      "power": 0.99,
+      "rating": "E",
+      "repair": 58.8
+    },
+    {
+      "ammo": 4400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 174960,
+      "edID": 128667609,
+      "eddbID": 1339,
+      "grp": "am",
+      "id": "0q",
+      "power": 1.32,
+      "rating": "D",
+      "repair": 70.4
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 524880,
+      "edID": 128667617,
+      "eddbID": 1347,
+      "grp": "am",
+      "id": "0p",
+      "power": 1.65,
+      "rating": "C",
+      "repair": 98
+    },
+    {
+      "ammo": 5900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 1574640,
+      "edID": 128667625,
+      "eddbID": 1355,
+      "grp": "am",
+      "id": "0o",
+      "power": 1.9,
+      "rating": "B",
+      "repair": 135.7
+    },
+    {
+      "ammo": 5400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 4723920,
+      "edID": 128667633,
+      "eddbID": 1363,
+      "grp": "am",
+      "id": "0n",
+      "power": 2.31,
+      "rating": "A",
+      "repair": 151.2
+    },
+    {
+      "ammo": 3600,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 32400,
+      "edID": 128667600,
+      "eddbID": 1330,
+      "grp": "am",
+      "id": "0m",
+      "power": 0.81,
+      "rating": "E",
+      "repair": 43.2
+    },
+    {
+      "ammo": 3200,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 97200,
+      "edID": 128667608,
+      "eddbID": 1338,
+      "grp": "am",
+      "id": "0l",
+      "power": 1.08,
+      "rating": "D",
+      "repair": 51.2
+    },
+    {
+      "ammo": 3600,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 291600,
+      "edID": 128667616,
+      "eddbID": 1346,
+      "grp": "am",
+      "id": "0k",
+      "power": 1.35,
+      "rating": "C",
+      "repair": 72
+    },
+    {
+      "ammo": 4300,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 874800,
+      "edID": 128667624,
+      "eddbID": 1354,
+      "grp": "am",
+      "id": "0j",
+      "power": 1.55,
+      "rating": "B",
+      "repair": 98.9
+    },
+    {
+      "ammo": 4000,
+      "ammocost": 1,
+      "class": 3,
+      "cost": 2624400,
+      "edID": 128667632,
+      "eddbID": 1362,
+      "grp": "am",
+      "id": "0i",
+      "power": 1.89,
+      "rating": "A",
+      "repair": 112
+    },
+    {
+      "ammo": 2300,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 18000,
+      "edID": 128667599,
+      "eddbID": 1329,
+      "grp": "am",
+      "id": "0h",
+      "power": 0.68,
+      "rating": "E",
+      "repair": 27.6
+    },
+    {
+      "ammo": 2100,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 54000,
+      "edID": 128667607,
+      "eddbID": 1337,
+      "grp": "am",
+      "id": "0g",
+      "power": 0.9,
+      "rating": "D",
+      "repair": 33.6
+    },
+    {
+      "ammo": 2300,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 162000,
+      "edID": 128667615,
+      "eddbID": 1345,
+      "grp": "am",
+      "id": "0f",
+      "power": 1.13,
+      "rating": "C",
+      "repair": 46
+    },
+    {
+      "ammo": 2800,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 486000,
+      "edID": 128667623,
+      "eddbID": 1353,
+      "grp": "am",
+      "id": "0e",
+      "power": 1.29,
+      "rating": "B",
+      "repair": 64.4
+    },
+    {
+      "ammo": 2500,
+      "ammocost": 1,
+      "class": 2,
+      "cost": 1458000,
+      "edID": 128667631,
+      "eddbID": 1361,
+      "grp": "am",
+      "id": "0d",
+      "power": 1.58,
+      "rating": "A",
+      "repair": 70
+    },
+    {
+      "ammo": 1000,
+      "ammocost": 1,
+      "class": 1,
+      "cost": 10000,
+      "edID": 128667598,
+      "eddbID": 1328,
+      "grp": "am",
+      "id": "0c",
+      "power": 0.54,
+      "rating": "E",
+      "repair": 12
+    },
+    {
+      "ammo": 900,
+      "ammocost": 1,
+      "class": 1,
+      "cost": 30000,
+      "edID": 128667606,
+      "eddbID": 1336,
+      "grp": "am",
+      "id": "0b",
+      "power": 0.72,
+      "rating": "D",
+      "repair": 14.4
+    },
+    {
+      "ammo": 1000,
+      "ammocost": 1,
+      "class": 1,
+      "cost": 90000,
+      "edID": 128667614,
+      "eddbID": 1344,
+      "grp": "am",
+      "id": "0a",
+      "power": 0.9,
+      "rating": "C",
+      "repair": 20
+    },
+    {
+      "ammo": 1200,
+      "ammocost": 1,
+      "class": 1,
+      "cost": 270000,
+      "edID": 128667622,
+      "eddbID": 1352,
+      "grp": "am",
+      "id": "09",
+      "power": 1.04,
+      "rating": "B",
+      "repair": 27.6
+    },
+    {
+      "ammo": 1100,
+      "ammocost": 1,
+      "class": 1,
+      "cost": 810000,
+      "edID": 128667630,
+      "eddbID": 1360,
+      "grp": "am",
+      "id": "08",
+      "power": 1.26,
+      "rating": "A",
+      "repair": 30.8
+    }
   ]
 }

modules/internal/bi_weave_shield_generator.json

@@ -1,12 +1,148 @@
 {
   "bsg": [
-    { "id": "B6", "edID": 128671331,"eddbID": 1530, "grp": "bsg", "class": 1, "rating": "C", "cost": 7710,     "mass": 1.3, "power": 1.2, "minmass": 13,  "optmass": 25,   "maxmass": 63,   "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 2.4 },
-    { "id": "B5", "edID": 128671332,"eddbID": 1531, "grp": "bsg", "class": 2, "rating": "C", "cost": 26710,    "mass": 2.5, "power": 1.5, "minmass": 23,  "optmass": 55,   "maxmass": 138,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 2.4 },
-    { "id": "B4", "edID": 128671333,"eddbID": 1532, "grp": "bsg", "class": 3, "rating": "C", "cost": 84650,    "mass": 5,   "power": 1.8, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 2.4 },
-    { "id": "B3", "edID": 128671334,"eddbID": 1533, "grp": "bsg", "class": 4, "rating": "C", "cost": 268350,   "mass": 10,  "power": 2.2, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 2.85 },
-    { "id": "B2", "edID": 128671335,"eddbID": 1534, "grp": "bsg", "class": 5, "rating": "C", "cost": 850660,   "mass": 20,  "power": 2.6, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 3.75 },
-    { "id": "B1", "edID": 128671336,"eddbID": 1535, "grp": "bsg", "class": 6, "rating": "C", "cost": 2696600,  "mass": 40,  "power": 3.1, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 4.8 },
-    { "id": "B0", "edID": 128671337,"eddbID": 1536, "grp": "bsg", "class": 7, "rating": "C", "cost": 8548200,  "mass": 80,  "power": 3.5, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 6 },
-    { "id": "B7", "edID": 128671338,"eddbID": 1537, "grp": "bsg", "class": 8, "rating": "C", "cost": 27097750, "mass": 160, "power": 4,   "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 7.2 }
+    {
+      "class": 1,
+      "cost": 7710,
+      "edID": 128671331,
+      "eddbID": 1530,
+      "grp": "bsg",
+      "id": "B6",
+      "mass": 1.3,
+      "maxmass": 63,
+      "maxmul": 0.4,
+      "minmass": 13,
+      "minmul": 1.4,
+      "optmass": 25,
+      "optmul": 0.9,
+      "power": 1.2,
+      "rating": "C",
+      "recover": 2.4
+    },
+    {
+      "class": 2,
+      "cost": 26710,
+      "edID": 128671332,
+      "eddbID": 1531,
+      "grp": "bsg",
+      "id": "B5",
+      "mass": 2.5,
+      "maxmass": 138,
+      "maxmul": 0.4,
+      "minmass": 23,
+      "minmul": 1.4,
+      "optmass": 55,
+      "optmul": 0.9,
+      "power": 1.5,
+      "rating": "C",
+      "recover": 2.4
+    },
+    {
+      "class": 3,
+      "cost": 84650,
+      "edID": 128671333,
+      "eddbID": 1532,
+      "grp": "bsg",
+      "id": "B4",
+      "mass": 5,
+      "maxmass": 413,
+      "maxmul": 0.4,
+      "minmass": 83,
+      "minmul": 1.4,
+      "optmass": 165,
+      "optmul": 0.9,
+      "power": 1.8,
+      "rating": "C",
+      "recover": 2.4
+    },
+    {
+      "class": 4,
+      "cost": 268350,
+      "edID": 128671334,
+      "eddbID": 1533,
+      "grp": "bsg",
+      "id": "B3",
+      "mass": 10,
+      "maxmass": 713,
+      "maxmul": 0.4,
+      "minmass": 143,
+      "minmul": 1.4,
+      "optmass": 285,
+      "optmul": 0.9,
+      "power": 2.2,
+      "rating": "C",
+      "recover": 2.85
+    },
+    {
+      "class": 5,
+      "cost": 850660,
+      "edID": 128671335,
+      "eddbID": 1534,
+      "grp": "bsg",
+      "id": "B2",
+      "mass": 20,
+      "maxmass": 1013,
+      "maxmul": 0.4,
+      "minmass": 203,
+      "minmul": 1.4,
+      "optmass": 405,
+      "optmul": 0.9,
+      "power": 2.6,
+      "rating": "C",
+      "recover": 3.75
+    },
+    {
+      "class": 6,
+      "cost": 2696600,
+      "edID": 128671336,
+      "eddbID": 1535,
+      "grp": "bsg",
+      "id": "B1",
+      "mass": 40,
+      "maxmass": 1350,
+      "maxmul": 0.4,
+      "minmass": 270,
+      "minmul": 1.4,
+      "optmass": 540,
+      "optmul": 0.9,
+      "power": 3.1,
+      "rating": "C",
+      "recover": 4.8
+    },
+    {
+      "class": 7,
+      "cost": 8548200,
+      "edID": 128671337,
+      "eddbID": 1536,
+      "grp": "bsg",
+      "id": "B0",
+      "mass": 80,
+      "maxmass": 2650,
+      "maxmul": 0.4,
+      "minmass": 530,
+      "minmul": 1.4,
+      "optmass": 1060,
+      "optmul": 0.9,
+      "power": 3.5,
+      "rating": "C",
+      "recover": 6
+    },
+    {
+      "class": 8,
+      "cost": 27097750,
+      "edID": 128671338,
+      "eddbID": 1537,
+      "grp": "bsg",
+      "id": "B7",
+      "mass": 160,
+      "maxmass": 4500,
+      "maxmul": 0.4,
+      "minmass": 900,
+      "minmul": 1.4,
+      "optmass": 1800,
+      "optmul": 0.9,
+      "power": 4,
+      "rating": "C",
+      "recover": 7.2
+    }
   ]
 }

modules/internal/business_passenger_cabin.json

@@ -0,0 +1,44 @@
+{
+  "pci": [
+    {
+      "class": 3,
+      "cost": -1,
+      "eddbID": 1568,
+      "grp": "pci",
+      "id": "mf",
+      "mass": 5,
+      "passengers": 3,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": -1,
+      "eddbID": 1569,
+      "grp": "pci",
+      "id": "mg",
+      "mass": 10,
+      "passengers": 6,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": -1,
+      "eddbID": 1570,
+      "grp": "pci",
+      "id": "mh",
+      "mass": 20,
+      "passengers": 10,
+      "rating": "D"
+    },
+    {
+      "class": 6,
+      "cost": -1,
+      "eddbID": 1571,
+      "grp": "pci",
+      "id": "mi",
+      "mass": 40,
+      "passengers": 16,
+      "rating": "D"
+    }
+  ]
+}

modules/internal/cargo_rack.json

@@ -1,12 +1,106 @@
 {
   "cr": [
-    { "id": "00", "edID": 128064338, "eddbID": 1191, "grp": "cr", "class": 1, "rating": "E", "cost": 1000,     "cargo": 2 },
-    { "id": "01", "edID": 128064339, "eddbID": 1192, "grp": "cr", "class": 2, "rating": "E", "cost": 3250,     "cargo": 4 },
-    { "id": "02", "edID": 128064340, "eddbID": 1193, "grp": "cr", "class": 3, "rating": "E", "cost": 10560,    "cargo": 8 },
-    { "id": "03", "edID": 128064341, "eddbID": 1194, "grp": "cr", "class": 4, "rating": "E", "cost": 34330,    "cargo": 16 },
-    { "id": "04", "edID": 128064342, "eddbID": 1195, "grp": "cr", "class": 5, "rating": "E", "cost": 111570,   "cargo": 32 },
-    { "id": "05", "edID": 128064343, "eddbID": 1196, "grp": "cr", "class": 6, "rating": "E", "cost": 362590,   "cargo": 64 },
-    { "id": "06", "edID": 128064344, "eddbID": 1197, "grp": "cr", "class": 7, "rating": "E", "cost": 1178420,  "cargo": 128 },
-    { "id": "07", "edID": 128064345, "eddbID": 1198, "grp": "cr", "class": 8, "rating": "E", "cost": 3829870,  "cargo": 256 }
+    {
+      "cargo": 2,
+      "class": 1,
+      "cost": 1000,
+      "edID": 128064338,
+      "eddbID": 1191,
+      "grp": "cr",
+      "id": "00",
+      "rating": "E"
+    },
+    {
+      "cargo": 4,
+      "class": 2,
+      "cost": 3250,
+      "edID": 128064339,
+      "eddbID": 1192,
+      "grp": "cr",
+      "id": "01",
+      "rating": "E"
+    },
+    {
+      "cargo": 8,
+      "class": 3,
+      "cost": 10560,
+      "edID": 128064340,
+      "eddbID": 1193,
+      "grp": "cr",
+      "id": "02",
+      "rating": "E"
+    },
+    {
+      "cargo": 16,
+      "class": 4,
+      "cost": 34330,
+      "edID": 128064341,
+      "eddbID": 1194,
+      "grp": "cr",
+      "id": "03",
+      "rating": "E"
+    },
+    {
+      "cargo": 32,
+      "class": 5,
+      "cost": 111570,
+      "edID": 128064342,
+      "eddbID": 1195,
+      "grp": "cr",
+      "id": "04",
+      "rating": "E"
+    },
+    {
+      "cargo": 64,
+      "class": 6,
+      "cost": 362590,
+      "edID": 128064343,
+      "eddbID": 1196,
+      "grp": "cr",
+      "id": "05",
+      "rating": "E"
+    },
+    {
+      "cargo": 128,
+      "class": 7,
+      "cost": 1178420,
+      "edID": 128064344,
+      "eddbID": 1197,
+      "grp": "cr",
+      "id": "06",
+      "rating": "E"
+    },
+    {
+      "cargo": 256,
+      "class": 8,
+      "cost": 3829870,
+      "edID": 128064345,
+      "eddbID": 1198,
+      "grp": "cr",
+      "id": "07",
+      "rating": "E"
+    },
+    {
+      "cargo": 1,
+      "class": 1,
+      "cost": 6250,
+      "edID": 128681641,
+      "eddbID": 1553,
+      "grp": "cr",
+      "id": "1w",
+      "name": "Corrosion Resistant",
+      "rating": "E"
+    },
+    {
+      "cargo": 2,
+      "class": 1,
+      "cost": 12563,
+      "edID": 128681992,
+      "eddbID": 1552,
+      "grp": "cr",
+      "id": "1y",
+      "name": "Corrosion Resistant",
+      "rating": "F"
+    }
   ]
-}
+}

modules/internal/collector_limpet_controllers.json

@@ -1,27 +1,284 @@
 {
   "cc": [
-    { "id": "Cf", "edID": 128671244, "eddbID": 1409, "grp":"cc", "class":7, "rating":"E", "cost": 437400, "mass": 32.0, "power":0.41, "range":1.36, "maximum": 4, "time":300 },
-    { "id": "Cg", "edID": 128671245, "eddbID": 1410, "grp":"cc", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.55, "range":1.02, "maximum": 4, "time":600 },
-    { "id": "Ch", "edID": 128671246, "eddbID": 1411, "grp":"cc", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range":1.70, "maximum": 4, "time":510 },
-    { "id": "Ci", "edID": 128671247, "eddbID": 1412, "grp":"cc", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":0.83, "range":2.38, "maximum": 4, "time":420 },
-    { "id": "Cj", "edID": 128671248, "eddbID": 1413, "grp":"cc", "class":7, "rating":"A", "cost":6998400, "mass":128.0, "power":0.97, "range":2.04, "maximum": 4, "time":720 },
-
-    { "id": "Ca", "edID": 128671239, "eddbID": 1404, "grp":"cc", "class":5, "rating":"E", "cost":  48600, "mass":  8.0, "power":0.30, "range":1.04, "maximum": 3, "time":300 },
-    { "id": "Cb", "edID": 128671240, "eddbID": 1405, "grp":"cc", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":0.40, "range":0.78, "maximum": 3, "time":600 },
-    { "id": "Cc", "edID": 128671241, "eddbID": 1406, "grp":"cc", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":0.50, "range":1.30, "maximum": 3, "time":510 },
-    { "id": "Cd", "edID": 128671242, "eddbID": 1407, "grp":"cc", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":0.60, "range":1.82, "maximum": 3, "time":420 },
-    { "id": "Ce", "edID": 128671243, "eddbID": 1408, "grp":"cc", "class":5, "rating":"A", "cost": 777600, "mass": 32.0, "power":0.70, "range":1.56, "maximum": 3, "time":720 },
-
-    { "id": "C6", "edID": 128671234, "eddbID": 1399, "grp":"cc", "class":3, "rating":"E", "cost":   5400, "mass":  2.0, "power":0.20, "range":0.88, "maximum": 2, "time":300 },
-    { "id": "C7", "edID": 128671235, "eddbID": 1400, "grp":"cc", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":0.27, "range":0.66, "maximum": 2, "time":600 },
-    { "id": "C8", "edID": 128671236, "eddbID": 1401, "grp":"cc", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":0.34, "range":1.10, "maximum": 2, "time":510 },
-    { "id": "C9", "edID": 128671237, "eddbID": 1402, "grp":"cc", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":0.41, "range":1.54, "maximum": 2, "time":420 },
-    { "id": "C0", "edID": 128671238, "eddbID": 1403, "grp":"cc", "class":3, "rating":"A", "cost":  86400, "mass":  8.0, "power":0.48, "range":1.32, "maximum": 2, "time":720 },
-
-    { "id": "C1", "edID": 128671229, "eddbID": 1394, "grp":"cc", "class":1, "rating":"E", "cost":    600, "mass":  0.5, "power":0.14, "range":0.80, "maximum": 1, "time":300 },
-    { "id": "C2", "edID": 128671230, "eddbID": 1395, "grp":"cc", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":0.18, "range":0.60, "maximum": 1, "time":600 },
-    { "id": "C3", "edID": 128671231, "eddbID": 1396, "grp":"cc", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":0.23, "range":1.00, "maximum": 1, "time":510 },
-    { "id": "C4", "edID": 128671232, "eddbID": 1397, "grp":"cc", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":0.28, "range":1.40, "maximum": 1, "time":420 },
-    { "id": "C5", "edID": 128671233, "eddbID": 1398, "grp":"cc", "class":1, "rating":"A", "cost":   9600, "mass":  2.0, "power":0.32, "range":1.20, "maximum": 1, "time":720 }
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671244,
+      "eddbID": 1409,
+      "grp": "cc",
+      "id": "Cf",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671245,
+      "eddbID": 1410,
+      "grp": "cc",
+      "id": "Cg",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "D",
+      "time": 600
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671246,
+      "eddbID": 1411,
+      "grp": "cc",
+      "id": "Ch",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C",
+      "time": 510
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671247,
+      "eddbID": 1412,
+      "grp": "cc",
+      "id": "Ci",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "B",
+      "time": 420
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671248,
+      "eddbID": 1413,
+      "grp": "cc",
+      "id": "Cj",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "A",
+      "time": 720
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671239,
+      "eddbID": 1404,
+      "grp": "cc",
+      "id": "Ca",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 1.04,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671240,
+      "eddbID": 1405,
+      "grp": "cc",
+      "id": "Cb",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.4,
+      "range": 0.78,
+      "rating": "D",
+      "time": 600
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671241,
+      "eddbID": 1406,
+      "grp": "cc",
+      "id": "Cc",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.5,
+      "range": 1.3,
+      "rating": "C",
+      "time": 510
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671242,
+      "eddbID": 1407,
+      "grp": "cc",
+      "id": "Cd",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "B",
+      "time": 420
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671243,
+      "eddbID": 1408,
+      "grp": "cc",
+      "id": "Ce",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.7,
+      "range": 1.56,
+      "rating": "A",
+      "time": 720
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128671234,
+      "eddbID": 1399,
+      "grp": "cc",
+      "id": "C6",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 0.88,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128671235,
+      "eddbID": 1400,
+      "grp": "cc",
+      "id": "C7",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 0.66,
+      "rating": "D",
+      "time": 600
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128671236,
+      "eddbID": 1401,
+      "grp": "cc",
+      "id": "C8",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 1.1,
+      "rating": "C",
+      "time": 510
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128671237,
+      "eddbID": 1402,
+      "grp": "cc",
+      "id": "C9",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 1.54,
+      "rating": "B",
+      "time": 420
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128671238,
+      "eddbID": 1403,
+      "grp": "cc",
+      "id": "C0",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 1.32,
+      "rating": "A",
+      "time": 720
+    },
+    {
+      "class": 1,
+      "cost": 600,
+      "edID": 128671229,
+      "eddbID": 1394,
+      "grp": "cc",
+      "id": "C1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 0.8,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671230,
+      "eddbID": 1395,
+      "grp": "cc",
+      "id": "C2",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
+      "rating": "D",
+      "time": 600
+    },
+    {
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671231,
+      "eddbID": 1396,
+      "grp": "cc",
+      "id": "C3",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
+      "rating": "C",
+      "time": 510
+    },
+    {
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671232,
+      "eddbID": 1397,
+      "grp": "cc",
+      "id": "C4",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 1.4,
+      "rating": "B",
+      "time": 420
+    },
+    {
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671233,
+      "eddbID": 1398,
+      "grp": "cc",
+      "id": "C5",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
+      "rating": "A",
+      "time": 720
+    }
   ]
-}
+}

modules/internal/docking_computer.json

@@ -1,5 +1,15 @@
 {
   "dc": [
-    { "id": "24", "edID": 128049549, "eddbID": 890, "grp": "dc", "name": "Standard Docking Computer", "class": 1, "rating": "E", "cost": 4500, "power": 0.39 }
+    {
+      "class": 1,
+      "cost": 4500,
+      "edID": 128049549,
+      "eddbID": 890,
+      "grp": "dc",
+      "id": "24",
+      "name": "Standard Docking Computer",
+      "power": 0.39,
+      "rating": "E"
+    }
   ]
-}
+}

modules/internal/economy_passenger_cabin.json

@@ -0,0 +1,54 @@
+{
+  "pce": [
+    {
+      "class": 2,
+      "cost": -1,
+      "eddbID": 1563,
+      "grp": "pce",
+      "id": "ma",
+      "mass": 2.5,
+      "passengers": 2,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": -1,
+      "eddbID": 1564,
+      "grp": "pce",
+      "id": "mb",
+      "mass": 5,
+      "passengers": 4,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": -1,
+      "eddbID": 1565,
+      "grp": "pce",
+      "id": "mc",
+      "mass": 10,
+      "passengers": 8,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": -1,
+      "eddbID": 1566,
+      "grp": "pce",
+      "id": "md",
+      "mass": 20,
+      "passengers": 16,
+      "rating": "E"
+    },
+    {
+      "class": 6,
+      "cost": -1,
+      "eddbID": 1567,
+      "grp": "pce",
+      "id": "me",
+      "mass": 40,
+      "passengers": 32,
+      "rating": "E"
+    }
+  ]
+}

modules/internal/fighter_hangar.json

@@ -0,0 +1,40 @@
+{
+  "fh": [
+    {
+      "bays": 2,
+      "class": 7,
+      "cost": -1,
+      "eddbID": 1560,
+      "grp": "fh",
+      "id": "fh",
+      "mass": 60,
+      "power": 0.35,
+      "rating": "D",
+      "rebuildsperbay": 15
+    },
+    {
+      "bays": 2,
+      "class": 6,
+      "cost": -1,
+      "eddbID": 1561,
+      "grp": "fh",
+      "id": "fm",
+      "mass": 40,
+      "power": 0.35,
+      "rating": "D",
+      "rebuildsperbay": 8
+    },
+    {
+      "bays": 1,
+      "class": 5,
+      "cost": -1,
+      "eddbID": 1562,
+      "grp": "fh",
+      "id": "fr",
+      "mass": 20,
+      "power": 0.25,
+      "rating": "D",
+      "rebuildsperbay": 6
+    }
+  ]
+}

modules/internal/first_passenger_cabin.json

@@ -0,0 +1,34 @@
+{
+  "pcm": [
+    {
+      "class": 4,
+      "cost": -1,
+      "eddbID": 1572,
+      "grp": "pcm",
+      "id": "mj",
+      "mass": 10,
+      "passengers": 3,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": -1,
+      "eddbID": 1573,
+      "grp": "pcm",
+      "id": "mk",
+      "mass": 20,
+      "passengers": 6,
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": -1,
+      "eddbID": 1574,
+      "grp": "pcm",
+      "id": "ml",
+      "mass": 40,
+      "passengers": 12,
+      "rating": "C"
+    }
+  ]
+}

modules/internal/frame_shift_drive_interdictor.json

@@ -1,27 +1,244 @@
 {
   "fi": [
-    { "id": "6p", "edID": 128666707, "eddbID": 1309, "grp": "fi", "class": 4, "rating": "E", "cost": 263420, "mass": 10, "power": 0.25, "rangeRating": "B" },
-    { "id": "6o", "edID": 128666711, "eddbID": 1313, "grp": "fi", "class": 4, "rating": "D", "cost": 790270, "mass": 4, "power": 0.33, "rangeRating": "A" },
-    { "id": "6n", "edID": 128666715, "eddbID": 1317, "grp": "fi", "class": 4, "rating": "C", "cost": 2370820, "mass": 10, "power": 0.41, "rangeRating": "A" },
-    { "id": "6m", "edID": 128666719, "eddbID": 1321, "grp": "fi", "class": 4, "rating": "B", "cost": 7112450, "mass": 16, "power": 0.49, "rangeRating": "A" },
-    { "id": "6l", "edID": 128666723, "eddbID": 1325, "grp": "fi", "class": 4, "rating": "A", "cost": 21337340, "mass": 10, "power": 0.57, "rangeRating": "A" },
-
-    { "id": "6k", "edID": 128666706, "eddbID": 1308, "grp": "fi", "class": 3, "rating": "E", "cost": 94080, "mass": 5, "power": 0.2, "rangeRating": "C" },
-    { "id": "6j", "edID": 128666710, "eddbID": 1312, "grp": "fi", "class": 3, "rating": "D", "cost": 282240, "mass": 2, "power": 0.27, "rangeRating": "B" },
-    { "id": "6i", "edID": 128666714, "eddbID": 1316, "grp": "fi", "class": 3, "rating": "C", "cost": 846720, "mass": 5, "power": 0.34, "rangeRating": "B" },
-    { "id": "6h", "edID": 128666718, "eddbID": 1320, "grp": "fi", "class": 3, "rating": "B", "cost": 2540160, "mass": 8, "power": 0.41, "rangeRating": "B" },
-    { "id": "6g", "edID": 128666722, "eddbID": 1324, "grp": "fi", "class": 3, "rating": "A", "cost": 7620480, "mass": 5, "power": 0.48, "rangeRating": "A" },
-
-    { "id": "6f", "edID": 128666705, "eddbID": 1307, "grp": "fi", "class": 2, "rating": "E", "cost": 33600, "mass": 2.5, "power": 0.17, "rangeRating": "D" },
-    { "id": "6e", "edID": 128666709, "eddbID": 1311, "grp": "fi", "class": 2, "rating": "D", "cost": 100800, "mass": 1, "power": 0.22, "rangeRating": "C" },
-    { "id": "6d", "edID": 128666713, "eddbID": 1315, "grp": "fi", "class": 2, "rating": "C", "cost": 302400, "mass": 2.5, "power": 0.28, "rangeRating": "C" },
-    { "id": "6c", "edID": 128666717, "eddbID": 1319, "grp": "fi", "class": 2, "rating": "B", "cost": 907200, "mass": 4, "power": 0.34, "rangeRating": "C" },
-    { "id": "6b", "edID": 128666721, "eddbID": 1323, "grp": "fi", "class": 2, "rating": "A", "cost": 2721600, "mass": 2.5, "power": 0.39, "rangeRating": "B" },
-
-    { "id": "6a", "edID": 128666704, "eddbID": 1306, "grp": "fi", "class": 1, "rating": "E", "cost": 12000, "mass": 1.3, "power": 0.14, "rangeRating": "E" },
-    { "id": "69", "edID": 128666708, "eddbID": 1310, "grp": "fi", "class": 1, "rating": "D", "cost": 36000, "mass": 0.5, "power": 0.18, "rangeRating": "D" },
-    { "id": "68", "edID": 128666712, "eddbID": 1314, "grp": "fi", "class": 1, "rating": "C", "cost": 108000, "mass": 1.3, "power": 0.23, "rangeRating": "D" },
-    { "id": "67", "edID": 128666716, "eddbID": 1318, "grp": "fi", "class": 1, "rating": "B", "cost": 324000, "mass": 2, "power": 0.28, "rangeRating": "D" },
-    { "id": "66", "edID": 128666720, "eddbID": 1322, "grp": "fi", "class": 1, "rating": "A", "cost": 972000, "mass": 1.3, "power": 0.32, "rangeRating": "C" }
+    {
+      "class": 4,
+      "cost": 263420,
+      "edID": 128666707,
+      "eddbID": 1309,
+      "grp": "fi",
+      "id": "6p",
+      "mass": 10,
+      "power": 0.25,
+      "rangeRating": "B",
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 790270,
+      "edID": 128666711,
+      "eddbID": 1313,
+      "grp": "fi",
+      "id": "6o",
+      "mass": 4,
+      "power": 0.33,
+      "rangeRating": "A",
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 2370820,
+      "edID": 128666715,
+      "eddbID": 1317,
+      "grp": "fi",
+      "id": "6n",
+      "mass": 10,
+      "power": 0.41,
+      "rangeRating": "A",
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 7112450,
+      "edID": 128666719,
+      "eddbID": 1321,
+      "grp": "fi",
+      "id": "6m",
+      "mass": 16,
+      "power": 0.49,
+      "rangeRating": "A",
+      "rating": "B"
+    },
+    {
+      "class": 4,
+      "cost": 21337340,
+      "edID": 128666723,
+      "eddbID": 1325,
+      "grp": "fi",
+      "id": "6l",
+      "mass": 10,
+      "power": 0.57,
+      "rangeRating": "A",
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 94080,
+      "edID": 128666706,
+      "eddbID": 1308,
+      "grp": "fi",
+      "id": "6k",
+      "mass": 5,
+      "power": 0.2,
+      "rangeRating": "C",
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 282240,
+      "edID": 128666710,
+      "eddbID": 1312,
+      "grp": "fi",
+      "id": "6j",
+      "mass": 2,
+      "power": 0.27,
+      "rangeRating": "B",
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 846720,
+      "edID": 128666714,
+      "eddbID": 1316,
+      "grp": "fi",
+      "id": "6i",
+      "mass": 5,
+      "power": 0.34,
+      "rangeRating": "B",
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 2540160,
+      "edID": 128666718,
+      "eddbID": 1320,
+      "grp": "fi",
+      "id": "6h",
+      "mass": 8,
+      "power": 0.41,
+      "rangeRating": "B",
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 7620480,
+      "edID": 128666722,
+      "eddbID": 1324,
+      "grp": "fi",
+      "id": "6g",
+      "mass": 5,
+      "power": 0.48,
+      "rangeRating": "A",
+      "rating": "A"
+    },
+    {
+      "class": 2,
+      "cost": 33600,
+      "edID": 128666705,
+      "eddbID": 1307,
+      "grp": "fi",
+      "id": "6f",
+      "mass": 2.5,
+      "power": 0.17,
+      "rangeRating": "D",
+      "rating": "E"
+    },
+    {
+      "class": 2,
+      "cost": 100800,
+      "edID": 128666709,
+      "eddbID": 1311,
+      "grp": "fi",
+      "id": "6e",
+      "mass": 1,
+      "power": 0.22,
+      "rangeRating": "C",
+      "rating": "D"
+    },
+    {
+      "class": 2,
+      "cost": 302400,
+      "edID": 128666713,
+      "eddbID": 1315,
+      "grp": "fi",
+      "id": "6d",
+      "mass": 2.5,
+      "power": 0.28,
+      "rangeRating": "C",
+      "rating": "C"
+    },
+    {
+      "class": 2,
+      "cost": 907200,
+      "edID": 128666717,
+      "eddbID": 1319,
+      "grp": "fi",
+      "id": "6c",
+      "mass": 4,
+      "power": 0.34,
+      "rangeRating": "C",
+      "rating": "B"
+    },
+    {
+      "class": 2,
+      "cost": 2721600,
+      "edID": 128666721,
+      "eddbID": 1323,
+      "grp": "fi",
+      "id": "6b",
+      "mass": 2.5,
+      "power": 0.39,
+      "rangeRating": "B",
+      "rating": "A"
+    },
+    {
+      "class": 1,
+      "cost": 12000,
+      "edID": 128666704,
+      "eddbID": 1306,
+      "grp": "fi",
+      "id": "6a",
+      "mass": 1.3,
+      "power": 0.14,
+      "rangeRating": "E",
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 36000,
+      "edID": 128666708,
+      "eddbID": 1310,
+      "grp": "fi",
+      "id": "69",
+      "mass": 0.5,
+      "power": 0.18,
+      "rangeRating": "D",
+      "rating": "D"
+    },
+    {
+      "class": 1,
+      "cost": 108000,
+      "edID": 128666712,
+      "eddbID": 1314,
+      "grp": "fi",
+      "id": "68",
+      "mass": 1.3,
+      "power": 0.23,
+      "rangeRating": "D",
+      "rating": "C"
+    },
+    {
+      "class": 1,
+      "cost": 324000,
+      "edID": 128666716,
+      "eddbID": 1318,
+      "grp": "fi",
+      "id": "67",
+      "mass": 2,
+      "power": 0.28,
+      "rangeRating": "D",
+      "rating": "B"
+    },
+    {
+      "class": 1,
+      "cost": 972000,
+      "edID": 128666720,
+      "eddbID": 1322,
+      "grp": "fi",
+      "id": "66",
+      "mass": 1.3,
+      "power": 0.32,
+      "rangeRating": "C",
+      "rating": "A"
+    }
   ]
-}
+}

modules/internal/fuel_scoop.json

@@ -1,51 +1,444 @@
 {
   "fs": [
-    { "id": "3q", "edID": 128666651, "eddbID": 1253, "grp": "fs", "class": 8, "rating": "E", "cost": 1083910, "power": 0.48, "rate": 720 },
-    { "id": "3p", "edID": 128666659, "eddbID": 1261, "grp": "fs", "class": 8, "rating": "D", "cost": 4516290, "power": 0.64, "rate": 960 },
-    { "id": "3o", "edID": 128666667, "eddbID": 1269, "grp": "fs", "class": 8, "rating": "C", "cost": 18065160, "power": 0.8, "rate": 1200 },
-    { "id": "3n", "edID": 128666675, "eddbID": 1277, "grp": "fs", "class": 8, "rating": "B", "cost": 72260660, "power": 0.96, "rate": 1440 },
-    { "id": "3m", "edID": 128666683, "eddbID": 1285, "grp": "fs", "class": 8, "rating": "A", "cost": 289042540, "power": 1.12, "rate": 1680 },
-
-    { "id": "3l", "edID": 128666650, "eddbID": 1252, "grp": "fs", "class": 7, "rating": "E", "cost": 341930, "power": 0.41, "rate": 534 },
-    { "id": "3k", "edID": 128666658, "eddbID": 1260, "grp": "fs", "class": 7, "rating": "D", "cost": 1424700, "power": 0.55, "rate": 712 },
-    { "id": "3j", "edID": 128666666, "eddbID": 1268, "grp": "fs", "class": 7, "rating": "C", "cost": 5698790, "power": 0.69, "rate": 890 },
-    { "id": "3i", "edID": 128666674, "eddbID": 1276, "grp": "fs", "class": 7, "rating": "B", "cost": 22795160, "power": 0.83, "rate": 1068 },
-    { "id": "3h", "edID": 128666682, "eddbID": 1284, "grp": "fs", "class": 7, "rating": "A", "cost": 91180640, "power": 0.97, "rate": 1245 },
-
-    { "id": "3g", "edID": 128666649, "eddbID": 1251, "grp": "fs", "class": 6, "rating": "E", "cost": 107860, "power": 0.35, "rate": 376 },
-    { "id": "3f", "edID": 128666657, "eddbID": 1259, "grp": "fs", "class": 6, "rating": "D", "cost": 449430, "power": 0.47, "rate": 502 },
-    { "id": "3e", "edID": 128666665, "eddbID": 1267, "grp": "fs", "class": 6, "rating": "C", "cost": 1797730, "power": 0.59, "rate": 627 },
-    { "id": "3d", "edID": 128666673, "eddbID": 1275, "grp": "fs", "class": 6, "rating": "B", "cost": 7190900, "power": 0.71, "rate": 752 },
-    { "id": "3c", "edID": 128666681, "eddbID": 1283, "grp": "fs", "class": 6, "rating": "A", "cost": 28763610, "power": 0.83, "rate": 878 },
-
-    { "id": "3b", "edID": 128666648, "eddbID": 1250, "grp": "fs", "class": 5, "rating": "E", "cost": 34030, "power": 0.3, "rate": 247 },
-    { "id": "3a", "edID": 128666656, "eddbID": 1258, "grp": "fs", "class": 5, "rating": "D", "cost": 141780, "power": 0.4, "rate": 330 },
-    { "id": "39", "edID": 128666664, "eddbID": 1266, "grp": "fs", "class": 5, "rating": "C", "cost": 567110, "power": 0.5, "rate": 412 },
-    { "id": "38", "edID": 128666672, "eddbID": 1274, "grp": "fs", "class": 5, "rating": "B", "cost": 2268420, "power": 0.6, "rate": 494 },
-    { "id": "37", "edID": 128666680, "eddbID": 1282, "grp": "fs", "class": 5, "rating": "A", "cost": 9073690, "power": 0.7, "rate": 577 },
-
-    { "id": "36", "edID": 128666647, "eddbID": 1249, "grp": "fs", "class": 4, "rating": "E", "cost": 10730, "power": 0.25, "rate": 147 },
-    { "id": "35", "edID": 128666655, "eddbID": 1257, "grp": "fs", "class": 4, "rating": "D", "cost": 44720, "power": 0.33, "rate": 196 },
-    { "id": "34", "edID": 128666663, "eddbID": 1265, "grp": "fs", "class": 4, "rating": "C", "cost": 178900, "power": 0.41, "rate": 245 },
-    { "id": "33", "edID": 128666671, "eddbID": 1273, "grp": "fs", "class": 4, "rating": "B", "cost": 715590, "power": 0.49, "rate": 294 },
-    { "id": "32", "edID": 128666679, "eddbID": 1281, "grp": "fs", "class": 4, "rating": "A", "cost": 2862360, "power": 0.57, "rate": 342 },
-
-    { "id": "31", "edID": 128666646, "eddbID": 1248, "grp": "fs", "class": 3, "rating": "E", "cost": 3390, "power": 0.2, "rate": 75 },
-    { "id": "30", "edID": 128666654, "eddbID": 1256, "grp": "fs", "class": 3, "rating": "D", "cost": 14110, "power": 0.27, "rate": 100 },
-    { "id": "2v", "edID": 128666662, "eddbID": 1264, "grp": "fs", "class": 3, "rating": "C", "cost": 56440, "power": 0.34, "rate": 126 },
-    { "id": "2u", "edID": 128666670, "eddbID": 1272, "grp": "fs", "class": 3, "rating": "B", "cost": 225740, "power": 0.41, "rate": 151 },
-    { "id": "2t", "edID": 128666678, "eddbID": 1280, "grp": "fs", "class": 3, "rating": "A", "cost": 902950, "power": 0.48, "rate": 176 },
-
-    { "id": "2s", "edID": 128666645, "eddbID": 1247, "grp": "fs", "class": 2, "rating": "E", "cost": 1070, "power": 0.17, "rate": 32 },
-    { "id": "2r", "edID": 128666653, "eddbID": 1255, "grp": "fs", "class": 2, "rating": "D", "cost": 4450, "power": 0.22, "rate": 43 },
-    { "id": "2q", "edID": 128666661, "eddbID": 1263, "grp": "fs", "class": 2, "rating": "C", "cost": 17800, "power": 0.28, "rate": 54 },
-    { "id": "2p", "edID": 128666669, "eddbID": 1271, "grp": "fs", "class": 2, "rating": "B", "cost": 71210, "power": 0.34, "rate": 65 },
-    { "id": "2o", "edID": 128666677, "eddbID": 1279, "grp": "fs", "class": 2, "rating": "A", "cost": 284840, "power": 0.39, "rate": 75 },
-
-    { "id": "2n", "edID": 128666644, "eddbID": 1246, "grp": "fs", "class": 1, "rating": "E", "cost": 310, "power": 0.14, "rate": 18 },
-    { "id": "2m", "edID": 128666652, "eddbID": 1254, "grp": "fs", "class": 1, "rating": "D", "cost": 1290, "power": 0.18, "rate": 24 },
-    { "id": "2l", "edID": 128666660, "eddbID": 1262, "grp": "fs", "class": 1, "rating": "C", "cost": 5140, "power": 0.23, "rate": 30 },
-    { "id": "2k", "edID": 128666668, "eddbID": 1270, "grp": "fs", "class": 1, "rating": "B", "cost": 20570, "power": 0.28, "rate": 36 },
-    { "id": "2j", "edID": 128666676, "eddbID": 1278, "grp": "fs", "class": 1, "rating": "A", "cost": 82270, "power": 0.32, "rate": 42 }
+    {
+      "class": 8,
+      "cost": 1083910,
+      "edID": 128666651,
+      "eddbID": 1253,
+      "grp": "fs",
+      "id": "3q",
+      "power": 0.48,
+      "rate": 720,
+      "rating": "E"
+    },
+    {
+      "class": 8,
+      "cost": 4516290,
+      "edID": 128666659,
+      "eddbID": 1261,
+      "grp": "fs",
+      "id": "3p",
+      "power": 0.64,
+      "rate": 960,
+      "rating": "D"
+    },
+    {
+      "class": 8,
+      "cost": 18065160,
+      "edID": 128666667,
+      "eddbID": 1269,
+      "grp": "fs",
+      "id": "3o",
+      "power": 0.8,
+      "rate": 1200,
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 72260660,
+      "edID": 128666675,
+      "eddbID": 1277,
+      "grp": "fs",
+      "id": "3n",
+      "power": 0.96,
+      "rate": 1440,
+      "rating": "B"
+    },
+    {
+      "class": 8,
+      "cost": 289042540,
+      "edID": 128666683,
+      "eddbID": 1285,
+      "grp": "fs",
+      "id": "3m",
+      "power": 1.12,
+      "rate": 1680,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 341930,
+      "edID": 128666650,
+      "eddbID": 1252,
+      "grp": "fs",
+      "id": "3l",
+      "power": 0.41,
+      "rate": 534,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 1424700,
+      "edID": 128666658,
+      "eddbID": 1260,
+      "grp": "fs",
+      "id": "3k",
+      "power": 0.55,
+      "rate": 712,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128666666,
+      "eddbID": 1268,
+      "grp": "fs",
+      "id": "3j",
+      "power": 0.69,
+      "rate": 890,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 22795160,
+      "edID": 128666674,
+      "eddbID": 1276,
+      "grp": "fs",
+      "id": "3i",
+      "power": 0.83,
+      "rate": 1068,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 91180640,
+      "edID": 128666682,
+      "eddbID": 1284,
+      "grp": "fs",
+      "id": "3h",
+      "power": 0.97,
+      "rate": 1245,
+      "rating": "A"
+    },
+    {
+      "class": 6,
+      "cost": 107860,
+      "edID": 128666649,
+      "eddbID": 1251,
+      "grp": "fs",
+      "id": "3g",
+      "power": 0.35,
+      "rate": 376,
+      "rating": "E"
+    },
+    {
+      "class": 6,
+      "cost": 449430,
+      "edID": 128666657,
+      "eddbID": 1259,
+      "grp": "fs",
+      "id": "3f",
+      "power": 0.47,
+      "rate": 502,
+      "rating": "D"
+    },
+    {
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128666665,
+      "eddbID": 1267,
+      "grp": "fs",
+      "id": "3e",
+      "power": 0.59,
+      "rate": 627,
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 7190900,
+      "edID": 128666673,
+      "eddbID": 1275,
+      "grp": "fs",
+      "id": "3d",
+      "power": 0.71,
+      "rate": 752,
+      "rating": "B"
+    },
+    {
+      "class": 6,
+      "cost": 28763610,
+      "edID": 128666681,
+      "eddbID": 1283,
+      "grp": "fs",
+      "id": "3c",
+      "power": 0.83,
+      "rate": 878,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 34030,
+      "edID": 128666648,
+      "eddbID": 1250,
+      "grp": "fs",
+      "id": "3b",
+      "power": 0.3,
+      "rate": 247,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 141780,
+      "edID": 128666656,
+      "eddbID": 1258,
+      "grp": "fs",
+      "id": "3a",
+      "power": 0.4,
+      "rate": 330,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 567110,
+      "edID": 128666664,
+      "eddbID": 1266,
+      "grp": "fs",
+      "id": "39",
+      "power": 0.5,
+      "rate": 412,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 2268420,
+      "edID": 128666672,
+      "eddbID": 1274,
+      "grp": "fs",
+      "id": "38",
+      "power": 0.6,
+      "rate": 494,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 9073690,
+      "edID": 128666680,
+      "eddbID": 1282,
+      "grp": "fs",
+      "id": "37",
+      "power": 0.7,
+      "rate": 577,
+      "rating": "A"
+    },
+    {
+      "class": 4,
+      "cost": 10730,
+      "edID": 128666647,
+      "eddbID": 1249,
+      "grp": "fs",
+      "id": "36",
+      "power": 0.25,
+      "rate": 147,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 44720,
+      "edID": 128666655,
+      "eddbID": 1257,
+      "grp": "fs",
+      "id": "35",
+      "power": 0.33,
+      "rate": 196,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 178900,
+      "edID": 128666663,
+      "eddbID": 1265,
+      "grp": "fs",
+      "id": "34",
+      "power": 0.41,
+      "rate": 245,
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 715590,
+      "edID": 128666671,
+      "eddbID": 1273,
+      "grp": "fs",
+      "id": "33",
+      "power": 0.49,
+      "rate": 294,
+      "rating": "B"
+    },
+    {
+      "class": 4,
+      "cost": 2862360,
+      "edID": 128666679,
+      "eddbID": 1281,
+      "grp": "fs",
+      "id": "32",
+      "power": 0.57,
+      "rate": 342,
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 3390,
+      "edID": 128666646,
+      "eddbID": 1248,
+      "grp": "fs",
+      "id": "31",
+      "power": 0.2,
+      "rate": 75,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 14110,
+      "edID": 128666654,
+      "eddbID": 1256,
+      "grp": "fs",
+      "id": "30",
+      "power": 0.27,
+      "rate": 100,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 56440,
+      "edID": 128666662,
+      "eddbID": 1264,
+      "grp": "fs",
+      "id": "2v",
+      "power": 0.34,
+      "rate": 126,
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 225740,
+      "edID": 128666670,
+      "eddbID": 1272,
+      "grp": "fs",
+      "id": "2u",
+      "power": 0.41,
+      "rate": 151,
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 902950,
+      "edID": 128666678,
+      "eddbID": 1280,
+      "grp": "fs",
+      "id": "2t",
+      "power": 0.48,
+      "rate": 176,
+      "rating": "A"
+    },
+    {
+      "class": 2,
+      "cost": 1070,
+      "edID": 128666645,
+      "eddbID": 1247,
+      "grp": "fs",
+      "id": "2s",
+      "power": 0.17,
+      "rate": 32,
+      "rating": "E"
+    },
+    {
+      "class": 2,
+      "cost": 4450,
+      "edID": 128666653,
+      "eddbID": 1255,
+      "grp": "fs",
+      "id": "2r",
+      "power": 0.22,
+      "rate": 43,
+      "rating": "D"
+    },
+    {
+      "class": 2,
+      "cost": 17800,
+      "edID": 128666661,
+      "eddbID": 1263,
+      "grp": "fs",
+      "id": "2q",
+      "power": 0.28,
+      "rate": 54,
+      "rating": "C"
+    },
+    {
+      "class": 2,
+      "cost": 71210,
+      "edID": 128666669,
+      "eddbID": 1271,
+      "grp": "fs",
+      "id": "2p",
+      "power": 0.34,
+      "rate": 65,
+      "rating": "B"
+    },
+    {
+      "class": 2,
+      "cost": 284840,
+      "edID": 128666677,
+      "eddbID": 1279,
+      "grp": "fs",
+      "id": "2o",
+      "power": 0.39,
+      "rate": 75,
+      "rating": "A"
+    },
+    {
+      "class": 1,
+      "cost": 310,
+      "edID": 128666644,
+      "eddbID": 1246,
+      "grp": "fs",
+      "id": "2n",
+      "power": 0.14,
+      "rate": 18,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 1290,
+      "edID": 128666652,
+      "eddbID": 1254,
+      "grp": "fs",
+      "id": "2m",
+      "power": 0.18,
+      "rate": 24,
+      "rating": "D"
+    },
+    {
+      "class": 1,
+      "cost": 5140,
+      "edID": 128666660,
+      "eddbID": 1262,
+      "grp": "fs",
+      "id": "2l",
+      "power": 0.23,
+      "rate": 30,
+      "rating": "C"
+    },
+    {
+      "class": 1,
+      "cost": 20570,
+      "edID": 128666668,
+      "eddbID": 1270,
+      "grp": "fs",
+      "id": "2k",
+      "power": 0.28,
+      "rate": 36,
+      "rating": "B"
+    },
+    {
+      "class": 1,
+      "cost": 82270,
+      "edID": 128666676,
+      "eddbID": 1278,
+      "grp": "fs",
+      "id": "2j",
+      "power": 0.32,
+      "rate": 42,
+      "rating": "A"
+    }
   ]
-}
+}

modules/internal/fuel_transfer_limpet_controllers.json

@@ -1,27 +1,264 @@
 {
   "fx": [
-    { "id": "Ff", "edID": 128671264, "eddbID": 1429, "grp":"fx", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":0.55, "range":1.02, "maximum": 8 },
-    { "id": "Fg", "edID": 128671265, "eddbID": 1430, "grp":"fx", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.41, "range":1.36, "maximum": 8 },
-    { "id": "Fh", "edID": 128671266, "eddbID": 1431, "grp":"fx", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range":1.70, "maximum": 8 },
-    { "id": "Fi", "edID": 128671267, "eddbID": 1432, "grp":"fx", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":0.97, "range":2.04, "maximum": 8 },
-    { "id": "Fj", "edID": 128671268, "eddbID": 1433, "grp":"fx", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":0.83, "range":2.38, "maximum": 8 },
-
-    { "id": "Fa", "edID": 128671259, "eddbID": 1424, "grp":"fx", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":0.40, "range":0.78, "maximum": 4 },
-    { "id": "Fb", "edID": 128671260, "eddbID": 1425, "grp":"fx", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":0.30, "range":1.04, "maximum": 4 },
-    { "id": "Fc", "edID": 128671261, "eddbID": 1426, "grp":"fx", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":0.50, "range":1.30, "maximum": 4 },
-    { "id": "Fd", "edID": 128671262, "eddbID": 1427, "grp":"fx", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":0.97, "range":1.56, "maximum": 4 },
-    { "id": "Fe", "edID": 128671263, "eddbID": 1428, "grp":"fx", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":0.60, "range":1.82, "maximum": 4 },
-
-    { "id": "F5", "edID": 128671254, "eddbID": 1419, "grp":"fx", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":0.27, "range":0.66, "maximum": 2 },
-    { "id": "F6", "edID": 128671255, "eddbID": 1420, "grp":"fx", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":0.20, "range":0.88, "maximum": 2 },
-    { "id": "F7", "edID": 128671256, "eddbID": 1421, "grp":"fx", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":0.34, "range":1.10, "maximum": 2 },
-    { "id": "F8", "edID": 128671257, "eddbID": 1422, "grp":"fx", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":0.48, "range":1.32, "maximum": 2 },
-    { "id": "F9", "edID": 128671258, "eddbID": 1423, "grp":"fx", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":0.41, "range":1.54, "maximum": 2 },
-
-    { "id": "F0", "edID": 128671249, "eddbID": 1414, "grp":"fx", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":0.18, "range":0.60, "maximum": 1 },
-    { "id": "F1", "edID": 128671250, "eddbID": 1415, "grp":"fx", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":0.14, "range":0.80, "maximum": 1 },
-    { "id": "F2", "edID": 128671251, "eddbID": 1416, "grp":"fx", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":0.23, "range":1.00, "maximum": 1 },
-    { "id": "F3", "edID": 128671252, "eddbID": 1417, "grp":"fx", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":0.32, "range":1.20, "maximum": 1 },
-    { "id": "F4", "edID": 128671253, "eddbID": 1418, "grp":"fx", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":0.28, "range":1.40, "maximum": 1 }
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671264,
+      "eddbID": 1429,
+      "grp": "fx",
+      "id": "Ff",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671265,
+      "eddbID": 1430,
+      "grp": "fx",
+      "id": "Fg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671266,
+      "eddbID": 1431,
+      "grp": "fx",
+      "id": "Fh",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671267,
+      "eddbID": 1432,
+      "grp": "fx",
+      "id": "Fi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671268,
+      "eddbID": 1433,
+      "grp": "fx",
+      "id": "Fj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671259,
+      "eddbID": 1424,
+      "grp": "fx",
+      "id": "Fa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 0.78,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671260,
+      "eddbID": 1425,
+      "grp": "fx",
+      "id": "Fb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 1.04,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671261,
+      "eddbID": 1426,
+      "grp": "fx",
+      "id": "Fc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 1.3,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671262,
+      "eddbID": 1427,
+      "grp": "fx",
+      "id": "Fd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 1.56,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671263,
+      "eddbID": 1428,
+      "grp": "fx",
+      "id": "Fe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128671254,
+      "eddbID": 1419,
+      "grp": "fx",
+      "id": "F5",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 0.66,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128671255,
+      "eddbID": 1420,
+      "grp": "fx",
+      "id": "F6",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 0.88,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128671256,
+      "eddbID": 1421,
+      "grp": "fx",
+      "id": "F7",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 1.1,
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128671257,
+      "eddbID": 1422,
+      "grp": "fx",
+      "id": "F8",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 1.32,
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128671258,
+      "eddbID": 1423,
+      "grp": "fx",
+      "id": "F9",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 1.54,
+      "rating": "A"
+    },
+    {
+      "class": 1,
+      "cost": 600,
+      "edID": 128671249,
+      "eddbID": 1414,
+      "grp": "fx",
+      "id": "F0",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671250,
+      "eddbID": 1415,
+      "grp": "fx",
+      "id": "F1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 0.8,
+      "rating": "D"
+    },
+    {
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671251,
+      "eddbID": 1416,
+      "grp": "fx",
+      "id": "F2",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
+      "rating": "C"
+    },
+    {
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671252,
+      "eddbID": 1417,
+      "grp": "fx",
+      "id": "F3",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
+      "rating": "B"
+    },
+    {
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671253,
+      "eddbID": 1418,
+      "grp": "fx",
+      "id": "F4",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 1.4,
+      "rating": "A"
+    }
   ]
-}
+}

modules/internal/hatch_breaker_limpet_controller.json

@@ -1,27 +1,284 @@
 {
   "hb": [
-    { "id": "7d", "edID": 128066547, "eddbID": 1222, "grp": "hb", "class": 7, "rating": "E", "cost": 437400, "power": 0.42, "range": 2.58, "maximum": 18, "time": 25 },
-    { "id": "7c", "edID": 128066548, "eddbID": 1223, "grp": "hb", "class": 7, "rating": "D", "cost": 874800, "power": 0.56, "range": 3.44, "maximum": 12, "time": 22 },
-    { "id": "7b", "edID": 128066549, "eddbID": 1224, "grp": "hb", "class": 7, "rating": "C", "cost": 1749600, "power": 0.7, "range": 4.3, "maximum": 15, "time": 18 },
-    { "id": "7a", "edID": 128066550, "eddbID": 1225, "grp": "hb", "class": 7, "rating": "B", "cost": 3499200, "power": 0.84, "range": 5.16, "maximum": 18, "time": 14 },
-    { "id": "79", "edID": 128066551, "eddbID": 1226, "grp": "hb", "class": 7, "rating": "A", "cost": 6998400, "power": 0.98, "range": 6.02, "maximum": 12, "time": 11 },
-
-    { "id": "78", "edID": 128066542, "eddbID": 1217, "grp": "hb", "class": 5, "rating": "E", "cost": 48600, "power": 0.3, "range": 1.98, "maximum": 9, "time": 31 },
-    { "id": "77", "edID": 128066543, "eddbID": 1218, "grp": "hb", "class": 5, "rating": "D", "cost": 97200, "power": 0.4, "range": 2.64, "maximum": 6, "time": 26 },
-    { "id": "76", "edID": 128066544, "eddbID": 1219, "grp": "hb", "class": 5, "rating": "C", "cost": 194400, "power": 0.5, "range": 3.3, "maximum": 7, "time": 22 },
-    { "id": "75", "edID": 128066545, "eddbID": 1220, "grp": "hb", "class": 5, "rating": "B", "cost": 388800, "power": 0.6, "range": 3.96, "maximum": 9, "time": 18 },
-    { "id": "74", "edID": 128066546, "eddbID": 1221, "grp": "hb", "class": 5, "rating": "A", "cost": 777600, "power": 0.7, "range": 4.62, "maximum": 6, "time": 13 },
-
-    { "id": "73", "edID": 128066537, "eddbID": 1212, "grp": "hb", "class": 3, "rating": "E", "cost": 5400, "power": 0.18, "range": 1.62, "maximum": 4, "time": 36 },
-    { "id": "72", "edID": 128066538, "eddbID": 1213, "grp": "hb", "class": 3, "rating": "D", "cost": 10800, "power": 0.24, "range": 2.16, "maximum": 3, "time": 31 },
-    { "id": "71", "edID": 128066539, "eddbID": 1214, "grp": "hb", "class": 3, "rating": "C", "cost": 21600, "power": 0.3, "range": 2.7, "maximum": 3, "time": 26 },
-    { "id": "70", "edID": 128066540, "eddbID": 1215, "grp": "hb", "class": 3, "rating": "B", "cost": 43200, "power": 0.36, "range": 3.24, "maximum": 4, "time": 21 },
-    { "id": "6v", "edID": 128066541, "eddbID": 1216, "grp": "hb", "class": 3, "rating": "A", "cost": 86400, "power": 0.42, "range": 3.78, "maximum": 3, "time": 16 },
-
-    { "id": "6u", "edID": 128066532, "eddbID": 1207, "grp": "hb", "class": 1, "rating": "E", "cost": 600, "power": 0.12, "range": 1.5, "maximum": 2, "time": 42 },
-    { "id": "6t", "edID": 128066533, "eddbID": 1208, "grp": "hb", "class": 1, "rating": "D", "cost": 1200, "power": 0.16, "range": 2, "maximum": 1, "time": 36 },
-    { "id": "6s", "edID": 128066534, "eddbID": 1209, "grp": "hb", "class": 1, "rating": "C", "cost": 2400, "power": 0.2, "range": 2.5, "maximum": 1, "time": 30 },
-    { "id": "6r", "edID": 128066535, "eddbID": 1210, "grp": "hb", "class": 1, "rating": "B", "cost": 4800, "power": 0.24, "range": 3, "maximum": 2, "time": 24 },
-    { "id": "6q", "edID": 128066536, "eddbID": 1211, "grp": "hb", "class": 1, "rating": "A", "cost": 9600, "power": 0.28, "range": 3.5, "maximum": 1, "time": 18 }
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128066547,
+      "eddbID": 1222,
+      "grp": "hb",
+      "id": "7d",
+      "mass": 80,
+      "maximum": 18,
+      "power": 0.42,
+      "range": 2.58,
+      "rating": "E",
+      "time": 25
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128066548,
+      "eddbID": 1223,
+      "grp": "hb",
+      "id": "7c",
+      "mass": 32,
+      "maximum": 12,
+      "power": 0.56,
+      "range": 3.44,
+      "rating": "D",
+      "time": 22
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128066549,
+      "eddbID": 1224,
+      "grp": "hb",
+      "id": "7b",
+      "mass": 80,
+      "maximum": 15,
+      "power": 0.7,
+      "range": 4.3,
+      "rating": "C",
+      "time": 18
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128066550,
+      "eddbID": 1225,
+      "grp": "hb",
+      "id": "7a",
+      "mass": 128,
+      "maximum": 18,
+      "power": 0.84,
+      "range": 5.16,
+      "rating": "B",
+      "time": 14
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128066551,
+      "eddbID": 1226,
+      "grp": "hb",
+      "id": "79",
+      "mass": 90,
+      "maximum": 12,
+      "power": 0.98,
+      "range": 6.02,
+      "rating": "A",
+      "time": 11
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128066542,
+      "eddbID": 1217,
+      "grp": "hb",
+      "id": "78",
+      "mass": 20,
+      "maximum": 9,
+      "power": 0.3,
+      "range": 1.98,
+      "rating": "E",
+      "time": 31
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128066543,
+      "eddbID": 1218,
+      "grp": "hb",
+      "id": "77",
+      "mass": 8,
+      "maximum": 6,
+      "power": 0.4,
+      "range": 2.64,
+      "rating": "D",
+      "time": 26
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128066544,
+      "eddbID": 1219,
+      "grp": "hb",
+      "id": "76",
+      "mass": 20,
+      "maximum": 7,
+      "power": 0.5,
+      "range": 3.3,
+      "rating": "C",
+      "time": 22
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128066545,
+      "eddbID": 1220,
+      "grp": "hb",
+      "id": "75",
+      "mass": 32,
+      "maximum": 9,
+      "power": 0.6,
+      "range": 3.96,
+      "rating": "B",
+      "time": 18
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128066546,
+      "eddbID": 1221,
+      "grp": "hb",
+      "id": "74",
+      "mass": 20,
+      "maximum": 6,
+      "power": 0.7,
+      "range": 4.62,
+      "rating": "A",
+      "time": 13
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128066537,
+      "eddbID": 1212,
+      "grp": "hb",
+      "id": "73",
+      "mass": 5,
+      "maximum": 4,
+      "power": 0.18,
+      "range": 1.62,
+      "rating": "E",
+      "time": 36
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128066538,
+      "eddbID": 1213,
+      "grp": "hb",
+      "id": "72",
+      "mass": 2,
+      "maximum": 3,
+      "power": 0.24,
+      "range": 2.16,
+      "rating": "D",
+      "time": 31
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128066539,
+      "eddbID": 1214,
+      "grp": "hb",
+      "id": "71",
+      "mass": 5,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 2.7,
+      "rating": "C",
+      "time": 26
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128066540,
+      "eddbID": 1215,
+      "grp": "hb",
+      "id": "70",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.36,
+      "range": 3.24,
+      "rating": "B",
+      "time": 21
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128066541,
+      "eddbID": 1216,
+      "grp": "hb",
+      "id": "6v",
+      "mass": 5,
+      "maximum": 3,
+      "power": 0.42,
+      "range": 3.78,
+      "rating": "A",
+      "time": 16
+    },
+    {
+      "class": 1,
+      "cost": 600,
+      "edID": 128066532,
+      "eddbID": 1207,
+      "grp": "hb",
+      "id": "6u",
+      "mass": 1.3,
+      "maximum": 2,
+      "power": 0.12,
+      "range": 1.5,
+      "rating": "E",
+      "time": 42
+    },
+    {
+      "class": 1,
+      "cost": 1200,
+      "edID": 128066533,
+      "eddbID": 1208,
+      "grp": "hb",
+      "id": "6t",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.16,
+      "range": 2,
+      "rating": "D",
+      "time": 36
+    },
+    {
+      "class": 1,
+      "cost": 2400,
+      "edID": 128066534,
+      "eddbID": 1209,
+      "grp": "hb",
+      "id": "6s",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.2,
+      "range": 2.5,
+      "rating": "C",
+      "time": 30
+    },
+    {
+      "class": 1,
+      "cost": 4800,
+      "edID": 128066535,
+      "eddbID": 1210,
+      "grp": "hb",
+      "id": "6r",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.24,
+      "range": 3,
+      "rating": "B",
+      "time": 24
+    },
+    {
+      "class": 1,
+      "cost": 9600,
+      "edID": 128066536,
+      "eddbID": 1211,
+      "grp": "hb",
+      "id": "6q",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 3.5,
+      "rating": "A",
+      "time": 18
+    }
   ]
-}
+}

modules/internal/hull_reinforcement_package.json

@@ -1,18 +1,114 @@
 {
   "hr": [
-    { "id": "2e", "edID": 128668545, "eddbID": 1381, "grp": "hr", "class": 5, "rating": "E", "cost": 150000, "mass": 64, "armouradd": 360 },
-    { "id": "2d", "edID": 128668546, "eddbID": 1382, "grp": "hr", "class": 5, "rating": "D", "cost": 450000, "mass": 32, "armouradd": 390 },
-
-    { "id": "2c", "edID": 128668543, "eddbID": 1379, "grp": "hr", "class": 4, "rating": "E", "cost": 65000, "mass": 32, "armouradd": 300 },
-    { "id": "2b", "edID": 128668544, "eddbID": 1380, "grp": "hr", "class": 4, "rating": "D", "cost": 195000, "mass": 16, "armouradd": 330 },
-
-    { "id": "2a", "edID": 128668541, "eddbID": 1377, "grp": "hr", "class": 3, "rating": "E", "cost": 28000, "mass": 16, "armouradd": 230 },
-    { "id": "29", "edID": 128668542, "eddbID": 1378, "grp": "hr", "class": 3, "rating": "D", "cost": 84000, "mass": 8, "armouradd": 260 },
-
-    { "id": "28", "edID": 128668539, "eddbID": 1375, "grp": "hr", "class": 2, "rating": "E", "cost": 12000, "mass": 8, "armouradd": 150 },
-    { "id": "27", "edID": 128668540, "eddbID": 1376, "grp": "hr", "class": 2, "rating": "D", "cost": 36000, "mass": 4, "armouradd": 190 },
-
-    { "id": "26", "edID": 128668537, "eddbID": 1373, "grp": "hr", "class": 1, "rating": "E", "cost": 5000, "mass": 4, "armouradd": 80 },
-    { "id": "25", "edID": 128668538, "eddbID": 1374, "grp": "hr", "class": 1, "rating": "D", "cost": 15000, "mass": 2, "armouradd": 110 }
+    {
+      "armouradd": 360,
+      "class": 5,
+      "cost": 150000,
+      "edID": 128668545,
+      "eddbID": 1381,
+      "grp": "hr",
+      "id": "2e",
+      "mass": 64,
+      "rating": "E"
+    },
+    {
+      "armouradd": 390,
+      "class": 5,
+      "cost": 450000,
+      "edID": 128668546,
+      "eddbID": 1382,
+      "grp": "hr",
+      "id": "2d",
+      "mass": 32,
+      "rating": "D"
+    },
+    {
+      "armouradd": 300,
+      "class": 4,
+      "cost": 65000,
+      "edID": 128668543,
+      "eddbID": 1379,
+      "grp": "hr",
+      "id": "2c",
+      "mass": 32,
+      "rating": "E"
+    },
+    {
+      "armouradd": 330,
+      "class": 4,
+      "cost": 195000,
+      "edID": 128668544,
+      "eddbID": 1380,
+      "grp": "hr",
+      "id": "2b",
+      "mass": 16,
+      "rating": "D"
+    },
+    {
+      "armouradd": 230,
+      "class": 3,
+      "cost": 28000,
+      "edID": 128668541,
+      "eddbID": 1377,
+      "grp": "hr",
+      "id": "2a",
+      "mass": 16,
+      "rating": "E"
+    },
+    {
+      "armouradd": 260,
+      "class": 3,
+      "cost": 84000,
+      "edID": 128668542,
+      "eddbID": 1378,
+      "grp": "hr",
+      "id": "29",
+      "mass": 8,
+      "rating": "D"
+    },
+    {
+      "armouradd": 150,
+      "class": 2,
+      "cost": 12000,
+      "edID": 128668539,
+      "eddbID": 1375,
+      "grp": "hr",
+      "id": "28",
+      "mass": 8,
+      "rating": "E"
+    },
+    {
+      "armouradd": 190,
+      "class": 2,
+      "cost": 36000,
+      "edID": 128668540,
+      "eddbID": 1376,
+      "grp": "hr",
+      "id": "27",
+      "mass": 4,
+      "rating": "D"
+    },
+    {
+      "armouradd": 80,
+      "class": 1,
+      "cost": 5000,
+      "edID": 128668537,
+      "eddbID": 1373,
+      "grp": "hr",
+      "id": "26",
+      "mass": 4,
+      "rating": "E"
+    },
+    {
+      "armouradd": 110,
+      "class": 1,
+      "cost": 15000,
+      "edID": 128668538,
+      "eddbID": 1374,
+      "grp": "hr",
+      "id": "25",
+      "mass": 2,
+      "rating": "D"
+    }
   ]
-}
+}

modules/internal/internal_fuel_tank.json

@@ -1,12 +1,84 @@
 {
   "ft": [
-    { "id": "f1", "edID": 128064346, "eddbID": 1199, "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "fuel": 2 },
-    { "id": "f2", "edID": 128064347, "eddbID": 1200, "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "fuel": 4 },
-    { "id": "f3", "edID": 128064348, "eddbID": 1201, "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "fuel": 8 },
-    { "id": "f4", "edID": 128064349, "eddbID": 1202, "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "fuel": 16 },
-    { "id": "f5", "edID": 128064350, "eddbID": 1203, "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "fuel": 32 },
-    { "id": "f6", "edID": 128064351, "eddbID": 1204, "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "fuel": 64 },
-    { "id": "f7", "edID": 128064352, "eddbID": 1205, "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "fuel": 128 },
-    { "id": "f8", "edID": 128064353, "eddbID": 1206, "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "fuel": 256 }
+    {
+      "class": 1,
+      "cost": 1000,
+      "edID": 128064346,
+      "eddbID": 1199,
+      "fuel": 2,
+      "grp": "ft",
+      "id": "f1",
+      "rating": "C"
+    },
+    {
+      "class": 2,
+      "cost": 3750,
+      "edID": 128064347,
+      "eddbID": 1200,
+      "fuel": 4,
+      "grp": "ft",
+      "id": "f2",
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 7060,
+      "edID": 128064348,
+      "eddbID": 1201,
+      "fuel": 8,
+      "grp": "ft",
+      "id": "f3",
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 24730,
+      "edID": 128064349,
+      "eddbID": 1202,
+      "fuel": 16,
+      "grp": "ft",
+      "id": "f4",
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 97750,
+      "edID": 128064350,
+      "eddbID": 1203,
+      "fuel": 32,
+      "grp": "ft",
+      "id": "f5",
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 341580,
+      "edID": 128064351,
+      "eddbID": 1204,
+      "fuel": 64,
+      "grp": "ft",
+      "id": "f6",
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 1780910,
+      "edID": 128064352,
+      "eddbID": 1205,
+      "fuel": 128,
+      "grp": "ft",
+      "id": "f7",
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 5428400,
+      "edID": 128064353,
+      "eddbID": 1206,
+      "fuel": 256,
+      "grp": "ft",
+      "id": "f8",
+      "rating": "C"
+    }
   ]
-}
+}

modules/internal/luxury_passenger_cabin.json

@@ -0,0 +1,24 @@
+{
+  "pcq": [
+    {
+      "class": 5,
+      "cost": -1,
+      "eddbID": 1575,
+      "grp": "pcq",
+      "id": "mm",
+      "mass": 20,
+      "passengers": 4,
+      "rating": "B"
+    },
+    {
+      "class": 6,
+      "cost": -1,
+      "eddbID": 1576,
+      "grp": "pcq",
+      "id": "mn",
+      "mass": 40,
+      "passengers": 8,
+      "rating": "B"
+    }
+  ]
+}

modules/internal/planetary_vehicle_hanger.json

@@ -1,12 +1,76 @@
 {
   "pv": [
-    { "id": "v1", "edID": 128672292, "eddbID": 1524, "grp": "pv", "class": 6, "rating": "H", "cost": 576000, "power": 0.6, "mass": 34, "bays": 4 },
-    { "id": "v2", "edID": 128672293, "eddbID": 1525, "grp": "pv", "class": 6, "rating": "G", "cost": 691200, "power": 1.8, "mass": 17, "bays": 4 },
-
-    { "id": "v3", "edID": 128672290, "eddbID": 1526, "grp": "pv", "class": 4, "rating": "H", "cost": 72000, "power": 0.4, "mass": 20, "bays": 2 },
-    { "id": "v4", "edID": 128672291, "eddbID": 1527, "grp": "pv", "class": 4, "rating": "G", "cost": 86400, "power": 1.2, "mass": 10, "bays": 2 },
-
-    { "id": "v5", "edID": 128672288, "eddbID": 1528, "grp": "pv", "class": 2, "rating": "H", "cost": 18000, "power": 0.25, "mass": 12, "bays": 1 },
-    { "id": "v6", "edID": 128672289, "eddbID": 1529, "grp": "pv", "class": 2, "rating": "G", "cost": 21600, "power": 0.75, "mass": 6, "bays": 1 }
+    {
+      "bays": 4,
+      "class": 6,
+      "cost": 576000,
+      "edID": 128672292,
+      "eddbID": 1524,
+      "grp": "pv",
+      "id": "v1",
+      "mass": 34,
+      "power": 0.6,
+      "rating": "H"
+    },
+    {
+      "bays": 4,
+      "class": 6,
+      "cost": 691200,
+      "edID": 128672293,
+      "eddbID": 1525,
+      "grp": "pv",
+      "id": "v2",
+      "mass": 17,
+      "power": 1.8,
+      "rating": "G"
+    },
+    {
+      "bays": 2,
+      "class": 4,
+      "cost": 72000,
+      "edID": 128672290,
+      "eddbID": 1526,
+      "grp": "pv",
+      "id": "v3",
+      "mass": 20,
+      "power": 0.4,
+      "rating": "H"
+    },
+    {
+      "bays": 2,
+      "class": 4,
+      "cost": 86400,
+      "edID": 128672291,
+      "eddbID": 1527,
+      "grp": "pv",
+      "id": "v4",
+      "mass": 10,
+      "power": 1.2,
+      "rating": "G"
+    },
+    {
+      "bays": 1,
+      "class": 2,
+      "cost": 18000,
+      "edID": 128672288,
+      "eddbID": 1528,
+      "grp": "pv",
+      "id": "v5",
+      "mass": 12,
+      "power": 0.25,
+      "rating": "H"
+    },
+    {
+      "bays": 1,
+      "class": 2,
+      "cost": 21600,
+      "edID": 128672289,
+      "eddbID": 1529,
+      "grp": "pv",
+      "id": "v6",
+      "mass": 6,
+      "power": 0.75,
+      "rating": "G"
+    }
   ]
 }

modules/internal/pristmatic_shield_generator.json

@@ -1,12 +1,156 @@
 {
   "psg": [
-    { "id": "p6", "edID": 128671323, "eddbID": 1485, "grp": "psg", "class": 1, "rating": "A", "cost": 132200,    "mass": 2.5, "power": 2.52, "minmass": 13,  "optmass": 25,   "maxmass": 63,   "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 },
-    { "id": "p5", "edID": 128671324, "eddbID": 1486, "grp": "psg", "class": 2, "rating": "A", "cost": 240340,    "mass": 5,   "power": 3.15, "minmass": 23,  "optmass": 55,   "maxmass": 138,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 },
-    { "id": "p4", "edID": 128671325, "eddbID": 1487, "grp": "psg", "class": 3, "rating": "A", "cost": 761870,    "mass": 10,  "power": 3.78, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 },
-    { "id": "p3", "edID": 128671326, "eddbID": 1488, "grp": "psg", "class": 4, "rating": "A", "cost": 2415120,   "mass": 20,  "power": 4.62, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.425 },
-    { "id": "p2", "edID": 128671327, "eddbID": 1489, "grp": "psg", "class": 5, "rating": "A", "cost": 7655930,   "mass": 40,  "power": 5.46, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.875 },
-    { "id": "p1", "edID": 128671328, "eddbID": 1490, "grp": "psg", "class": 6, "rating": "A", "cost": 24269300,  "mass": 80,  "power": 6.51, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 2.4 },
-    { "id": "p0", "edID": 128671329, "eddbID": 1491, "grp": "psg", "class": 7, "rating": "A", "cost": 76933670,  "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3 },
-    { "id": "p7", "edID": 128671330, "eddbID": 1492, "grp": "psg", "class": 8, "rating": "A", "cost": 243879730, "mass": 320, "power": 8.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3.6 }
+    {
+      "class": 1,
+      "cost": 132200,
+      "edID": 128671323,
+      "eddbID": 1485,
+      "grp": "psg",
+      "id": "p6",
+      "mass": 2.5,
+      "maxmass": 63,
+      "maxmul": 1,
+      "minmass": 13,
+      "minmul": 2,
+      "optmass": 25,
+      "optmul": 1.5,
+      "power": 2.52,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 1.2
+    },
+    {
+      "class": 2,
+      "cost": 240340,
+      "edID": 128671324,
+      "eddbID": 1486,
+      "grp": "psg",
+      "id": "p5",
+      "mass": 5,
+      "maxmass": 138,
+      "maxmul": 1,
+      "minmass": 23,
+      "minmul": 2,
+      "optmass": 55,
+      "optmul": 1.5,
+      "power": 3.15,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 1.2
+    },
+    {
+      "class": 3,
+      "cost": 761870,
+      "edID": 128671325,
+      "eddbID": 1487,
+      "grp": "psg",
+      "id": "p4",
+      "mass": 10,
+      "maxmass": 413,
+      "maxmul": 1,
+      "minmass": 83,
+      "minmul": 2,
+      "optmass": 165,
+      "optmul": 1.5,
+      "power": 3.78,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 1.2
+    },
+    {
+      "class": 4,
+      "cost": 2415120,
+      "edID": 128671326,
+      "eddbID": 1488,
+      "grp": "psg",
+      "id": "p3",
+      "mass": 20,
+      "maxmass": 713,
+      "maxmul": 1,
+      "minmass": 143,
+      "minmul": 2,
+      "optmass": 285,
+      "optmul": 1.5,
+      "power": 4.62,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 1.425
+    },
+    {
+      "class": 5,
+      "cost": 7655930,
+      "edID": 128671327,
+      "eddbID": 1489,
+      "grp": "psg",
+      "id": "p2",
+      "mass": 40,
+      "maxmass": 1013,
+      "maxmul": 1,
+      "minmass": 203,
+      "minmul": 2,
+      "optmass": 405,
+      "optmul": 1.5,
+      "power": 5.46,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 1.875
+    },
+    {
+      "class": 6,
+      "cost": 24269300,
+      "edID": 128671328,
+      "eddbID": 1490,
+      "grp": "psg",
+      "id": "p1",
+      "mass": 80,
+      "maxmass": 1350,
+      "maxmul": 1,
+      "minmass": 270,
+      "minmul": 2,
+      "optmass": 540,
+      "optmul": 1.5,
+      "power": 6.51,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 2.4
+    },
+    {
+      "class": 7,
+      "cost": 76933670,
+      "edID": 128671329,
+      "eddbID": 1491,
+      "grp": "psg",
+      "id": "p0",
+      "mass": 160,
+      "maxmass": 2650,
+      "maxmul": 1,
+      "minmass": 530,
+      "minmul": 2,
+      "optmass": 1060,
+      "optmul": 1.5,
+      "power": 7.35,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 3
+    },
+    {
+      "class": 8,
+      "cost": 243879730,
+      "edID": 128671330,
+      "eddbID": 1492,
+      "grp": "psg",
+      "id": "p7",
+      "mass": 320,
+      "maxmass": 4500,
+      "maxmul": 1,
+      "minmass": 900,
+      "minmul": 2,
+      "optmass": 1800,
+      "optmul": 1.5,
+      "power": 8.4,
+      "pp": "Aisling Duval",
+      "rating": "A",
+      "recover": 3.6
+    }
   ]
 }

modules/internal/prospector_limpet_controllers.json

@@ -1,27 +1,264 @@
 {
   "pc": [
-    { "id": "Pf", "edID": 128671284, "eddbID": 1449, "grp":"pc", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":0.55, "range": 5.10, "maximum": 8 },
-    { "id": "Pg", "edID": 128671285, "eddbID": 1450, "grp":"pc", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.41, "range": 6.80, "maximum": 8 },
-    { "id": "Ph", "edID": 128671286, "eddbID": 1451, "grp":"pc", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range": 8.50, "maximum": 8 },
-    { "id": "Pi", "edID": 128671287, "eddbID": 1452, "grp":"pc", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":0.97, "range":10.20, "maximum": 8 },
-    { "id": "Pj", "edID": 128671288, "eddbID": 1453, "grp":"pc", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":0.83, "range":11.90, "maximum": 8 },
-
-    { "id": "Pa", "edID": 128671279, "eddbID": 1444, "grp":"pc", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":0.40, "range": 3.90, "maximum": 4 },
-    { "id": "Pb", "edID": 128671280, "eddbID": 1445, "grp":"pc", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":0.30, "range": 5.20, "maximum": 4 },
-    { "id": "Pc", "edID": 128671281, "eddbID": 1446, "grp":"pc", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":0.50, "range": 6.50, "maximum": 4 },
-    { "id": "Pd", "edID": 128671282, "eddbID": 1447, "grp":"pc", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":0.97, "range": 7.80, "maximum": 4 },
-    { "id": "Pe", "edID": 128671283, "eddbID": 1448, "grp":"pc", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":0.60, "range": 9.10, "maximum": 4 },
-
-    { "id": "P5", "edID": 128671274, "eddbID": 1439, "grp":"pc", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":0.27, "range": 3.30, "maximum": 2 },
-    { "id": "P6", "edID": 128671275, "eddbID": 1440, "grp":"pc", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":0.20, "range": 4.40, "maximum": 2 },
-    { "id": "P7", "edID": 128671276, "eddbID": 1441, "grp":"pc", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":0.34, "range": 5.50, "maximum": 2 },
-    { "id": "P8", "edID": 128671277, "eddbID": 1442, "grp":"pc", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":0.48, "range": 6.60, "maximum": 2 },
-    { "id": "P9", "edID": 128671278, "eddbID": 1443, "grp":"pc", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":0.41, "range": 7.70, "maximum": 2 },
-
-    { "id": "P0", "edID": 128671269, "eddbID": 1434, "grp":"pc", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":0.18, "range": 3.00, "maximum": 1 },
-    { "id": "P1", "edID": 128671270, "eddbID": 1435, "grp":"pc", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":0.14, "range": 4.00, "maximum": 1 },
-    { "id": "P2", "edID": 128671271, "eddbID": 1436, "grp":"pc", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":0.23, "range": 5.00, "maximum": 1 },
-    { "id": "P3", "edID": 128671272, "eddbID": 1437, "grp":"pc", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":0.32, "range": 6.00, "maximum": 1 },
-    { "id": "P4", "edID": 128671273, "eddbID": 1438, "grp":"pc", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":0.28, "range": 7.00, "maximum": 1 }
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671284,
+      "eddbID": 1449,
+      "grp": "pc",
+      "id": "Pf",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 5.1,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671285,
+      "eddbID": 1450,
+      "grp": "pc",
+      "id": "Pg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 6.8,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671286,
+      "eddbID": 1451,
+      "grp": "pc",
+      "id": "Ph",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 8.5,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671287,
+      "eddbID": 1452,
+      "grp": "pc",
+      "id": "Pi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 10.2,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671288,
+      "eddbID": 1453,
+      "grp": "pc",
+      "id": "Pj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 11.9,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671279,
+      "eddbID": 1444,
+      "grp": "pc",
+      "id": "Pa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 3.9,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671280,
+      "eddbID": 1445,
+      "grp": "pc",
+      "id": "Pb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 5.2,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671281,
+      "eddbID": 1446,
+      "grp": "pc",
+      "id": "Pc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 6.5,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671282,
+      "eddbID": 1447,
+      "grp": "pc",
+      "id": "Pd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 7.8,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671283,
+      "eddbID": 1448,
+      "grp": "pc",
+      "id": "Pe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 9.1,
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128671274,
+      "eddbID": 1439,
+      "grp": "pc",
+      "id": "P5",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 3.3,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128671275,
+      "eddbID": 1440,
+      "grp": "pc",
+      "id": "P6",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 4.4,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128671276,
+      "eddbID": 1441,
+      "grp": "pc",
+      "id": "P7",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 5.5,
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128671277,
+      "eddbID": 1442,
+      "grp": "pc",
+      "id": "P8",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 6.6,
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128671278,
+      "eddbID": 1443,
+      "grp": "pc",
+      "id": "P9",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 7.7,
+      "rating": "A"
+    },
+    {
+      "class": 1,
+      "cost": 600,
+      "edID": 128671269,
+      "eddbID": 1434,
+      "grp": "pc",
+      "id": "P0",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 3,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671270,
+      "eddbID": 1435,
+      "grp": "pc",
+      "id": "P1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 4,
+      "rating": "D"
+    },
+    {
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671271,
+      "eddbID": 1436,
+      "grp": "pc",
+      "id": "P2",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 5,
+      "rating": "C"
+    },
+    {
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671272,
+      "eddbID": 1437,
+      "grp": "pc",
+      "id": "P3",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 6,
+      "rating": "B"
+    },
+    {
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671273,
+      "eddbID": 1438,
+      "grp": "pc",
+      "id": "P4",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 7,
+      "rating": "A"
+    }
   ]
-}
+}

modules/internal/refinery.json

@@ -1,27 +1,224 @@
 {
   "rf": [
-    { "id": "23", "edID": 128666687, "eddbID": 1289, "grp": "rf", "class": 4, "rating": "E", "cost": 55570, "power": 0.25, "bins": 4 },
-    { "id": "22", "edID": 128666691, "eddbID": 1293, "grp": "rf", "class": 4, "rating": "D", "cost": 166700, "power": 0.33, "bins": 5 },
-    { "id": "21", "edID": 128666695, "eddbID": 1297, "grp": "rf", "class": 4, "rating": "C", "cost": 500090, "power": 0.41, "bins": 7 },
-    { "id": "20", "edID": 128666699, "eddbID": 1301, "grp": "rf", "class": 4, "rating": "B", "cost": 1500280, "power": 0.49, "bins": 9 },
-    { "id": "1v", "edID": 128666703, "eddbID": 1305, "grp": "rf", "class": 4, "rating": "A", "cost": 4500850, "power": 0.57, "bins": 10 },
-
-    { "id": "1u", "edID": 128666686, "eddbID": 1288, "grp": "rf", "class": 3, "rating": "E", "cost": 26460, "power": 0.2, "bins": 3 },
-    { "id": "1t", "edID": 128666690, "eddbID": 1292, "grp": "rf", "class": 3, "rating": "D", "cost": 79380, "power": 0.27, "bins": 4 },
-    { "id": "1s", "edID": 128666694, "eddbID": 1296, "grp": "rf", "class": 3, "rating": "C", "cost": 238140, "power": 0.34, "bins": 6 },
-    { "id": "1r", "edID": 128666698, "eddbID": 1300, "grp": "rf", "class": 3, "rating": "B", "cost": 714420, "power": 0.41, "bins": 7 },
-    { "id": "1q", "edID": 128666702, "eddbID": 1304, "grp": "rf", "class": 3, "rating": "A", "cost": 2143260, "power": 0.48, "bins": 8 },
-
-    { "id": "1p", "edID": 128666685, "eddbID": 1287, "grp": "rf", "class": 2, "rating": "E", "cost": 12600, "power": 0.17, "bins": 2 },
-    { "id": "1o", "edID": 128666689, "eddbID": 1291, "grp": "rf", "class": 2, "rating": "D", "cost": 37800, "power": 0.22, "bins": 3 },
-    { "id": "1n", "edID": 128666693, "eddbID": 1295, "grp": "rf", "class": 2, "rating": "C", "cost": 113400, "power": 0.28, "bins": 4 },
-    { "id": "1m", "edID": 128666697, "eddbID": 1299, "grp": "rf", "class": 2, "rating": "B", "cost": 340200, "power": 0.34, "bins": 5 },
-    { "id": "1l", "edID": 128666701, "eddbID": 1303, "grp": "rf", "class": 2, "rating": "A", "cost": 1020600, "power": 0.39, "bins": 6 },
-
-    { "id": "1k", "edID": 128666684, "eddbID": 1286, "grp": "rf", "class": 1, "rating": "E", "cost": 6000, "power": 0.14, "bins": 1 },
-    { "id": "1j", "edID": 128666688, "eddbID": 1290, "grp": "rf", "class": 1, "rating": "D", "cost": 18000, "power": 0.18, "bins": 1 },
-    { "id": "1i", "edID": 128666692, "eddbID": 1294, "grp": "rf", "class": 1, "rating": "C", "cost": 54000, "power": 0.23, "bins": 2 },
-    { "id": "1h", "edID": 128666696, "eddbID": 1298, "grp": "rf", "class": 1, "rating": "B", "cost": 162000, "power": 0.28, "bins": 3 },
-    { "id": "1g", "edID": 128666700, "eddbID": 1302, "grp": "rf", "class": 1, "rating": "A", "cost": 486000, "power": 0.32, "bins": 4 }
+    {
+      "bins": 4,
+      "class": 4,
+      "cost": 55570,
+      "edID": 128666687,
+      "eddbID": 1289,
+      "grp": "rf",
+      "id": "23",
+      "power": 0.25,
+      "rating": "E"
+    },
+    {
+      "bins": 5,
+      "class": 4,
+      "cost": 166700,
+      "edID": 128666691,
+      "eddbID": 1293,
+      "grp": "rf",
+      "id": "22",
+      "power": 0.33,
+      "rating": "D"
+    },
+    {
+      "bins": 7,
+      "class": 4,
+      "cost": 500090,
+      "edID": 128666695,
+      "eddbID": 1297,
+      "grp": "rf",
+      "id": "21",
+      "power": 0.41,
+      "rating": "C"
+    },
+    {
+      "bins": 9,
+      "class": 4,
+      "cost": 1500280,
+      "edID": 128666699,
+      "eddbID": 1301,
+      "grp": "rf",
+      "id": "20",
+      "power": 0.49,
+      "rating": "B"
+    },
+    {
+      "bins": 10,
+      "class": 4,
+      "cost": 4500850,
+      "edID": 128666703,
+      "eddbID": 1305,
+      "grp": "rf",
+      "id": "1v",
+      "power": 0.57,
+      "rating": "A"
+    },
+    {
+      "bins": 3,
+      "class": 3,
+      "cost": 26460,
+      "edID": 128666686,
+      "eddbID": 1288,
+      "grp": "rf",
+      "id": "1u",
+      "power": 0.2,
+      "rating": "E"
+    },
+    {
+      "bins": 4,
+      "class": 3,
+      "cost": 79380,
+      "edID": 128666690,
+      "eddbID": 1292,
+      "grp": "rf",
+      "id": "1t",
+      "power": 0.27,
+      "rating": "D"
+    },
+    {
+      "bins": 6,
+      "class": 3,
+      "cost": 238140,
+      "edID": 128666694,
+      "eddbID": 1296,
+      "grp": "rf",
+      "id": "1s",
+      "power": 0.34,
+      "rating": "C"
+    },
+    {
+      "bins": 7,
+      "class": 3,
+      "cost": 714420,
+      "edID": 128666698,
+      "eddbID": 1300,
+      "grp": "rf",
+      "id": "1r",
+      "power": 0.41,
+      "rating": "B"
+    },
+    {
+      "bins": 8,
+      "class": 3,
+      "cost": 2143260,
+      "edID": 128666702,
+      "eddbID": 1304,
+      "grp": "rf",
+      "id": "1q",
+      "power": 0.48,
+      "rating": "A"
+    },
+    {
+      "bins": 2,
+      "class": 2,
+      "cost": 12600,
+      "edID": 128666685,
+      "eddbID": 1287,
+      "grp": "rf",
+      "id": "1p",
+      "power": 0.17,
+      "rating": "E"
+    },
+    {
+      "bins": 3,
+      "class": 2,
+      "cost": 37800,
+      "edID": 128666689,
+      "eddbID": 1291,
+      "grp": "rf",
+      "id": "1o",
+      "power": 0.22,
+      "rating": "D"
+    },
+    {
+      "bins": 4,
+      "class": 2,
+      "cost": 113400,
+      "edID": 128666693,
+      "eddbID": 1295,
+      "grp": "rf",
+      "id": "1n",
+      "power": 0.28,
+      "rating": "C"
+    },
+    {
+      "bins": 5,
+      "class": 2,
+      "cost": 340200,
+      "edID": 128666697,
+      "eddbID": 1299,
+      "grp": "rf",
+      "id": "1m",
+      "power": 0.34,
+      "rating": "B"
+    },
+    {
+      "bins": 6,
+      "class": 2,
+      "cost": 1020600,
+      "edID": 128666701,
+      "eddbID": 1303,
+      "grp": "rf",
+      "id": "1l",
+      "power": 0.39,
+      "rating": "A"
+    },
+    {
+      "bins": 1,
+      "class": 1,
+      "cost": 6000,
+      "edID": 128666684,
+      "eddbID": 1286,
+      "grp": "rf",
+      "id": "1k",
+      "power": 0.14,
+      "rating": "E"
+    },
+    {
+      "bins": 1,
+      "class": 1,
+      "cost": 18000,
+      "edID": 128666688,
+      "eddbID": 1290,
+      "grp": "rf",
+      "id": "1j",
+      "power": 0.18,
+      "rating": "D"
+    },
+    {
+      "bins": 2,
+      "class": 1,
+      "cost": 54000,
+      "edID": 128666692,
+      "eddbID": 1294,
+      "grp": "rf",
+      "id": "1i",
+      "power": 0.23,
+      "rating": "C"
+    },
+    {
+      "bins": 3,
+      "class": 1,
+      "cost": 162000,
+      "edID": 128666696,
+      "eddbID": 1298,
+      "grp": "rf",
+      "id": "1h",
+      "power": 0.28,
+      "rating": "B"
+    },
+    {
+      "bins": 4,
+      "class": 1,
+      "cost": 486000,
+      "edID": 128666700,
+      "eddbID": 1302,
+      "grp": "rf",
+      "id": "1g",
+      "power": 0.32,
+      "rating": "A"
+    }
   ]
 }

modules/internal/scanner.json

@@ -1,8 +1,55 @@
 {
   "sc": [
-    { "id": "2f", "edID": 128663561, "eddbID": 1244, "grp": "sc", "name": "Advanced Discovery Scanner", "class": 1, "rating": "C", "cost": 1545000, "mass": 2, "power": 0, "rangeLS": null },
-    { "id": "2g", "edID": 128663560, "eddbID": 1243, "grp": "sc", "name": "Intermediate Discovery Scanner", "class": 1, "rating": "D", "cost": 505000, "mass": 2, "power": 0, "rangeLS": 1000 },
-    { "id": "2h", "edID": 128662535, "eddbID": 1242, "grp": "sc", "name": "Basic Discovery Scanner", "class": 1, "rating": "E", "cost": 1000, "mass": 2, "power": 0, "rangeLS": 500 },
-    { "id": "2i", "edID": 128666634, "eddbID": 1245, "grp": "sc", "name": "Detailed Surface Scanner", "class": 1, "rating": "C", "cost": 250000, "mass": 1.3, "power": 0 }
+    {
+      "class": 1,
+      "cost": 1545000,
+      "edID": 128663561,
+      "eddbID": 1244,
+      "grp": "sc",
+      "id": "2f",
+      "mass": 2,
+      "name": "Advanced Discovery Scanner",
+      "power": 0,
+      "rangeLS": null,
+      "rating": "C"
+    },
+    {
+      "class": 1,
+      "cost": 505000,
+      "edID": 128663560,
+      "eddbID": 1243,
+      "grp": "sc",
+      "id": "2g",
+      "mass": 2,
+      "name": "Intermediate Discovery Scanner",
+      "power": 0,
+      "rangeLS": 1000,
+      "rating": "D"
+    },
+    {
+      "class": 1,
+      "cost": 1000,
+      "edID": 128662535,
+      "eddbID": 1242,
+      "grp": "sc",
+      "id": "2h",
+      "mass": 2,
+      "name": "Basic Discovery Scanner",
+      "power": 0,
+      "rangeLS": 500,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 250000,
+      "edID": 128666634,
+      "eddbID": 1245,
+      "grp": "sc",
+      "id": "2i",
+      "mass": 1.3,
+      "name": "Detailed Surface Scanner",
+      "power": 0,
+      "rating": "C"
+    }
   ]
-}
+}

modules/internal/shield_cell_bank.json

@@ -1,51 +1,604 @@
 {
   "scb": [
-    { "id": "65", "edID": 128064333, "eddbID": 1186, "grp": "scb", "class": 8, "rating": "E", "cost": 697580, "mass": 160, "power": 1.44, "cells": 6, "rechargeRating": "C", "recharge": 475, "ammocost": 300 },
-    { "id": "64", "edID": 128064334, "eddbID": 1187, "grp": "scb", "class": 8, "rating": "D", "cost": 1743960, "mass": 64, "power": 1.92, "cells": 4, "rechargeRating": "C", "recharge": 630, "ammocost": 300 },
-    { "id": "63", "edID": 128064335, "eddbID": 1188, "grp": "scb", "class": 8, "rating": "C", "cost": 4359900, "mass": 160, "power": 2.4, "cells": 5, "rechargeRating": "B", "recharge": 790, "ammocost": 300 },
-    { "id": "62", "edID": 128064336, "eddbID": 1189, "grp": "scb", "class": 8, "rating": "B", "cost": 10899760, "mass": 256, "power": 2.88, "cells": 6, "rechargeRating": "A", "recharge": 950, "ammocost": 300 },
-    { "id": "61", "edID": 128064337, "eddbID": 1190, "grp": "scb", "class": 8, "rating": "A", "cost": 27249390, "mass": 160, "power": 3.36, "cells": 5, "rechargeRating": "A", "recharge": 1105, "ammocost": 300 },
-
-    { "id": "60", "edID": 128064328, "eddbID": 1181, "grp": "scb", "class": 7, "rating": "E", "cost": 249140, "mass": 80, "power": 1.24, "cells": 6, "rechargeRating": "D", "recharge": 280, "ammocost": 300 },
-    { "id": "5v", "edID": 128064329, "eddbID": 1182, "grp": "scb", "class": 7, "rating": "D", "cost": 622840, "mass": 32, "power": 1.66, "cells": 4, "rechargeRating": "C", "recharge": 370, "ammocost": 300 },
-    { "id": "5u", "edID": 128064330, "eddbID": 1183, "grp": "scb", "class": 7, "rating": "C", "cost": 1557110, "mass": 80, "power": 2.07, "cells": 5, "rechargeRating": "B", "recharge": 465, "ammocost": 300 },
-    { "id": "5t", "edID": 128064331, "eddbID": 1184, "grp": "scb", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 2.48, "cells": 6, "rechargeRating": "B", "recharge": 560, "ammocost": 300 },
-    { "id": "5s", "edID": 128064332, "eddbID": 1185, "grp": "scb", "class": 7, "rating": "A", "cost": 9731930, "mass": 80, "power": 2.9, "cells": 5, "rechargeRating": "A", "recharge": 650, "ammocost": 300 },
-
-    { "id": "5r", "edID": 128064323, "eddbID": 1176, "grp": "scb", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 1.06, "cells": 6, "rechargeRating": "D", "recharge": 150, "ammocost": 300 },
-    { "id": "5q", "edID": 128064324, "eddbID": 1177, "grp": "scb", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 1.42, "cells": 4, "rechargeRating": "C", "recharge": 200, "ammocost": 300 },
-    { "id": "5p", "edID": 128064325, "eddbID": 1178, "grp": "scb", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 1.77, "cells": 5, "rechargeRating": "C", "recharge": 250, "ammocost": 300 },
-    { "id": "5o", "edID": 128064326, "eddbID": 1179, "grp": "scb", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 2.12, "cells": 6, "rechargeRating": "B", "recharge": 300, "ammocost": 300 },
-    { "id": "5n", "edID": 128064327, "eddbID": 1180, "grp": "scb", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 2.48, "cells": 5, "rechargeRating": "A", "recharge": 350, "ammocost": 300 },
-
-    { "id": "5m", "edID": 128064318, "eddbID": 1171, "grp": "scb", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.9, "cells": 5, "rechargeRating": "D", "recharge": 105, "ammocost": 300 },
-    { "id": "5l", "edID": 128064319, "eddbID": 1172, "grp": "scb", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 1.2, "cells": 3, "rechargeRating": "C", "recharge": 140, "ammocost": 300 },
-    { "id": "5k", "edID": 128064320, "eddbID": 1173, "grp": "scb", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 1.5, "cells": 4, "rechargeRating": "C", "recharge": 175, "ammocost": 300 },
-    { "id": "5j", "edID": 128064321, "eddbID": 1174, "grp": "scb", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 1.8, "cells": 5, "rechargeRating": "B", "recharge": 210, "ammocost": 300 },
-    { "id": "5i", "edID": 128064322, "eddbID": 1175, "grp": "scb", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 2.1, "cells": 4, "rechargeRating": "B", "recharge": 245, "ammocost": 300 },
-
-    { "id": "5h", "edID": 128064313, "eddbID": 1166, "grp": "scb", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.74, "cells": 5, "rechargeRating": "D", "recharge": 65, "ammocost": 300 },
-    { "id": "5g", "edID": 128064314, "eddbID": 1167, "grp": "scb", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.98, "cells": 3, "rechargeRating": "D", "recharge": 90, "ammocost": 300 },
-    { "id": "5f", "edID": 128064315, "eddbID": 1168, "grp": "scb", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 1.23, "cells": 4, "rechargeRating": "C", "recharge": 110, "ammocost": 300 },
-    { "id": "5e", "edID": 128064316, "eddbID": 1169, "grp": "scb", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 1.48, "cells": 5, "rechargeRating": "C", "recharge": 135, "ammocost": 300 },
-    { "id": "5d", "edID": 128064317, "eddbID": 1170, "grp": "scb", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 1.72, "cells": 4, "rechargeRating": "B", "recharge": 155, "ammocost": 300 },
-
-    { "id": "5c", "edID": 128064308, "eddbID": 1161, "grp": "scb", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.61, "cells": 5, "rechargeRating": "D", "recharge": 40, "ammocost": 300 },
-    { "id": "5b", "edID": 128064309, "eddbID": 1162, "grp": "scb", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.82, "cells": 3, "rechargeRating": "D", "recharge": 50, "ammocost": 300 },
-    { "id": "5a", "edID": 128064310, "eddbID": 1163, "grp": "scb", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 1.02, "cells": 4, "rechargeRating": "D", "recharge": 65, "ammocost": 300 },
-    { "id": "59", "edID": 128064311, "eddbID": 1164, "grp": "scb", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 1.22, "cells": 5, "rechargeRating": "C", "recharge": 80, "ammocost": 300 },
-    { "id": "58", "edID": 128064312, "eddbID": 1165, "grp": "scb", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 1.43, "cells": 4, "rechargeRating": "C", "recharge": 90, "ammocost": 300 },
-
-    { "id": "57", "edID": 128064303, "eddbID": 1156, "grp": "scb", "class": 2, "rating": "E", "cost": 11, "mass": 2.5, "power": 0.5, "cells": 5, "rechargeRating": "E", "recharge": 25, "ammocost": 300 },
-    { "id": "56", "edID": 128064304, "eddbID": 1157, "grp": "scb", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.67, "cells": 3, "rechargeRating": "D", "recharge": 30, "ammocost": 300 },
-    { "id": "55", "edID": 128064305, "eddbID": 1158, "grp": "scb", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.84, "cells": 4, "rechargeRating": "D", "recharge": 38, "ammocost": 300 },
-    { "id": "54", "edID": 128064306, "eddbID": 1159, "grp": "scb", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 1.01, "cells": 5, "rechargeRating": "D", "recharge": 45, "ammocost": 300 },
-    { "id": "53", "edID": 128064307, "eddbID": 1160, "grp": "scb", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 1.18, "cells": 4, "rechargeRating": "C", "recharge": 55, "ammocost": 300 },
-
-    { "id": "52", "edID": 128064298, "eddbID": 1151, "grp": "scb", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.41, "cells": 4, "rechargeRating": "E", "recharge": 10, "ammocost": 300 },
-    { "id": "51", "edID": 128064299, "eddbID": 1152, "grp": "scb", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.55, "cells": 2, "rechargeRating": "E", "recharge": 12.5, "ammocost": 300 },
-    { "id": "50", "edID": 128064300, "eddbID": 1153, "grp": "scb", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.69, "cells": 3, "rechargeRating": "D", "recharge": 15, "ammocost": 300 },
-    { "id": "4v", "edID": 128064301, "eddbID": 1154, "grp": "scb", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.83, "cells": 4, "rechargeRating": "D", "recharge": 20, "ammocost": 300 },
-    { "id": "4u", "edID": 128064302, "eddbID": 1155, "grp": "scb", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.97, "cells": 3, "rechargeRating": "D", "recharge": 25, "ammocost": 300 }
+    {
+      "ammocost": 300,
+      "cells": 6,
+      "class": 8,
+      "cost": 697580,
+      "edID": 128064333,
+      "eddbID": 1186,
+      "grp": "scb",
+      "id": "65",
+      "mass": 160,
+      "power": 1.44,
+      "rating": "E",
+      "recharge": 475,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 8,
+      "cost": 1743960,
+      "edID": 128064334,
+      "eddbID": 1187,
+      "grp": "scb",
+      "id": "64",
+      "mass": 64,
+      "power": 1.92,
+      "rating": "D",
+      "recharge": 630,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 8,
+      "cost": 4359900,
+      "edID": 128064335,
+      "eddbID": 1188,
+      "grp": "scb",
+      "id": "63",
+      "mass": 160,
+      "power": 2.4,
+      "rating": "C",
+      "recharge": 790,
+      "rechargeRating": "B"
+    },
+    {
+      "ammocost": 300,
+      "cells": 6,
+      "class": 8,
+      "cost": 10899760,
+      "edID": 128064336,
+      "eddbID": 1189,
+      "grp": "scb",
+      "id": "62",
+      "mass": 256,
+      "power": 2.88,
+      "rating": "B",
+      "recharge": 950,
+      "rechargeRating": "A"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 8,
+      "cost": 27249390,
+      "edID": 128064337,
+      "eddbID": 1190,
+      "grp": "scb",
+      "id": "61",
+      "mass": 160,
+      "power": 3.36,
+      "rating": "A",
+      "recharge": 1105,
+      "rechargeRating": "A"
+    },
+    {
+      "ammocost": 300,
+      "cells": 6,
+      "class": 7,
+      "cost": 249140,
+      "edID": 128064328,
+      "eddbID": 1181,
+      "grp": "scb",
+      "id": "60",
+      "mass": 80,
+      "power": 1.24,
+      "rating": "E",
+      "recharge": 280,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 7,
+      "cost": 622840,
+      "edID": 128064329,
+      "eddbID": 1182,
+      "grp": "scb",
+      "id": "5v",
+      "mass": 32,
+      "power": 1.66,
+      "rating": "D",
+      "recharge": 370,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 7,
+      "cost": 1557110,
+      "edID": 128064330,
+      "eddbID": 1183,
+      "grp": "scb",
+      "id": "5u",
+      "mass": 80,
+      "power": 2.07,
+      "rating": "C",
+      "recharge": 465,
+      "rechargeRating": "B"
+    },
+    {
+      "ammocost": 300,
+      "cells": 6,
+      "class": 7,
+      "cost": 3892770,
+      "edID": 128064331,
+      "eddbID": 1184,
+      "grp": "scb",
+      "id": "5t",
+      "mass": 128,
+      "power": 2.48,
+      "rating": "B",
+      "recharge": 560,
+      "rechargeRating": "B"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 7,
+      "cost": 9731930,
+      "edID": 128064332,
+      "eddbID": 1185,
+      "grp": "scb",
+      "id": "5s",
+      "mass": 80,
+      "power": 2.9,
+      "rating": "A",
+      "recharge": 650,
+      "rechargeRating": "A"
+    },
+    {
+      "ammocost": 300,
+      "cells": 6,
+      "class": 6,
+      "cost": 88980,
+      "edID": 128064323,
+      "eddbID": 1176,
+      "grp": "scb",
+      "id": "5r",
+      "mass": 40,
+      "power": 1.06,
+      "rating": "E",
+      "recharge": 150,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 6,
+      "cost": 222440,
+      "edID": 128064324,
+      "eddbID": 1177,
+      "grp": "scb",
+      "id": "5q",
+      "mass": 16,
+      "power": 1.42,
+      "rating": "D",
+      "recharge": 200,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 6,
+      "cost": 556110,
+      "edID": 128064325,
+      "eddbID": 1178,
+      "grp": "scb",
+      "id": "5p",
+      "mass": 40,
+      "power": 1.77,
+      "rating": "C",
+      "recharge": 250,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 6,
+      "class": 6,
+      "cost": 1390280,
+      "edID": 128064326,
+      "eddbID": 1179,
+      "grp": "scb",
+      "id": "5o",
+      "mass": 64,
+      "power": 2.12,
+      "rating": "B",
+      "recharge": 300,
+      "rechargeRating": "B"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 6,
+      "cost": 3475690,
+      "edID": 128064327,
+      "eddbID": 1180,
+      "grp": "scb",
+      "id": "5n",
+      "mass": 40,
+      "power": 2.48,
+      "rating": "A",
+      "recharge": 350,
+      "rechargeRating": "A"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 5,
+      "cost": 31780,
+      "edID": 128064318,
+      "eddbID": 1171,
+      "grp": "scb",
+      "id": "5m",
+      "mass": 20,
+      "power": 0.9,
+      "rating": "E",
+      "recharge": 105,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 3,
+      "class": 5,
+      "cost": 79440,
+      "edID": 128064319,
+      "eddbID": 1172,
+      "grp": "scb",
+      "id": "5l",
+      "mass": 8,
+      "power": 1.2,
+      "rating": "D",
+      "recharge": 140,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 5,
+      "cost": 198610,
+      "edID": 128064320,
+      "eddbID": 1173,
+      "grp": "scb",
+      "id": "5k",
+      "mass": 20,
+      "power": 1.5,
+      "rating": "C",
+      "recharge": 175,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 5,
+      "cost": 496530,
+      "edID": 128064321,
+      "eddbID": 1174,
+      "grp": "scb",
+      "id": "5j",
+      "mass": 32,
+      "power": 1.8,
+      "rating": "B",
+      "recharge": 210,
+      "rechargeRating": "B"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 5,
+      "cost": 1241320,
+      "edID": 128064322,
+      "eddbID": 1175,
+      "grp": "scb",
+      "id": "5i",
+      "mass": 20,
+      "power": 2.1,
+      "rating": "A",
+      "recharge": 245,
+      "rechargeRating": "B"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 4,
+      "cost": 11350,
+      "edID": 128064313,
+      "eddbID": 1166,
+      "grp": "scb",
+      "id": "5h",
+      "mass": 10,
+      "power": 0.74,
+      "rating": "E",
+      "recharge": 65,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 3,
+      "class": 4,
+      "cost": 28370,
+      "edID": 128064314,
+      "eddbID": 1167,
+      "grp": "scb",
+      "id": "5g",
+      "mass": 4,
+      "power": 0.98,
+      "rating": "D",
+      "recharge": 90,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 4,
+      "cost": 70930,
+      "edID": 128064315,
+      "eddbID": 1168,
+      "grp": "scb",
+      "id": "5f",
+      "mass": 10,
+      "power": 1.23,
+      "rating": "C",
+      "recharge": 110,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 4,
+      "cost": 177330,
+      "edID": 128064316,
+      "eddbID": 1169,
+      "grp": "scb",
+      "id": "5e",
+      "mass": 16,
+      "power": 1.48,
+      "rating": "B",
+      "recharge": 135,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 4,
+      "cost": 443330,
+      "edID": 128064317,
+      "eddbID": 1170,
+      "grp": "scb",
+      "id": "5d",
+      "mass": 10,
+      "power": 1.72,
+      "rating": "A",
+      "recharge": 155,
+      "rechargeRating": "B"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 3,
+      "cost": 4050,
+      "edID": 128064308,
+      "eddbID": 1161,
+      "grp": "scb",
+      "id": "5c",
+      "mass": 5,
+      "power": 0.61,
+      "rating": "E",
+      "recharge": 40,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 3,
+      "class": 3,
+      "cost": 10130,
+      "edID": 128064309,
+      "eddbID": 1162,
+      "grp": "scb",
+      "id": "5b",
+      "mass": 2,
+      "power": 0.82,
+      "rating": "D",
+      "recharge": 50,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 3,
+      "cost": 25330,
+      "edID": 128064310,
+      "eddbID": 1163,
+      "grp": "scb",
+      "id": "5a",
+      "mass": 5,
+      "power": 1.02,
+      "rating": "C",
+      "recharge": 65,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 3,
+      "cost": 63330,
+      "edID": 128064311,
+      "eddbID": 1164,
+      "grp": "scb",
+      "id": "59",
+      "mass": 8,
+      "power": 1.22,
+      "rating": "B",
+      "recharge": 80,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 3,
+      "cost": 158330,
+      "edID": 128064312,
+      "eddbID": 1165,
+      "grp": "scb",
+      "id": "58",
+      "mass": 5,
+      "power": 1.43,
+      "rating": "A",
+      "recharge": 90,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 2,
+      "cost": 11,
+      "edID": 128064303,
+      "eddbID": 1156,
+      "grp": "scb",
+      "id": "57",
+      "mass": 2.5,
+      "power": 0.5,
+      "rating": "E",
+      "recharge": 25,
+      "rechargeRating": "E"
+    },
+    {
+      "ammocost": 300,
+      "cells": 3,
+      "class": 2,
+      "cost": 3620,
+      "edID": 128064304,
+      "eddbID": 1157,
+      "grp": "scb",
+      "id": "56",
+      "mass": 1,
+      "power": 0.67,
+      "rating": "D",
+      "recharge": 30,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 2,
+      "cost": 9050,
+      "edID": 128064305,
+      "eddbID": 1158,
+      "grp": "scb",
+      "id": "55",
+      "mass": 2.5,
+      "power": 0.84,
+      "rating": "C",
+      "recharge": 38,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 5,
+      "class": 2,
+      "cost": 22620,
+      "edID": 128064306,
+      "eddbID": 1159,
+      "grp": "scb",
+      "id": "54",
+      "mass": 4,
+      "power": 1.01,
+      "rating": "B",
+      "recharge": 45,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 2,
+      "cost": 56550,
+      "edID": 128064307,
+      "eddbID": 1160,
+      "grp": "scb",
+      "id": "53",
+      "mass": 2.5,
+      "power": 1.18,
+      "rating": "A",
+      "recharge": 55,
+      "rechargeRating": "C"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 1,
+      "cost": 520,
+      "edID": 128064298,
+      "eddbID": 1151,
+      "grp": "scb",
+      "id": "52",
+      "mass": 1.3,
+      "power": 0.41,
+      "rating": "E",
+      "recharge": 10,
+      "rechargeRating": "E"
+    },
+    {
+      "ammocost": 300,
+      "cells": 2,
+      "class": 1,
+      "cost": 1290,
+      "edID": 128064299,
+      "eddbID": 1152,
+      "grp": "scb",
+      "id": "51",
+      "mass": 0.5,
+      "power": 0.55,
+      "rating": "D",
+      "recharge": 12.5,
+      "rechargeRating": "E"
+    },
+    {
+      "ammocost": 300,
+      "cells": 3,
+      "class": 1,
+      "cost": 3230,
+      "edID": 128064300,
+      "eddbID": 1153,
+      "grp": "scb",
+      "id": "50",
+      "mass": 1.3,
+      "power": 0.69,
+      "rating": "C",
+      "recharge": 15,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 4,
+      "class": 1,
+      "cost": 8080,
+      "edID": 128064301,
+      "eddbID": 1154,
+      "grp": "scb",
+      "id": "4v",
+      "mass": 2,
+      "power": 0.83,
+      "rating": "B",
+      "recharge": 20,
+      "rechargeRating": "D"
+    },
+    {
+      "ammocost": 300,
+      "cells": 3,
+      "class": 1,
+      "cost": 20200,
+      "edID": 128064302,
+      "eddbID": 1155,
+      "grp": "scb",
+      "id": "4u",
+      "mass": 1.3,
+      "power": 0.97,
+      "rating": "A",
+      "recharge": 25,
+      "rechargeRating": "D"
+    }
   ]
 }

modules/internal/shield_generator.json

@@ -1,45 +1,652 @@
 {
   "sg": [
-    { "id": "4t", "edID": 128064293, "eddbID": 1146, "grp": "sg", "class": 8, "rating": "E", "cost": 2007240,   "mass": 160, "power": 2.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3, "recover": 4.8 },
-    { "id": "4s", "edID": 128064294, "eddbID": 1147, "grp": "sg", "class": 8, "rating": "D", "cost": 6021720,   "mass": 64,  "power": 3.2,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 4.8 },
-    { "id": "4r", "edID": 128064295, "eddbID": 1148, "grp": "sg", "class": 8, "rating": "C", "cost": 18065170,  "mass": 160, "power": 4,    "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 4.8 },
-    { "id": "4q", "edID": 128064296, "eddbID": 1149, "grp": "sg", "class": 8, "rating": "B", "cost": 54195500,  "mass": 256, "power": 4.8,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 4.8 },
-    { "id": "4p", "edID": 128064297, "eddbID": 1150, "grp": "sg", "class": 8, "rating": "A", "cost": 162586490, "mass": 160, "power": 5.6,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 4.8 },
-
-    { "id": "4o", "edID": 128064288, "eddbID": 1141, "grp": "sg", "class": 7, "rating": "E", "cost": 633200,    "mass": 80,  "power": 2.1,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3, "recover": 4 },
-    { "id": "4n", "edID": 128064289, "eddbID": 1142, "grp": "sg", "class": 7, "rating": "D", "cost": 1899600,   "mass": 32,  "power": 2.8,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 4 },
-    { "id": "4m", "edID": 128064290, "eddbID": 1143, "grp": "sg", "class": 7, "rating": "C", "cost": 5698790,   "mass": 80,  "power": 3.5,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 4 },
-    { "id": "4l", "edID": 128064291, "eddbID": 1144, "grp": "sg", "class": 7, "rating": "B", "cost": 17096370,  "mass": 128, "power": 4.2,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 4 },
-    { "id": "4k", "edID": 128064292, "eddbID": 1145, "grp": "sg", "class": 7, "rating": "A", "cost": 51289110,  "mass": 80,  "power": 4.9,  "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 4 },
-
-    { "id": "4j", "edID": 128064283, "eddbID": 1136, "grp": "sg", "class": 6, "rating": "E", "cost": 199750,    "mass": 40,  "power": 1.86, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3, "recover": 3.2 },
-    { "id": "4i", "edID": 128064284, "eddbID": 1137, "grp": "sg", "class": 6, "rating": "D", "cost": 599240,    "mass": 16,  "power": 2.48, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 3.2 },
-    { "id": "4h", "edID": 128064285, "eddbID": 1138, "grp": "sg", "class": 6, "rating": "C", "cost": 1797730,   "mass": 40,  "power": 3.1,  "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 3.2 },
-    { "id": "4g", "edID": 128064286, "eddbID": 1139, "grp": "sg", "class": 6, "rating": "B", "cost": 5393180,   "mass": 64,  "power": 3.72, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 3.2 },
-    { "id": "4f", "edID": 128064287, "eddbID": 1140, "grp": "sg", "class": 6, "rating": "A", "cost": 16179530,  "mass": 40,  "power": 4.34, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 3.2 },
-
-    { "id": "4e", "edID": 128064278, "eddbID": 1131, "grp": "sg", "class": 5, "rating": "E", "cost": 63010,     "mass": 20,  "power": 1.56, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3, "recover": 2.5 },
-    { "id": "4d", "edID": 128064279, "eddbID": 1132, "grp": "sg", "class": 5, "rating": "D", "cost": 189040,    "mass": 8,   "power": 2.08, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 2.5 },
-    { "id": "4c", "edID": 128064280, "eddbID": 1133, "grp": "sg", "class": 5, "rating": "C", "cost": 567110,    "mass": 20,  "power": 2.6,  "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 2.5 },
-    { "id": "4b", "edID": 128064281, "eddbID": 1134, "grp": "sg", "class": 5, "rating": "B", "cost": 1701320,   "mass": 32,  "power": 3.12, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 2.5 },
-    { "id": "4a", "edID": 128064282, "eddbID": 1135, "grp": "sg", "class": 5, "rating": "A", "cost": 5103950,   "mass": 20,  "power": 3.64, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 2.5 },
-
-    { "id": "49", "edID": 128064273, "eddbID": 1126, "grp": "sg", "class": 4, "rating": "E", "cost": 19880,     "mass": 10,  "power": 1.32, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3, "recover": 1.9 },
-    { "id": "48", "edID": 128064274, "eddbID": 1127, "grp": "sg", "class": 4, "rating": "D", "cost": 59630,     "mass": 4,   "power": 1.76, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 1.9 },
-    { "id": "47", "edID": 128064275, "eddbID": 1128, "grp": "sg", "class": 4, "rating": "C", "cost": 178900,    "mass": 10,  "power": 2.2,  "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 1.9 },
-    { "id": "46", "edID": 128064276, "eddbID": 1129, "grp": "sg", "class": 4, "rating": "B", "cost": 536690,    "mass": 16,  "power": 2.64, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 1.9 },
-    { "id": "45", "edID": 128064277, "eddbID": 1130, "grp": "sg", "class": 4, "rating": "A", "cost": 1610080,   "mass": 10,  "power": 3.08, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.9 },
-
-    { "id": "44", "edID": 128064268, "eddbID": 1121, "grp": "sg", "class": 3, "rating": "E", "cost": 6270,      "mass": 5,   "power": 1.08, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3, "recover": 1.6 },
-    { "id": "43", "edID": 128064269, "eddbID": 1122, "grp": "sg", "class": 3, "rating": "D", "cost": 18810,     "mass": 2,   "power": 1.44, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 1.6 },
-    { "id": "42", "edID": 128064270, "eddbID": 1123, "grp": "sg", "class": 3, "rating": "C", "cost": 56440,     "mass": 5,   "power": 1.8,  "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 1.6 },
-    { "id": "41", "edID": 128064271, "eddbID": 1124, "grp": "sg", "class": 3, "rating": "B", "cost": 169300,    "mass": 8,   "power": 2.16, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 1.6 },
-    { "id": "40", "edID": 128064272, "eddbID": 1125, "grp": "sg", "class": 3, "rating": "A", "cost": 507910,    "mass": 5,   "power": 2.52, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.6 },
-
-    { "id": "3v", "edID": 128064263, "eddbID": 1116, "grp": "sg", "class": 2, "rating": "E", "cost": 1980,      "mass": 2.5, "power": 0.9,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.3, "optmul": 0.8, "maxmul": 0.3, "recover": 1.6 },
-    { "id": "3u", "edID": 128064264, "eddbID": 1117, "grp": "sg", "class": 2, "rating": "D", "cost": 5930,      "mass": 1,   "power": 1.2,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 1.6 },
-    { "id": "3t", "edID": 128064265, "eddbID": 1118, "grp": "sg", "class": 2, "rating": "C", "cost": 17800,     "mass": 2.5, "power": 1.5,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 1.6 },
-    { "id": "3s", "edID": 128064266, "eddbID": 1119, "grp": "sg", "class": 2, "rating": "B", "cost": 53410,     "mass": 4,   "power": 1.8,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 1.6 },
-    { "id": "3r", "edID": 128064267, "eddbID": 1120, "grp": "sg", "class": 2, "rating": "A", "cost": 160220,    "mass": 2.5, "power": 2.1,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.6 }
+    {
+      "class": 8,
+      "cost": 2007240,
+      "edID": 128064293,
+      "eddbID": 1146,
+      "grp": "sg",
+      "id": "4t",
+      "mass": 160,
+      "maxmass": 4500,
+      "maxmul": 0.3,
+      "minmass": 900,
+      "minmul": 1.3,
+      "optmass": 1800,
+      "optmul": 0.8,
+      "power": 2.4,
+      "rating": "E",
+      "recover": 4.8
+    },
+    {
+      "class": 8,
+      "cost": 6021720,
+      "edID": 128064294,
+      "eddbID": 1147,
+      "grp": "sg",
+      "id": "4s",
+      "mass": 64,
+      "maxmass": 4500,
+      "maxmul": 0.4,
+      "minmass": 900,
+      "minmul": 1.4,
+      "optmass": 1800,
+      "optmul": 0.9,
+      "power": 3.2,
+      "rating": "D",
+      "recover": 4.8
+    },
+    {
+      "class": 8,
+      "cost": 18065170,
+      "edID": 128064295,
+      "eddbID": 1148,
+      "grp": "sg",
+      "id": "4r",
+      "mass": 160,
+      "maxmass": 4500,
+      "maxmul": 0.5,
+      "minmass": 900,
+      "minmul": 1.5,
+      "optmass": 1800,
+      "optmul": 1,
+      "power": 4,
+      "rating": "C",
+      "recover": 4.8
+    },
+    {
+      "class": 8,
+      "cost": 54195500,
+      "edID": 128064296,
+      "eddbID": 1149,
+      "grp": "sg",
+      "id": "4q",
+      "mass": 256,
+      "maxmass": 4500,
+      "maxmul": 0.6,
+      "minmass": 900,
+      "minmul": 1.6,
+      "optmass": 1800,
+      "optmul": 1.1,
+      "power": 4.8,
+      "rating": "B",
+      "recover": 4.8
+    },
+    {
+      "class": 8,
+      "cost": 162586490,
+      "edID": 128064297,
+      "eddbID": 1150,
+      "grp": "sg",
+      "id": "4p",
+      "mass": 160,
+      "maxmass": 4500,
+      "maxmul": 0.7,
+      "minmass": 900,
+      "minmul": 1.7,
+      "optmass": 1800,
+      "optmul": 1.2,
+      "power": 5.6,
+      "rating": "A",
+      "recover": 4.8
+    },
+    {
+      "class": 7,
+      "cost": 633200,
+      "edID": 128064288,
+      "eddbID": 1141,
+      "grp": "sg",
+      "id": "4o",
+      "mass": 80,
+      "maxmass": 2650,
+      "maxmul": 0.3,
+      "minmass": 530,
+      "minmul": 1.3,
+      "optmass": 1060,
+      "optmul": 0.8,
+      "power": 2.1,
+      "rating": "E",
+      "recover": 4
+    },
+    {
+      "class": 7,
+      "cost": 1899600,
+      "edID": 128064289,
+      "eddbID": 1142,
+      "grp": "sg",
+      "id": "4n",
+      "mass": 32,
+      "maxmass": 2650,
+      "maxmul": 0.4,
+      "minmass": 530,
+      "minmul": 1.4,
+      "optmass": 1060,
+      "optmul": 0.9,
+      "power": 2.8,
+      "rating": "D",
+      "recover": 4
+    },
+    {
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128064290,
+      "eddbID": 1143,
+      "grp": "sg",
+      "id": "4m",
+      "mass": 80,
+      "maxmass": 2650,
+      "maxmul": 0.5,
+      "minmass": 530,
+      "minmul": 1.5,
+      "optmass": 1060,
+      "optmul": 1,
+      "power": 3.5,
+      "rating": "C",
+      "recover": 4
+    },
+    {
+      "class": 7,
+      "cost": 17096370,
+      "edID": 128064291,
+      "eddbID": 1144,
+      "grp": "sg",
+      "id": "4l",
+      "mass": 128,
+      "maxmass": 2650,
+      "maxmul": 0.6,
+      "minmass": 530,
+      "minmul": 1.6,
+      "optmass": 1060,
+      "optmul": 1.1,
+      "power": 4.2,
+      "rating": "B",
+      "recover": 4
+    },
+    {
+      "class": 7,
+      "cost": 51289110,
+      "edID": 128064292,
+      "eddbID": 1145,
+      "grp": "sg",
+      "id": "4k",
+      "mass": 80,
+      "maxmass": 2650,
+      "maxmul": 0.7,
+      "minmass": 530,
+      "minmul": 1.7,
+      "optmass": 1060,
+      "optmul": 1.2,
+      "power": 4.9,
+      "rating": "A",
+      "recover": 4
+    },
+    {
+      "class": 6,
+      "cost": 199750,
+      "edID": 128064283,
+      "eddbID": 1136,
+      "grp": "sg",
+      "id": "4j",
+      "mass": 40,
+      "maxmass": 1350,
+      "maxmul": 0.3,
+      "minmass": 270,
+      "minmul": 1.3,
+      "optmass": 540,
+      "optmul": 0.8,
+      "power": 1.86,
+      "rating": "E",
+      "recover": 3.2
+    },
+    {
+      "class": 6,
+      "cost": 599240,
+      "edID": 128064284,
+      "eddbID": 1137,
+      "grp": "sg",
+      "id": "4i",
+      "mass": 16,
+      "maxmass": 1350,
+      "maxmul": 0.4,
+      "minmass": 270,
+      "minmul": 1.4,
+      "optmass": 540,
+      "optmul": 0.9,
+      "power": 2.48,
+      "rating": "D",
+      "recover": 3.2
+    },
+    {
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128064285,
+      "eddbID": 1138,
+      "grp": "sg",
+      "id": "4h",
+      "mass": 40,
+      "maxmass": 1350,
+      "maxmul": 0.5,
+      "minmass": 270,
+      "minmul": 1.5,
+      "optmass": 540,
+      "optmul": 1,
+      "power": 3.1,
+      "rating": "C",
+      "recover": 3.2
+    },
+    {
+      "class": 6,
+      "cost": 5393180,
+      "edID": 128064286,
+      "eddbID": 1139,
+      "grp": "sg",
+      "id": "4g",
+      "mass": 64,
+      "maxmass": 1350,
+      "maxmul": 0.6,
+      "minmass": 270,
+      "minmul": 1.6,
+      "optmass": 540,
+      "optmul": 1.1,
+      "power": 3.72,
+      "rating": "B",
+      "recover": 3.2
+    },
+    {
+      "class": 6,
+      "cost": 16179530,
+      "edID": 128064287,
+      "eddbID": 1140,
+      "grp": "sg",
+      "id": "4f",
+      "mass": 40,
+      "maxmass": 1350,
+      "maxmul": 0.7,
+      "minmass": 270,
+      "minmul": 1.7,
+      "optmass": 540,
+      "optmul": 1.2,
+      "power": 4.34,
+      "rating": "A",
+      "recover": 3.2
+    },
+    {
+      "class": 5,
+      "cost": 63010,
+      "edID": 128064278,
+      "eddbID": 1131,
+      "grp": "sg",
+      "id": "4e",
+      "mass": 20,
+      "maxmass": 1013,
+      "maxmul": 0.3,
+      "minmass": 203,
+      "minmul": 1.3,
+      "optmass": 405,
+      "optmul": 0.8,
+      "power": 1.56,
+      "rating": "E",
+      "recover": 2.5
+    },
+    {
+      "class": 5,
+      "cost": 189040,
+      "edID": 128064279,
+      "eddbID": 1132,
+      "grp": "sg",
+      "id": "4d",
+      "mass": 8,
+      "maxmass": 1013,
+      "maxmul": 0.4,
+      "minmass": 203,
+      "minmul": 1.4,
+      "optmass": 405,
+      "optmul": 0.9,
+      "power": 2.08,
+      "rating": "D",
+      "recover": 2.5
+    },
+    {
+      "class": 5,
+      "cost": 567110,
+      "edID": 128064280,
+      "eddbID": 1133,
+      "grp": "sg",
+      "id": "4c",
+      "mass": 20,
+      "maxmass": 1013,
+      "maxmul": 0.5,
+      "minmass": 203,
+      "minmul": 1.5,
+      "optmass": 405,
+      "optmul": 1,
+      "power": 2.6,
+      "rating": "C",
+      "recover": 2.5
+    },
+    {
+      "class": 5,
+      "cost": 1701320,
+      "edID": 128064281,
+      "eddbID": 1134,
+      "grp": "sg",
+      "id": "4b",
+      "mass": 32,
+      "maxmass": 1013,
+      "maxmul": 0.6,
+      "minmass": 203,
+      "minmul": 1.6,
+      "optmass": 405,
+      "optmul": 1.1,
+      "power": 3.12,
+      "rating": "B",
+      "recover": 2.5
+    },
+    {
+      "class": 5,
+      "cost": 5103950,
+      "edID": 128064282,
+      "eddbID": 1135,
+      "grp": "sg",
+      "id": "4a",
+      "mass": 20,
+      "maxmass": 1013,
+      "maxmul": 0.7,
+      "minmass": 203,
+      "minmul": 1.7,
+      "optmass": 405,
+      "optmul": 1.2,
+      "power": 3.64,
+      "rating": "A",
+      "recover": 2.5
+    },
+    {
+      "class": 4,
+      "cost": 19880,
+      "edID": 128064273,
+      "eddbID": 1126,
+      "grp": "sg",
+      "id": "49",
+      "mass": 10,
+      "maxmass": 713,
+      "maxmul": 0.3,
+      "minmass": 143,
+      "minmul": 1.3,
+      "optmass": 285,
+      "optmul": 0.8,
+      "power": 1.32,
+      "rating": "E",
+      "recover": 1.9
+    },
+    {
+      "class": 4,
+      "cost": 59630,
+      "edID": 128064274,
+      "eddbID": 1127,
+      "grp": "sg",
+      "id": "48",
+      "mass": 4,
+      "maxmass": 713,
+      "maxmul": 0.4,
+      "minmass": 143,
+      "minmul": 1.4,
+      "optmass": 285,
+      "optmul": 0.9,
+      "power": 1.76,
+      "rating": "D",
+      "recover": 1.9
+    },
+    {
+      "class": 4,
+      "cost": 178900,
+      "edID": 128064275,
+      "eddbID": 1128,
+      "grp": "sg",
+      "id": "47",
+      "mass": 10,
+      "maxmass": 713,
+      "maxmul": 0.5,
+      "minmass": 143,
+      "minmul": 1.5,
+      "optmass": 285,
+      "optmul": 1,
+      "power": 2.2,
+      "rating": "C",
+      "recover": 1.9
+    },
+    {
+      "class": 4,
+      "cost": 536690,
+      "edID": 128064276,
+      "eddbID": 1129,
+      "grp": "sg",
+      "id": "46",
+      "mass": 16,
+      "maxmass": 713,
+      "maxmul": 0.6,
+      "minmass": 143,
+      "minmul": 1.6,
+      "optmass": 285,
+      "optmul": 1.1,
+      "power": 2.64,
+      "rating": "B",
+      "recover": 1.9
+    },
+    {
+      "class": 4,
+      "cost": 1610080,
+      "edID": 128064277,
+      "eddbID": 1130,
+      "grp": "sg",
+      "id": "45",
+      "mass": 10,
+      "maxmass": 713,
+      "maxmul": 0.7,
+      "minmass": 143,
+      "minmul": 1.7,
+      "optmass": 285,
+      "optmul": 1.2,
+      "power": 3.08,
+      "rating": "A",
+      "recover": 1.9
+    },
+    {
+      "class": 3,
+      "cost": 6270,
+      "edID": 128064268,
+      "eddbID": 1121,
+      "grp": "sg",
+      "id": "44",
+      "mass": 5,
+      "maxmass": 413,
+      "maxmul": 0.3,
+      "minmass": 83,
+      "minmul": 1.3,
+      "optmass": 165,
+      "optmul": 0.8,
+      "power": 1.08,
+      "rating": "E",
+      "recover": 1.6
+    },
+    {
+      "class": 3,
+      "cost": 18810,
+      "edID": 128064269,
+      "eddbID": 1122,
+      "grp": "sg",
+      "id": "43",
+      "mass": 2,
+      "maxmass": 413,
+      "maxmul": 0.4,
+      "minmass": 83,
+      "minmul": 1.4,
+      "optmass": 165,
+      "optmul": 0.9,
+      "power": 1.44,
+      "rating": "D",
+      "recover": 1.6
+    },
+    {
+      "class": 3,
+      "cost": 56440,
+      "edID": 128064270,
+      "eddbID": 1123,
+      "grp": "sg",
+      "id": "42",
+      "mass": 5,
+      "maxmass": 413,
+      "maxmul": 0.5,
+      "minmass": 83,
+      "minmul": 1.5,
+      "optmass": 165,
+      "optmul": 1,
+      "power": 1.8,
+      "rating": "C",
+      "recover": 1.6
+    },
+    {
+      "class": 3,
+      "cost": 169300,
+      "edID": 128064271,
+      "eddbID": 1124,
+      "grp": "sg",
+      "id": "41",
+      "mass": 8,
+      "maxmass": 413,
+      "maxmul": 0.6,
+      "minmass": 83,
+      "minmul": 1.6,
+      "optmass": 165,
+      "optmul": 1.1,
+      "power": 2.16,
+      "rating": "B",
+      "recover": 1.6
+    },
+    {
+      "class": 3,
+      "cost": 507910,
+      "edID": 128064272,
+      "eddbID": 1125,
+      "grp": "sg",
+      "id": "40",
+      "mass": 5,
+      "maxmass": 413,
+      "maxmul": 0.7,
+      "minmass": 83,
+      "minmul": 1.7,
+      "optmass": 165,
+      "optmul": 1.2,
+      "power": 2.52,
+      "rating": "A",
+      "recover": 1.6
+    },
+    {
+      "class": 2,
+      "cost": 1980,
+      "edID": 128064263,
+      "eddbID": 1116,
+      "grp": "sg",
+      "id": "3v",
+      "mass": 2.5,
+      "maxmass": 138,
+      "maxmul": 0.3,
+      "minmass": 28,
+      "minmul": 1.3,
+      "optmass": 55,
+      "optmul": 0.8,
+      "power": 0.9,
+      "rating": "E",
+      "recover": 1.6
+    },
+    {
+      "class": 2,
+      "cost": 5930,
+      "edID": 128064264,
+      "eddbID": 1117,
+      "grp": "sg",
+      "id": "3u",
+      "mass": 1,
+      "maxmass": 138,
+      "maxmul": 0.4,
+      "minmass": 28,
+      "minmul": 1.4,
+      "optmass": 55,
+      "optmul": 0.9,
+      "power": 1.2,
+      "rating": "D",
+      "recover": 1.6
+    },
+    {
+      "class": 2,
+      "cost": 17800,
+      "edID": 128064265,
+      "eddbID": 1118,
+      "grp": "sg",
+      "id": "3t",
+      "mass": 2.5,
+      "maxmass": 138,
+      "maxmul": 0.5,
+      "minmass": 28,
+      "minmul": 1.5,
+      "optmass": 55,
+      "optmul": 1,
+      "power": 1.5,
+      "rating": "C",
+      "recover": 1.6
+    },
+    {
+      "class": 2,
+      "cost": 53410,
+      "edID": 128064266,
+      "eddbID": 1119,
+      "grp": "sg",
+      "id": "3s",
+      "mass": 4,
+      "maxmass": 138,
+      "maxmul": 0.6,
+      "minmass": 28,
+      "minmul": 1.6,
+      "optmass": 55,
+      "optmul": 1.1,
+      "power": 1.8,
+      "rating": "B",
+      "recover": 1.6
+    },
+    {
+      "class": 2,
+      "cost": 160220,
+      "edID": 128064267,
+      "eddbID": 1120,
+      "grp": "sg",
+      "id": "3r",
+      "mass": 2.5,
+      "maxmass": 138,
+      "maxmul": 0.7,
+      "minmass": 28,
+      "minmul": 1.7,
+      "optmass": 55,
+      "optmul": 1.2,
+      "power": 2.1,
+      "rating": "A",
+      "recover": 1.6
+    },
+    {
+      "class": 1,
+      "cost": 88075,
+      "edID": 128064262,
+      "eddbID": 1551,
+      "grp": "sg",
+      "id": "1x",
+      "mass": 1.3,
+      "maxmass": 63,
+      "maxmul": 0.7,
+      "minmass": 13,
+      "minmul": 1.7,
+      "optmass": 25,
+      "optmul": 1.2,
+      "power": 1.68,
+      "rating": "A",
+      "recover": 1
+    }
   ]
-}
+}

modules/standard/frame_shift_drive.json

@@ -1,45 +1,529 @@
 {
   "fsd": [
-    { "id":"Fy", "edID": 128064133, "eddbID": 991, "grp": "fsd", "class": 8, "rating": "E", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.011, "fuelpower": 2.9 },
-    { "id":"Fx", "edID": 128064134, "eddbID": 992, "grp": "fsd", "class": 8, "rating": "D", "cost": 0, "mass": 64, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 },
-    { "id":"Fw", "edID": 128064135, "eddbID": 993, "grp": "fsd", "class": 8, "rating": "C", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.008, "fuelpower": 2.9 },
-    { "id":"Fv", "edID": 128064136, "eddbID": 994, "grp": "fsd", "class": 8, "rating": "B", "cost": 0, "mass": 256, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 },
-    { "id":"Fu", "edID": 128064137, "eddbID": 995, "grp": "fsd", "class": 8, "rating": "A", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.012, "fuelpower": 2.9 },
-
-    { "id":"Ft", "edID": 128064128, "eddbID": 986, "grp": "fsd", "class": 7, "rating": "E", "cost": 633200, "mass": 80, "power": 0.48, "optmass": 1440, "maxfuel": 8.5, "fuelmul": 0.011, "fuelpower": 2.75 },
-    { "id":"Fs", "edID": 128064129, "eddbID": 987, "grp": "fsd", "class": 7, "rating": "D", "cost": 1899600, "mass": 32, "power": 0.54, "optmass": 1620, "maxfuel": 8.5, "fuelmul": 0.01, "fuelpower": 2.75 },
-    { "id":"Fr", "edID": 128064130, "eddbID": 988, "grp": "fsd", "class": 7, "rating": "C", "cost": 5698790, "mass": 80, "power": 0.60, "optmass": 1800, "maxfuel": 8.5, "fuelmul": 0.008, "fuelpower": 2.75 },
-    { "id":"Fq", "edID": 128064131, "eddbID": 989, "grp": "fsd", "class": 7, "rating": "B", "cost": 17096370, "mass": 128, "power": 0.75, "optmass": 2250, "maxfuel": 10.6, "fuelmul": 0.01, "fuelpower": 2.75 },
-    { "id":"Fp", "edID": 128064132, "eddbID": 990, "grp": "fsd", "class": 7, "rating": "A", "cost": 51289110, "mass": 80, "power": 0.90, "optmass": 2700, "maxfuel": 12.8, "fuelmul": 0.012, "fuelpower": 2.75 },
-
-    { "id":"Fo", "edID": 128064123, "eddbID": 981, "grp": "fsd", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "power": 0.4, "optmass": 960, "maxfuel": 5.3, "fuelmul": 0.011, "fuelpower": 2.6 },
-    { "id":"Fn", "edID": 128064124, "eddbID": 982, "grp": "fsd", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "power": 0.45, "optmass": 1080, "maxfuel": 5.3, "fuelmul": 0.01, "fuelpower": 2.6 },
-    { "id":"Fm", "edID": 128064125, "eddbID": 983, "grp": "fsd", "class": 6, "rating": "C", "cost": 1797730, "mass": 40, "power": 0.5, "optmass": 1200, "maxfuel": 5.3, "fuelmul": 0.008, "fuelpower": 2.6 },
-    { "id":"Fl", "edID": 128064126, "eddbID": 984, "grp": "fsd", "class": 6, "rating": "B", "cost": 5393180, "mass": 64, "power": 0.63, "optmass": 1500, "maxfuel": 6.6, "fuelmul": 0.01, "fuelpower": 2.6 },
-    { "id":"Fk", "edID": 128064127, "eddbID": 985, "grp": "fsd", "class": 6, "rating": "A", "cost": 16179530, "mass": 40, "power": 0.75, "optmass": 1800, "maxfuel": 8, "fuelmul": 0.012, "fuelpower": 2.6 },
-
-    { "id":"Fj", "edID": 128064118, "eddbID": 976, "grp": "fsd", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "power": 0.32, "optmass": 560, "maxfuel": 3.3, "fuelmul": 0.011, "fuelpower": 2.45 },
-    { "id":"Fi", "edID": 128064119, "eddbID": 977, "grp": "fsd", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "power": 0.36, "optmass": 630, "maxfuel": 3.3, "fuelmul": 0.01, "fuelpower": 2.45 },
-    { "id":"Fh", "edID": 128064120, "eddbID": 978, "grp": "fsd", "class": 5, "rating": "C", "cost": 567110, "mass": 20, "power": 0.4, "optmass": 700, "maxfuel": 3.3, "fuelmul": 0.008, "fuelpower": 2.45 },
-    { "id":"Fg", "edID": 128064121, "eddbID": 979, "grp": "fsd", "class": 5, "rating": "B", "cost": 1701320, "mass": 32, "power": 0.5, "optmass": 875, "maxfuel": 4.1, "fuelmul": 0.01, "fuelpower": 2.45 },
-    { "id":"Ff", "edID": 128064122, "eddbID": 980, "grp": "fsd", "class": 5, "rating": "A", "cost": 5103950, "mass": 20, "power": 0.6, "optmass": 1050, "maxfuel": 5, "fuelmul": 0.012, "fuelpower": 2.45 },
-
-    { "id":"Fe", "edID": 128064113, "eddbID": 971, "grp": "fsd", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "power": 0.24, "optmass": 280, "maxfuel": 2, "fuelmul": 0.011, "fuelpower": 2.3 },
-    { "id":"Fd", "edID": 128064114, "eddbID": 972, "grp": "fsd", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "power": 0.27, "optmass": 315, "maxfuel": 2, "fuelmul": 0.01, "fuelpower": 2.3 },
-    { "id":"Fc", "edID": 128064115, "eddbID": 973, "grp": "fsd", "class": 4, "rating": "C", "cost": 178900, "mass": 10, "power": 0.3, "optmass": 350, "maxfuel": 2, "fuelmul": 0.008, "fuelpower": 2.3 },
-    { "id":"Fb", "edID": 128064116, "eddbID": 974, "grp": "fsd", "class": 4, "rating": "B", "cost": 536690, "mass": 16, "power": 0.38, "optmass": 438, "maxfuel": 2.5, "fuelmul": 0.01, "fuelpower": 2.3 },
-    { "id":"Fa", "edID": 128064117, "eddbID": 975, "grp": "fsd", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 0.45, "optmass": 525, "maxfuel": 3, "fuelmul": 0.012, "fuelpower": 2.3 },
-
-    { "id":"F9", "edID": 128064108, "eddbID": 966, "grp": "fsd", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "power": 0.24, "optmass": 80, "maxfuel": 1.2, "fuelmul": 0.011, "fuelpower": 2.15 },
-    { "id":"F8", "edID": 128064109, "eddbID": 967, "grp": "fsd", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "power": 0.27, "optmass": 90, "maxfuel": 1.2, "fuelmul": 0.01, "fuelpower": 2.15 },
-    { "id":"F7", "edID": 128064110, "eddbID": 968, "grp": "fsd", "class": 3, "rating": "C", "cost": 56440, "mass": 5, "power": 0.3, "optmass": 100, "maxfuel": 1.2, "fuelmul": 0.008, "fuelpower": 2.15 },
-    { "id":"F6", "edID": 128064111, "eddbID": 969, "grp": "fsd", "class": 3, "rating": "B", "cost": 169300, "mass": 8, "power": 0.38, "optmass": 125, "maxfuel": 1.5, "fuelmul": 0.01, "fuelpower": 2.15 },
-    { "id":"F5", "edID": 128064112, "eddbID": 970, "grp": "fsd", "class": 3, "rating": "A", "cost": 507910, "mass": 5, "power": 0.45, "optmass": 150, "maxfuel": 1.8, "fuelmul": 0.012, "fuelpower": 2.15 },
-
-    { "id":"F4", "edID": 128064103, "eddbID": 961, "grp": "fsd", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "power": 0.16, "optmass": 48, "maxfuel": 0.6, "fuelmul": 0.011, "fuelpower": 2 },
-    { "id":"F3", "edID": 128064104, "eddbID": 962, "grp": "fsd", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "power": 0.18, "optmass": 54, "maxfuel": 0.6, "fuelmul": 0.01, "fuelpower": 2 },
-    { "id":"F2", "edID": 128064105, "eddbID": 963, "grp": "fsd", "class": 2, "rating": "C", "cost": 17800, "mass": 2.5, "power": 0.2, "optmass": 60, "maxfuel": 0.6, "fuelmul": 0.008, "fuelpower": 2 },
-    { "id":"F1", "edID": 128064106, "eddbID": 964, "grp": "fsd", "class": 2, "rating": "B", "cost": 53410, "mass": 4, "power": 0.25, "optmass": 75, "maxfuel": 0.8, "fuelmul": 0.01, "fuelpower": 2 },
-    { "id":"F0", "edID": 128064107, "eddbID": 965, "grp": "fsd", "class": 2, "rating": "A", "cost": 160220, "mass": 2.5, "power": 0.3, "optmass": 90, "maxfuel": 0.9, "fuelmul": 0.012, "fuelpower": 2 }
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064133,
+      "eddbID": 991,
+      "fuelmul": 0.011,
+      "fuelpower": 2.9,
+      "grp": "fsd",
+      "id": "Fy",
+      "mass": 160,
+      "maxfuel": 0,
+      "optmass": 0,
+      "power": 0,
+      "rating": "E"
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064134,
+      "eddbID": 992,
+      "fuelmul": 0.01,
+      "fuelpower": 2.9,
+      "grp": "fsd",
+      "id": "Fx",
+      "mass": 64,
+      "maxfuel": 0,
+      "optmass": 0,
+      "power": 0,
+      "rating": "D"
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064135,
+      "eddbID": 993,
+      "fuelmul": 0.008,
+      "fuelpower": 2.9,
+      "grp": "fsd",
+      "id": "Fw",
+      "mass": 160,
+      "maxfuel": 0,
+      "optmass": 0,
+      "power": 0,
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064136,
+      "eddbID": 994,
+      "fuelmul": 0.01,
+      "fuelpower": 2.9,
+      "grp": "fsd",
+      "id": "Fv",
+      "mass": 256,
+      "maxfuel": 0,
+      "optmass": 0,
+      "power": 0,
+      "rating": "B"
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064137,
+      "eddbID": 995,
+      "fuelmul": 0.012,
+      "fuelpower": 2.9,
+      "grp": "fsd",
+      "id": "Fu",
+      "mass": 160,
+      "maxfuel": 0,
+      "optmass": 0,
+      "power": 0,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 633200,
+      "edID": 128064128,
+      "eddbID": 986,
+      "fuelmul": 0.011,
+      "fuelpower": 2.75,
+      "grp": "fsd",
+      "id": "Ft",
+      "mass": 80,
+      "maxfuel": 8.5,
+      "optmass": 1440,
+      "power": 0.48,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 1899600,
+      "edID": 128064129,
+      "eddbID": 987,
+      "fuelmul": 0.01,
+      "fuelpower": 2.75,
+      "grp": "fsd",
+      "id": "Fs",
+      "mass": 32,
+      "maxfuel": 8.5,
+      "optmass": 1620,
+      "power": 0.54,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128064130,
+      "eddbID": 988,
+      "fuelmul": 0.008,
+      "fuelpower": 2.75,
+      "grp": "fsd",
+      "id": "Fr",
+      "mass": 80,
+      "maxfuel": 8.5,
+      "optmass": 1800,
+      "power": 0.6,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 17096370,
+      "edID": 128064131,
+      "eddbID": 989,
+      "fuelmul": 0.01,
+      "fuelpower": 2.75,
+      "grp": "fsd",
+      "id": "Fq",
+      "mass": 128,
+      "maxfuel": 10.6,
+      "optmass": 2250,
+      "power": 0.75,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 51289110,
+      "edID": 128064132,
+      "eddbID": 990,
+      "fuelmul": 0.012,
+      "fuelpower": 2.75,
+      "grp": "fsd",
+      "id": "Fp",
+      "mass": 80,
+      "maxfuel": 12.8,
+      "optmass": 2700,
+      "power": 0.9,
+      "rating": "A"
+    },
+    {
+      "class": 6,
+      "cost": 199750,
+      "edID": 128064123,
+      "eddbID": 981,
+      "fuelmul": 0.011,
+      "fuelpower": 2.6,
+      "grp": "fsd",
+      "id": "Fo",
+      "mass": 40,
+      "maxfuel": 5.3,
+      "optmass": 960,
+      "power": 0.4,
+      "rating": "E"
+    },
+    {
+      "class": 6,
+      "cost": 599240,
+      "edID": 128064124,
+      "eddbID": 982,
+      "fuelmul": 0.01,
+      "fuelpower": 2.6,
+      "grp": "fsd",
+      "id": "Fn",
+      "mass": 16,
+      "maxfuel": 5.3,
+      "optmass": 1080,
+      "power": 0.45,
+      "rating": "D"
+    },
+    {
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128064125,
+      "eddbID": 983,
+      "fuelmul": 0.008,
+      "fuelpower": 2.6,
+      "grp": "fsd",
+      "id": "Fm",
+      "mass": 40,
+      "maxfuel": 5.3,
+      "optmass": 1200,
+      "power": 0.5,
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 5393180,
+      "edID": 128064126,
+      "eddbID": 984,
+      "fuelmul": 0.01,
+      "fuelpower": 2.6,
+      "grp": "fsd",
+      "id": "Fl",
+      "mass": 64,
+      "maxfuel": 6.6,
+      "optmass": 1500,
+      "power": 0.63,
+      "rating": "B"
+    },
+    {
+      "class": 6,
+      "cost": 16179530,
+      "edID": 128064127,
+      "eddbID": 985,
+      "fuelmul": 0.012,
+      "fuelpower": 2.6,
+      "grp": "fsd",
+      "id": "Fk",
+      "mass": 40,
+      "maxfuel": 8,
+      "optmass": 1800,
+      "power": 0.75,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 63010,
+      "edID": 128064118,
+      "eddbID": 976,
+      "fuelmul": 0.011,
+      "fuelpower": 2.45,
+      "grp": "fsd",
+      "id": "Fj",
+      "mass": 20,
+      "maxfuel": 3.3,
+      "optmass": 560,
+      "power": 0.32,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 189040,
+      "edID": 128064119,
+      "eddbID": 977,
+      "fuelmul": 0.01,
+      "fuelpower": 2.45,
+      "grp": "fsd",
+      "id": "Fi",
+      "mass": 8,
+      "maxfuel": 3.3,
+      "optmass": 630,
+      "power": 0.36,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 567110,
+      "edID": 128064120,
+      "eddbID": 978,
+      "fuelmul": 0.008,
+      "fuelpower": 2.45,
+      "grp": "fsd",
+      "id": "Fh",
+      "mass": 20,
+      "maxfuel": 3.3,
+      "optmass": 700,
+      "power": 0.4,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 1701320,
+      "edID": 128064121,
+      "eddbID": 979,
+      "fuelmul": 0.01,
+      "fuelpower": 2.45,
+      "grp": "fsd",
+      "id": "Fg",
+      "mass": 32,
+      "maxfuel": 4.1,
+      "optmass": 875,
+      "power": 0.5,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 5103950,
+      "edID": 128064122,
+      "eddbID": 980,
+      "fuelmul": 0.012,
+      "fuelpower": 2.45,
+      "grp": "fsd",
+      "id": "Ff",
+      "mass": 20,
+      "maxfuel": 5,
+      "optmass": 1050,
+      "power": 0.6,
+      "rating": "A"
+    },
+    {
+      "class": 4,
+      "cost": 19880,
+      "edID": 128064113,
+      "eddbID": 971,
+      "fuelmul": 0.011,
+      "fuelpower": 2.3,
+      "grp": "fsd",
+      "id": "Fe",
+      "mass": 10,
+      "maxfuel": 2,
+      "optmass": 280,
+      "power": 0.24,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 59630,
+      "edID": 128064114,
+      "eddbID": 972,
+      "fuelmul": 0.01,
+      "fuelpower": 2.3,
+      "grp": "fsd",
+      "id": "Fd",
+      "mass": 4,
+      "maxfuel": 2,
+      "optmass": 315,
+      "power": 0.27,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 178900,
+      "edID": 128064115,
+      "eddbID": 973,
+      "fuelmul": 0.008,
+      "fuelpower": 2.3,
+      "grp": "fsd",
+      "id": "Fc",
+      "mass": 10,
+      "maxfuel": 2,
+      "optmass": 350,
+      "power": 0.3,
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 536690,
+      "edID": 128064116,
+      "eddbID": 974,
+      "fuelmul": 0.01,
+      "fuelpower": 2.3,
+      "grp": "fsd",
+      "id": "Fb",
+      "mass": 16,
+      "maxfuel": 2.5,
+      "optmass": 438,
+      "power": 0.38,
+      "rating": "B"
+    },
+    {
+      "class": 4,
+      "cost": 1610080,
+      "edID": 128064117,
+      "eddbID": 975,
+      "fuelmul": 0.012,
+      "fuelpower": 2.3,
+      "grp": "fsd",
+      "id": "Fa",
+      "mass": 10,
+      "maxfuel": 3,
+      "optmass": 525,
+      "power": 0.45,
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 6270,
+      "edID": 128064108,
+      "eddbID": 966,
+      "fuelmul": 0.011,
+      "fuelpower": 2.15,
+      "grp": "fsd",
+      "id": "F9",
+      "mass": 5,
+      "maxfuel": 1.2,
+      "optmass": 80,
+      "power": 0.24,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 18810,
+      "edID": 128064109,
+      "eddbID": 967,
+      "fuelmul": 0.01,
+      "fuelpower": 2.15,
+      "grp": "fsd",
+      "id": "F8",
+      "mass": 2,
+      "maxfuel": 1.2,
+      "optmass": 90,
+      "power": 0.27,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 56440,
+      "edID": 128064110,
+      "eddbID": 968,
+      "fuelmul": 0.008,
+      "fuelpower": 2.15,
+      "grp": "fsd",
+      "id": "F7",
+      "mass": 5,
+      "maxfuel": 1.2,
+      "optmass": 100,
+      "power": 0.3,
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 169300,
+      "edID": 128064111,
+      "eddbID": 969,
+      "fuelmul": 0.01,
+      "fuelpower": 2.15,
+      "grp": "fsd",
+      "id": "F6",
+      "mass": 8,
+      "maxfuel": 1.5,
+      "optmass": 125,
+      "power": 0.38,
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 507910,
+      "edID": 128064112,
+      "eddbID": 970,
+      "fuelmul": 0.012,
+      "fuelpower": 2.15,
+      "grp": "fsd",
+      "id": "F5",
+      "mass": 5,
+      "maxfuel": 1.8,
+      "optmass": 150,
+      "power": 0.45,
+      "rating": "A"
+    },
+    {
+      "class": 2,
+      "cost": 1980,
+      "edID": 128064103,
+      "eddbID": 961,
+      "fuelmul": 0.011,
+      "fuelpower": 2,
+      "grp": "fsd",
+      "id": "F4",
+      "mass": 2.5,
+      "maxfuel": 0.6,
+      "optmass": 48,
+      "power": 0.16,
+      "rating": "E"
+    },
+    {
+      "class": 2,
+      "cost": 5930,
+      "edID": 128064104,
+      "eddbID": 962,
+      "fuelmul": 0.01,
+      "fuelpower": 2,
+      "grp": "fsd",
+      "id": "F3",
+      "mass": 1,
+      "maxfuel": 0.6,
+      "optmass": 54,
+      "power": 0.18,
+      "rating": "D"
+    },
+    {
+      "class": 2,
+      "cost": 17800,
+      "edID": 128064105,
+      "eddbID": 963,
+      "fuelmul": 0.008,
+      "fuelpower": 2,
+      "grp": "fsd",
+      "id": "F2",
+      "mass": 2.5,
+      "maxfuel": 0.6,
+      "optmass": 60,
+      "power": 0.2,
+      "rating": "C"
+    },
+    {
+      "class": 2,
+      "cost": 53410,
+      "edID": 128064106,
+      "eddbID": 964,
+      "fuelmul": 0.01,
+      "fuelpower": 2,
+      "grp": "fsd",
+      "id": "F1",
+      "mass": 4,
+      "maxfuel": 0.8,
+      "optmass": 75,
+      "power": 0.25,
+      "rating": "B"
+    },
+    {
+      "class": 2,
+      "cost": 160220,
+      "edID": 128064107,
+      "eddbID": 965,
+      "fuelmul": 0.012,
+      "fuelpower": 2,
+      "grp": "fsd",
+      "id": "F0",
+      "mass": 2.5,
+      "maxfuel": 0.9,
+      "optmass": 90,
+      "power": 0.3,
+      "rating": "A"
+    }
   ]
-}
+}

modules/standard/fuel_tank.json

@@ -1,12 +1,84 @@
 {
   "ft": [
-    { "id": "f1", "edID": 128064346, "eddbID": 1199, "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "fuel": 2 },
-    { "id": "f2", "edID": 128064347, "eddbID": 1200, "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "fuel": 4 },
-    { "id": "f3", "edID": 128064348, "eddbID": 1201, "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "fuel": 8 },
-    { "id": "f4", "edID": 128064349, "eddbID": 1202, "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "fuel": 16 },
-    { "id": "f5", "edID": 128064350, "eddbID": 1203, "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "fuel": 32 },
-    { "id": "f6", "edID": 128064351, "eddbID": 1204, "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "fuel": 64 },
-    { "id": "f7", "edID": 128064352, "eddbID": 1205, "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "fuel": 128 },
-    { "id": "f8", "edID": 128064353, "eddbID": 1206, "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "fuel": 256 }
+    {
+      "class": 1,
+      "cost": 1000,
+      "edID": 128064346,
+      "eddbID": 1199,
+      "fuel": 2,
+      "grp": "ft",
+      "id": "f1",
+      "rating": "C"
+    },
+    {
+      "class": 2,
+      "cost": 3750,
+      "edID": 128064347,
+      "eddbID": 1200,
+      "fuel": 4,
+      "grp": "ft",
+      "id": "f2",
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 7060,
+      "edID": 128064348,
+      "eddbID": 1201,
+      "fuel": 8,
+      "grp": "ft",
+      "id": "f3",
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 24730,
+      "edID": 128064349,
+      "eddbID": 1202,
+      "fuel": 16,
+      "grp": "ft",
+      "id": "f4",
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 97750,
+      "edID": 128064350,
+      "eddbID": 1203,
+      "fuel": 32,
+      "grp": "ft",
+      "id": "f5",
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 341580,
+      "edID": 128064351,
+      "eddbID": 1204,
+      "fuel": 64,
+      "grp": "ft",
+      "id": "f6",
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 1780910,
+      "edID": 128064352,
+      "eddbID": 1205,
+      "fuel": 128,
+      "grp": "ft",
+      "id": "f7",
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 5428400,
+      "edID": 128064353,
+      "eddbID": 1206,
+      "fuel": 256,
+      "grp": "ft",
+      "id": "f8",
+      "rating": "C"
+    }
   ]
-}
+}

modules/standard/life_support.json

@@ -1,51 +1,484 @@
 {
   "ls": [
-    { "id":"lD", "edID": 128064173, "eddbID": 1031, "grp": "ls", "class": 8, "rating": "E", "cost": 0, "mass": 160, "power": 0, "time": 300 },
-    { "id":"lC", "edID": 128064174, "eddbID": 1032, "grp": "ls", "class": 8, "rating": "D", "cost": 0, "mass": 64, "power": 0, "time": 450 },
-    { "id":"lB", "edID": 128064175, "eddbID": 1033, "grp": "ls", "class": 8, "rating": "C", "cost": 0, "mass": 160, "power": 0, "time": 600 },
-    { "id":"lA", "edID": 128064176, "eddbID": 1034, "grp": "ls", "class": 8, "rating": "B", "cost": 0, "mass": 256, "power": 0, "time": 900 },
-    { "id":"lz", "edID": 128064177, "eddbID": 1035, "grp": "ls", "class": 8, "rating": "A", "cost": 0, "mass": 160, "power": 0, "time": 1500 },
-
-    { "id":"ly", "edID": 128064168, "eddbID": 1026, "grp": "ls", "class": 7, "rating": "E", "cost": 249140, "mass": 80, "power": 0.72, "time": 300 },
-    { "id":"lx", "edID": 128064169, "eddbID": 1027, "grp": "ls", "class": 7, "rating": "D", "cost": 622840, "mass": 32, "power": 0.81, "time": 450 },
-    { "id":"lw", "edID": 128064170, "eddbID": 1028, "grp": "ls", "class": 7, "rating": "C", "cost": 1557110, "mass": 80, "power": 0.90, "time": 600 },
-    { "id":"lv", "edID": 128064171, "eddbID": 1029, "grp": "ls", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 0.99, "time": 900 },
-    { "id":"lu", "edID": 128064172, "eddbID": 1030, "grp": "ls", "class": 7, "rating": "A", "cost": 9731930, "mass": 80, "power": 1.08, "time": 1500 },
-
-    { "id":"lt", "edID": 128064163, "eddbID": 1021, "grp": "ls", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.64, "time": 300 },
-    { "id":"ls", "edID": 128064164, "eddbID": 1022, "grp": "ls", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.72, "time": 450 },
-    { "id":"lr", "edID": 128064165, "eddbID": 1023, "grp": "ls", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.8, "time": 600 },
-    { "id":"lq", "edID": 128064166, "eddbID": 1024, "grp": "ls", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.88, "time": 900 },
-    { "id":"lp", "edID": 128064167, "eddbID": 1025, "grp": "ls", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 0.96, "time": 1500 },
-
-    { "id":"lo", "edID": 128064158, "eddbID": 1016, "grp": "ls", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.57, "time": 300 },
-    { "id":"ln", "edID": 128064159, "eddbID": 1017, "grp": "ls", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.64, "time": 450 },
-    { "id":"lm", "edID": 128064160, "eddbID": 1018, "grp": "ls", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.71, "time": 600 },
-    { "id":"ll", "edID": 128064161, "eddbID": 1019, "grp": "ls", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.78, "time": 900 },
-    { "id":"lk", "edID": 128064162, "eddbID": 1020, "grp": "ls", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 0.85, "time": 1500 },
-
-    { "id":"lj", "edID": 128064153, "eddbID": 1011, "grp": "ls", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.5, "time": 300 },
-    { "id":"li", "edID": 128064154, "eddbID": 1012, "grp": "ls", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.56, "time": 450 },
-    { "id":"lh", "edID": 128064155, "eddbID": 1013, "grp": "ls", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.62, "time": 600 },
-    { "id":"lg", "edID": 128064156, "eddbID": 1014, "grp": "ls", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.68, "time": 900 },
-    { "id":"lf", "edID": 128064157, "eddbID": 1015, "grp": "ls", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 0.74, "time": 1500 },
-
-    { "id":"le", "edID": 128064148, "eddbID": 1006, "grp": "ls", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.42, "time": 300 },
-    { "id":"ld", "edID": 128064149, "eddbID": 1007, "grp": "ls", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.48, "time": 450 },
-    { "id":"lc", "edID": 128064150, "eddbID": 1008, "grp": "ls", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.53, "time": 600 },
-    { "id":"lb", "edID": 128064151, "eddbID": 1009, "grp": "ls", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.58, "time": 900 },
-    { "id":"la", "edID": 128064152, "eddbID": 1010, "grp": "ls", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.64, "time": 1500 },
-
-    { "id":"l9", "edID": 128064143, "eddbID": 1001, "grp": "ls", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.37, "time": 300 },
-    { "id":"l8", "edID": 128064144, "eddbID": 1002, "grp": "ls", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.41, "time": 450 },
-    { "id":"l7", "edID": 128064145, "eddbID": 1003, "grp": "ls", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.46, "time": 600 },
-    { "id":"l6", "edID": 128064146, "eddbID": 1004, "grp": "ls", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.51, "time": 900 },
-    { "id":"l5", "edID": 128064147, "eddbID": 1005, "grp": "ls", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.55, "time": 1500 },
-
-    { "id":"l4", "edID": 128064138, "eddbID": 996, "grp": "ls", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.32, "time": 300 },
-    { "id":"l3", "edID": 128064139, "eddbID": 997, "grp": "ls", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.36, "time": 450 },
-    { "id":"l2", "edID": 128064140, "eddbID": 998, "grp": "ls", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.4, "time": 600 },
-    { "id":"l1", "edID": 128064141, "eddbID": 999, "grp": "ls", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.44, "time": 900 },
-    { "id":"l0", "edID": 128064142, "eddbID": 1000, "grp": "ls", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.48, "time": 1500 }
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064173,
+      "eddbID": 1031,
+      "grp": "ls",
+      "id": "lD",
+      "mass": 160,
+      "power": 0,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064174,
+      "eddbID": 1032,
+      "grp": "ls",
+      "id": "lC",
+      "mass": 64,
+      "power": 0,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064175,
+      "eddbID": 1033,
+      "grp": "ls",
+      "id": "lB",
+      "mass": 160,
+      "power": 0,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064176,
+      "eddbID": 1034,
+      "grp": "ls",
+      "id": "lA",
+      "mass": 256,
+      "power": 0,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 8,
+      "cost": 0,
+      "edID": 128064177,
+      "eddbID": 1035,
+      "grp": "ls",
+      "id": "lz",
+      "mass": 160,
+      "power": 0,
+      "rating": "A",
+      "time": 1500
+    },
+    {
+      "class": 7,
+      "cost": 249140,
+      "edID": 128064168,
+      "eddbID": 1026,
+      "grp": "ls",
+      "id": "ly",
+      "mass": 80,
+      "power": 0.72,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 7,
+      "cost": 622840,
+      "edID": 128064169,
+      "eddbID": 1027,
+      "grp": "ls",
+      "id": "lx",
+      "mass": 32,
+      "power": 0.81,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 7,
+      "cost": 1557110,
+      "edID": 128064170,
+      "eddbID": 1028,
+      "grp": "ls",
+      "id": "lw",
+      "mass": 80,
+      "power": 0.9,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 7,
+      "cost": 3892770,
+      "edID": 128064171,
+      "eddbID": 1029,
+      "grp": "ls",
+      "id": "lv",
+      "mass": 128,
+      "power": 0.99,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 7,
+      "cost": 9731930,
+      "edID": 128064172,
+      "eddbID": 1030,
+      "grp": "ls",
+      "id": "lu",
+      "mass": 80,
+      "power": 1.08,
+      "rating": "A",
+      "time": 1500
+    },
+    {
+      "class": 6,
+      "cost": 88980,
+      "edID": 128064163,
+      "eddbID": 1021,
+      "grp": "ls",
+      "id": "lt",
+      "mass": 40,
+      "power": 0.64,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 6,
+      "cost": 222440,
+      "edID": 128064164,
+      "eddbID": 1022,
+      "grp": "ls",
+      "id": "ls",
+      "mass": 16,
+      "power": 0.72,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 6,
+      "cost": 556110,
+      "edID": 128064165,
+      "eddbID": 1023,
+      "grp": "ls",
+      "id": "lr",
+      "mass": 40,
+      "power": 0.8,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 6,
+      "cost": 1390280,
+      "edID": 128064166,
+      "eddbID": 1024,
+      "grp": "ls",
+      "id": "lq",
+      "mass": 64,
+      "power": 0.88,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 6,
+      "cost": 3475690,
+      "edID": 128064167,
+      "eddbID": 1025,
+      "grp": "ls",
+      "id": "lp",
+      "mass": 40,
+      "power": 0.96,
+      "rating": "A",
+      "time": 1500
+    },
+    {
+      "class": 5,
+      "cost": 31780,
+      "edID": 128064158,
+      "eddbID": 1016,
+      "grp": "ls",
+      "id": "lo",
+      "mass": 20,
+      "power": 0.57,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 5,
+      "cost": 79440,
+      "edID": 128064159,
+      "eddbID": 1017,
+      "grp": "ls",
+      "id": "ln",
+      "mass": 8,
+      "power": 0.64,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 5,
+      "cost": 198610,
+      "edID": 128064160,
+      "eddbID": 1018,
+      "grp": "ls",
+      "id": "lm",
+      "mass": 20,
+      "power": 0.71,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 5,
+      "cost": 496530,
+      "edID": 128064161,
+      "eddbID": 1019,
+      "grp": "ls",
+      "id": "ll",
+      "mass": 32,
+      "power": 0.78,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 5,
+      "cost": 1241320,
+      "edID": 128064162,
+      "eddbID": 1020,
+      "grp": "ls",
+      "id": "lk",
+      "mass": 20,
+      "power": 0.85,
+      "rating": "A",
+      "time": 1500
+    },
+    {
+      "class": 4,
+      "cost": 11350,
+      "edID": 128064153,
+      "eddbID": 1011,
+      "grp": "ls",
+      "id": "lj",
+      "mass": 10,
+      "power": 0.5,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 4,
+      "cost": 28370,
+      "edID": 128064154,
+      "eddbID": 1012,
+      "grp": "ls",
+      "id": "li",
+      "mass": 4,
+      "power": 0.56,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 4,
+      "cost": 70930,
+      "edID": 128064155,
+      "eddbID": 1013,
+      "grp": "ls",
+      "id": "lh",
+      "mass": 10,
+      "power": 0.62,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 4,
+      "cost": 177330,
+      "edID": 128064156,
+      "eddbID": 1014,
+      "grp": "ls",
+      "id": "lg",
+      "mass": 16,
+      "power": 0.68,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 4,
+      "cost": 443330,
+      "edID": 128064157,
+      "eddbID": 1015,
+      "grp": "ls",
+      "id": "lf",
+      "mass": 10,
+      "power": 0.74,
+      "rating": "A",
+      "time": 1500
+    },
+    {
+      "class": 3,
+      "cost": 4050,
+      "edID": 128064148,
+      "eddbID": 1006,
+      "grp": "ls",
+      "id": "le",
+      "mass": 5,
+      "power": 0.42,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 3,
+      "cost": 10130,
+      "edID": 128064149,
+      "eddbID": 1007,
+      "grp": "ls",
+      "id": "ld",
+      "mass": 2,
+      "power": 0.48,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 3,
+      "cost": 25330,
+      "edID": 128064150,
+      "eddbID": 1008,
+      "grp": "ls",
+      "id": "lc",
+      "mass": 5,
+      "power": 0.53,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 3,
+      "cost": 63330,
+      "edID": 128064151,
+      "eddbID": 1009,
+      "grp": "ls",
+      "id": "lb",
+      "mass": 8,
+      "power": 0.58,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 3,
+      "cost": 158330,
+      "edID": 128064152,
+      "eddbID": 1010,
+      "grp": "ls",
+      "id": "la",
+      "mass": 5,
+      "power": 0.64,
+      "rating": "A",
+      "time": 1500
+    },
+    {
+      "class": 2,
+      "cost": 1450,
+      "edID": 128064143,
+      "eddbID": 1001,
+      "grp": "ls",
+      "id": "l9",
+      "mass": 2.5,
+      "power": 0.37,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 2,
+      "cost": 3620,
+      "edID": 128064144,
+      "eddbID": 1002,
+      "grp": "ls",
+      "id": "l8",
+      "mass": 1,
+      "power": 0.41,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 2,
+      "cost": 9050,
+      "edID": 128064145,
+      "eddbID": 1003,
+      "grp": "ls",
+      "id": "l7",
+      "mass": 2.5,
+      "power": 0.46,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 2,
+      "cost": 22620,
+      "edID": 128064146,
+      "eddbID": 1004,
+      "grp": "ls",
+      "id": "l6",
+      "mass": 4,
+      "power": 0.51,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 2,
+      "cost": 56550,
+      "edID": 128064147,
+      "eddbID": 1005,
+      "grp": "ls",
+      "id": "l5",
+      "mass": 2.5,
+      "power": 0.55,
+      "rating": "A",
+      "time": 1500
+    },
+    {
+      "class": 1,
+      "cost": 520,
+      "edID": 128064138,
+      "eddbID": 996,
+      "grp": "ls",
+      "id": "l4",
+      "mass": 1.3,
+      "power": 0.32,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 1,
+      "cost": 1290,
+      "edID": 128064139,
+      "eddbID": 997,
+      "grp": "ls",
+      "id": "l3",
+      "mass": 0.5,
+      "power": 0.36,
+      "rating": "D",
+      "time": 450
+    },
+    {
+      "class": 1,
+      "cost": 3230,
+      "edID": 128064140,
+      "eddbID": 998,
+      "grp": "ls",
+      "id": "l2",
+      "mass": 1.3,
+      "power": 0.4,
+      "rating": "C",
+      "time": 600
+    },
+    {
+      "class": 1,
+      "cost": 8080,
+      "edID": 128064141,
+      "eddbID": 999,
+      "grp": "ls",
+      "id": "l1",
+      "mass": 2,
+      "power": 0.44,
+      "rating": "B",
+      "time": 900
+    },
+    {
+      "class": 1,
+      "cost": 20200,
+      "edID": 128064142,
+      "eddbID": 1000,
+      "grp": "ls",
+      "id": "l0",
+      "mass": 1.3,
+      "power": 0.48,
+      "rating": "A",
+      "time": 1500
+    }
   ]
-}
+}

modules/standard/planetary_approach_suite.json

@@ -1,5 +1,15 @@
 {
   "pas": [
-    { "id": "PA", "edID": 128672317, "eddbID": null, "grp": "pas", "class": 1, "rating": "I", "cost": 500, "power": 0.0, "mass": 0 }
+    {
+      "class": 1,
+      "cost": 500,
+      "edID": 128672317,
+      "eddbID": 1538,
+      "grp": "pas",
+      "id": "PA",
+      "mass": 0,
+      "power": 0,
+      "rating": "I"
+    }
   ]
-}
+}

modules/standard/power_distributor.json

@@ -1,51 +1,684 @@
 {
   "pd": [
-    { "id":"dD", "edID": 128064213, "eddbID": 1071, "grp": "pd", "class": 8, "rating": "E", "cost": 697580, "mass": 160, "power": 0.64, "weaponcapacity": 48, "weaponrecharge": 4.8, "enginecapacity": 32, "enginerecharge": 3.2, "systemcapacity": 32, "systemrecharge": 3.2 },
-    { "id":"dC", "edID": 128064214, "eddbID": 1072, "grp": "pd", "class": 8, "rating": "D", "cost": 1743960, "mass": 64, "power": 0.72, "weaponcapacity": 54, "weaponrecharge": 5.4, "enginecapacity": 36, "enginerecharge": 3.6, "systemcapacity": 36, "systemrecharge": 3.6 },
-    { "id":"dB", "edID": 128064215, "eddbID": 1073, "grp": "pd", "class": 8, "rating": "C", "cost": 4359900, "mass": 160, "power": 0.8, "weaponcapacity": 60, "weaponrecharge": 6, "enginecapacity": 40, "enginerecharge": 4, "systemcapacity": 40, "systemrecharge": 4 },
-    { "id":"dA", "edID": 128064216, "eddbID": 1074, "grp": "pd", "class": 8, "rating": "B", "cost": 10899760, "mass": 256, "power": 0.88, "weaponcapacity": 66, "weaponrecharge": 6.6, "enginecapacity": 44, "enginerecharge": 4.4, "systemcapacity": 44, "systemrecharge": 4.4 },
-    { "id":"dz", "edID": 128064217, "eddbID": 1075, "grp": "pd", "class": 8, "rating": "A", "cost": 27249390, "mass": 160, "power": 0.96, "weaponcapacity": 72, "weaponrecharge": 7.2, "enginecapacity": 48, "enginerecharge": 4.8, "systemcapacity": 48, "systemrecharge": 4.8 },
-
-    { "id":"dy", "edID": 128064208, "eddbID": 1066, "grp": "pd", "class": 7, "rating": "E", "cost": 249140, "mass": 80, "power": 0.59, "weaponcapacity": 41, "weaponrecharge": 4.1, "enginecapacity": 27, "enginerecharge": 2.6, "systemcapacity": 27, "systemrecharge": 2.6 },
-    { "id":"dx", "edID": 128064209, "eddbID": 1067, "grp": "pd", "class": 7, "rating": "D", "cost": 622840, "mass": 32, "power": 0.67, "weaponcapacity": 46, "weaponrecharge": 4.6, "enginecapacity": 31, "enginerecharge": 3, "systemcapacity": 31, "systemrecharge": 3 },
-    { "id":"dw", "edID": 128064210, "eddbID": 1068, "grp": "pd", "class": 7, "rating": "C", "cost": 1557110, "mass": 80, "power": 0.74, "weaponcapacity": 51, "weaponrecharge": 5.1, "enginecapacity": 34, "enginerecharge": 3.3, "systemcapacity": 34, "systemrecharge": 3.3 },
-    { "id":"dv", "edID": 128064211, "eddbID": 1069, "grp": "pd", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 0.81, "weaponcapacity": 56, "weaponrecharge": 5.6, "enginecapacity": 37, "enginerecharge": 3.6, "systemcapacity": 37, "systemrecharge": 3.6 },
-    { "id":"du", "edID": 128064212, "eddbID": 1070, "grp": "pd", "class": 7, "rating": "A", "cost": 9731930, "mass": 80, "power": 0.89, "weaponcapacity": 61, "weaponrecharge": 6.1, "enginecapacity": 41, "enginerecharge": 4, "systemcapacity": 41, "systemrecharge": 4 },
-
-    { "id":"dt", "edID": 128064203, "eddbID": 1061, "grp": "pd", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.54, "weaponcapacity": 34, "weaponrecharge": 3.4, "enginecapacity": 23, "enginerecharge": 2.2, "systemcapacity": 23, "systemrecharge": 2.2 },
-    { "id":"ds", "edID": 128064204, "eddbID": 1062, "grp": "pd", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.61, "weaponcapacity": 38, "weaponrecharge": 3.9, "enginecapacity": 26, "enginerecharge": 2.4, "systemcapacity": 26, "systemrecharge": 2.4 },
-    { "id":"dr", "edID": 128064205, "eddbID": 1063, "grp": "pd", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.68, "weaponcapacity": 42, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.7, "systemcapacity": 29, "systemrecharge": 2.7 },
-    { "id":"dq", "edID": 128064206, "eddbID": 1064, "grp": "pd", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.75, "weaponcapacity": 46, "weaponrecharge": 4.7, "enginecapacity": 32, "enginerecharge": 3, "systemcapacity": 32, "systemrecharge": 3 },
-    { "id":"dp", "edID": 128064207, "eddbID": 1065, "grp": "pd", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 0.82, "weaponcapacity": 50, "weaponrecharge": 5.2, "enginecapacity": 35, "enginerecharge": 3.2, "systemcapacity": 35, "systemrecharge": 3.2 },
-
-    { "id":"do", "edID": 128064198, "eddbID": 1056, "grp": "pd", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.5, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.7, "systemcapacity": 19, "systemrecharge": 1.7 },
-    { "id":"dn", "edID": 128064199, "eddbID": 1057, "grp": "pd", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.56, "weaponcapacity": 31, "weaponrecharge": 3.2, "enginecapacity": 22, "enginerecharge": 1.9, "systemcapacity": 22, "systemrecharge": 1.9 },
-    { "id":"dm", "edID": 128064200, "eddbID": 1058, "grp": "pd", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.62, "weaponcapacity": 34, "weaponrecharge": 3.6, "enginecapacity": 24, "enginerecharge": 2.1, "systemcapacity": 24, "systemrecharge": 2.1 },
-    { "id":"dl", "edID": 128064201, "eddbID": 1059, "grp": "pd", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.68, "weaponcapacity": 37, "weaponrecharge": 4, "enginecapacity": 26, "enginerecharge": 2.3, "systemcapacity": 26, "systemrecharge": 2.3 },
-    { "id":"dk", "edID": 128064202, "eddbID": 1060, "grp": "pd", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 0.74, "weaponcapacity": 41, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.5, "systemcapacity": 29, "systemrecharge": 2.5 },
-
-    { "id":"dj", "edID": 128064193, "eddbID": 1051, "grp": "pd", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.45, "weaponcapacity": 22, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.3, "systemcapacity": 15, "systemrecharge": 1.3 },
-    { "id":"di", "edID": 128064194, "eddbID": 1052, "grp": "pd", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.5, "weaponcapacity": 24, "weaponrecharge": 2.6, "enginecapacity": 17, "enginerecharge": 1.4, "systemcapacity": 17, "systemrecharge": 1.4 },
-    { "id":"dh", "edID": 128064195, "eddbID": 1053, "grp": "pd", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.56, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.6, "systemcapacity": 19, "systemrecharge": 1.6 },
-    { "id":"dg", "edID": 128064196, "eddbID": 1054, "grp": "pd", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.62, "weaponcapacity": 30, "weaponrecharge": 3.2, "enginecapacity": 21, "enginerecharge": 1.8, "systemcapacity": 21, "systemrecharge": 1.8 },
-    { "id":"df", "edID": 128064197, "eddbID": 1055, "grp": "pd", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 0.67, "weaponcapacity": 32, "weaponrecharge": 3.5, "enginecapacity": 23, "enginerecharge": 1.9, "systemcapacity": 23, "systemrecharge": 1.9 },
-
-    { "id":"de", "edID": 128064188, "eddbID": 1046, "grp": "pd", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.4, "weaponcapacity": 16, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.9, "systemcapacity": 12, "systemrecharge": 0.9 },
-    { "id":"dd", "edID": 128064189, "eddbID": 1047, "grp": "pd", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.45, "weaponcapacity": 18, "weaponrecharge": 2.1, "enginecapacity": 14, "enginerecharge": 1, "systemcapacity": 14, "systemrecharge": 1 },
-    { "id":"dc", "edID": 128064190, "eddbID": 1048, "grp": "pd", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.5, "weaponcapacity": 20, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.1, "systemcapacity": 15, "systemrecharge": 1.1 },
-    { "id":"db", "edID": 128064191, "eddbID": 1049, "grp": "pd", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.55, "weaponcapacity": 22, "weaponrecharge": 2.5, "enginecapacity": 17, "enginerecharge": 1.2, "systemcapacity": 17, "systemrecharge": 1.2 },
-    { "id":"da", "edID": 128064192, "eddbID": 1050, "grp": "pd", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.6, "weaponcapacity": 24, "weaponrecharge": 2.8, "enginecapacity": 18, "enginerecharge": 1.3, "systemcapacity": 18, "systemrecharge": 1.3 },
-
-    { "id":"d9", "edID": 128064183, "eddbID": 1041, "grp": "pd", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.36, "weaponcapacity": 12, "weaponrecharge": 1.4, "enginecapacity": 10, "enginerecharge": 0.6, "systemcapacity": 10, "systemrecharge": 0.6 },
-    { "id":"d8", "edID": 128064184, "eddbID": 1042, "grp": "pd", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.41, "weaponcapacity": 14, "weaponrecharge": 1.6, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 },
-    { "id":"d7", "edID": 128064185, "eddbID": 1043, "grp": "pd", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.45, "weaponcapacity": 15, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.7, "systemcapacity": 12, "systemrecharge": 0.7 },
-    { "id":"d6", "edID": 128064186, "eddbID": 1044, "grp": "pd", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.5, "weaponcapacity": 17, "weaponrecharge": 2, "enginecapacity": 13, "enginerecharge": 0.8, "systemcapacity": 13, "systemrecharge": 0.8 },
-    { "id":"d5", "edID": 128064187, "eddbID": 1045, "grp": "pd", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.54, "weaponcapacity": 18, "weaponrecharge": 2.2, "enginecapacity": 14, "enginerecharge": 0.8, "systemcapacity": 14, "systemrecharge": 0.8 },
-
-    { "id":"d4", "edID": 128064178, "eddbID": 1036, "grp": "pd", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.32, "weaponcapacity": 10, "weaponrecharge": 1.2, "enginecapacity": 8, "enginerecharge": 0.4, "systemcapacity": 8, "systemrecharge": 0.4 },
-    { "id":"d3", "edID": 128064179, "eddbID": 1037, "grp": "pd", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.36, "weaponcapacity": 11, "weaponrecharge": 1.4, "enginecapacity": 9, "enginerecharge": 0.5, "systemcapacity": 9, "systemrecharge": 0.5 },
-    { "id":"d2", "edID": 128064180, "eddbID": 1038, "grp": "pd", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.4, "weaponcapacity": 12, "weaponrecharge": 1.5, "enginecapacity": 10, "enginerecharge": 0.5, "systemcapacity": 10, "systemrecharge": 0.5 },
-    { "id":"d1", "edID": 128064181, "eddbID": 1039, "grp": "pd", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.44, "weaponcapacity": 13, "weaponrecharge": 1.7, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 },
-    { "id":"d0", "edID": 128064182, "eddbID": 1040, "grp": "pd", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.48, "weaponcapacity": 14, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.6, "systemcapacity": 12, "systemrecharge": 0.6 }
+    {
+      "class": 8,
+      "cost": 697580,
+      "edID": 128064213,
+      "eddbID": 1071,
+      "enginecapacity": 32,
+      "enginerecharge": 3.2,
+      "grp": "pd",
+      "id": "dD",
+      "mass": 160,
+      "power": 0.64,
+      "rating": "E",
+      "systemcapacity": 32,
+      "systemrecharge": 3.2,
+      "weaponcapacity": 48,
+      "weaponrecharge": 4.8
+    },
+    {
+      "class": 8,
+      "cost": 1743960,
+      "edID": 128064214,
+      "eddbID": 1072,
+      "enginecapacity": 36,
+      "enginerecharge": 3.6,
+      "grp": "pd",
+      "id": "dC",
+      "mass": 64,
+      "power": 0.72,
+      "rating": "D",
+      "systemcapacity": 36,
+      "systemrecharge": 3.6,
+      "weaponcapacity": 54,
+      "weaponrecharge": 5.4
+    },
+    {
+      "class": 8,
+      "cost": 4359900,
+      "edID": 128064215,
+      "eddbID": 1073,
+      "enginecapacity": 40,
+      "enginerecharge": 4,
+      "grp": "pd",
+      "id": "dB",
+      "mass": 160,
+      "power": 0.8,
+      "rating": "C",
+      "systemcapacity": 40,
+      "systemrecharge": 4,
+      "weaponcapacity": 60,
+      "weaponrecharge": 6
+    },
+    {
+      "class": 8,
+      "cost": 10899760,
+      "edID": 128064216,
+      "eddbID": 1074,
+      "enginecapacity": 44,
+      "enginerecharge": 4.4,
+      "grp": "pd",
+      "id": "dA",
+      "mass": 256,
+      "power": 0.88,
+      "rating": "B",
+      "systemcapacity": 44,
+      "systemrecharge": 4.4,
+      "weaponcapacity": 66,
+      "weaponrecharge": 6.6
+    },
+    {
+      "class": 8,
+      "cost": 27249390,
+      "edID": 128064217,
+      "eddbID": 1075,
+      "enginecapacity": 48,
+      "enginerecharge": 4.8,
+      "grp": "pd",
+      "id": "dz",
+      "mass": 160,
+      "power": 0.96,
+      "rating": "A",
+      "systemcapacity": 48,
+      "systemrecharge": 4.8,
+      "weaponcapacity": 72,
+      "weaponrecharge": 7.2
+    },
+    {
+      "class": 7,
+      "cost": 249140,
+      "edID": 128064208,
+      "eddbID": 1066,
+      "enginecapacity": 27,
+      "enginerecharge": 2.6,
+      "grp": "pd",
+      "id": "dy",
+      "mass": 80,
+      "power": 0.59,
+      "rating": "E",
+      "systemcapacity": 27,
+      "systemrecharge": 2.6,
+      "weaponcapacity": 41,
+      "weaponrecharge": 4.1
+    },
+    {
+      "class": 7,
+      "cost": 622840,
+      "edID": 128064209,
+      "eddbID": 1067,
+      "enginecapacity": 31,
+      "enginerecharge": 3,
+      "grp": "pd",
+      "id": "dx",
+      "mass": 32,
+      "power": 0.67,
+      "rating": "D",
+      "systemcapacity": 31,
+      "systemrecharge": 3,
+      "weaponcapacity": 46,
+      "weaponrecharge": 4.6
+    },
+    {
+      "class": 7,
+      "cost": 1557110,
+      "edID": 128064210,
+      "eddbID": 1068,
+      "enginecapacity": 34,
+      "enginerecharge": 3.3,
+      "grp": "pd",
+      "id": "dw",
+      "mass": 80,
+      "power": 0.74,
+      "rating": "C",
+      "systemcapacity": 34,
+      "systemrecharge": 3.3,
+      "weaponcapacity": 51,
+      "weaponrecharge": 5.1
+    },
+    {
+      "class": 7,
+      "cost": 3892770,
+      "edID": 128064211,
+      "eddbID": 1069,
+      "enginecapacity": 37,
+      "enginerecharge": 3.6,
+      "grp": "pd",
+      "id": "dv",
+      "mass": 128,
+      "power": 0.81,
+      "rating": "B",
+      "systemcapacity": 37,
+      "systemrecharge": 3.6,
+      "weaponcapacity": 56,
+      "weaponrecharge": 5.6
+    },
+    {
+      "class": 7,
+      "cost": 9731930,
+      "edID": 128064212,
+      "eddbID": 1070,
+      "enginecapacity": 41,
+      "enginerecharge": 4,
+      "grp": "pd",
+      "id": "du",
+      "mass": 80,
+      "power": 0.89,
+      "rating": "A",
+      "systemcapacity": 41,
+      "systemrecharge": 4,
+      "weaponcapacity": 61,
+      "weaponrecharge": 6.1
+    },
+    {
+      "class": 6,
+      "cost": 88980,
+      "edID": 128064203,
+      "eddbID": 1061,
+      "enginecapacity": 23,
+      "enginerecharge": 2.2,
+      "grp": "pd",
+      "id": "dt",
+      "mass": 40,
+      "power": 0.54,
+      "rating": "E",
+      "systemcapacity": 23,
+      "systemrecharge": 2.2,
+      "weaponcapacity": 34,
+      "weaponrecharge": 3.4
+    },
+    {
+      "class": 6,
+      "cost": 222440,
+      "edID": 128064204,
+      "eddbID": 1062,
+      "enginecapacity": 26,
+      "enginerecharge": 2.4,
+      "grp": "pd",
+      "id": "ds",
+      "mass": 16,
+      "power": 0.61,
+      "rating": "D",
+      "systemcapacity": 26,
+      "systemrecharge": 2.4,
+      "weaponcapacity": 38,
+      "weaponrecharge": 3.9
+    },
+    {
+      "class": 6,
+      "cost": 556110,
+      "edID": 128064205,
+      "eddbID": 1063,
+      "enginecapacity": 29,
+      "enginerecharge": 2.7,
+      "grp": "pd",
+      "id": "dr",
+      "mass": 40,
+      "power": 0.68,
+      "rating": "C",
+      "systemcapacity": 29,
+      "systemrecharge": 2.7,
+      "weaponcapacity": 42,
+      "weaponrecharge": 4.3
+    },
+    {
+      "class": 6,
+      "cost": 1390280,
+      "edID": 128064206,
+      "eddbID": 1064,
+      "enginecapacity": 32,
+      "enginerecharge": 3,
+      "grp": "pd",
+      "id": "dq",
+      "mass": 64,
+      "power": 0.75,
+      "rating": "B",
+      "systemcapacity": 32,
+      "systemrecharge": 3,
+      "weaponcapacity": 46,
+      "weaponrecharge": 4.7
+    },
+    {
+      "class": 6,
+      "cost": 3475690,
+      "edID": 128064207,
+      "eddbID": 1065,
+      "enginecapacity": 35,
+      "enginerecharge": 3.2,
+      "grp": "pd",
+      "id": "dp",
+      "mass": 40,
+      "power": 0.82,
+      "rating": "A",
+      "systemcapacity": 35,
+      "systemrecharge": 3.2,
+      "weaponcapacity": 50,
+      "weaponrecharge": 5.2
+    },
+    {
+      "class": 5,
+      "cost": 31780,
+      "edID": 128064198,
+      "eddbID": 1056,
+      "enginecapacity": 19,
+      "enginerecharge": 1.7,
+      "grp": "pd",
+      "id": "do",
+      "mass": 20,
+      "power": 0.5,
+      "rating": "E",
+      "systemcapacity": 19,
+      "systemrecharge": 1.7,
+      "weaponcapacity": 27,
+      "weaponrecharge": 2.9
+    },
+    {
+      "class": 5,
+      "cost": 79440,
+      "edID": 128064199,
+      "eddbID": 1057,
+      "enginecapacity": 22,
+      "enginerecharge": 1.9,
+      "grp": "pd",
+      "id": "dn",
+      "mass": 8,
+      "power": 0.56,
+      "rating": "D",
+      "systemcapacity": 22,
+      "systemrecharge": 1.9,
+      "weaponcapacity": 31,
+      "weaponrecharge": 3.2
+    },
+    {
+      "class": 5,
+      "cost": 198610,
+      "edID": 128064200,
+      "eddbID": 1058,
+      "enginecapacity": 24,
+      "enginerecharge": 2.1,
+      "grp": "pd",
+      "id": "dm",
+      "mass": 20,
+      "power": 0.62,
+      "rating": "C",
+      "systemcapacity": 24,
+      "systemrecharge": 2.1,
+      "weaponcapacity": 34,
+      "weaponrecharge": 3.6
+    },
+    {
+      "class": 5,
+      "cost": 496530,
+      "edID": 128064201,
+      "eddbID": 1059,
+      "enginecapacity": 26,
+      "enginerecharge": 2.3,
+      "grp": "pd",
+      "id": "dl",
+      "mass": 32,
+      "power": 0.68,
+      "rating": "B",
+      "systemcapacity": 26,
+      "systemrecharge": 2.3,
+      "weaponcapacity": 37,
+      "weaponrecharge": 4
+    },
+    {
+      "class": 5,
+      "cost": 1241320,
+      "edID": 128064202,
+      "eddbID": 1060,
+      "enginecapacity": 29,
+      "enginerecharge": 2.5,
+      "grp": "pd",
+      "id": "dk",
+      "mass": 20,
+      "power": 0.74,
+      "rating": "A",
+      "systemcapacity": 29,
+      "systemrecharge": 2.5,
+      "weaponcapacity": 41,
+      "weaponrecharge": 4.3
+    },
+    {
+      "class": 4,
+      "cost": 11350,
+      "edID": 128064193,
+      "eddbID": 1051,
+      "enginecapacity": 15,
+      "enginerecharge": 1.3,
+      "grp": "pd",
+      "id": "dj",
+      "mass": 10,
+      "power": 0.45,
+      "rating": "E",
+      "systemcapacity": 15,
+      "systemrecharge": 1.3,
+      "weaponcapacity": 22,
+      "weaponrecharge": 2.3
+    },
+    {
+      "class": 4,
+      "cost": 28370,
+      "edID": 128064194,
+      "eddbID": 1052,
+      "enginecapacity": 17,
+      "enginerecharge": 1.4,
+      "grp": "pd",
+      "id": "di",
+      "mass": 4,
+      "power": 0.5,
+      "rating": "D",
+      "systemcapacity": 17,
+      "systemrecharge": 1.4,
+      "weaponcapacity": 24,
+      "weaponrecharge": 2.6
+    },
+    {
+      "class": 4,
+      "cost": 70930,
+      "edID": 128064195,
+      "eddbID": 1053,
+      "enginecapacity": 19,
+      "enginerecharge": 1.6,
+      "grp": "pd",
+      "id": "dh",
+      "mass": 10,
+      "power": 0.56,
+      "rating": "C",
+      "systemcapacity": 19,
+      "systemrecharge": 1.6,
+      "weaponcapacity": 27,
+      "weaponrecharge": 2.9
+    },
+    {
+      "class": 4,
+      "cost": 177330,
+      "edID": 128064196,
+      "eddbID": 1054,
+      "enginecapacity": 21,
+      "enginerecharge": 1.8,
+      "grp": "pd",
+      "id": "dg",
+      "mass": 16,
+      "power": 0.62,
+      "rating": "B",
+      "systemcapacity": 21,
+      "systemrecharge": 1.8,
+      "weaponcapacity": 30,
+      "weaponrecharge": 3.2
+    },
+    {
+      "class": 4,
+      "cost": 443330,
+      "edID": 128064197,
+      "eddbID": 1055,
+      "enginecapacity": 23,
+      "enginerecharge": 1.9,
+      "grp": "pd",
+      "id": "df",
+      "mass": 10,
+      "power": 0.67,
+      "rating": "A",
+      "systemcapacity": 23,
+      "systemrecharge": 1.9,
+      "weaponcapacity": 32,
+      "weaponrecharge": 3.5
+    },
+    {
+      "class": 3,
+      "cost": 4050,
+      "edID": 128064188,
+      "eddbID": 1046,
+      "enginecapacity": 12,
+      "enginerecharge": 0.9,
+      "grp": "pd",
+      "id": "de",
+      "mass": 5,
+      "power": 0.4,
+      "rating": "E",
+      "systemcapacity": 12,
+      "systemrecharge": 0.9,
+      "weaponcapacity": 16,
+      "weaponrecharge": 1.8
+    },
+    {
+      "class": 3,
+      "cost": 10130,
+      "edID": 128064189,
+      "eddbID": 1047,
+      "enginecapacity": 14,
+      "enginerecharge": 1,
+      "grp": "pd",
+      "id": "dd",
+      "mass": 2,
+      "power": 0.45,
+      "rating": "D",
+      "systemcapacity": 14,
+      "systemrecharge": 1,
+      "weaponcapacity": 18,
+      "weaponrecharge": 2.1
+    },
+    {
+      "class": 3,
+      "cost": 25330,
+      "edID": 128064190,
+      "eddbID": 1048,
+      "enginecapacity": 15,
+      "enginerecharge": 1.1,
+      "grp": "pd",
+      "id": "dc",
+      "mass": 5,
+      "power": 0.5,
+      "rating": "C",
+      "systemcapacity": 15,
+      "systemrecharge": 1.1,
+      "weaponcapacity": 20,
+      "weaponrecharge": 2.3
+    },
+    {
+      "class": 3,
+      "cost": 63330,
+      "edID": 128064191,
+      "eddbID": 1049,
+      "enginecapacity": 17,
+      "enginerecharge": 1.2,
+      "grp": "pd",
+      "id": "db",
+      "mass": 8,
+      "power": 0.55,
+      "rating": "B",
+      "systemcapacity": 17,
+      "systemrecharge": 1.2,
+      "weaponcapacity": 22,
+      "weaponrecharge": 2.5
+    },
+    {
+      "class": 3,
+      "cost": 158330,
+      "edID": 128064192,
+      "eddbID": 1050,
+      "enginecapacity": 18,
+      "enginerecharge": 1.3,
+      "grp": "pd",
+      "id": "da",
+      "mass": 5,
+      "power": 0.6,
+      "rating": "A",
+      "systemcapacity": 18,
+      "systemrecharge": 1.3,
+      "weaponcapacity": 24,
+      "weaponrecharge": 2.8
+    },
+    {
+      "class": 2,
+      "cost": 1450,
+      "edID": 128064183,
+      "eddbID": 1041,
+      "enginecapacity": 10,
+      "enginerecharge": 0.6,
+      "grp": "pd",
+      "id": "d9",
+      "mass": 2.5,
+      "power": 0.36,
+      "rating": "E",
+      "systemcapacity": 10,
+      "systemrecharge": 0.6,
+      "weaponcapacity": 12,
+      "weaponrecharge": 1.4
+    },
+    {
+      "class": 2,
+      "cost": 3620,
+      "edID": 128064184,
+      "eddbID": 1042,
+      "enginecapacity": 11,
+      "enginerecharge": 0.6,
+      "grp": "pd",
+      "id": "d8",
+      "mass": 1,
+      "power": 0.41,
+      "rating": "D",
+      "systemcapacity": 11,
+      "systemrecharge": 0.6,
+      "weaponcapacity": 14,
+      "weaponrecharge": 1.6
+    },
+    {
+      "class": 2,
+      "cost": 9050,
+      "edID": 128064185,
+      "eddbID": 1043,
+      "enginecapacity": 12,
+      "enginerecharge": 0.7,
+      "grp": "pd",
+      "id": "d7",
+      "mass": 2.5,
+      "power": 0.45,
+      "rating": "C",
+      "systemcapacity": 12,
+      "systemrecharge": 0.7,
+      "weaponcapacity": 15,
+      "weaponrecharge": 1.8
+    },
+    {
+      "class": 2,
+      "cost": 22620,
+      "edID": 128064186,
+      "eddbID": 1044,
+      "enginecapacity": 13,
+      "enginerecharge": 0.8,
+      "grp": "pd",
+      "id": "d6",
+      "mass": 4,
+      "power": 0.5,
+      "rating": "B",
+      "systemcapacity": 13,
+      "systemrecharge": 0.8,
+      "weaponcapacity": 17,
+      "weaponrecharge": 2
+    },
+    {
+      "class": 2,
+      "cost": 56550,
+      "edID": 128064187,
+      "eddbID": 1045,
+      "enginecapacity": 14,
+      "enginerecharge": 0.8,
+      "grp": "pd",
+      "id": "d5",
+      "mass": 2.5,
+      "power": 0.54,
+      "rating": "A",
+      "systemcapacity": 14,
+      "systemrecharge": 0.8,
+      "weaponcapacity": 18,
+      "weaponrecharge": 2.2
+    },
+    {
+      "class": 1,
+      "cost": 520,
+      "edID": 128064178,
+      "eddbID": 1036,
+      "enginecapacity": 8,
+      "enginerecharge": 0.4,
+      "grp": "pd",
+      "id": "d4",
+      "mass": 1.3,
+      "power": 0.32,
+      "rating": "E",
+      "systemcapacity": 8,
+      "systemrecharge": 0.4,
+      "weaponcapacity": 10,
+      "weaponrecharge": 1.2
+    },
+    {
+      "class": 1,
+      "cost": 1290,
+      "edID": 128064179,
+      "eddbID": 1037,
+      "enginecapacity": 9,
+      "enginerecharge": 0.5,
+      "grp": "pd",
+      "id": "d3",
+      "mass": 0.5,
+      "power": 0.36,
+      "rating": "D",
+      "systemcapacity": 9,
+      "systemrecharge": 0.5,
+      "weaponcapacity": 11,
+      "weaponrecharge": 1.4
+    },
+    {
+      "class": 1,
+      "cost": 3230,
+      "edID": 128064180,
+      "eddbID": 1038,
+      "enginecapacity": 10,
+      "enginerecharge": 0.5,
+      "grp": "pd",
+      "id": "d2",
+      "mass": 1.3,
+      "power": 0.4,
+      "rating": "C",
+      "systemcapacity": 10,
+      "systemrecharge": 0.5,
+      "weaponcapacity": 12,
+      "weaponrecharge": 1.5
+    },
+    {
+      "class": 1,
+      "cost": 8080,
+      "edID": 128064181,
+      "eddbID": 1039,
+      "enginecapacity": 11,
+      "enginerecharge": 0.6,
+      "grp": "pd",
+      "id": "d1",
+      "mass": 2,
+      "power": 0.44,
+      "rating": "B",
+      "systemcapacity": 11,
+      "systemrecharge": 0.6,
+      "weaponcapacity": 13,
+      "weaponrecharge": 1.7
+    },
+    {
+      "class": 1,
+      "cost": 20200,
+      "edID": 128064182,
+      "eddbID": 1040,
+      "enginecapacity": 12,
+      "enginerecharge": 0.6,
+      "grp": "pd",
+      "id": "d0",
+      "mass": 1.3,
+      "power": 0.48,
+      "rating": "A",
+      "systemcapacity": 12,
+      "systemrecharge": 0.6,
+      "weaponcapacity": 14,
+      "weaponrecharge": 1.8
+    }
   ]
-}
+}

modules/standard/power_plant.json

@@ -1,45 +1,424 @@
 {
   "pp": [
-    { "id":"py", "edID": 128064063, "eddbID": 921, "grp": "pp", "class": 8, "rating": "E", "cost": 2007240, "mass": 160, "pGen": 24, "eff": "F" },
-    { "id":"px", "edID": 128064064, "eddbID": 922, "grp": "pp", "class": 8, "rating": "D", "cost": 6021720, "mass": 64, "pGen": 27, "eff": "D" },
-    { "id":"pw", "edID": 128064065, "eddbID": 923, "grp": "pp", "class": 8, "rating": "C", "cost": 18065170, "mass": 80, "pGen": 30, "eff": "C" },
-    { "id":"pv", "edID": 128064066, "eddbID": 924, "grp": "pp", "class": 8, "rating": "B", "cost": 54195500, "mass": 128, "pGen": 33, "eff": "C" },
-    { "id":"pu", "edID": 128064067, "eddbID": 925, "grp": "pp", "class": 8, "rating": "A", "cost": 162586490, "mass": 80, "pGen": 36, "eff": "B" },
-
-    { "id":"pt", "edID": 128064058, "eddbID": 916, "grp": "pp", "class": 7, "rating": "E", "cost": 633200, "mass": 80, "pGen": 20, "eff": "F" },
-    { "id":"ps", "edID": 128064059, "eddbID": 917, "grp": "pp", "class": 7, "rating": "D", "cost": 1899600, "mass": 32, "pGen": 22.5, "eff": "D" },
-    { "id":"pr", "edID": 128064060, "eddbID": 918, "grp": "pp", "class": 7, "rating": "C", "cost": 5698790, "mass": 40, "pGen": 25, "eff": "C" },
-    { "id":"pq", "edID": 128064061, "eddbID": 919, "grp": "pp", "class": 7, "rating": "B", "cost": 17096370, "mass": 64, "pGen": 27.5, "eff": "C" },
-    { "id":"pp", "edID": 128064062, "eddbID": 920, "grp": "pp", "class": 7, "rating": "A", "cost": 51289110, "mass": 40, "pGen": 30, "eff": "B" },
-
-    { "id":"po", "edID": 128064053, "eddbID": 911, "grp": "pp", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "pGen": 16.8, "eff": "F" },
-    { "id":"pn", "edID": 128064054, "eddbID": 912, "grp": "pp", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "pGen": 18.9, "eff": "D" },
-    { "id":"pm", "edID": 128064055, "eddbID": 913, "grp": "pp", "class": 6, "rating": "C", "cost": 1797730, "mass": 20, "pGen": 21, "eff": "C" },
-    { "id":"pl", "edID": 128064056, "eddbID": 914, "grp": "pp", "class": 6, "rating": "B", "cost": 5393180, "mass": 32, "pGen": 23.1, "eff": "C" },
-    { "id":"pk", "edID": 128064057, "eddbID": 915, "grp": "pp", "class": 6, "rating": "A", "cost": 16179530, "mass": 20, "pGen": 25.2, "eff": "B" },
-
-    { "id":"pj", "edID": 128064048, "eddbID": 906, "grp": "pp", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "pGen": 13.6, "eff": "F" },
-    { "id":"pi", "edID": 128064049, "eddbID": 907, "grp": "pp", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "pGen": 15.3, "eff": "D" },
-    { "id":"ph", "edID": 128064050, "eddbID": 908, "grp": "pp", "class": 5, "rating": "C", "cost": 567110, "mass": 10, "pGen": 17, "eff": "C" },
-    { "id":"pg", "edID": 128064051, "eddbID": 909, "grp": "pp", "class": 5, "rating": "B", "cost": 1701320, "mass": 16, "pGen": 18.7, "eff": "C" },
-    { "id":"pf", "edID": 128064052, "eddbID": 910, "grp": "pp", "class": 5, "rating": "A", "cost": 5103950, "mass": 10, "pGen": 20.4, "eff": "B" },
-
-    { "id":"pe", "edID": 128064043, "eddbID": 901, "grp": "pp", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "pGen": 10.4, "eff": "F" },
-    { "id":"pd", "edID": 128064044, "eddbID": 902, "grp": "pp", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "pGen": 11.7, "eff": "D" },
-    { "id":"pc", "edID": 128064045, "eddbID": 903, "grp": "pp", "class": 4, "rating": "C", "cost": 178900, "mass": 5, "pGen": 13, "eff": "C" },
-    { "id":"pb", "edID": 128064046, "eddbID": 904, "grp": "pp", "class": 4, "rating": "B", "cost": 536690, "mass": 8, "pGen": 14.3, "eff": "C" },
-    { "id":"pa", "edID": 128064047, "eddbID": 905, "grp": "pp", "class": 4, "rating": "A", "cost": 1610080, "mass": 5, "pGen": 15.6, "eff": "B" },
-
-    { "id":"p9", "edID": 128064038, "eddbID": 896, "grp": "pp", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "pGen": 8, "eff": "F" },
-    { "id":"p8", "edID": 128064039, "eddbID": 897, "grp": "pp", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "pGen": 9, "eff": "D" },
-    { "id":"p7", "edID": 128064040, "eddbID": 898, "grp": "pp", "class": 3, "rating": "C", "cost": 56440, "mass": 2.5, "pGen": 10, "eff": "C" },
-    { "id":"p6", "edID": 128064041, "eddbID": 899, "grp": "pp", "class": 3, "rating": "B", "cost": 169300, "mass": 4, "pGen": 11, "eff": "C" },
-    { "id":"p5", "edID": 128064042, "eddbID": 900, "grp": "pp", "class": 3, "rating": "A", "cost": 507910, "mass": 2.5, "pGen": 12, "eff": "B" },
-
-    { "id":"p4", "edID": 128064033, "eddbID": 891, "grp": "pp", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "pGen": 6.4, "eff": "F" },
-    { "id":"p3", "edID": 128064034, "eddbID": 892, "grp": "pp", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "pGen": 7.2, "eff": "D" },
-    { "id":"p2", "edID": 128064035, "eddbID": 893, "grp": "pp", "class": 2, "rating": "C", "cost": 17800, "mass": 1.3, "pGen": 8, "eff": "C" },
-    { "id":"p1", "edID": 128064036, "eddbID": 894, "grp": "pp", "class": 2, "rating": "B", "cost": 53410, "mass": 2, "pGen": 8.8, "eff": "C" },
-    { "id":"p0", "edID": 128064037, "eddbID": 895, "grp": "pp", "class": 2, "rating": "A", "cost": 160220, "mass": 1.3, "pGen": 9.6, "eff": "B" }
+    {
+      "class": 8,
+      "cost": 2007240,
+      "edID": 128064063,
+      "eddbID": 921,
+      "eff": "F",
+      "grp": "pp",
+      "id": "py",
+      "mass": 160,
+      "pGen": 24,
+      "rating": "E"
+    },
+    {
+      "class": 8,
+      "cost": 6021720,
+      "edID": 128064064,
+      "eddbID": 922,
+      "eff": "D",
+      "grp": "pp",
+      "id": "px",
+      "mass": 64,
+      "pGen": 27,
+      "rating": "D"
+    },
+    {
+      "class": 8,
+      "cost": 18065170,
+      "edID": 128064065,
+      "eddbID": 923,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pw",
+      "mass": 80,
+      "pGen": 30,
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 54195500,
+      "edID": 128064066,
+      "eddbID": 924,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pv",
+      "mass": 128,
+      "pGen": 33,
+      "rating": "B"
+    },
+    {
+      "class": 8,
+      "cost": 162586490,
+      "edID": 128064067,
+      "eddbID": 925,
+      "eff": "B",
+      "grp": "pp",
+      "id": "pu",
+      "mass": 80,
+      "pGen": 36,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 633200,
+      "edID": 128064058,
+      "eddbID": 916,
+      "eff": "F",
+      "grp": "pp",
+      "id": "pt",
+      "mass": 80,
+      "pGen": 20,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 1899600,
+      "edID": 128064059,
+      "eddbID": 917,
+      "eff": "D",
+      "grp": "pp",
+      "id": "ps",
+      "mass": 32,
+      "pGen": 22.5,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128064060,
+      "eddbID": 918,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pr",
+      "mass": 40,
+      "pGen": 25,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 17096370,
+      "edID": 128064061,
+      "eddbID": 919,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pq",
+      "mass": 64,
+      "pGen": 27.5,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 51289110,
+      "edID": 128064062,
+      "eddbID": 920,
+      "eff": "B",
+      "grp": "pp",
+      "id": "pp",
+      "mass": 40,
+      "pGen": 30,
+      "rating": "A"
+    },
+    {
+      "class": 6,
+      "cost": 199750,
+      "edID": 128064053,
+      "eddbID": 911,
+      "eff": "F",
+      "grp": "pp",
+      "id": "po",
+      "mass": 40,
+      "pGen": 16.8,
+      "rating": "E"
+    },
+    {
+      "class": 6,
+      "cost": 599240,
+      "edID": 128064054,
+      "eddbID": 912,
+      "eff": "D",
+      "grp": "pp",
+      "id": "pn",
+      "mass": 16,
+      "pGen": 18.9,
+      "rating": "D"
+    },
+    {
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128064055,
+      "eddbID": 913,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pm",
+      "mass": 20,
+      "pGen": 21,
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 5393180,
+      "edID": 128064056,
+      "eddbID": 914,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pl",
+      "mass": 32,
+      "pGen": 23.1,
+      "rating": "B"
+    },
+    {
+      "class": 6,
+      "cost": 16179530,
+      "edID": 128064057,
+      "eddbID": 915,
+      "eff": "B",
+      "grp": "pp",
+      "id": "pk",
+      "mass": 20,
+      "pGen": 25.2,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 63010,
+      "edID": 128064048,
+      "eddbID": 906,
+      "eff": "F",
+      "grp": "pp",
+      "id": "pj",
+      "mass": 20,
+      "pGen": 13.6,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 189040,
+      "edID": 128064049,
+      "eddbID": 907,
+      "eff": "D",
+      "grp": "pp",
+      "id": "pi",
+      "mass": 8,
+      "pGen": 15.3,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 567110,
+      "edID": 128064050,
+      "eddbID": 908,
+      "eff": "C",
+      "grp": "pp",
+      "id": "ph",
+      "mass": 10,
+      "pGen": 17,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 1701320,
+      "edID": 128064051,
+      "eddbID": 909,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pg",
+      "mass": 16,
+      "pGen": 18.7,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 5103950,
+      "edID": 128064052,
+      "eddbID": 910,
+      "eff": "B",
+      "grp": "pp",
+      "id": "pf",
+      "mass": 10,
+      "pGen": 20.4,
+      "rating": "A"
+    },
+    {
+      "class": 4,
+      "cost": 19880,
+      "edID": 128064043,
+      "eddbID": 901,
+      "eff": "F",
+      "grp": "pp",
+      "id": "pe",
+      "mass": 10,
+      "pGen": 10.4,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 59630,
+      "edID": 128064044,
+      "eddbID": 902,
+      "eff": "D",
+      "grp": "pp",
+      "id": "pd",
+      "mass": 4,
+      "pGen": 11.7,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 178900,
+      "edID": 128064045,
+      "eddbID": 903,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pc",
+      "mass": 5,
+      "pGen": 13,
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 536690,
+      "edID": 128064046,
+      "eddbID": 904,
+      "eff": "C",
+      "grp": "pp",
+      "id": "pb",
+      "mass": 8,
+      "pGen": 14.3,
+      "rating": "B"
+    },
+    {
+      "class": 4,
+      "cost": 1610080,
+      "edID": 128064047,
+      "eddbID": 905,
+      "eff": "B",
+      "grp": "pp",
+      "id": "pa",
+      "mass": 5,
+      "pGen": 15.6,
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 6270,
+      "edID": 128064038,
+      "eddbID": 896,
+      "eff": "F",
+      "grp": "pp",
+      "id": "p9",
+      "mass": 5,
+      "pGen": 8,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 18810,
+      "edID": 128064039,
+      "eddbID": 897,
+      "eff": "D",
+      "grp": "pp",
+      "id": "p8",
+      "mass": 2,
+      "pGen": 9,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 56440,
+      "edID": 128064040,
+      "eddbID": 898,
+      "eff": "C",
+      "grp": "pp",
+      "id": "p7",
+      "mass": 2.5,
+      "pGen": 10,
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 169300,
+      "edID": 128064041,
+      "eddbID": 899,
+      "eff": "C",
+      "grp": "pp",
+      "id": "p6",
+      "mass": 4,
+      "pGen": 11,
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 507910,
+      "edID": 128064042,
+      "eddbID": 900,
+      "eff": "B",
+      "grp": "pp",
+      "id": "p5",
+      "mass": 2.5,
+      "pGen": 12,
+      "rating": "A"
+    },
+    {
+      "class": 2,
+      "cost": 1980,
+      "edID": 128064033,
+      "eddbID": 891,
+      "eff": "F",
+      "grp": "pp",
+      "id": "p4",
+      "mass": 2.5,
+      "pGen": 6.4,
+      "rating": "E"
+    },
+    {
+      "class": 2,
+      "cost": 5930,
+      "edID": 128064034,
+      "eddbID": 892,
+      "eff": "D",
+      "grp": "pp",
+      "id": "p3",
+      "mass": 1,
+      "pGen": 7.2,
+      "rating": "D"
+    },
+    {
+      "class": 2,
+      "cost": 17800,
+      "edID": 128064035,
+      "eddbID": 893,
+      "eff": "C",
+      "grp": "pp",
+      "id": "p2",
+      "mass": 1.3,
+      "pGen": 8,
+      "rating": "C"
+    },
+    {
+      "class": 2,
+      "cost": 53410,
+      "edID": 128064036,
+      "eddbID": 894,
+      "eff": "C",
+      "grp": "pp",
+      "id": "p1",
+      "mass": 2,
+      "pGen": 8.8,
+      "rating": "B"
+    },
+    {
+      "class": 2,
+      "cost": 160220,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": "B",
+      "grp": "pp",
+      "id": "p0",
+      "mass": 1.3,
+      "pGen": 9.6,
+      "rating": "A"
+    }
   ]
-}
+}

modules/standard/sensors.json

@@ -1,51 +1,484 @@
 {
   "s": [
-    { "id":"sy", "edID": 128064253, "eddbID": 1111, "grp": "s", "class": 8, "rating": "E", "cost": 697580, "mass": 160, "power": 0.55, "range": 5.12 },
-    { "id":"sx", "edID": 128064254, "eddbID": 1112, "grp": "s", "class": 8, "rating": "D", "cost": 1743960, "mass": 64, "power": 0.62, "range": 5.76 },
-    { "id":"sw", "edID": 128064255, "eddbID": 1113, "grp": "s", "class": 8, "rating": "C", "cost": 4359900, "mass": 160, "power": 0.69, "range": 6.4 },
-    { "id":"sv", "edID": 128064256, "eddbID": 1114, "grp": "s", "class": 8, "rating": "B", "cost": 10899760, "mass": 256, "power": 1.14, "range": 7.04 },
-    { "id":"su", "edID": 128064257, "eddbID": 1115, "grp": "s", "class": 8, "rating": "A", "cost": 27249390, "mass": 160, "power": 2.07, "range": 7.68 },
-
-    { "id":"sD", "edID": 128064248, "eddbID": 1106, "grp": "s", "class": 7, "rating": "E", "cost": 249140, "mass": 80, "power": 0.47, "range": 4.96 },
-    { "id":"sC", "edID": 128064249, "eddbID": 1107, "grp": "s", "class": 7, "rating": "D", "cost": 622840, "mass": 32, "power": 0.53, "range": 5.58 },
-    { "id":"sB", "edID": 128064250, "eddbID": 1108, "grp": "s", "class": 7, "rating": "C", "cost": 1557110, "mass": 80, "power": 0.59, "range": 6.2 },
-    { "id":"sA", "edID": 128064251, "eddbID": 1109, "grp": "s", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 0.97, "range": 6.82 },
-    { "id":"sz", "edID": 128064252, "eddbID": 1110, "grp": "s", "class": 7, "rating": "A", "cost": 9731930, "mass": 80, "power": 1.77, "range": 7.44 },
-
-    { "id":"st", "edID": 128064243, "eddbID": 1101, "grp": "s", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.4, "range": 4.8 },
-    { "id":"ss", "edID": 128064244, "eddbID": 1102, "grp": "s", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.45, "range": 5.4 },
-    { "id":"sr", "edID": 128064245, "eddbID": 1103, "grp": "s", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.5, "range": 6 },
-    { "id":"sq", "edID": 128064246, "eddbID": 1104, "grp": "s", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.83, "range": 6.6 },
-    { "id":"sp", "edID": 128064247, "eddbID": 1105, "grp": "s", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 1.5, "range": 7.2 },
-
-    { "id":"so", "edID": 128064238, "eddbID": 1096, "grp": "s", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.33, "range": 4.64 },
-    { "id":"sn", "edID": 128064239, "eddbID": 1097, "grp": "s", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.37, "range": 5.22 },
-    { "id":"sm", "edID": 128064240, "eddbID": 1098, "grp": "s", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.41, "range": 5.8 },
-    { "id":"sl", "edID": 128064241, "eddbID": 1099, "grp": "s", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.68, "range": 6.38 },
-    { "id":"sk", "edID": 128064242, "eddbID": 1100, "grp": "s", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 1.23, "range": 6.96 },
-
-    { "id":"sj", "edID": 128064233, "eddbID": 1091, "grp": "s", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.27, "range": 4.48 },
-    { "id":"si", "edID": 128064234, "eddbID": 1092, "grp": "s", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.31, "range": 5.04 },
-    { "id":"sh", "edID": 128064235, "eddbID": 1093, "grp": "s", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.34, "range": 5.6 },
-    { "id":"sg", "edID": 128064236, "eddbID": 1094, "grp": "s", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.56, "range": 6.16 },
-    { "id":"sf", "edID": 128064237, "eddbID": 1095, "grp": "s", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 1.02, "range": 6.72 },
-
-    { "id":"se", "edID": 128064228, "eddbID": 1086, "grp": "s", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.22, "range": 4.32 },
-    { "id":"sd", "edID": 128064229, "eddbID": 1087, "grp": "s", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.25, "range": 4.86 },
-    { "id":"sc", "edID": 128064230, "eddbID": 1088, "grp": "s", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.28, "range": 5.4 },
-    { "id":"sb", "edID": 128064231, "eddbID": 1089, "grp": "s", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.46, "range": 5.94 },
-    { "id":"sa", "edID": 128064232, "eddbID": 1090, "grp": "s", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.84, "range": 6.48 },
-
-    { "id":"s9", "edID": 128064223, "eddbID": 1081, "grp": "s", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.18, "range": 4.16 },
-    { "id":"s8", "edID": 128064224, "eddbID": 1082, "grp": "s", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.21, "range": 4.68 },
-    { "id":"s7", "edID": 128064225, "eddbID": 1083, "grp": "s", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.23, "range": 5.2 },
-    { "id":"s6", "edID": 128064226, "eddbID": 1084, "grp": "s", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.38, "range": 5.72 },
-    { "id":"s5", "edID": 128064227, "eddbID": 1085, "grp": "s", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.69, "range": 6.24 },
-
-    { "id":"s4", "edID": 128064218, "eddbID": 1076, "grp": "s", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.16, "range": 4 },
-    { "id":"s3", "edID": 128064219, "eddbID": 1077, "grp": "s", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.18, "range": 4.5 },
-    { "id":"s2", "edID": 128064220, "eddbID": 1078, "grp": "s", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.2, "range": 5 },
-    { "id":"s1", "edID": 128064221, "eddbID": 1079, "grp": "s", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.33, "range": 5.5 },
-    { "id":"s0", "edID": 128064222, "eddbID": 1080, "grp": "s", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.6, "range": 6 }
+    {
+      "class": 8,
+      "cost": 697580,
+      "edID": 128064253,
+      "eddbID": 1111,
+      "grp": "s",
+      "id": "sy",
+      "mass": 160,
+      "power": 0.55,
+      "range": 5.12,
+      "rating": "E"
+    },
+    {
+      "class": 8,
+      "cost": 1743960,
+      "edID": 128064254,
+      "eddbID": 1112,
+      "grp": "s",
+      "id": "sx",
+      "mass": 64,
+      "power": 0.62,
+      "range": 5.76,
+      "rating": "D"
+    },
+    {
+      "class": 8,
+      "cost": 4359900,
+      "edID": 128064255,
+      "eddbID": 1113,
+      "grp": "s",
+      "id": "sw",
+      "mass": 160,
+      "power": 0.69,
+      "range": 6.4,
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 10899760,
+      "edID": 128064256,
+      "eddbID": 1114,
+      "grp": "s",
+      "id": "sv",
+      "mass": 256,
+      "power": 1.14,
+      "range": 7.04,
+      "rating": "B"
+    },
+    {
+      "class": 8,
+      "cost": 27249390,
+      "edID": 128064257,
+      "eddbID": 1115,
+      "grp": "s",
+      "id": "su",
+      "mass": 160,
+      "power": 2.07,
+      "range": 7.68,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 249140,
+      "edID": 128064248,
+      "eddbID": 1106,
+      "grp": "s",
+      "id": "sD",
+      "mass": 80,
+      "power": 0.47,
+      "range": 4.96,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 622840,
+      "edID": 128064249,
+      "eddbID": 1107,
+      "grp": "s",
+      "id": "sC",
+      "mass": 32,
+      "power": 0.53,
+      "range": 5.58,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1557110,
+      "edID": 128064250,
+      "eddbID": 1108,
+      "grp": "s",
+      "id": "sB",
+      "mass": 80,
+      "power": 0.59,
+      "range": 6.2,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3892770,
+      "edID": 128064251,
+      "eddbID": 1109,
+      "grp": "s",
+      "id": "sA",
+      "mass": 128,
+      "power": 0.97,
+      "range": 6.82,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 9731930,
+      "edID": 128064252,
+      "eddbID": 1110,
+      "grp": "s",
+      "id": "sz",
+      "mass": 80,
+      "power": 1.77,
+      "range": 7.44,
+      "rating": "A"
+    },
+    {
+      "class": 6,
+      "cost": 88980,
+      "edID": 128064243,
+      "eddbID": 1101,
+      "grp": "s",
+      "id": "st",
+      "mass": 40,
+      "power": 0.4,
+      "range": 4.8,
+      "rating": "E"
+    },
+    {
+      "class": 6,
+      "cost": 222440,
+      "edID": 128064244,
+      "eddbID": 1102,
+      "grp": "s",
+      "id": "ss",
+      "mass": 16,
+      "power": 0.45,
+      "range": 5.4,
+      "rating": "D"
+    },
+    {
+      "class": 6,
+      "cost": 556110,
+      "edID": 128064245,
+      "eddbID": 1103,
+      "grp": "s",
+      "id": "sr",
+      "mass": 40,
+      "power": 0.5,
+      "range": 6,
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 1390280,
+      "edID": 128064246,
+      "eddbID": 1104,
+      "grp": "s",
+      "id": "sq",
+      "mass": 64,
+      "power": 0.83,
+      "range": 6.6,
+      "rating": "B"
+    },
+    {
+      "class": 6,
+      "cost": 3475690,
+      "edID": 128064247,
+      "eddbID": 1105,
+      "grp": "s",
+      "id": "sp",
+      "mass": 40,
+      "power": 1.5,
+      "range": 7.2,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 31780,
+      "edID": 128064238,
+      "eddbID": 1096,
+      "grp": "s",
+      "id": "so",
+      "mass": 20,
+      "power": 0.33,
+      "range": 4.64,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 79440,
+      "edID": 128064239,
+      "eddbID": 1097,
+      "grp": "s",
+      "id": "sn",
+      "mass": 8,
+      "power": 0.37,
+      "range": 5.22,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 198610,
+      "edID": 128064240,
+      "eddbID": 1098,
+      "grp": "s",
+      "id": "sm",
+      "mass": 20,
+      "power": 0.41,
+      "range": 5.8,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 496530,
+      "edID": 128064241,
+      "eddbID": 1099,
+      "grp": "s",
+      "id": "sl",
+      "mass": 32,
+      "power": 0.68,
+      "range": 6.38,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 1241320,
+      "edID": 128064242,
+      "eddbID": 1100,
+      "grp": "s",
+      "id": "sk",
+      "mass": 20,
+      "power": 1.23,
+      "range": 6.96,
+      "rating": "A"
+    },
+    {
+      "class": 4,
+      "cost": 11350,
+      "edID": 128064233,
+      "eddbID": 1091,
+      "grp": "s",
+      "id": "sj",
+      "mass": 10,
+      "power": 0.27,
+      "range": 4.48,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 28370,
+      "edID": 128064234,
+      "eddbID": 1092,
+      "grp": "s",
+      "id": "si",
+      "mass": 4,
+      "power": 0.31,
+      "range": 5.04,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 70930,
+      "edID": 128064235,
+      "eddbID": 1093,
+      "grp": "s",
+      "id": "sh",
+      "mass": 10,
+      "power": 0.34,
+      "range": 5.6,
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 177330,
+      "edID": 128064236,
+      "eddbID": 1094,
+      "grp": "s",
+      "id": "sg",
+      "mass": 16,
+      "power": 0.56,
+      "range": 6.16,
+      "rating": "B"
+    },
+    {
+      "class": 4,
+      "cost": 443330,
+      "edID": 128064237,
+      "eddbID": 1095,
+      "grp": "s",
+      "id": "sf",
+      "mass": 10,
+      "power": 1.02,
+      "range": 6.72,
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 4050,
+      "edID": 128064228,
+      "eddbID": 1086,
+      "grp": "s",
+      "id": "se",
+      "mass": 5,
+      "power": 0.22,
+      "range": 4.32,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 10130,
+      "edID": 128064229,
+      "eddbID": 1087,
+      "grp": "s",
+      "id": "sd",
+      "mass": 2,
+      "power": 0.25,
+      "range": 4.86,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 25330,
+      "edID": 128064230,
+      "eddbID": 1088,
+      "grp": "s",
+      "id": "sc",
+      "mass": 5,
+      "power": 0.28,
+      "range": 5.4,
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 63330,
+      "edID": 128064231,
+      "eddbID": 1089,
+      "grp": "s",
+      "id": "sb",
+      "mass": 8,
+      "power": 0.46,
+      "range": 5.94,
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 158330,
+      "edID": 128064232,
+      "eddbID": 1090,
+      "grp": "s",
+      "id": "sa",
+      "mass": 5,
+      "power": 0.84,
+      "range": 6.48,
+      "rating": "A"
+    },
+    {
+      "class": 2,
+      "cost": 1450,
+      "edID": 128064223,
+      "eddbID": 1081,
+      "grp": "s",
+      "id": "s9",
+      "mass": 2.5,
+      "power": 0.18,
+      "range": 4.16,
+      "rating": "E"
+    },
+    {
+      "class": 2,
+      "cost": 3620,
+      "edID": 128064224,
+      "eddbID": 1082,
+      "grp": "s",
+      "id": "s8",
+      "mass": 1,
+      "power": 0.21,
+      "range": 4.68,
+      "rating": "D"
+    },
+    {
+      "class": 2,
+      "cost": 9050,
+      "edID": 128064225,
+      "eddbID": 1083,
+      "grp": "s",
+      "id": "s7",
+      "mass": 2.5,
+      "power": 0.23,
+      "range": 5.2,
+      "rating": "C"
+    },
+    {
+      "class": 2,
+      "cost": 22620,
+      "edID": 128064226,
+      "eddbID": 1084,
+      "grp": "s",
+      "id": "s6",
+      "mass": 4,
+      "power": 0.38,
+      "range": 5.72,
+      "rating": "B"
+    },
+    {
+      "class": 2,
+      "cost": 56550,
+      "edID": 128064227,
+      "eddbID": 1085,
+      "grp": "s",
+      "id": "s5",
+      "mass": 2.5,
+      "power": 0.69,
+      "range": 6.24,
+      "rating": "A"
+    },
+    {
+      "class": 1,
+      "cost": 520,
+      "edID": 128064218,
+      "eddbID": 1076,
+      "grp": "s",
+      "id": "s4",
+      "mass": 1.3,
+      "power": 0.16,
+      "range": 4,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 1290,
+      "edID": 128064219,
+      "eddbID": 1077,
+      "grp": "s",
+      "id": "s3",
+      "mass": 0.5,
+      "power": 0.18,
+      "range": 4.5,
+      "rating": "D"
+    },
+    {
+      "class": 1,
+      "cost": 3230,
+      "edID": 128064220,
+      "eddbID": 1078,
+      "grp": "s",
+      "id": "s2",
+      "mass": 1.3,
+      "power": 0.2,
+      "range": 5,
+      "rating": "C"
+    },
+    {
+      "class": 1,
+      "cost": 8080,
+      "edID": 128064221,
+      "eddbID": 1079,
+      "grp": "s",
+      "id": "s1",
+      "mass": 2,
+      "power": 0.33,
+      "range": 5.5,
+      "rating": "B"
+    },
+    {
+      "class": 1,
+      "cost": 20200,
+      "edID": 128064222,
+      "eddbID": 1080,
+      "grp": "s",
+      "id": "s0",
+      "mass": 1.3,
+      "power": 0.6,
+      "range": 6,
+      "rating": "A"
+    }
   ]
-}
+}

modules/standard/thrusters.json

@@ -1,45 +1,561 @@
 {
   "t": [
-    { "id":"ty", "edID": 128064098, "eddbID": 956, "grp": "t", "class": 8, "rating": "E", "M": 0.17, "P": 0.235, "cost": 2007240, "mass": 160, "power": 7.2, "optmass": 2240, "maxmass": 3360 },
-    { "id":"tx", "edID": 128064099, "eddbID": 957, "grp": "t", "class": 8, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 6021720, "mass": 64, "power": 8.1, "optmass": 2520, "maxmass": 3780 },
-    { "id":"tw", "edID": 128064100, "eddbID": 958, "grp": "t", "class": 8, "rating": "C", "M": 0.10, "P": 1, "cost": 18065170, "mass": 160, "power": 9, "optmass": 2800, "maxmass": 4200 },
-    { "id":"tv", "edID": 128064101, "eddbID": 959, "grp": "t", "class": 8, "rating": "B", "M": 0.07, "P": 1.51, "cost": 54195500, "mass": 256, "power": 9.9, "optmass": 3080, "maxmass": 4620 },
-    { "id":"tu", "edID": 128064102, "eddbID": 960, "grp": "t", "class": 8, "rating": "A", "M": 0.04, "P": 2.33, "cost": 162586490, "mass": 160, "power": 10.8, "optmass": 3360, "maxmass": 5040 },
-
-    { "id":"tt", "edID": 128064093, "eddbID": 951, "grp": "t", "class": 7, "rating": "E", "M": 0.17, "P": 0.235, "cost": 633200, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 },
-    { "id":"ts", "edID": 128064094, "eddbID": 952, "grp": "t", "class": 7, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 1899600, "mass": 32, "power": 6.84, "optmass": 1620, "maxmass": 2430 },
-    { "id":"tr", "edID": 128064095, "eddbID": 953, "grp": "t", "class": 7, "rating": "C", "M": 0.10, "P": 1, "cost": 5698790, "mass": 80, "power": 7.6, "optmass": 1800, "maxmass": 2700 },
-    { "id":"tq", "edID": 128064096, "eddbID": 954, "grp": "t", "class": 7, "rating": "B", "M": 0.07, "P": 1.51, "cost": 17096370, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 },
-    { "id":"tp", "edID": 128064097, "eddbID": 955, "grp": "t", "class": 7, "rating": "A", "M": 0.04, "P": 2.33, "cost": 51289110, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 },
-
-    { "id":"to", "edID": 128064088, "eddbID": 946, "grp": "t", "class": 6, "rating": "E", "M": 0.17, "P": 0.235, "cost": 199750, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 },
-    { "id":"tn", "edID": 128064089, "eddbID": 947, "grp": "t", "class": 6, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 599240, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 },
-    { "id":"tm", "edID": 128064090, "eddbID": 948, "grp": "t", "class": 6, "rating": "C", "M": 0.10, "P": 1, "cost": 1797730, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 },
-    { "id":"tl", "edID": 128064091, "eddbID": 949, "grp": "t", "class": 6, "rating": "B", "M": 0.07, "P": 1.51, "cost": 5393180, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 },
-    { "id":"tk", "edID": 128064092, "eddbID": 950, "grp": "t", "class": 6, "rating": "A", "M": 0.04, "P": 2.33, "cost": 16179530, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 },
-
-    { "id":"tj", "edID": 128064083, "eddbID": 941, "grp": "t", "class": 5, "rating": "E", "M": 0.17, "P": 0.235, "cost": 63010, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 },
-    { "id":"ti", "edID": 128064084, "eddbID": 942, "grp": "t", "class": 5, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 189040, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 },
-    { "id":"th", "edID": 128064085, "eddbID": 943, "grp": "t", "class": 5, "rating": "C", "M": 0.10, "P": 1, "cost": 567110, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 },
-    { "id":"tg", "edID": 128064086, "eddbID": 944, "grp": "t", "class": 5, "rating": "B", "M": 0.07, "P": 1.51, "cost": 1701320, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 },
-    { "id":"tf", "edID": 128064087, "eddbID": 945, "grp": "t", "class": 5, "rating": "A", "M": 0.04, "P": 2.33, "cost": 5103950, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 },
-
-    { "id":"te", "edID": 128064078, "eddbID": 936, "grp": "t", "class": 4, "rating": "E", "M": 0.17, "P": 0.235, "cost": 19880, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 },
-    { "id":"td", "edID": 128064079, "eddbID": 937, "grp": "t", "class": 4, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 59630, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 },
-    { "id":"tc", "edID": 128064080, "eddbID": 938, "grp": "t", "class": 4, "rating": "C", "M": 0.10, "P": 1, "cost": 178900, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 },
-    { "id":"tb", "edID": 128064081, "eddbID": 939, "grp": "t", "class": 4, "rating": "B", "M": 0.07, "P": 1.51, "cost": 536690, "mass": 16, "power": 4.51, "optmass": 385, "maxmass": 578 },
-    { "id":"ta", "edID": 128064082, "eddbID": 940, "grp": "t", "class": 4, "rating": "A", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 10, "power": 4.92, "optmass": 420, "maxmass": 630 },
-
-    { "id":"t9", "edID": 128064073, "eddbID": 931, "grp": "t", "class": 3, "rating": "E", "M": 0.17, "P": 0.235, "cost": 6270, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 },
-    { "id":"t8", "edID": 128064074, "eddbID": 932, "grp": "t", "class": 3, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 18810, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 },
-    { "id":"t7", "edID": 128064075, "eddbID": 933, "grp": "t", "class": 3, "rating": "C", "M": 0.10, "P": 1, "cost": 56440, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 },
-    { "id":"t6", "edID": 128064076, "eddbID": 934, "grp": "t", "class": 3, "rating": "B", "M": 0.07, "P": 1.51, "cost": 169300, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 },
-    { "id":"t5", "edID": 128064077, "eddbID": 935, "grp": "t", "class": 3, "rating": "A", "M": 0.04, "P": 2.33, "cost": 507910, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 },
-
-    { "id":"t4", "edID": 128064068, "eddbID": 926, "grp": "t", "class": 2, "rating": "E", "M": 0.17, "P": 0.235, "cost": 1980, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 },
-    { "id":"t3", "edID": 128064069, "eddbID": 927, "grp": "t", "class": 2, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 5930, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 },
-    { "id":"t2", "edID": 128064070, "eddbID": 928, "grp": "t", "class": 2, "rating": "C", "M": 0.10, "P": 1, "cost": 17800, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 },
-    { "id":"t1", "edID": 128064071, "eddbID": 929, "grp": "t", "class": 2, "rating": "B", "M": 0.07, "P": 1.51, "cost": 53410, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 },
-    { "id":"t0", "edID": 128064072, "eddbID": 930, "grp": "t", "class": 2, "rating": "A", "M": 0.04, "P": 2.33, "cost": 160220, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 }
+    {
+      "M": 0.17,
+      "P": 0.235,
+      "class": 8,
+      "cost": 2007240,
+      "edID": 128064098,
+      "eddbID": 956,
+      "grp": "t",
+      "id": "ty",
+      "mass": 160,
+      "maxmass": 3360,
+      "optmass": 2240,
+      "power": 7.2,
+      "rating": "E"
+    },
+    {
+      "M": 0.14,
+      "P": 0.5145,
+      "class": 8,
+      "cost": 6021720,
+      "edID": 128064099,
+      "eddbID": 957,
+      "grp": "t",
+      "id": "tx",
+      "mass": 64,
+      "maxmass": 3780,
+      "optmass": 2520,
+      "power": 8.1,
+      "rating": "D"
+    },
+    {
+      "M": 0.1,
+      "P": 1,
+      "class": 8,
+      "cost": 18065170,
+      "edID": 128064100,
+      "eddbID": 958,
+      "grp": "t",
+      "id": "tw",
+      "mass": 160,
+      "maxmass": 4200,
+      "optmass": 2800,
+      "power": 9,
+      "rating": "C"
+    },
+    {
+      "M": 0.07,
+      "P": 1.51,
+      "class": 8,
+      "cost": 54195500,
+      "edID": 128064101,
+      "eddbID": 959,
+      "grp": "t",
+      "id": "tv",
+      "mass": 256,
+      "maxmass": 4620,
+      "optmass": 3080,
+      "power": 9.9,
+      "rating": "B"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 8,
+      "cost": 162586490,
+      "edID": 128064102,
+      "eddbID": 960,
+      "grp": "t",
+      "id": "tu",
+      "mass": 160,
+      "maxmass": 5040,
+      "optmass": 3360,
+      "power": 10.8,
+      "rating": "A"
+    },
+    {
+      "M": 0.17,
+      "P": 0.235,
+      "class": 7,
+      "cost": 633200,
+      "edID": 128064093,
+      "eddbID": 951,
+      "grp": "t",
+      "id": "tt",
+      "mass": 80,
+      "maxmass": 2160,
+      "optmass": 1440,
+      "power": 6.08,
+      "rating": "E"
+    },
+    {
+      "M": 0.14,
+      "P": 0.5145,
+      "class": 7,
+      "cost": 1899600,
+      "edID": 128064094,
+      "eddbID": 952,
+      "grp": "t",
+      "id": "ts",
+      "mass": 32,
+      "maxmass": 2430,
+      "optmass": 1620,
+      "power": 6.84,
+      "rating": "D"
+    },
+    {
+      "M": 0.1,
+      "P": 1,
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128064095,
+      "eddbID": 953,
+      "grp": "t",
+      "id": "tr",
+      "mass": 80,
+      "maxmass": 2700,
+      "optmass": 1800,
+      "power": 7.6,
+      "rating": "C"
+    },
+    {
+      "M": 0.07,
+      "P": 1.51,
+      "class": 7,
+      "cost": 17096370,
+      "edID": 128064096,
+      "eddbID": 954,
+      "grp": "t",
+      "id": "tq",
+      "mass": 128,
+      "maxmass": 2970,
+      "optmass": 1980,
+      "power": 8.36,
+      "rating": "B"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 7,
+      "cost": 51289110,
+      "edID": 128064097,
+      "eddbID": 955,
+      "grp": "t",
+      "id": "tp",
+      "mass": 80,
+      "maxmass": 3240,
+      "optmass": 2160,
+      "power": 9.12,
+      "rating": "A"
+    },
+    {
+      "M": 0.17,
+      "P": 0.235,
+      "class": 6,
+      "cost": 199750,
+      "edID": 128064088,
+      "eddbID": 946,
+      "grp": "t",
+      "id": "to",
+      "mass": 40,
+      "maxmass": 1440,
+      "optmass": 960,
+      "power": 5.04,
+      "rating": "E"
+    },
+    {
+      "M": 0.14,
+      "P": 0.5145,
+      "class": 6,
+      "cost": 599240,
+      "edID": 128064089,
+      "eddbID": 947,
+      "grp": "t",
+      "id": "tn",
+      "mass": 16,
+      "maxmass": 1620,
+      "optmass": 1080,
+      "power": 5.67,
+      "rating": "D"
+    },
+    {
+      "M": 0.1,
+      "P": 1,
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128064090,
+      "eddbID": 948,
+      "grp": "t",
+      "id": "tm",
+      "mass": 40,
+      "maxmass": 1800,
+      "optmass": 1200,
+      "power": 6.3,
+      "rating": "C"
+    },
+    {
+      "M": 0.07,
+      "P": 1.51,
+      "class": 6,
+      "cost": 5393180,
+      "edID": 128064091,
+      "eddbID": 949,
+      "grp": "t",
+      "id": "tl",
+      "mass": 64,
+      "maxmass": 1980,
+      "optmass": 1320,
+      "power": 6.93,
+      "rating": "B"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 6,
+      "cost": 16179530,
+      "edID": 128064092,
+      "eddbID": 950,
+      "grp": "t",
+      "id": "tk",
+      "mass": 40,
+      "maxmass": 2160,
+      "optmass": 1440,
+      "power": 7.56,
+      "rating": "A"
+    },
+    {
+      "M": 0.17,
+      "P": 0.235,
+      "class": 5,
+      "cost": 63010,
+      "edID": 128064083,
+      "eddbID": 941,
+      "grp": "t",
+      "id": "tj",
+      "mass": 20,
+      "maxmass": 840,
+      "optmass": 560,
+      "power": 4.08,
+      "rating": "E"
+    },
+    {
+      "M": 0.14,
+      "P": 0.5145,
+      "class": 5,
+      "cost": 189040,
+      "edID": 128064084,
+      "eddbID": 942,
+      "grp": "t",
+      "id": "ti",
+      "mass": 8,
+      "maxmass": 945,
+      "optmass": 630,
+      "power": 4.59,
+      "rating": "D"
+    },
+    {
+      "M": 0.1,
+      "P": 1,
+      "class": 5,
+      "cost": 567110,
+      "edID": 128064085,
+      "eddbID": 943,
+      "grp": "t",
+      "id": "th",
+      "mass": 20,
+      "maxmass": 1050,
+      "optmass": 700,
+      "power": 5.1,
+      "rating": "C"
+    },
+    {
+      "M": 0.07,
+      "P": 1.51,
+      "class": 5,
+      "cost": 1701320,
+      "edID": 128064086,
+      "eddbID": 944,
+      "grp": "t",
+      "id": "tg",
+      "mass": 32,
+      "maxmass": 1155,
+      "optmass": 770,
+      "power": 5.61,
+      "rating": "B"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 5,
+      "cost": 5103950,
+      "edID": 128064087,
+      "eddbID": 945,
+      "grp": "t",
+      "id": "tf",
+      "mass": 20,
+      "maxmass": 1260,
+      "optmass": 840,
+      "power": 6.12,
+      "rating": "A"
+    },
+    {
+      "M": 0.17,
+      "P": 0.235,
+      "class": 4,
+      "cost": 19880,
+      "edID": 128064078,
+      "eddbID": 936,
+      "grp": "t",
+      "id": "te",
+      "mass": 10,
+      "maxmass": 420,
+      "optmass": 280,
+      "power": 3.28,
+      "rating": "E"
+    },
+    {
+      "M": 0.14,
+      "P": 0.5145,
+      "class": 4,
+      "cost": 59630,
+      "edID": 128064079,
+      "eddbID": 937,
+      "grp": "t",
+      "id": "td",
+      "mass": 4,
+      "maxmass": 473,
+      "optmass": 315,
+      "power": 3.69,
+      "rating": "D"
+    },
+    {
+      "M": 0.1,
+      "P": 1,
+      "class": 4,
+      "cost": 178900,
+      "edID": 128064080,
+      "eddbID": 938,
+      "grp": "t",
+      "id": "tc",
+      "mass": 10,
+      "maxmass": 525,
+      "optmass": 350,
+      "power": 4.1,
+      "rating": "C"
+    },
+    {
+      "M": 0.07,
+      "P": 1.51,
+      "class": 4,
+      "cost": 536690,
+      "edID": 128064081,
+      "eddbID": 939,
+      "grp": "t",
+      "id": "tb",
+      "mass": 16,
+      "maxmass": 578,
+      "optmass": 385,
+      "power": 4.51,
+      "rating": "B"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 4,
+      "cost": 1610080,
+      "edID": 128064082,
+      "eddbID": 940,
+      "grp": "t",
+      "id": "ta",
+      "mass": 10,
+      "maxmass": 630,
+      "optmass": 420,
+      "power": 4.92,
+      "rating": "A"
+    },
+    {
+      "M": 0.17,
+      "P": 0.235,
+      "class": 3,
+      "cost": 6270,
+      "edID": 128064073,
+      "eddbID": 931,
+      "grp": "t",
+      "id": "t9",
+      "mass": 5,
+      "maxmass": 120,
+      "optmass": 80,
+      "power": 2.48,
+      "rating": "E"
+    },
+    {
+      "M": 0.14,
+      "P": 0.5145,
+      "class": 3,
+      "cost": 18810,
+      "edID": 128064074,
+      "eddbID": 932,
+      "grp": "t",
+      "id": "t8",
+      "mass": 2,
+      "maxmass": 135,
+      "optmass": 90,
+      "power": 2.79,
+      "rating": "D"
+    },
+    {
+      "M": 0.1,
+      "P": 1,
+      "class": 3,
+      "cost": 56440,
+      "edID": 128064075,
+      "eddbID": 933,
+      "grp": "t",
+      "id": "t7",
+      "mass": 5,
+      "maxmass": 150,
+      "optmass": 100,
+      "power": 3.1,
+      "rating": "C"
+    },
+    {
+      "M": 0.07,
+      "P": 1.51,
+      "class": 3,
+      "cost": 169300,
+      "edID": 128064076,
+      "eddbID": 934,
+      "grp": "t",
+      "id": "t6",
+      "mass": 8,
+      "maxmass": 165,
+      "optmass": 110,
+      "power": 3.41,
+      "rating": "B"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 3,
+      "cost": 507910,
+      "edID": 128064077,
+      "eddbID": 935,
+      "grp": "t",
+      "id": "t5",
+      "mass": 5,
+      "maxmass": 180,
+      "optmass": 120,
+      "power": 3.72,
+      "rating": "A"
+    },
+    {
+      "M": 0.17,
+      "P": 0.235,
+      "class": 2,
+      "cost": 1980,
+      "edID": 128064068,
+      "eddbID": 926,
+      "grp": "t",
+      "id": "t4",
+      "mass": 2.5,
+      "maxmass": 72,
+      "optmass": 48,
+      "power": 2,
+      "rating": "E"
+    },
+    {
+      "M": 0.14,
+      "P": 0.5145,
+      "class": 2,
+      "cost": 5930,
+      "edID": 128064069,
+      "eddbID": 927,
+      "grp": "t",
+      "id": "t3",
+      "mass": 1,
+      "maxmass": 81,
+      "optmass": 54,
+      "power": 2.25,
+      "rating": "D"
+    },
+    {
+      "M": 0.1,
+      "P": 1,
+      "class": 2,
+      "cost": 17800,
+      "edID": 128064070,
+      "eddbID": 928,
+      "grp": "t",
+      "id": "t2",
+      "mass": 2.5,
+      "maxmass": 90,
+      "optmass": 60,
+      "power": 2.5,
+      "rating": "C"
+    },
+    {
+      "M": 0.07,
+      "P": 1.51,
+      "class": 2,
+      "cost": 53410,
+      "edID": 128064071,
+      "eddbID": 929,
+      "grp": "t",
+      "id": "t1",
+      "mass": 4,
+      "maxmass": 99,
+      "optmass": 66,
+      "power": 2.75,
+      "rating": "B"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 2,
+      "cost": 160220,
+      "edID": 128064072,
+      "eddbID": 930,
+      "grp": "t",
+      "id": "t0",
+      "mass": 2.5,
+      "maxmass": 108,
+      "optmass": 72,
+      "power": 3,
+      "rating": "A"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 3,
+      "cost": 5103952,
+      "edID": 128682013,
+      "eddbID": 1548,
+      "grp": "t",
+      "id": "tz",
+      "mass": 5,
+      "maxmass": 200,
+      "name": "Enhanced Performance",
+      "optmass": 90,
+      "power": 5,
+      "rating": "A"
+    },
+    {
+      "M": 0.04,
+      "P": 2.33,
+      "class": 2,
+      "cost": 1610080,
+      "edID": 128682014,
+      "eddbID": 1547,
+      "grp": "t",
+      "id": "u0",
+      "mass": 2.5,
+      "maxmass": 120,
+      "name": "Enhanced Performance",
+      "optmass": 60,
+      "power": 4,
+      "rating": "A"
+    }
   ]
 }

package.json

@@ -1,18 +1,18 @@
 {
   "name": "coriolis-data",
-  "version": "2.0.2",
+  "version": "2.2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/cmmcleod/coriolis-data"
+    "url": "https://github.com/EDCD/coriolis-data"
   },
   "main": "index.js",
-  "homepage": "http://coriolis.io",
-  "bugs": "https://github.com/cmmcleod/coriolis/issues",
+  "homepage": "https://coriolis.edcd.io",
+  "bugs": "https://github.com/EDCD/coriolis/issues",
   "private": true,
   "engine": "node >= 0.12.2",
   "license": "MIT",
   "scripts": {
-    "lint": "eslint --plugin json --ext .json modules ships",
+    "lint": "eslint --plugin json --ext .json modules ships dist",
     "jasmine": "jasmine-node spec",
     "jasmine-no-stack": "jasmine-node --noStack spec",
     "test": "npm run lint && npm run jasmine-no-stack",

ships/adder.json

@@ -11,7 +11,7 @@
       "boost": 320,
       "boostEnergy": 9,
       "agility": 8,
-      "baseShieldStrength": 60,
+      "baseShieldStrength": 78,
       "baseArmour": 162,
       "hullMass": 35,
       "masslock": 7,
@@ -19,11 +19,11 @@
     },
     "retailCost": 87810,
     "bulkheads": [
-      { "id": "Bx", "edID": 128049268, "eddbID": 753, "cost": 0, "mass": 0 },
-      { "id": "By", "edID": 128049269, "eddbID": 754, "cost": 30622340, "mass": 75 },
-      { "id": "Bz", "edID": 128049270, "eddbID": 755, "cost": 68900260, "mass": 150 },
-      { "id": "BA", "edID": 128049271, "eddbID": 756, "cost": 162834280, "mass": 150 },
-      { "id": "BB", "edID": 128049272, "eddbID": 757, "cost": 180442120, "mass": 150 }
+      { "id": "BC", "edID": 128049268, "eddbID": 753, "cost": 0, "mass": 0 },
+      { "id": "BD", "edID": 128049269, "eddbID": 754, "cost": 35120, "mass": 3 },
+      { "id": "BE", "edID": 128049270, "eddbID": 755, "cost": 79030, "mass": 5 },
+      { "id": "BF", "edID": 128049271, "eddbID": 756, "cost": 186770, "mass": 5 },
+      { "id": "BG", "edID": 128049272, "eddbID": 757, "cost": 206960, "mass": 5 }
     ],
     "slots": {
       "standard": [3, 3, 3, 1, 2, 3, 3],

ships/anaconda.json

@@ -7,15 +7,16 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 3,
       "hullCost": 141889930,
-      "speed": 180,
-      "boost": 240,
+      "speed": 183,
+      "boost": 244,
       "boostEnergy": 29,
       "agility": 2,
-      "baseShieldStrength": 350,
+      "baseShieldStrength": 362,
       "baseArmour": 945,
       "hullMass": 400,
       "masslock": 23,
-      "pipSpeed": 0.13875
+      "pipSpeed": 0.13875,
+      "fighterHangars": true
     },
     "retailCost": 146969450,
     "bulkheads": [
@@ -36,4 +37,4 @@
       "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, "2h", "00"]
     }
   }
-}
+}

ships/asp.json

@@ -7,11 +7,11 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 6135660,
-      "speed": 250,
-      "boost": 340,
+      "speed": 254,
+      "boost": 345,
       "boostEnergy": 14,
       "agility": 6,
-      "baseShieldStrength": 140,
+      "baseShieldStrength": 152,
       "baseArmour": 378,
       "hullMass": 280,
       "masslock": 11,
@@ -36,4 +36,4 @@
       "internal": ["04", "4e", "01", 0, 0, "00", "2h"]
     }
   }
-}
+}

ships/asp_scout.json

@@ -6,11 +6,11 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 3818240,
-      "speed": 220,
-      "boost": 300,
+      "speed": 223,
+      "boost": 304,
       "boostEnergy": 13,
       "agility": 8,
-      "baseShieldStrength": 120,
+      "baseShieldStrength": 105,
       "baseArmour": 324,
       "hullMass": 150,
       "masslock": 8,
@@ -35,4 +35,4 @@
       "internal": ["02", "02", "44", 0, 0]
     }
   }
-}
+}

ships/beluga.json

@@ -0,0 +1,48 @@
+{
+  "beluga": {
+    "edID": -1,
+    "eddbID": 30,
+    "properties": {
+      "name": "Beluga Liner",
+      "manufacturer": "Saud Kruger",
+      "class": 3,
+      "hullCost": -1,
+      "speed": 195,
+      "boost": 273,
+      "boostEnergy": 20,
+      "agility": 2,
+      "baseShieldStrength": 92,
+      "baseArmour": 504,
+      "hullMass": 1100,
+      "masslock": 18,
+      "pipSpeed": -1,
+      "luxuryCabins": true,
+      "fighterHangars": true
+    },
+    "retailCost": -1,
+    "bulkheads": [
+      { "id": "cl", "eddbID": 1554,"cost": 0, "mass": 0 },
+      { "id": "cm", "eddbID": 1555,"cost": -1, "mass": 83 },
+      { "id": "cn", "eddbID": 1556,"cost": -1, "mass": 165 },
+      { "id": "co", "eddbID": 1557,"cost": -1, "mass": 165 },
+      { "id": "cp", "eddbID": 1558,"cost": -1, "mass": 165 }
+    ],
+    "slots": {
+      "standard": [6, 7, 7, 8, 6, 5, 7],
+      "hardpoints": [2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0],
+      "internal": [
+        6, 6,
+        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        4, 3, 3, 3, 3
+      ]
+    },
+    "defaults": {
+      "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"],
+      "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h"]
+    }
+  }
+}

ships/cobra_mk_iii.json

@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 205800,
-      "speed": 280,
-      "boost": 400,
+      "speed": 282,
+      "boost": 402,
       "boostEnergy": 11,
       "agility": 6,
-      "baseShieldStrength": 80,
+      "baseShieldStrength": 92,
       "baseArmour": 216,
       "hullMass": 180,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["02", "02", "49", "00", 0, "2h"]
     }
   }
-}
+}

ships/cobra_mk_iv.json

@@ -8,10 +8,10 @@
       "class": 1,
       "hullCost": 603740,
       "speed": 200,
-      "boost": 300,
+      "boost": 299,
       "boostEnergy": 11,
       "agility": 4,
-      "baseShieldStrength": 120,
+      "baseShieldStrength": 125,
       "baseArmour": 216,
       "hullMass": 210,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["02", "02", "49", 0, 0, 0, "00", "2h"]
     }
   }
-}
+}

ships/diamondback_explorer.json

@@ -6,11 +6,11 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 1635700,
-      "speed": 260,
-      "boost": 340,
+      "speed": 242,
+      "boost": 316,
       "boostEnergy": 14,
       "agility": 5,
-      "baseShieldStrength": 146,
+      "baseShieldStrength": 115,
       "baseArmour": 270,
       "hullMass": 298,
       "masslock": 10,
@@ -35,4 +35,4 @@
       "internal": ["49", "02", "01", 0, "2h"]
     }
   }
-}
+}

ships/diamondback_scout.json

@@ -8,10 +8,10 @@
       "class": 1,
       "hullCost": 461340,
       "speed": 283,
-      "boost": 380,
+      "boost": 384,
       "boostEnergy": 11,
       "agility": 8,
-      "baseShieldStrength": 118,
+      "baseShieldStrength": 93,
       "baseArmour": 216,
       "hullMass": 170,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["44", 0, 0, "2h"]
     }
   }
-}
+}

ships/eagle.json

@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 10440,
-      "speed": 240,
-      "boost": 350,
+      "speed": 239,
+      "boost": 349,
       "boostEnergy": 9,
       "agility": 10,
-      "baseShieldStrength": 60,
+      "baseShieldStrength": 89,
       "baseArmour": 72,
       "hullMass": 50,
       "masslock": 6,
@@ -28,12 +28,12 @@
     "slots": {
       "standard": [2, 3, 3, 1, 2, 2, 2],
       "hardpoints": [1, 1, 1, 0],
-      "internal": [3, 2, 1]
+      "internal": [3, 2, 1, 1]
     },
     "defaults": {
       "standard": ["2E", "3E", "3E", "1E", "2E", "2E", "2C"],
       "hardpoints": [17, 17, 0, 0],
-      "internal": ["44", "00", "2h"]
+      "internal": ["44", "00", "2h", 0]
     }
   }
-}
+}

ships/federal_assault_ship.json

@@ -6,11 +6,11 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 19072000,
-      "speed": 210,
-      "boost": 350,
+      "speed": 214,
+      "boost": 357,
       "boostEnergy": 21,
       "agility": 6,
-      "baseShieldStrength": 200,
+      "baseShieldStrength": 133,
       "baseArmour": 540,
       "hullMass": 480,
       "masslock": 14,
@@ -35,4 +35,4 @@
       "internal": ["4e", "03", "02", "02", 0, 0]
     }
   }
-}
+}

ships/federal_corvette.json

@@ -7,15 +7,16 @@
       "manufacturer": "Core Dynamics",
       "class": 3,
       "hullCost": 182589570,
-      "speed": 200,
-      "boost": 260,
+      "speed": 198,
+      "boost": 257,
       "boostEnergy": 27,
       "agility": 2,
-      "baseShieldStrength": 555,
+      "baseShieldStrength": 516,
       "baseArmour": 666,
       "hullMass": 900,
       "masslock": 24,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "fighterHangars": true
     },
     "retailCost": 187969450,
     "bulkheads": [
@@ -36,4 +37,4 @@
       "internal": ["4o", "05", 0, 0, 0, 0, 0, "02", "01", "2h"]
     }
   }
-}
+}

ships/federal_dropship.json

@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 13469990,
-      "speed": 180,
-      "boost": 300,
+      "speed": 182,
+      "boost": 304,
       "boostEnergy": 21,
       "agility": 2,
-      "baseShieldStrength": 200,
+      "baseShieldStrength": 104,
       "baseArmour": 540,
       "hullMass": 580,
       "masslock": 14,
@@ -36,4 +36,4 @@
       "internal": ["04", "03", "4e", "02", 0, 0, "2h"]
     }
   }
-}
+}

ships/federal_gunship.json

@@ -7,15 +7,16 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 34774790,
-      "speed": 170,
-      "boost": 280,
+      "speed": 171,
+      "boost": 282,
       "boostEnergy": 21,
       "agility": 2,
-      "baseShieldStrength": 250,
+      "baseShieldStrength": 186,
       "baseArmour": 630,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.1025
+      "pipSpeed": 0.1025,
+      "fighterHangars": true
     },
     "retailCost": 35814210,
     "bulkheads": [
@@ -36,4 +37,4 @@
       "internal": [0, "4j", "03", 0, "2h"]
     }
   }
-}
+}

ships/fer_de_lance.json

@@ -7,11 +7,11 @@
       "manufacturer": "Zorgon Peterson",
       "class": 2,
       "hullCost": 51232230,
-      "speed": 260,
-      "boost": 350,
+      "speed": 265,
+      "boost": 357,
       "boostEnergy": 21,
       "agility": 6,
-      "baseShieldStrength": 300,
+      "baseShieldStrength": 271,
       "baseArmour": 405,
       "hullMass": 250,
       "masslock": 12,

ships/hauler.json

@@ -7,11 +7,11 @@
       "manufacturer": "Zorgon Peterson",
       "class": 1,
       "hullCost": 29790,
-      "speed": 200,
-      "boost": 300,
+      "speed": 203,
+      "boost": 305,
       "agility": 6,
       "boostEnergy": 7,
-      "baseShieldStrength": 50,
+      "baseShieldStrength": 65,
       "baseArmour": 90,
       "hullMass": 14,
       "masslock": 6,
@@ -36,4 +36,4 @@
       "internal": ["01", "01", "3v", "2h"]
     }
   }
-}
+}

ships/imperial_clipper.json

@@ -7,11 +7,11 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 21077780,
-      "speed": 300,
-      "boost": 380,
+      "speed": 306,
+      "boost": 388,
       "boostEnergy": 21,
       "agility": 2,
-      "baseShieldStrength": 180,
+      "baseShieldStrength": 186,
       "baseArmour": 486,
       "hullMass": 400,
       "masslock": 12,
@@ -36,4 +36,4 @@
       "internal": ["05", "4j", "02", 0, 0, 0, "00", "2h"]
     }
   }
-}
+}

ships/imperial_courier.json

@@ -10,7 +10,7 @@
       "boost": 380,
       "boostEnergy": 11,
       "agility": 6,
-      "baseShieldStrength": 197,
+      "baseShieldStrength": 230,
       "baseArmour": 144,
       "hullMass": 35,
       "masslock": 7,
@@ -35,4 +35,4 @@
       "internal": ["01", "01", "3v", "00", "00", "2h"]
     }
   }
-}
+}

ships/imperial_cutter.json

@@ -6,15 +6,16 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 199926890,
-      "speed": 200,
-      "boost": 320,
+      "speed": 202,
+      "boost": 323,
       "boostEnergy": 24,
       "agility": 2,
-      "baseShieldStrength": 605,
+      "baseShieldStrength": 703,
       "baseArmour": 720,
       "hullMass": 1100,
       "masslock": 27,
-      "pipSpeed": 0.05
+      "pipSpeed": 0.05,
+       "fighterHangars": true
     },
     "retailCost": 208969450,
     "bulkheads": [
@@ -35,4 +36,4 @@
       "internal": ["4t", "06", "04", 0, 0, 0, 0, "01", "2h"]
     }
   }
-}
+}

ships/imperial_eagle.json

@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 72180,
-      "speed": 300,
-      "boost": 400,
+      "speed": 298,
+      "boost": 397,
       "boostEnergy": 9,
       "agility": 6,
-      "baseShieldStrength": 80,
+      "baseShieldStrength": 104,
       "baseArmour": 108,
       "hullMass": 50,
       "masslock": 6,
@@ -36,4 +36,4 @@
       "internal": ["44", "00", "2h", 0]
     }
   }
-}
+}

ships/index.js

@@ -3,6 +3,7 @@ module.exports = {
   anaconda: require('./anaconda').anaconda,
   asp: require('./asp').asp,
   asp_scout: require('./asp_scout').asp_scout,
+  beluga: require('./beluga').beluga,
   cobra_mk_iii: require('./cobra_mk_iii').cobra_mk_iii,
   cobra_mk_iv: require('./cobra_mk_iv').cobra_mk_iv,
   diamondback_explorer: require('./diamondback_explorer').diamondback_explorer,
@@ -28,4 +29,4 @@ module.exports = {
   viper: require('./viper').viper,
   viper_mk_iv: require('./viper_mk_iv').viper_mk_iv,
   vulture: require('./vulture').vulture
-};
+};

ships/keelback.json

@@ -7,15 +7,16 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 2951180,
-      "speed": 200,
-      "boost": 300,
+      "speed": 202,
+      "boost": 303,
       "boostEnergy": 10,
       "agility": 2,
-      "baseShieldStrength": 110,
-      "baseArmour": 198,
+      "baseShieldStrength": 99,
+      "baseArmour": 243,
       "hullMass": 180,
       "masslock": 8,
-      "pipSpeed": 0.1375
+      "pipSpeed": 0.1375,
+      "fighterHangars": true
     },
     "retailCost": 3126150,
     "bulkheads": [
@@ -28,12 +29,12 @@
     "slots": {
       "standard": [4, 4, 4, 1, 3, 2, 4],
       "hardpoints": [2, 2, 1, 1, 0, 0, 0],
-      "internal": [5, 5, 3, 3, 2, 2]
+      "internal": [5, 5, 4, 3, 2, 2]
     },
     "defaults": {
       "standard": ["4E", "4E", "4E", "1E", "3E", "2E", "4C"],
       "hardpoints": [0, 0, 17, 17, 0, 0, 0],
-      "internal": ["03", "03", "01", "44" ,"00", "2h"]
+      "internal": ["03", "03", "02", "44" ,"00", "2h"]
     }
   }
-}
+}

ships/orca.json

@@ -7,15 +7,16 @@
       "manufacturer": "Saud Kruger",
       "class": 3,
       "hullCost": 47798080,
-      "speed": 300,
-      "boost": 380,
+      "speed": 303,
+      "boost": 384,
       "boostEnergy": 17,
       "agility": 2,
-      "baseShieldStrength": 220,
+      "baseShieldStrength": 114,
       "baseArmour": 396,
       "hullMass": 580,
       "masslock": 13,
-      "pipSpeed": 0.08375
+      "pipSpeed": 0.08375,
+      "luxuryCabins": true
     },
     "retailCost": 48539890,
     "bulkheads": [
@@ -26,18 +27,18 @@
       { "id": "BQ", "edID": 128049332, "eddbID": 802, "cost": 114408510, "mass": 87 }
     ],
     "slots": {
-      "standard": [5, 6, 5, 6, 5, 4, 4],
+      "standard": [5, 6, 5, 6, 5, 4, 5],
       "hardpoints": [3, 2, 2, 0, 0, 0, 0],
       "internal": [
-        { "class": 6, "eligible": { "cr": 1, "hr": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1 } },
+        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
         5, 5, 4, 3, 2, 2
       ]
     },
     "defaults": {
-      "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "4C"],
+      "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["04", "03", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h"]
     }
   }
-}
+}

ships/python.json

@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 2,
       "hullCost": 55171380,
-      "speed": 230,
-      "boost": 300,
+      "speed": 234,
+      "boost": 305,
       "boostEnergy": 24,
       "agility": 6,
-      "baseShieldStrength": 260,
+      "baseShieldStrength": 294,
       "baseArmour": 468,
       "hullMass": 350,
       "masslock": 17,
@@ -36,4 +36,4 @@
       "internal": ["04", "04", "4j", "03", 0, 0, 0, "00", "2h"]
     }
   }
-}
+}

ships/sidewinder.json

@@ -8,10 +8,10 @@
       "class": 1,
       "hullCost": 12870,
       "speed": 220,
-      "boost": 320,
+      "boost": 321,
       "boostEnergy": 7,
       "agility": 8,
-      "baseShieldStrength": 40,
+      "baseShieldStrength": 52,
       "baseArmour": 108,
       "hullMass": 25,
       "masslock": 6,
@@ -28,12 +28,12 @@
     "slots": {
       "standard": [2, 2, 2, 1, 1, 1, 1],
       "hardpoints": [1, 1, 0, 0],
-      "internal": [2, 2, 1]
+      "internal": [2, 2, 1, 1]
     },
     "defaults": {
       "standard": ["2E", "2E", "2E", "1E", "1E", "1E", "1C"],
       "hardpoints": [18, 18, 0, 0],
-      "internal": ["3v", "01", "2h"]
+      "internal": ["3v", "01", "2h", 0]
     }
   }
-}
+}

ships/type_6_transporter.json

@@ -7,11 +7,11 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 865790,
-      "speed": 220,
-      "boost": 350,
+      "speed": 223,
+      "boost": 355,
       "boostEnergy": 11,
       "agility": 3,
-      "baseShieldStrength": 90,
+      "baseShieldStrength": 77,
       "baseArmour": 162,
       "hullMass": 155,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["03", "03", "02", "02", "44", "00", "2h"]
     }
   }
-}
+}

ships/type_7_transport.json

@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 3,
       "hullCost": 16881510,
-      "speed": 180,
-      "boost": 300,
+      "speed": 181,
+      "boost": 301,
       "boostEnergy": 11,
       "agility": 2,
-      "baseShieldStrength": 120,
-      "baseArmour": 216,
+      "baseShieldStrength": 78,
+      "baseArmour": 306,
       "hullMass": 420,
       "masslock": 10,
       "pipSpeed": 0.16625
@@ -28,12 +28,12 @@
     "slots": {
       "standard": [4, 5, 5, 4, 3, 3, 5],
       "hardpoints": [1, 1, 1, 1, 0, 0, 0, 0],
-      "internal": [6, 6, 5, 5, 4, 4, 2, 2]
+      "internal": [6, 6, 6, 5, 5, 5, 3, 3]
     },
     "defaults": {
       "standard": ["4E", "5E", "5E", "4E", "3E", "3E", "5C"],
       "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "04", "03", "03", "02", "49", 0, "2h"]
+      "internal": ["04", "04", "04", "03", "03", "49", 0, "2h"]
     }
   }
 }

ships/type_9_heavy.json

@@ -7,23 +7,24 @@
       "manufacturer": "Lakon",
       "class": 3,
       "hullCost": 73255150,
-      "speed": 130,
-      "boost": 200,
+      "speed": 131,
+      "boost": 201,
       "boostEnergy": 21,
       "agility": 0,
-      "baseShieldStrength": 240,
+      "baseShieldStrength": 88,
       "baseArmour": 432,
       "hullMass": 1000,
       "masslock": 16,
-      "pipSpeed": 0.17375
+      "pipSpeed": 0.17375,
+      "fighterHangars": true
     },
     "retailCost": 76555840,
     "bulkheads": [
-      { "id": "cl", "edID": 128049334, "eddbID": 803, "cost": 0, "mass": 0 },
-      { "id": "cm", "edID": 128049335, "eddbID": 804, "cost": 30622340, "mass": 75 },
-      { "id": "cn", "edID": 128049336, "eddbID": 805, "cost": 68900260, "mass": 150 },
-      { "id": "co", "edID": 128049337, "eddbID": 806, "cost": 162834280, "mass": 150 },
-      { "id": "cp", "edID": 128049338, "eddbID": 807, "cost": 180442120, "mass": 150 }
+      { "id": "Bx", "edID": 128049334, "eddbID": 803, "cost": 0, "mass": 0 },
+      { "id": "By", "edID": 128049335, "eddbID": 804, "cost": 30622340, "mass": 75 },
+      { "id": "Bz", "edID": 128049336, "eddbID": 805, "cost": 68900260, "mass": 150 },
+      { "id": "BA", "edID": 128049337, "eddbID": 806, "cost": 162834280, "mass": 150 },
+      { "id": "BB", "edID": 128049338, "eddbID": 807, "cost": 180442120, "mass": 150 }
     ],
     "slots": {
       "standard": [6, 7, 6, 5, 6, 4, 6],
@@ -36,4 +37,4 @@
       "internal": ["06", "05", "4j", "03", "02", 0, "01", 0, "2h"]
     }
   }
-}
+}

ships/viper.json

@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 95900,
-      "speed": 320,
-      "boost": 400,
+      "speed": 310,
+      "boost": 388,
       "boostEnergy": 11,
       "agility": 6,
-      "baseShieldStrength": 105,
+      "baseShieldStrength": 137,
       "baseArmour": 126,
       "hullMass": 60,
       "masslock": 7,
@@ -36,4 +36,4 @@
       "internal": ["01", "44", 0, "2h"]
     }
   }
-}
+}

ships/viper_mk_iv.json

@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 310220,
-      "speed": 270,
-      "boost": 340,
+      "speed": 271,
+      "boost": 342,
       "boostEnergy": 10,
       "agility": 4,
-      "baseShieldStrength": 150,
+      "baseShieldStrength": 103,
       "baseArmour": 270,
       "hullMass": 190,
       "masslock": 7,
@@ -36,4 +36,4 @@
       "internal": ["02", "02", "44", "00", 0, "2h"]
     }
   }
-}
+}

ships/vulture.json

@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 4689640,
-      "speed": 210,
-      "boost": 340,
+      "speed": 215,
+      "boost": 348,
       "boostEnergy": 17,
       "agility": 9,
-      "baseShieldStrength": 240,
+      "baseShieldStrength": 293,
       "baseArmour": 288,
       "hullMass": 230,
       "masslock": 10,
@@ -36,4 +36,4 @@
       "internal": ["4e", "02", 0, 0, "2h"]
     }
   }
-}
+}

spec/data-spec.js

@@ -1,5 +1,5 @@
-var Modules = require('../Modules');
-var Ships = require('../Ships');
+var Modules = require('../modules');
+var Ships = require('../ships');
 
 describe('JSON Data', function() {
 
@@ -35,13 +35,17 @@ describe('JSON Data', function() {
       for (var i = 0; i < group.length; i++) {
         var id = group[i].id;
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
-        expect(group[i].edID).toBeDefined('Standard module' + id + ' is missing E:D ID');
-        expect(group[i].eddbID).toBeDefined('Standard module' + id + ' is missing EDDB ID');
+        expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
+        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module' + id + ' is missing EDDB ID');
         expect(group[i].grp).toBeDefined(`No group defined, Type: ${s}, ID: ${id}, Index: ${i}`);
         expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists for ID: ${id}, Index: ${i}`);
         expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists for ID: ${id}, Index: ${i}`);
-        eddbIDs[group[i].eddbID] = true;
-        edIDs[group[i].edID] = true;
+        if (group[i].eddbID) {
+          eddbIDs[group[i].eddbID] = true;
+        }
+        if (group[i].edID) {
+          edIDs[group[i].edID] = true;
+        }
         ids[id] = true;
       }
     }
@@ -57,14 +61,32 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
         expect(group[i].grp).toBeDefined('Hardpoint has no group defined, ID:' + id);
-        expect(group[i].eddbID).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
-        expect(group[i].edID).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+        expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`);
+        expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`);
+        expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
+        expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
         expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
-        eddbIDs[group[i].eddbID] = true;
+        if (group[i].eddbID) {
+          eddbIDs[group[i].eddbID] = true;
+        }
         if (group[i].edID) {
           edIDs[group[i].edID] = true;
         }
+	if (group[i].dps) {
+            expect(group[i].dps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing dps`);
+            expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`);
+            expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`);
+            expect(group[i].breachdps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdps`);
+            expect(group[i].armourpen).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing armourpen`);
+            expect(group[i].eps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing eps`);
+            expect(group[i].hps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing hps`);
+        }
+	if (group[i].ammo || group[i].reload || group[i].clip) {
+            expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
+            expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
+            expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
+        }
         ids[id] = true;
       }
     }
@@ -80,14 +102,18 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
-        expect(group[i].eddbID).toBeDefined(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
-        expect(group[i].edID).toBeDefined(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
+        expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs
           expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists:  ${id}`);
           expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists:  ${id}`);
         }
-        eddbIDs[group[i].eddbID] = true;
-        edIDs[group[i].edID] = true;
+        if (group[i].eddbID) {
+          eddbIDs[group[i].eddbID] = true;
+        }
+        if (group[i].edID) {
+          edIDs[group[i].edID] = true;
+        }
         ids[id] = true;
       }
     }
@@ -100,8 +126,8 @@ describe('JSON Data', function() {
       for (var p = 0; p < shipProperties.length; p++) {
         expect(Ships[s].properties[shipProperties[p]]).toBeDefined(shipProperties[p] + ' is missing for ' + s);
       }
-      expect(Ships[s].eddbID).toBeDefined(s + ' is missing EDDB ID');
-      expect(Ships[s].edID).toBeDefined(s + ' is missing E:D ID');
+      expect(Ships[s].eddbID > 0).toBeTruthy(s + ' is missing EDDB ID');
+      expect(Ships[s].edID > 0).toBeTruthy(s + ' is missing E:D ID');
       expect(edIDs[Ships[s].edID]).toBeFalsy(`${s} E:D ID [${Ships[s].edID}] already exists`);
       expect(Ships[s].slots.standard.length).toEqual(7, s + ' is missing standard slots');
       expect(Ships[s].defaults.standard.length).toEqual(7, s + ' is missing standard defaults');
@@ -110,18 +136,24 @@ describe('JSON Data', function() {
       expect(Ships[s].retailCost).toBeGreaterThan(Ships[s].properties.hullCost, s + ' has invalid retail cost');
       expect(Ships[s].bulkheads).toBeDefined(s + ' is missing bulkheads');
       expect(Ships[s].bulkheads.length).toEqual(5, s + ' is missing bulkheads');
-      edIDs[Ships[s].edID] = true;
+      if (Ships[s].edID) {
+        edIDs[Ships[s].edID] = true;
+      }
 
       for (var i = 0; i < Ships[s].bulkheads.length; i++) {
         var b = Ships[s].bulkheads[i];
         expect(b.id).toBeDefined(`${s} bulkhead [${i}] is missing an ID`);
         expect(bulkheadIds[b.id]).toBeFalsy(`${s} bulkhead [${i} - ${b.id}] ID already exists`);
-        expect(b.eddbID).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing EDDB ID`);
+        expect(b.eddbID > 0).toBeTruthy(`${s} bulkhead [${i} - ${b.id}] is missing EDDB ID`);
         expect(eddbIDs[b.eddbID]).toBeFalsy(`EDDB ID [${b.eddbID}] already exists: ${s} bulkhead [${i} - ${b.id}]`);
-        expect(b.edID).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`);
+        expect(b.edID > 0).toBeTruthy(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`);
         expect(edIDs[b.edID]).toBeFalsy(`E:D ID [${b.edID}] already exists: ${s} bulkhead [${i} - ${b.id}]`);
-        edIDs[b.edID] = true;
-        eddbIDs[b.eddbID] = true;
+        if (b.eddbID) {
+          eddbIDs[b.eddbID] = true;
+        }
+        if (b.edID) {
+          edIDs[b.edID] = true;
+        }
         bulkheadIds[b.id] = true;
       }
     }