2.9.18

Fixed a bug where Meta Alloy Hull Reinforcements could not be allocat…

.eslintrc.js

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

.gitignore

@@ -2,4 +2,5 @@ node_modules
 node_modules/*
 *.log
 .idea
-
+.vscode/
+package-lock.json

.npmrc

@@ -0,0 +1 @@
+package-lock=false

modifications/modifications.json

@@ -3,7 +3,8 @@
     "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite", "higherbetter": true},
-    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": false},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": true},
+    "causres": {"id": 51, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
     "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
@@ -15,7 +16,7 @@
     "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
     "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "numeric", "hidden": true, "method": "overwrite"},
+    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "numeric", "aggregated": true, "method": "overwrite"},
     "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative", "higherbetter": true},
@@ -33,7 +34,7 @@
     "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "angle": {"id": 46, "name": "angle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "scanrate": {"id": 49, "name": "scanrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
@@ -47,5 +48,7 @@
     "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
     "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true}
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "jumpboost": {"id": 47, "name": "jumpboost", "type": "numeric", "method": "additive", "higherbetter": true},
+    "shieldaddition": {"id": 50, "name": "shieldaddition", "type": "numeric", "method": "additive", "higherbetter": true}
 }

modifications/modifierActions.json

@@ -165,12 +165,22 @@
   },
   "special_auto_loader": {},
   "special_choke_canister": {},
+  "special_feedback_cascade_cooled": {
+    "thermload": -0.4
+  },
+  "special_super_penetrator_cooled": {
+    "thermload": -0.4
+  },
   "special_concordant_sequence": {
     "thermload": 0.5
   },
   "special_corrosive_shell": {
     "ammo": -0.2
   },
+  "special_plasma_slug_cooled": {
+    "damage": -0.1,
+    "thermload": -0.4
+  },
   "special_dispersal_field": {
   },
   "special_distortion_field": {},
@@ -183,8 +193,7 @@
     "damage": -0.2
   },
   "special_force_shell": {
-    "jitter": 1,
-    "speed": -0.1667
+    "shotspeed": -0.1667
   },
   "special_fsd_interrupt": {
     "damage": -0.3,
@@ -243,12 +252,223 @@
   "special_thermal_conduit": {
     "damage": -0.2
   },
-  "special_thermal_vent": {
-    "thermload": 0.25
-  },
+  "special_thermal_vent": {},
   "special_thermalshock": {
     "damage": -0.2
   },
+  "special_penetrator_munitions": {
+  },
+  "special_deep_cut_payload": {
+  },
+  "special_mass_lock": {
+  },
+  "special_shield_regenerative": {
+    "brokenregen": 0.15,
+    "regen": 0.15,
+    "thermres": -1,
+    "kinres": -1,
+    "explres": -1
+  },
+  "special_shield_resistive": {
+    "thermres": 3,
+    "kinres": 3,
+    "explres": 3,
+    "power": 0.1,
+    "distdraw": 0.25
+  },
+  "special_shield_health": {
+    "power": 0.1,
+    "optmul": 0.06,
+    "distdraw": 0.25
+  },
+  "special_shield_efficient": {
+    "power": -0.2,
+    "distdraw": -0.2,
+    "thermres": -1,
+    "optmul": -0.02,
+    "kinres": -1,
+    "explres": -1
+  },
+  "special_shield_thermic": {
+    "optmul": -0.03,
+    "thermres": 8
+  },
+  "special_shield_kinetic": {
+    "optmul": -0.03,
+    "kinres": 8
+  },
+  "special_shield_toughened": {
+    "integrity": 0.15
+  },
+  "special_shield_lightweight": {
+    "mass": -0.1
+  },
+  "special_engine_cooled": {
+    "mass": 0.1,
+    "thermload": -0.1
+  },
+  "special_engine_haulage": {
+    "optmass": 0.1
+  },
+  "special_engine_overloaded": {
+    "optmul": 0.04,
+    "thermload": 0.1
+  },
+  "special_engine_toughened": {
+    "integrity": 0.15
+  },
+  "special_engine_lightweight": {
+    "mass": -0.1
+  },
+  "special_fsd_fuelcapacity": {
+    "power": 0.05,
+    "maxfuel": 0.1
+  },
+  "special_fsd_heavy": {
+    "integrity": -0.08,
+    "optmass": 0.04
+  },
+  "special_fsd_toughened": {
+    "integrity": 0.15
+  },
+  "special_fsd_lightweight": {
+    "mass": -0.1
+  },
+  "special_fsd_cooled": {
+    "thermload": -0.1
+  },
+  "special_powerplant_highcharge": {
+    "mass": 0.1,
+    "pgen": 0.05
+  },
+  "special_powerplant_cooled": {
+    "eff": -0.1
+  },
+  "special_powerplant_toughened": {
+    "integrity": 0.15
+  },
+  "special_powerplant_lightweight": {
+    "mass": -0.1
+  },
+  "special_powerdistributor_capacity": {
+    "wepcap": 0.08,
+    "syscap": 0.08,
+    "engcap": 0.08,
+    "weprate": -0.02,
+    "sysrate": -0.02,
+    "engrate": -0.02
+  },
+  "special_powerdistributor_fast": {
+    "wepcap": -0.04,
+    "syscap": -0.04,
+    "engcap": -0.04,
+    "weprate": 0.04,
+    "sysrate": 0.04,
+    "engrate": 0.04
+  },
+  "special_powerdistributor_efficient": {
+    "power": -0.1
+  },
+  "special_powerdistributor_toughened": {
+    "integrity": 0.15
+  },
+  "special_powerdistributor_lightweight": {
+    "mass": -0.1
+  },
+  "special_shieldcell_gradual": {
+    "duration": 0.1,
+    "shieldreinforcement": -0.05
+  },
+  "special_shieldcell_oversized": {
+    "spinup": 0.2,
+    "shieldreinforcement": 0.05
+  },
+  "special_shieldcell_efficient": {
+    "power": -0.1
+  },
+  "special_shieldcell_toughened": {
+    "integrity": 0.15
+  },
+  "special_shieldcell_lightweight": {
+    "mass": -0.1
+  },
+  "special_weapon_damage": {
+    "power": 0.05,
+    "damage": 0.03
+  },
+  "special_weapon_rateoffire": {
+    "power": 0.05,
+    "rof": -0.03
+  },
+  "special_weapon_efficient": {
+    "power": -0.1
+  },
+  "special_weapon_toughened": {
+    "integrity": 0.15
+  },
+  "special_weapon_lightweight": {
+    "mass": -0.1
+  },
+  "special_armour_thermic": {
+    "hullboost": -0.03,
+    "thermres": 8
+  },
+  "special_armour_kinetic": {
+    "hullboost": -0.03,
+    "kinres": 8
+  },
+  "special_armour_explosive": {
+    "hullboost": -0.03,
+    "explres": 8
+  },
+  "special_armour_chunky": {
+    "hullboost": 0.08,
+    "thermres": -3,
+    "explres": -3,
+    "kinres": -3
+  },
+  "special_hullreinforcement_thermic": {
+    "hullreinforcement": -0.05,
+    "thermres": 2
+  },
+  "special_hullreinforcement_kinetic": {
+    "hullreinforcement": -0.05,
+    "kinres": 2
+  },
+  "special_hullreinforcement_explosive": {
+    "hullreinforcement": -0.05,
+    "explres": 2
+  },
+  "special_hullreinforcement_chunky": {
+    "hullreinforcement": 0.1,
+    "explres": -2,
+    "thermres": -2,
+    "kinres": -2
+  },
+  "special_shieldbooster_thermic": {
+    "shieldboost": -0.01,
+    "thermres": 2
+  },
+  "special_shieldbooster_kinetic": {
+    "shieldboost": -0.01,
+    "kinres": 2
+  },
+  "special_shieldbooster_explosive": {
+    "shieldboost": -0.01,
+    "explres": 2
+  },
+  "special_shieldbooster_efficient": {
+    "power": -0.1
+  },
+  "special_shieldbooster_toughened": {
+    "integrity": 0.15
+  },
+  "special_shieldbooster_chunky": {
+    "shieldboost": 0.05,
+    "thermres": -2,
+    "kinres": -2,
+    "explres": -2
+  },
   "trade_cell_heat_cell_units": {
     "shieldreinforcement": -1,
     "thermload": -1

modifications/modules.json

@@ -188,11 +188,18 @@
       }
     },
     "modifications": [
+      "causres",
       "explres",
       "hullboost",
       "kinres",
       "mass",
       "thermres"
+    ],
+    "specials": [
+      "special_armour_kinetic",
+      "special_armour_explosive",
+      "special_armour_chunky",
+      "special_armour_thermic"
     ]
   },
   "bl": {
@@ -408,7 +415,12 @@
       "special_regeneration_sequence",
       "special_thermal_conduit",
       "special_thermalshock",
-      "special_thermal_vent"
+      "special_thermal_vent",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "bsg": {
@@ -555,7 +567,6 @@
       }
     },
     "modifications": [
-      "boot",
       "brokenregen",
       "distdraw",
       "explres",
@@ -566,8 +577,17 @@
       "optmul",
       "power",
       "regen",
-      "thermload",
       "thermres"
+    ],
+    "specials": [
+      "special_shield_regenerative",
+      "special_shield_resistive",
+      "special_shield_health",
+      "special_shield_efficient",
+      "special_shield_thermic",
+      "special_shield_kinetic",
+      "special_shield_toughened",
+      "special_shield_lightweight"
     ]
   },
   "c": {
@@ -814,7 +834,12 @@
       "special_smart_rounds",
       "special_force_shell",
       "special_high_yield_shell",
-      "special_thermal_cascade"
+      "special_thermal_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "cc": {
@@ -1644,7 +1669,12 @@
       "special_blinding_shell",
       "special_incendiary_rounds",
       "special_drag_munitions",
-      "special_screening_shell"
+      "special_screening_shell",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "rfl": {
@@ -1709,6 +1739,11 @@
               "Colonel Bris Dekker",
               "Tiana Fortune"
             ]
+          },
+          "4": {
+            "engineers": [
+              "Colonel Bris Dekker"
+            ]
           }
         }
       }
@@ -1888,6 +1923,13 @@
       "optmass",
       "power",
       "thermload"
+    ],
+    "specials": [
+      "special_fsd_fuelcapacity",
+      "special_fsd_heavy",
+      "special_fsd_toughened",
+      "special_fsd_lightweight",
+      "special_fsd_cooled"
     ]
   },
   "ft": {
@@ -2297,11 +2339,17 @@
     },
     "modifications": [
       "hullreinforcement",
+      "causres",
       "explres",
-      "hullboost",
       "kinres",
       "mass",
       "thermres"
+    ],
+    "specials": [
+      "special_hullreinforcement_thermic",
+      "special_hullreinforcement_kinetic",
+      "special_hullreinforcement_explosive",
+      "special_hullreinforcement_chunky"
     ]
   },
   "hs": {
@@ -3016,7 +3064,12 @@
       "special_emissive_munitions",
       "special_incendiary_rounds",
       "special_smart_rounds",
-      "special_thermalshock"
+      "special_thermalshock",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "axmc": {
@@ -3183,7 +3236,12 @@
       "special_emissive_munitions",
       "special_overload_munitions",
       "special_penetrator_payload",
-      "special_thermal_cascade"
+      "special_thermal_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ],
     "specials_D": [
       "special_drag_munitions",
@@ -3191,7 +3249,13 @@
       "special_fsd_interrupt",
       "special_overload_munitions",
       "special_penetrator_payload",
-      "special_thermal_cascade"
+      "special_thermal_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight",
+      "special_penetrator_munitions"
     ]
   },
   "axmr": {
@@ -3359,7 +3423,72 @@
       "special_radiant_canister",
       "special_reverberating_cascade",
       "special_shiftlock_canister",
-      "special_emissive_munitions"
+      "special_emissive_munitions",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
+    ]
+  },
+  "gpc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "gpl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "gsrp": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "gfsb": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "ghrp": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "gmrp": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "tbsc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "gsc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "gpp": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "ggc": {
+    "blueprints": {
+    },
+    "modifications": [
     ]
   },
   "pa": {
@@ -3627,6 +3756,7 @@
       "power",
       "range",
       "reload",
+      "shotspeed",
       "rof",
       "thermload"
     ],
@@ -3635,8 +3765,14 @@
       "special_dispersal_field",
       "special_phasing_sequence",
       "special_plasma_slug",
+      "special_plasma_slug_cooled",
       "special_lock_breaker",
-      "special_thermal_conduit"
+      "special_thermal_conduit",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "pas": {
@@ -3851,6 +3987,16 @@
               "Marco Qwent",
               "The Dweller"
             ]
+          },
+          "4": {
+            "engineers": [
+              "The Dweller"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "The Dweller"
+            ]
           }
         }
       },
@@ -3946,6 +4092,16 @@
               "Marco Qwent",
               "The Dweller"
             ]
+          },
+          "4": {
+            "engineers": [
+              "The Dweller"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "The Dweller"
+            ]
           }
         }
       },
@@ -3971,6 +4127,16 @@
               "Marco Qwent",
               "The Dweller"
             ]
+          },
+          "4": {
+            "engineers": [
+              "The Dweller"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "The Dweller"
+            ]
           }
         }
       }
@@ -3986,6 +4152,13 @@
       "sysrate",
       "wepcap",
       "weprate"
+    ],
+    "specials": [
+      "special_powerdistributor_capacity",
+      "special_powerdistributor_fast",
+      "special_powerdistributor_efficient",
+      "special_powerdistributor_toughened",
+      "special_powerdistributor_lightweight"
     ]
   },
   "pl": {
@@ -4274,7 +4447,12 @@
       "special_emissive_munitions",
       "special_phasing_sequence",
       "special_scramble_spectrum",
-      "special_thermalshock"
+      "special_thermalshock",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "po": {
@@ -4440,6 +4618,17 @@
               "Hera Tani",
               "Marco Qwent"
             ]
+          },
+          "4": {
+            "engineers": [
+              "Hera Tani",
+              "Marco Qwent"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "Hera Tani"
+            ]
           }
         }
       },
@@ -4483,6 +4672,12 @@
       "integrity",
       "mass",
       "pgen"
+    ],
+    "specials": [
+      "special_powerplant_highcharge",
+      "special_powerplant_cooled",
+      "special_powerplant_toughened",
+      "special_powerplant_lightweight"
     ]
   },
   "psg": {
@@ -4629,7 +4824,6 @@
       }
     },
     "modifications": [
-      "boot",
       "brokenregen",
       "distdraw",
       "explres",
@@ -4640,8 +4834,17 @@
       "optmul",
       "power",
       "regen",
-      "thermload",
       "thermres"
+    ],
+    "specials": [
+      "special_shield_regenerative",
+      "special_shield_resistive",
+      "special_shield_health",
+      "special_shield_efficient",
+      "special_shield_thermic",
+      "special_shield_kinetic",
+      "special_shield_toughened",
+      "special_shield_lightweight"
     ]
   },
   "pv": {
@@ -4867,8 +5070,16 @@
     ],
     "specials": [
       "special_feedback_cascade",
+      "special_feedback_cascade_cooled",
       "special_plasma_slug",
-      "special_super_penetrator"
+      "special_plasma_slug_cooled",
+      "special_super_penetrator",
+      "special_super_penetrator_cooled",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "s": {
@@ -4879,7 +5090,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4888,7 +5099,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4897,7 +5108,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4906,7 +5117,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4915,7 +5126,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4929,7 +5140,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4939,7 +5150,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4949,7 +5160,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4958,7 +5169,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4966,7 +5177,7 @@
           "5": {
             "engineers": [
               "Bill Turner",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4980,7 +5191,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4990,7 +5201,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5000,7 +5211,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5009,7 +5220,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5017,7 +5228,7 @@
           "5": {
             "engineers": [
               "Bill Turner",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5041,19 +5252,19 @@
             "engineers": [
               "Didi Vatermann",
               "Felicity Farseer",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "2": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "3": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "4": {
@@ -5074,19 +5285,19 @@
             "engineers": [
               "Didi Vatermann",
               "Felicity Farseer",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "2": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "3": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "4": {
@@ -5107,19 +5318,19 @@
             "engineers": [
               "Didi Vatermann",
               "Felicity Farseer",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "2": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "3": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "4": {
@@ -5140,19 +5351,19 @@
             "engineers": [
               "Didi Vatermann",
               "Felicity Farseer",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "2": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "3": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "4": {
@@ -5173,19 +5384,19 @@
             "engineers": [
               "Didi Vatermann",
               "Felicity Farseer",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "2": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "3": {
             "engineers": [
               "Didi Vatermann",
-              "Lei Chung"
+              "Lei Cheung"
             ]
           },
           "4": {
@@ -5209,6 +5420,14 @@
       "power",
       "shieldboost",
       "thermres"
+    ],
+    "specials": [
+      "special_shieldbooster_thermic",
+      "special_shieldbooster_kinetic",
+      "special_shieldbooster_explosive",
+      "special_shieldbooster_efficient",
+      "special_shieldbooster_toughened",
+      "special_shieldbooster_chunky"
     ]
   },
   "sfn": {
@@ -5276,6 +5495,13 @@
       "shieldreinforcement",
       "spinup",
       "thermload"
+    ],
+    "specials": [
+      "special_shieldcell_gradual",
+      "special_shieldcell_oversized",
+      "special_shieldcell_efficient",
+      "special_shieldcell_toughened",
+      "special_shieldcell_lightweight"
     ]
   },
   "sg": {
@@ -5422,7 +5648,6 @@
       }
     },
     "modifications": [
-      "boot",
       "brokenregen",
       "distdraw",
       "explres",
@@ -5433,8 +5658,17 @@
       "optmul",
       "power",
       "regen",
-      "thermload",
       "thermres"
+    ],
+    "specials": [
+      "special_shield_regenerative",
+      "special_shield_resistive",
+      "special_shield_health",
+      "special_shield_efficient",
+      "special_shield_thermic",
+      "special_shield_kinetic",
+      "special_shield_toughened",
+      "special_shield_lightweight"
     ]
   },
   "ss": {
@@ -5446,7 +5680,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5456,7 +5690,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5466,7 +5700,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5475,7 +5709,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson"
             ]
           },
@@ -5483,7 +5717,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson"
             ]
           }
@@ -5496,7 +5730,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5506,7 +5740,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5516,7 +5750,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5525,7 +5759,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson"
             ]
           },
@@ -5533,7 +5767,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson"
             ]
           }
@@ -5546,7 +5780,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5556,7 +5790,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5566,7 +5800,7 @@
               "Bill Turner",
               "Felicity Farseer",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5575,7 +5809,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson"
             ]
           },
@@ -5583,7 +5817,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
+              "Lei Cheung",
               "Lori Jameson"
             ]
           }
@@ -5715,6 +5949,13 @@
       "optmul",
       "power",
       "thermload"
+    ],
+    "specials": [
+      "special_engine_cooled",
+      "special_engine_haulage",
+      "special_engine_overloaded",
+      "special_engine_toughened",
+      "special_engine_lightweight"
     ]
   },
   "tp": {
@@ -5801,7 +6042,14 @@
     "specials": [
       "special_mass_lock_munition",
       "special_penetrator_payload",
-      "special_reverberating_cascade"
+      "special_reverberating_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight",
+      "special_deep_cut_payload",
+      "special_mass_lock"
     ]
   },
   "ul": {
@@ -6092,7 +6340,12 @@
       "special_inertial_impact",
       "special_phasing_sequence",
       "special_scramble_spectrum",
-      "special_thermalshock"
+      "special_thermalshock",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "ws": {
@@ -6325,5 +6578,29 @@
       "range",
       "scantime"
     ]
+  },
+  "tbem": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "tbrfl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "dtl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "mahr": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
   }
 }

modifications/specials.json

@@ -1,36 +1,548 @@
 {
-    "special_auto_loader": {"id": 0, "edname": "special_auto_loader", "name": "Auto loader"},
-    "special_choke_canister": {"id": 1, "edname": "special_choke_canister", "name": "Choke canister"},
-    "special_concordant_sequence": {"id": 2, "edname": "special_concordant_sequence", "name": "Concordant sequence"},
-    "special_corrosive_shell": {"id": 3, "edname": "special_corrosive_shell", "name": "Corrosive shell"},
-    "special_blinding_shell": {"id": 4, "edname": "special_blinding_shell", "name": "Dazzle shell"},
-    "special_dispersal_field": {"id": 5, "edname": "special_dispersal_field", "name": "Dispersal field"},
-    "special_distortion_field": {"id": 6, "edname": "special_distortion_field", "name": "Distortion field"},
-    "special_drag_munitions": {"id": 7, "edname": "special_drag_munitions", "name": "Drag munitions"},
-    "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
-    "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
-    "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
-    "special_fsd_interrupt": {"id": 33, "edname": "special_fsd_interrupt", "name": "FSD interrupt"},
-    "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
-    "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
-    "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},
-    "special_ion_disruptor": {"id": 13, "edname": "special_ion_disruptor", "name": "Ion disruptor"},
-    "special_mass_lock_munition": {"id": 14, "edname": "special_mass_lock_munition", "name": "Mass lock munition"},
-    "special_overload_munitions": {"id": 15, "edname": "special_overload_munitions", "name": "Overload munitions"},
-    "special_penetrator_payload": {"id": 16, "edname": "special_penetrator_payload", "name": "Penetrator payload"},
-    "special_phasing_sequence": {"id": 17, "edname": "special_phasing_sequence", "name": "Phasing sequence"},
-    "special_plasma_slug": {"id": 18, "edname": "special_plasma_slug", "name": "Plasma slug"},
-    "special_radiant_canister": {"id": 19, "edname": "special_radiant_canister", "name": "Radiant Canister"},
-    "special_regeneration_sequence": {"id": 20, "edname": "special_regeneration_sequence", "name": "Regeneration sequence"},
-    "special_reverberating_cascade": {"id": 21, "edname": "special_reverberating_cascade", "name": "Reverberating cascade"},
-    "special_scramble_spectrum": {"id": 22, "edname": "special_scramble_spectrum", "name": "Scramble spectrum"},
-    "special_screening_shell": {"id": 23, "edname": "special_screening_shell", "name": "Screening shell"},
-    "special_shiftlock_canister": {"id": 24, "edname": "special_shiftlock_canister", "name": "Shift-lock canister"},
-    "special_smart_rounds": {"id": 25, "edname": "special_smart_rounds", "name": "Smart rounds"},
-    "special_super_penetrator": {"id": 26, "edname": "special_super_penetrator", "name": "Super penetrator"},
-    "special_lock_breaker": {"id": 27, "edname": "special_lock_breaker", "name": "Target lock breaker"},
-    "special_thermal_cascade": {"id": 28, "edname": "special_thermal_cascade", "name": "Thermal cascade"},
-    "special_thermal_conduit": {"id": 29, "edname": "special_thermal_conduit", "name": "Thermal conduit"},
-    "special_thermal_vent": {"id": 30, "edname": "special_thermal_vent", "name": "Thermal vent"},
-    "special_thermalshock": {"id": 31, "edname": "special_thermalshock", "name": "Thermal shock"}
-}
+    "special_auto_loader": {
+        "id": 0,
+        "edname": "special_auto_loader",
+        "name": "Auto loader",
+        "uuid": "640d6dde-f497-42cd-8bc9-73ab3fa1b43a"
+    },
+    "special_choke_canister": {
+        "id": 1,
+        "edname": "special_choke_canister",
+        "name": "Choke canister",
+        "uuid": "770007e7-398c-40ce-be02-22b227728aef"
+    },
+    "special_concordant_sequence": {
+        "id": 2,
+        "edname": "special_concordant_sequence",
+        "name": "Concordant sequence",
+        "uuid": "b556c19a-e756-45b1-846f-9ddc61af18a9"
+    },
+    "special_corrosive_shell": {
+        "id": 3,
+        "edname": "special_corrosive_shell",
+        "name": "Corrosive shell",
+        "uuid": "a6faa870-ff89-4e48-b607-424e065cbd43"
+    },
+    "special_blinding_shell": {
+        "id": 4,
+        "edname": "special_blinding_shell",
+        "name": "Dazzle shell",
+        "uuid": "0a1e29ee-2fc7-4cbd-bbda-e8803c3e03ac"
+    },
+    "special_dispersal_field": {
+        "id": 5,
+        "edname": "special_dispersal_field",
+        "name": "Dispersal field",
+        "uuid": "0e2dbd63-335d-4dca-8050-c7ca8ddc56b0"
+    },
+    "special_distortion_field": {
+        "id": 6,
+        "edname": "special_distortion_field",
+        "name": "Distortion field",
+        "uuid": "4da956d5-df5b-4d4f-8651-22fd5e343454"
+    },
+    "special_drag_munitions": {
+        "id": 7,
+        "edname": "special_drag_munitions",
+        "name": "Drag munitions",
+        "uuid": "ca4cd540-660a-4fba-b38d-179f72125819"
+    },
+    "special_emissive_munitions": {
+        "id": 8,
+        "edname": "special_emissive_munitions",
+        "name": "Emissive munitions",
+        "uuid": "16c9ed0f-63c0-4ff2-b2e0-59bbb294632d"
+    },
+    "special_feedback_cascade": {
+        "id": 9,
+        "edname": "special_feedback_cascade",
+        "name": "Feedback cascade (Legacy)",
+        "uuid": "fe22ebee-802a-4905-b390-f59a65c1394c"
+    },
+    "special_force_shell": {
+        "id": 10,
+        "edname": "special_force_shell",
+        "name": "Force shell",
+        "uuid": "62056851-d2f2-474d-ba77-66c030c900e9"
+    },
+    "special_fsd_interrupt": {
+        "id": 33,
+        "edname": "special_fsd_interrupt",
+        "name": "FSD interrupt",
+        "uuid": "c1400054-1c2b-487c-8854-7a22d96d4cd2"
+    },
+    "special_high_yield_shell": {
+        "id": 11,
+        "edname": "special_high_yield_shell",
+        "name": "High yield shell",
+        "uuid": "a950b42c-204f-4775-a0c5-21bfcec1fd14"
+    },
+    "special_incendiary_rounds": {
+        "id": 12,
+        "edname": "special_incendiary_rounds",
+        "name": "Incendiary rounds",
+        "uuid": "3526773e-a814-4bec-afbf-30db79a3e239"
+    },
+    "special_inertial_impact": {
+        "id": 32,
+        "edname": "special_inertial_impact",
+        "name": "Inertial impact",
+        "uuid": "6eda22d3-8049-4bab-a125-762b12fa576a"
+    },
+    "special_ion_disruptor": {
+        "id": 13,
+        "edname": "special_ion_disruptor",
+        "name": "Ion disruptor",
+        "uuid": "d84e40ca-afc1-4b01-9940-034152d288e7"
+    },
+    "special_mass_lock_munition": {
+        "id": 14,
+        "edname": "special_mass_lock_munition",
+        "name": "Mass lock munition",
+        "uuid": "8565714f-912d-488b-82fb-43911504a300"
+    },
+    "special_overload_munitions": {
+        "id": 15,
+        "edname": "special_overload_munitions",
+        "name": "Overload munitions",
+        "uuid": "c157bbd1-a14d-4aa2-9081-94cbfbdee558"
+    },
+    "special_penetrator_payload": {
+        "id": 16,
+        "edname": "special_penetrator_payload",
+        "name": "Penetrator payload",
+        "uuid": "39e3bb85-e349-434b-b9fe-7fd02ee57f3d"
+    },
+    "special_phasing_sequence": {
+        "id": 17,
+        "edname": "special_phasing_sequence",
+        "name": "Phasing sequence",
+        "uuid": "47254ea9-c88f-43e0-9166-d1796649917b"
+    },
+    "special_plasma_slug": {
+        "id": 18,
+        "edname": "special_plasma_slug",
+        "name": "Plasma slug (Legacy)",
+        "uuid": "8794e18a-ecd5-4ebc-afd7-0b7d0d0cdd91"
+    },
+    "special_radiant_canister": {
+        "id": 19,
+        "edname": "special_radiant_canister",
+        "name": "Radiant Canister",
+        "uuid": "51f84837-e9a5-432c-a125-d4322099266c"
+    },
+    "special_regeneration_sequence": {
+        "id": 20,
+        "edname": "special_regeneration_sequence",
+        "name": "Regeneration sequence",
+        "uuid": "3bece1bb-7c31-4735-8c18-54dc4a0057bc"
+    },
+    "special_reverberating_cascade": {
+        "id": 21,
+        "edname": "special_reverberating_cascade",
+        "name": "Reverberating cascade",
+        "uuid": "c03e2f4f-9520-44bb-9a1f-7a917e8e3a48"
+    },
+    "special_scramble_spectrum": {
+        "id": 22,
+        "edname": "special_scramble_spectrum",
+        "name": "Scramble spectrum",
+        "uuid": "4f42cb92-4440-4295-ada9-fcca788a65b8"
+    },
+    "special_screening_shell": {
+        "id": 23,
+        "edname": "special_screening_shell",
+        "name": "Screening shell",
+        "uuid": "9cf533fc-ccb1-4c92-8b6b-dd700af2988a"
+    },
+    "special_shiftlock_canister": {
+        "id": 24,
+        "edname": "special_shiftlock_canister",
+        "name": "Shift-lock canister",
+        "uuid": "1f7b0deb-e023-43e5-96f6-ebf60d683e8b"
+    },
+    "special_smart_rounds": {
+        "id": 25,
+        "edname": "special_smart_rounds",
+        "name": "Smart rounds",
+        "uuid": "2a3d8519-27af-44f2-a50b-33095964d1cc"
+    },
+    "special_super_penetrator": {
+        "id": 26,
+        "edname": "special_super_penetrator",
+        "name": "Super penetrator (Legacy)",
+        "uuid": "2423e8f7-2384-4d32-8b9d-0e06a42a301d"
+    },
+    "special_lock_breaker": {
+        "id": 27,
+        "edname": "special_lock_breaker",
+        "name": "Target lock breaker",
+        "uuid": "4cf42ed8-574f-4bb8-a1f2-ee154475b463"
+    },
+    "special_thermal_cascade": {
+        "id": 28,
+        "edname": "special_thermal_cascade",
+        "name": "Thermal cascade",
+        "uuid": "e5c8cab4-7a2f-450d-a937-2d0d8b9e3714"
+    },
+    "special_thermal_conduit": {
+        "id": 29,
+        "edname": "special_thermal_conduit",
+        "name": "Thermal conduit",
+        "uuid": "4e4e1f59-6762-47ff-b1fa-40ca43304698"
+    },
+    "special_thermal_vent": {
+        "id": 30,
+        "edname": "special_thermal_vent",
+        "name": "Thermal vent",
+        "uuid": "70f11414-7904-405c-92db-806178ee9df4"
+    },
+    "special_thermalshock": {
+        "id": 31,
+        "edname": "special_thermalshock",
+        "name": "Thermal shock",
+        "uuid": "fe8b4daa-e65d-464c-811d-400d3632a3d6"
+    },
+    "special_feedback_cascade_cooled": {
+        "name": "Feedback Cascade",
+        "id": 100,
+        "edname": "special_feedback_cascade_cooled",
+        "uuid": "3c153755-3d2c-4832-bb73-d6b3d0e99a71"
+    },
+    "special_super_penetrator_cooled": {
+        "name": "Super Penetrator",
+        "id": 101,
+        "edname": "special_super_penetrator_cooled",
+        "uuid": "4bb4ec50-40fb-473d-abaf-4fc386aa889c"
+    },
+    "special_plasma_slug_cooled": {
+        "name": "Plasma Slug",
+        "id": 102,
+        "edname": "special_plasma_slug_cooled",
+        "uuid": "58a7b1b6-57b9-40f2-9a5a-712a5388a5eb"
+    },
+    "special_penetrator_munitions": {
+        "name": "Penetrator Munitions",
+        "id": 103,
+        "edname": "special_penetrator_munitions",
+        "uuid": "35578402-1bc7-4d19-828b-af31ebd79866"
+    },
+    "special_deep_cut_payload": {
+        "name": "Penetrator Payload",
+        "id": 104,
+        "edname": "special_deep_cut_payload",
+        "uuid": "5d25c5bc-4b45-4119-bd87-71bfd0f85957"
+    },
+    "special_mass_lock": {
+        "name": "Mass Lock Munition",
+        "id": 105,
+        "edname": "special_mass_lock",
+        "uuid": "9e8635af-4077-4d7a-98dd-5220c8722688"
+    },
+    "special_shield_regenerative": {
+        "name": "Fast Charge",
+        "id": 106,
+        "edname": "special_shield_regenerative",
+        "uuid": "42c5e92d-ccab-435a-b2c6-fd268d39d6f5"
+    },
+    "special_shield_resistive": {
+        "name": "Multi-weave",
+        "id": 107,
+        "edname": "special_shield_resistive",
+        "uuid": "dd46c8be-730c-4671-87fe-f98b181b66cf"
+    },
+    "special_shield_health": {
+        "name": "Hi-Cap",
+        "id": 108,
+        "edname": "special_shield_health",
+        "uuid": "603c1ba6-45e6-4401-af56-639c3e7c9b79"
+    },
+    "special_shield_efficient": {
+        "name": "Lo-draw",
+        "id": 109,
+        "edname": "special_shield_efficient",
+        "uuid": "66a39288-59d7-4cfb-914d-354a200c0210"
+    },
+    "special_shield_thermic": {
+        "name": "Thermo Block",
+        "id": 110,
+        "edname": "special_shield_thermic",
+        "uuid": "c7636c6b-5849-4cad-bd8e-d99968d4014e"
+    },
+    "special_shield_kinetic": {
+        "name": "Force Block",
+        "id": 111,
+        "edname": "special_shield_kinetic",
+        "uuid": "3f9e7ca8-7e07-46c4-ad06-cf3787352201"
+    },
+    "special_shield_toughened": {
+        "name": "Double Braced",
+        "id": 112,
+        "edname": "special_shield_toughened",
+        "uuid": "d7d8433c-445c-4d8e-b4a4-3bd78cba9d15"
+    },
+    "special_shield_lightweight": {
+        "name": "Stripped Down",
+        "id": 113,
+        "edname": "special_shield_lightweight",
+        "uuid": "91ff72db-51cf-428d-80a8-be96d6418c4b"
+    },
+    "special_engine_cooled": {
+        "name": "Thermal Spread",
+        "id": 114,
+        "edname": "special_engine_cooled",
+        "uuid": "42ff1374-3ecb-4872-abfa-b39b495fb203"
+    },
+    "special_engine_haulage": {
+        "name": "Drive Distributors",
+        "id": 115,
+        "edname": "special_engine_haulage",
+        "uuid": "bd3c1991-370e-4b9d-b8cd-d5dec3260647"
+    },
+    "special_engine_overloaded": {
+        "name": "Drag Drives",
+        "id": 116,
+        "edname": "special_engine_overloaded",
+        "uuid": "68998b16-7b65-4f58-8bc0-6e0f2686c367"
+    },
+    "special_engine_toughened": {
+        "name": "Double Braced",
+        "id": 117,
+        "edname": "special_engine_toughened",
+        "uuid": "41b04d96-0817-479b-92e5-2114de444170"
+    },
+    "special_engine_lightweight": {
+        "name": "Stripped Down",
+        "id": 118,
+        "edname": "special_engine_lightweight",
+        "uuid": "dd77b197-412e-4ca1-88ed-0939c5c31a01"
+    },
+    "special_fsd_fuelcapacity": {
+        "name": "Deep Charge",
+        "id": 119,
+        "edname": "special_fsd_fuelcapacity",
+        "uuid": "56f1e58d-2044-4a31-8b54-ad0f99dfd64e"
+    },
+    "special_fsd_heavy": {
+        "name": "Mass Manager",
+        "id": 120,
+        "edname": "special_fsd_heavy",
+        "uuid": "4d7d30c3-970b-4c6e-a507-89ac7e6441bd"
+    },
+    "special_fsd_toughened": {
+        "name": "Double Braced",
+        "id": 121,
+        "edname": "special_fsd_toughened",
+        "uuid": "14c7f016-5c32-4599-8a27-caa1733f92e3"
+    },
+    "special_fsd_lightweight": {
+        "name": "Stripped Down",
+        "id": 122,
+        "edname": "special_fsd_lightweight",
+        "uuid": "6ab9d9d4-d488-4de8-9c1b-089a31f290a0"
+    },
+    "special_fsd_cooled": {
+        "name": "Thermal Spread",
+        "id": 123,
+        "edname": "special_fsd_cooled",
+        "uuid": "60ab0728-c8cd-47c9-a357-8c8bfeeb7023"
+    },
+    "special_powerplant_highcharge": {
+        "name": "Monstered",
+        "id": 124,
+        "edname": "special_powerplant_highcharge",
+        "uuid": "12a57a09-0e05-41a9-9824-14a3618e7a0f"
+    },
+    "special_powerplant_cooled": {
+        "name": "Thermal Spread",
+        "id": 125,
+        "edname": "special_powerplant_cooled",
+        "uuid": "6cda2960-a05b-4dd1-978c-202d746e47bc"
+    },
+    "special_powerplant_toughened": {
+        "name": "Double Braced",
+        "id": 126,
+        "edname": "special_powerplant_toughened",
+        "uuid": "1fddaba5-bc0b-492c-9caa-4a72a149532b"
+    },
+    "special_powerplant_lightweight": {
+        "name": "Stripped Down",
+        "id": 127,
+        "edname": "special_powerplant_lightweight",
+        "uuid": "11b258eb-36d1-4cbc-be04-7fc426ef3121"
+    },
+    "special_powerdistributor_capacity": {
+        "name": "Cluster Capacitors",
+        "id": 128,
+        "edname": "special_powerdistributor_capacity",
+        "uuid": "c4231886-f988-4a31-a749-2a58550f9e44"
+    },
+    "special_powerdistributor_fast": {
+        "name": "Super Conduits",
+        "id": 129,
+        "edname": "special_powerdistributor_fast",
+        "uuid": "b5bb35a1-e851-4d37-8f26-8fe828f84c95"
+    },
+    "special_powerdistributor_efficient": {
+        "name": "Flow Control",
+        "id": 130,
+        "edname": "special_powerdistributor_efficient",
+        "uuid": "c226afaf-ee7f-4809-a4e4-0797d4822a69"
+    },
+    "special_powerdistributor_toughened": {
+        "name": "Double Braced",
+        "id": 131,
+        "edname": "special_powerdistributor_toughened",
+        "uuid": "14d36c9b-efd5-450b-8175-80287daecd78"
+    },
+    "special_powerdistributor_lightweight": {
+        "name": "Stripped Down",
+        "id": 132,
+        "edname": "special_powerdistributor_lightweight",
+        "uuid": "ec53deaf-ece6-443f-9503-dd3dc5329e14"
+    },
+    "special_shieldcell_gradual": {
+        "name": "Recycling Cell",
+        "id": 133,
+        "edname": "special_shieldcell_gradual",
+        "uuid": "c8aa2134-3153-47b8-a367-9c5dbb9c557d"
+    },
+    "special_shieldcell_oversized": {
+        "name": "Boss Cells",
+        "id": 134,
+        "edname": "special_shieldcell_oversized",
+        "uuid": "87ed0cec-9624-4ecb-8ffb-cc941464e8d2"
+    },
+    "special_shieldcell_efficient": {
+        "name": "Flow Control",
+        "id": 135,
+        "edname": "special_shieldcell_efficient",
+        "uuid": "1d2316b8-3ddb-4db4-b36f-2d3e0e8581b5"
+    },
+    "special_shieldcell_toughened": {
+        "name": "Double Braced",
+        "id": 136,
+        "edname": "special_shieldcell_toughened",
+        "uuid": "beecd33b-b171-4a08-9d5a-459266bcb275"
+    },
+    "special_shieldcell_lightweight": {
+        "name": "Stripped Down",
+        "id": 137,
+        "edname": "special_shieldcell_lightweight",
+        "uuid": "b92c2e2e-baa5-4ce9-bf60-05771d7dcbc1"
+    },
+    "special_weapon_damage": {
+        "name": "Oversized",
+        "id": 138,
+        "edname": "special_weapon_damage",
+        "uuid": "ceb5c729-4565-4869-ade8-5ee897e8b410"
+    },
+    "special_weapon_rateoffire": {
+        "name": "Multi-servos",
+        "id": 139,
+        "edname": "special_weapon_rateoffire",
+        "uuid": "fd62292f-f5ed-4728-bc8a-3ae215ced386"
+    },
+    "special_weapon_efficient": {
+        "name": "Flow Control",
+        "id": 140,
+        "edname": "special_weapon_efficient",
+        "uuid": "d7ae7537-52ce-402a-b997-1cc463d8c7d0"
+    },
+    "special_weapon_toughened": {
+        "name": "Double Braced",
+        "id": 141,
+        "edname": "special_weapon_toughened",
+        "uuid": "167892c7-c4bd-411e-af8a-5bb464beec29"
+    },
+    "special_weapon_lightweight": {
+        "name": "Stripped Down",
+        "id": 142,
+        "edname": "special_weapon_lightweight",
+        "uuid": "dfc22aad-48b8-4f8d-af16-ec3b978fc8b6"
+    },
+    "special_armour_thermic": {
+        "name": "Reflective Plating",
+        "id": 143,
+        "edname": "special_armour_thermic",
+        "uuid": "dfe731fd-b709-4bbb-989b-5190bba4aa0e"
+    },
+    "special_armour_kinetic": {
+        "name": "Angled Plating",
+        "id": 144,
+        "edname": "special_armour_kinetic",
+        "uuid": "4803f4b3-f8ac-44a6-a6da-8d4c94aee048"
+    },
+    "special_armour_explosive": {
+        "name": "Layered Plating",
+        "id": 145,
+        "edname": "special_armour_explosive",
+        "uuid": "2af2d71c-b511-49a0-a605-22cfce862a63"
+    },
+    "special_armour_chunky": {
+        "name": "Deep Plating",
+        "id": 146,
+        "edname": "special_armour_chunky",
+        "uuid": "c4318e14-d50c-49ff-984f-bacae4aaa334"
+    },
+    "special_hullreinforcement_thermic": {
+        "name": "Reflective Plating",
+        "id": 147,
+        "edname": "special_hullreinforcement_thermic",
+        "uuid": "6c88aa33-01db-4eda-928e-6ca8b9b1bc3d"
+    },
+    "special_hullreinforcement_kinetic": {
+        "name": "Angled Plating",
+        "id": 148,
+        "edname": "special_hullreinforcement_kinetic",
+        "uuid": "e8631809-2915-4373-905c-8dcf3bda6921"
+    },
+    "special_hullreinforcement_explosive": {
+        "name": "Layered Plating",
+        "id": 149,
+        "edname": "special_hullreinforcement_explosive",
+        "uuid": "cdd19fcc-74b4-463a-a8f1-2e9909da664f"
+    },
+    "special_hullreinforcement_chunky": {
+        "name": "Deep Plating",
+        "id": 150,
+        "edname": "special_hullreinforcement_chunky",
+        "uuid": "b51706cc-d412-4559-8654-f812d2eb44b9"
+    },
+    "special_shieldbooster_thermic": {
+        "name": "Thermo Block",
+        "id": 151,
+        "edname": "special_shieldbooster_thermic",
+        "uuid": "c3340df8-c6da-49c9-b236-8f1cc4209088"
+    },
+    "special_shieldbooster_kinetic": {
+        "name": "Force Block",
+        "id": 152,
+        "edname": "special_shieldbooster_kinetic",
+        "uuid": "cb95d9b4-a945-491d-95ad-e230c0454cd9"
+    },
+    "special_shieldbooster_explosive": {
+        "name": "Blast Block",
+        "id": 153,
+        "edname": "special_shieldbooster_explosive",
+        "uuid": "eb1c4a92-03ef-4263-8051-9ac91b2d43b2"
+    },
+    "special_shieldbooster_efficient": {
+        "name": "Flow Control",
+        "id": 154,
+        "edname": "special_shieldbooster_efficient",
+        "uuid": "441e1d85-5174-4172-85ea-caee8d3c632d"
+    },
+    "special_shieldbooster_toughened": {
+        "name": "Double Braced",
+        "id": 155,
+        "edname": "special_shieldbooster_toughened",
+        "uuid": "32cb80c0-bb11-49ea-ae21-4c94eb5f9195"
+    },
+    "special_shieldbooster_chunky": {
+        "name": "Super Capacitors",
+        "id": 156,
+        "edname": "special_shieldbooster_chunky",
+        "uuid": "4197c308-a3df-442a-91c2-db856b4f57cf"
+    }
+}

modules/hardpoints/enzyme_missile_rack.json

@@ -0,0 +1,33 @@
+{
+  "tbem": [
+    {
+      "rating": "B",
+      "class": 2,
+      "grp": "tbem",
+      "id": "xt",
+      "eddbID": 0,
+      "edID": 128833995,
+      "mount": "F",
+      "cost": 480501,
+      "mass": 4,
+      "integrity": 51,
+      "power": 1.2,
+      "damage": 5,
+      "distdraw": 0.08,
+      "thermload": 1.5,
+      "piercing": 60,
+      "shotspeed": 750,
+      "rof": 0.5,
+      "clip": 8,
+      "ammo": 64,
+      "reload": 5,
+      "breachdmg": 0,
+      "breachmin": 0.8,
+      "breachmax": 1,
+      "symbol": "Hpt_CausticMissile_Fixed_Medium",
+      "damagedist": {
+          "E": 1
+      }
+    }
+  ]
+}

modules/hardpoints/fragment_cannon.json

@@ -139,7 +139,7 @@
       "breachmin": 0.4,
       "class": 2,
       "clip": 3,
-      "cost": 437800,
+      "cost": 437761,
       "damage": 2.275,
       "damagedist": {
         "K": 1
@@ -332,4 +332,4 @@
       "symbol": "Hpt_Slugshot_Fixed_Large_Range"
     }
   ]
-}
+}

modules/hardpoints/guardian_gauss_cannon.json

@@ -0,0 +1,72 @@
+{
+  "ggc": [
+    {
+      "ammo": 80,
+      "breachdmg": 11,
+      "breachmax": 0.4,
+      "breachmin": 0.2,
+      "class": 1,
+      "clip": 1,
+      "cost": 167250,
+      "damage": 22,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3.8,
+      "edID": 0,
+      "eddbID": 0,
+      "falloff": 1500,
+      "grp": "ggc",
+      "id": "yL",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "F",
+      "piercing": 140,
+      "power": 1.91,
+      "range": 3000,
+      "rating": "D",
+      "reload": 1,
+      "rof": 1.2,
+      "thermload": 15,
+      "symbol": "Hpt_Guardian_GaussCannon_Fixed_Small",
+      "requirements": {
+        "horizons": true
+      }
+    },
+    {
+      "ammo": 80,
+      "breachdmg": 35,
+      "breachmax": 0.4,
+      "breachmin": 0.2,
+      "burst": 1,
+      "burstrof": 0.83,
+      "class": 2,
+      "clip": 1,
+      "cost": 543801,
+      "damage": 70,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 7.20,
+      "edID": 128833687,
+      "eddbID": 876,
+      "falloff": 1500,
+      "grp": "ggc",
+      "id": "0H",
+      "integrity": 42,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 140,
+      "power": 2.61,
+      "range": 3000,
+      "rating": "B",
+      "reload": 1,
+      "rof": 1.205,
+      "thermload": 25,
+      "symbol": "Hpt_Guardian_GaussCannon_Fixed_Medium",
+      "requirements": {
+        "horizons": true
+      }
+    }
+  ]
+}

modules/hardpoints/guardian_plasma_charger.json

@@ -0,0 +1,190 @@
+{
+  "gpc": [
+    {
+      "ammo": 200,
+      "breachdmg": 0.4,
+      "breachmax": 0.8,
+      "breachmin": 0.5,
+      "class": 1,
+      "clip": 15,
+      "cost": 176500,
+      "damage": 1.7,
+      "damagedist": {
+        "A": 1
+      },
+      "distdraw": 0.68,
+      "edID": 0,
+      "eddbID": 0,
+      "falloff": 1000,
+      "grp": "gpc",
+      "id": "yN",
+      "integrity": 34,
+      "mass": 2,
+      "mount": "F",
+      "piercing": 65,
+      "power": 1.4,
+      "range": 3000,
+      "rating": "D",
+      "reload": 3,
+      "rof": 5,
+      "shotspeed": 1200,
+      "thermload": 4.2,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Fixed_Small"
+    },
+    {
+      "ammo": 200,
+      "breachdmg": 0.3,
+      "breachmax": 0.8,
+      "breachmin": 0.5,
+      "class": 1,
+      "clip": 15,
+      "cost": 484050,
+      "damage": 1.1,
+      "damagedist": {
+        "A": 1
+      },
+      "distdraw": 0.8,
+      "edID": 0,
+      "eddbID": 0,
+      "falloff": 1000,
+      "grp": "gpc",
+      "id": "yM",
+      "integrity": 34,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 65,
+      "power": 1.6,
+      "range": 3000,
+      "rating": "F",
+      "reload": 3,
+      "rof": 5,
+      "shotspeed": 1200,
+      "thermload": 5,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Small"
+    },
+    {
+      "ammo": 200,
+      "breachdmg": 0.7,
+      "breachmax": 0.8,
+      "breachmin": 0.5,
+      "class": 2,
+      "clip": 15,
+      "cost": 567761,
+      "damage": 5,
+      "damagedist": {
+        "A": 1
+      },
+      "distdraw": 13.6,
+      "edID": 128833998,
+      "eddbID": 874,
+      "falloff": 1000,
+      "grp": "gpc",
+      "id": "0J",
+      "integrity": 42,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 80,
+      "power": 2.13,
+      "range": 3500,
+      "rating": "B",
+      "reload": 3,
+      "rof": 5,
+      "shotspeed": 1200,
+      "thermload": 5.2,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Fixed_Medium"
+    },
+    {
+      "ammo": 200,
+      "breachdmg": 1.0,
+      "breachmax": 0.8,
+      "breachmin": 0.5,
+      "class": 2,
+      "clip": 15,
+      "cost": 1659200,
+      "damage": 4,
+      "damagedist": {
+        "A": 1
+      },
+      "distdraw": 13.6,
+      "edID": 128833999,
+      "eddbID": 874,
+      "falloff": 1000,
+      "grp": "gpc",
+      "id": "0I",
+      "integrity": 42,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 80,
+      "power": 2.01,
+      "range": 3500,
+      "rating": "E",
+      "reload": 3,
+      "rof": 5,
+      "shotspeed": 1200,
+      "thermload": 5.8,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Medium"
+    },
+    {
+      "rating": "C",
+      "class": 3,
+      "grp": "gpc",
+      "id": "xu",
+      "eddbID": 0,
+      "edID": 128834783,
+      "mount": "F",
+      "cost": 1423301,
+      "mass": 8,
+      "integrity": 51,
+      "power": 3.10,
+      "damage": 3.4,
+      "distdraw": 2.42,
+      "thermload": 6.2,
+      "piercing": 95,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 5,
+      "clip": 15,
+      "ammo": 200,
+      "reload": 3,
+      "breachdmg": 1,
+      "breachmin": 0.5,
+      "breachmax": 0.8,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Fixed_Large",
+      "damagedist": {
+        "A": 1
+      },
+      "falloff": 1000
+    },
+    {
+      "ammo": 200,
+      "breachdmg": 0.8,
+      "breachmax": 0.8,
+      "breachmin": 0.5,
+      "class": 3,
+      "clip": 15,
+      "cost": 5495200,
+      "damage": 3.3,
+      "damagedist": {
+        "A": 1
+      },
+      "distdraw": 2.6,
+      "edID": 128834784,
+      "eddbID": 0,
+      "falloff": 1000,
+      "grp": "gpc",
+      "id": "xv",
+      "integrity": 51,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 95,
+      "power": 2.53,
+      "range": 3000,
+      "rating": "D",
+      "reload": 3,
+      "rof": 5,
+      "shotspeed": 1200,
+      "thermload": 6.4,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Large"
+    }
+  ]
+}

modules/hardpoints/guardian_shard_cannon.json

@@ -0,0 +1,202 @@
+{
+  "gsc": [
+    {
+      "rating": "D",
+      "class": 1,
+      "grp": "gsc",
+      "id": "yO",
+      "eddbID": 0,
+      "edID": 0,
+      "mount": "F",
+      "cost": 151650,
+      "mass": 2,
+      "integrity": 34,
+      "power": 0.87,
+      "damage": 2,
+      "distdraw": 0.42,
+      "thermload": 0.7,
+      "piercing": 30,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "roundspershot": 12,
+      "clip": 5,
+      "ammo": 180,
+      "reload": 5,
+      "breachdmg": 1.6,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "symbol": "Hpt_Guardian_ShardCannon_Fixed_Small",
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    },
+    {
+      "rating": "F",
+      "class": 1,
+      "grp": "gsc",
+      "id": "yP",
+      "eddbID": 0,
+      "edID": 0,
+      "mount": "T",
+      "cost": 502000,
+      "mass": 2,
+      "integrity": 34,
+      "power": 0.72,
+      "damage": 1.1,
+      "distdraw": 0.36,
+      "thermload": 0.6,
+      "piercing": 30,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "roundspershot": 12,
+      "clip": 5,
+      "ammo": 180,
+      "reload": 5,
+      "breachdmg": 0.9,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "symbol": "Hpt_Guardian_ShardCannon_Turret_Small",
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    },
+    {
+      "rating": "A",
+      "class": 2,
+      "grp": "gsc",
+      "id": "2P",
+      "eddbID": 0,
+      "edID": 128834000,
+      "mount": "F",
+      "cost": 507761,
+      "mass": 4,
+      "integrity": 42,
+      "power": 1.21,
+      "damage": 3.7,
+      "distdraw": 0.65,
+      "thermload": 1.2,
+      "piercing": 45,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "roundspershot": 12,
+      "clip": 5,
+      "ammo": 180,
+      "reload": 5,
+      "breachdmg": 3,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "symbol": "Hpt_Guardian_ShardCannon_Fixed_Medium",
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    },
+    {
+      "rating": "D",
+      "class": 2,
+      "grp": "gsc",
+      "id": "xw",
+      "eddbID": 0,
+      "edID": 0,
+      "mount": "T",
+      "cost": 1767001,
+      "mass": 4,
+      "integrity": 42,
+      "power": 1.16,
+      "damage": 2.4,
+      "distdraw": 0.57,
+      "thermload": 1.1,
+      "piercing": 45,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "roundspershot": 12,
+      "clip": 5,
+      "ammo": 180,
+      "reload": 5,
+      "breachdmg": 1.9,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "symbol": "Hpt_Guardian_ShardCannon_Turret_Medium",
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    },
+    {
+      "rating": "C",
+      "class": 3,
+      "grp": "gsc",
+      "id": "2Q",
+      "eddbID": 0,
+      "edID": 128834778,
+      "mount": "F",
+      "cost": 1461350,
+      "mass": 8,
+      "integrity": 51,
+      "power": 1.68,
+      "damage": 5.2,
+      "distdraw": 1.4,
+      "thermload": 2.2,
+      "piercing": 60,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "clip": 5,
+      "ammo": 180,
+      "roundspershot": 12,
+      "reload": 5,
+      "breachdmg": 4.2,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "symbol": "Hpt_Guardian_ShardCannon_Fixed_Large",
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    },
+    {
+      "rating": "D",
+      "class": 3,
+      "grp": "gsc",
+      "id": "xx",
+      "eddbID": 0,
+      "edID": 128834779,
+      "mount": "T",
+      "cost": 5865026,
+      "mass": 8,
+      "integrity": 51,
+      "power": 1.39,
+      "damage": 3.4,
+      "distdraw": 1.2,
+      "thermload": 2.0,
+      "piercing": 60,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "clip": 5,
+      "ammo": 180,
+      "roundspershot": 12,
+      "reload": 5,
+      "breachdmg": 2.7,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "symbol": "Hpt_Guardian_ShardCannon_Turret_Large",
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    }
+  ]
+}

modules/hardpoints/mining_laser.json

@@ -77,7 +77,8 @@
       "pp": "Zemina Torval",
       "range": 2000,
       "rating": "D",
-      "thermload": 6
+      "thermload": 6,
+      "symbol": "Hpt_MiningLaser_Fixed_Small_Advanced"
     },
     {
       "breachdmg": 0.6,
@@ -110,7 +111,7 @@
       "breachmax": 0.2,
       "breachmin": 0.1,
       "class": 2,
-      "cost": 32590,
+      "cost": 32578,
       "damage": 4,
       "damagedist": {
         "T": 1
@@ -132,4 +133,4 @@
       "symbol": "Hpt_MiningLaser_Turret_Medium"
     }
   ]
-}
+}

modules/hardpoints/missile_rack.json

@@ -190,6 +190,66 @@
       "shotspeed": 600,
       "thermload": 3.6,
       "symbol": "Hpt_DrunkMissileRack_Fixed_Medium"
+    },
+    {
+      "ammo": 96,
+      "breachdmg": 20,
+      "breachmax": 1,
+      "breachmin": 1,
+      "class": 3,
+      "clip": 12,
+      "cost": 1021501,
+      "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
+      "edID": 0,
+      "eddbID": 0,
+      "grp": "mr",
+      "id": "yI",
+      "integrity": 64,
+      "mass": 8,
+      "missile": "D",
+      "mount": "F",
+      "piercing": 60,
+      "power": 1.62,
+      "rating": "A",
+      "reload": 5,
+      "rof": 0.5,
+      "shotspeed": 750,
+      "thermload": 3.6,
+      "symbol": "Hpt_DumbfireMissileRack_Fixed_Large"
+    },
+    {
+      "ammo": 36,
+      "breachdmg": 16,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 3,
+      "clip": 6,
+      "cost": 1471030,
+      "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
+      "edID": 0,
+      "eddbID": 0,
+      "grp": "mr",
+      "id": "yJ",
+      "integrity": 64,
+      "mass": 8,
+      "missile": "S",
+      "mount": "F",
+      "piercing": 60,
+      "power": 1.62,
+      "rating": "A",
+      "reload": 12,
+      "rof": 0.333,
+      "shotspeed": 625,
+      "thermload": 3.6,
+      "symbol": "Hpt_BasicMissileRack_Fixed_Large"
     }
   ]
 }

modules/hardpoints/multi_cannon.json

@@ -123,7 +123,8 @@
       "reload": 4,
       "rof": 4.3,
       "shotspeed": 1800,
-      "thermload": 0.2
+      "thermload": 0.2,
+      "symbol": "Hpt_MultiCannon_Fixed_Small_Strong"
     },
     {
       "ammo": 2100,
@@ -280,6 +281,37 @@
       "thermload": 0.34,
       "symbol": "Hpt_MultiCannon_Gimbal_Large"
     },
+    {
+      "ammo": 2100,
+      "breachdmg": 2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 90,
+      "cost": 3794601,
+      "damage": 2.2,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.16,
+      "edID": 0,
+      "eddbID": 0,
+      "falloff": 2000,
+      "grp": "mc",
+      "id": "yH",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 54,
+      "power": 0.86,
+      "range": 4000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 5.3,
+      "shotspeed": 1600,
+      "thermload": 0.2,
+      "symbol": "Hpt_MultiCannon_Turret_Large"
+    },
     {
       "ammo": 2100,
       "breachdmg": 4.2,
@@ -345,4 +377,4 @@
       "symbol": "Hpt_MultiCannon_Gimbal_Huge"
     }
   ]
-}
+}

modules/hardpoints/pulse_laser.json

@@ -187,7 +187,8 @@
       "pp": "Felicia Winters",
       "rating": "E",
       "rof": 1.664,
-      "thermload": 1
+      "thermload": 1,
+      "symbol": "Hpt_PulseLaser_Fixed_Medium_Disruptor"
     },
     {
       "breachdmg": 5.1,
@@ -325,4 +326,4 @@
       "symbol": "Hpt_PulseLaser_Gimbal_Huge"
     }
   ]
-}
+}

modules/hardpoints/remote_release_flechette_launcher.json

@@ -0,0 +1,62 @@
+{
+  "tbrfl": [
+    {
+      "rating": "B",
+      "class": 2,
+      "grp": "tbrfl",
+      "id": "xy",
+      "eddbID": 0,
+      "edID": 128833996,
+      "mount": "F",
+      "cost": 353761,
+      "mass": 4,
+      "integrity": 51,
+      "power": 1.2,
+      "damage": 13,
+      "distdraw": 0.24,
+      "thermload": 3.6,
+      "piercing": 80,
+      "shotspeed": 550,
+      "rof": 0.5,
+      "clip": 1,
+      "ammo": 72,
+      "reload": 2,
+      "breachdmg": 6.5,
+      "breachmin": 1,
+      "breachmax": 1,
+      "symbol": "Hpt_FlechetteLauncher_Fixed_Medium",
+      "damagedist": {
+        "K": 1
+      }
+    },
+    {
+      "rating": "B",
+      "class": 2,
+      "grp": "tbrfl",
+      "id": "yF",
+      "eddbID": 0,
+      "edID": 128833997,
+      "mount": "T",
+      "cost": 1279200,
+      "mass": 4,
+      "integrity": 51,
+      "power": 1.2,
+      "damage": 13,
+      "distdraw": 0.24,
+      "thermload": 3.6,
+      "piercing": 70,
+      "shotspeed": 550,
+      "rof": 0.5,
+      "clip": 1,
+      "ammo": 72,
+      "reload": 2,
+      "breachdmg": 6.5,
+      "breachmin": 1,
+      "breachmax": 1,
+      "symbol": "Hpt_FlechetteLauncher_Turret_Medium",
+      "damagedist": {
+        "K": 1
+      }
+    }
+  ]
+}

modules/hardpoints/shield_booster.json

@@ -13,6 +13,9 @@
       "power": 0.2,
       "rating": "E",
       "shieldboost": 0.04,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0,
       "symbol": "Hpt_ShieldBooster_Size0_Class1"
     },
     {
@@ -28,6 +31,9 @@
       "power": 0.5,
       "rating": "D",
       "shieldboost": 0.08,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0,
       "symbol": "Hpt_ShieldBooster_Size0_Class2"
     },
     {
@@ -43,6 +49,9 @@
       "power": 0.7,
       "rating": "C",
       "shieldboost": 0.12,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0,
       "symbol": "Hpt_ShieldBooster_Size0_Class3"
     },
     {
@@ -58,6 +67,9 @@
       "power": 1,
       "rating": "B",
       "shieldboost": 0.16,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0,
       "symbol": "Hpt_ShieldBooster_Size0_Class4"
     },
     {
@@ -73,7 +85,10 @@
       "power": 1.2,
       "rating": "A",
       "shieldboost": 0.2,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0,
       "symbol": "Hpt_ShieldBooster_Size0_Class5"
     }
   ]
-}
+}

modules/hardpoints/shock_cannon.json

@@ -0,0 +1,287 @@
+{
+  "tbsc": [
+    {
+      "rating": "C",
+      "class": 3,
+      "grp": "tbsc",
+      "id": "yG",
+      "eddbID": 0,
+      "edID": 128834780,
+      "mount": "F",
+      "cost": 1015750,
+      "mass": 8,
+      "integrity": 64,
+      "power": 0.89,
+      "damage": 18.1,
+      "distdraw": 0.92,
+      "thermload": 2.7,
+      "piercing": 60,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "roundspershot": 0,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 12.7,
+      "breachmin": 0.4,
+      "breachmax": 0.8,
+      "jitter": 0,
+      "symbol": "Hpt_PlasmaShockCannon_Fixed_Large",
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
+    },
+    {
+      "rating": "C",
+      "class": 3,
+      "grp": "tbsc",
+      "ammo": 240,
+      "mass": 8,
+      "eddbID": 0,
+      "breachdmg": 10.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "clip": 16,
+      "damage": 14.9,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 1.07,
+      "falloff": 2500,
+      "integrity": 64,
+      "mount": "G",
+      "piercing": 60,
+      "power": 0.89,
+      "range": 3000,
+      "rof": 10,
+      "shotspeed": 1200,
+      "thermload": 3.1,
+      "cost": 2249050,
+      "reload": 6,
+      "id": "2N",
+      "edID": 128834781,
+      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Large"
+    },
+    {
+      "rating": "D",
+      "class": 3,
+      "grp": "tbsc",
+      "symbol": "Hpt_PlasmaShockCannon_Turret_Large",
+      "id": "xz",
+      "eddbID": 0,
+      "edID": 128834782,
+      "mount": "T",
+      "cost": 6050201,
+      "mass": 8,
+      "integrity": 64,
+      "power": 0.64,
+      "damage": 12.32,
+      "distdraw": 0.79,
+      "thermload": 2.2,
+      "piercing": 60,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 8.6,
+      "breachmin": 0.4,
+      "breachmax": 0.8,
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
+    },
+    {
+      "rating": "D",
+      "class": 2,
+      "grp": "tbsc",
+      "ammo": 240,
+      "mass": 4,
+      "eddbID": 0,
+      "breachdmg": 7.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "clip": 16,
+      "damage": 14.9,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.58,
+      "falloff": 2500,
+      "integrity": 51,
+      "mount": "G",
+      "piercing": 40,
+      "power": 0.89,
+      "range": 3000,
+      "rof": 10,
+      "reload": 6,
+      "shotspeed": 1200,
+      "thermload": 2.1,
+      "cost": 565200,
+      "id": "2O",
+      "edID": 128834003,
+      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Medium"
+    },
+    {
+      "grp": "tbsc",
+      "symbol": "Hpt_PlasmaShockCannon_Fixed_Medium",
+      "id": "y0",
+      "eddbID": 0,
+      "edID": 128834002,
+      "class": 2,
+      "rating": "D",
+      "mount": "F",
+      "cost": 367501,
+      "mass": 4,
+      "integrity": 51,
+      "power": 0.57,
+      "damage": 13,
+      "distdraw": 0.47,
+      "thermload": 1.8,
+      "piercing": 40,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 9.1,
+      "breachmin": 0.4,
+      "breachmax": 0.6,
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
+    },
+    {
+      "rating": "E",
+      "class": 2,
+      "grp": "tbsc",
+      "id": "0",
+      "eddbID": 0,
+      "edID": 128834004,
+      "mount": "T",
+      "cost": 1359200,
+      "mass": 4,
+      "integrity": 51,
+      "power": 0.5,
+      "damage": 9.0,
+      "distdraw": 0.39,
+      "thermload": 1.2,
+      "piercing": 40,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "roundspershot": 0,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 6.3,
+      "breachmin": 0.4,
+      "breachmax": 0.8,
+      "jitter": 0,
+      "symbol": "Hpt_PlasmaShockCannon_Turret_Medium",
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
+    },
+    {
+      "rating": "D",
+      "class": 1,
+      "grp": "tbsc",
+      "id": "yQ",
+      "eddbID": 0,
+      "edID": 0,
+      "mount": "F",
+      "cost": 65941,
+      "mass": 2,
+      "integrity": 40,
+      "power": 0.41,
+      "damage": 8.6,
+      "distdraw": 0.27,
+      "thermload": 1.1,
+      "piercing": 25,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 6,
+      "breachmin": 0.4,
+      "breachmax": 0.6,
+      "symbol": "Hpt_PlasmaShockCannon_Fixed_Small",
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
+    },
+    {
+      "rating": "E",
+      "class": 1,
+      "grp": "tbsc",
+      "ammo": 240,
+      "mass": 2,
+      "eddbID": 0,
+      "breachdmg": 4.8,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "clip": 16,
+      "damage": 6.9,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.39,
+      "falloff": 2500,
+      "integrity": 40,
+      "mount": "G",
+      "piercing": 25,
+      "power": 0.47,
+      "range": 3000,
+      "rof": 10,
+      "shotspeed": 1200,
+      "thermload": 1.5,
+      "cost": 137501,
+      "reload": 6,
+      "id": "yR",
+      "edID": 0,
+      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Small"
+    },
+    {
+      "rating": "F",
+      "class": 1,
+      "grp": "tbsc",
+      "symbol": "Hpt_PlasmaShockCannon_Turret_Small",
+      "id": "yS",
+      "eddbID": 0,
+      "edID": 0,
+      "mount": "T",
+      "cost": 364000,
+      "mass": 2,
+      "integrity": 40,
+      "power": 0.54,
+      "damage": 4.5,
+      "distdraw": 0.21,
+      "thermload": 0.7,
+      "piercing": 25,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 3.1,
+      "breachmin": 0.4,
+      "breachmax": 0.8,
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
+    }
+  ]
+}

modules/hardpoints/torpedo_pylon.json

@@ -59,6 +59,36 @@
       "shotspeed": 250,
       "thermload": 50,
       "symbol": "Hpt_AdvancedTorpPylon_Fixed_Medium"
+    },
+    {
+      "ammo": 4,
+      "breachdmg": 60,
+      "breachmax": 1,
+      "breachmin": 1,
+      "class": 3,
+      "clip": 4,
+      "cost": 157960,
+      "damage": 120,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0,
+      "edID": 0,
+      "eddbID": 0,
+      "grp": "tp",
+      "id": "yK",
+      "integrity": 64,
+      "mass": 8,
+      "missile": "S",
+      "mount": "F",
+      "piercing": 10000,
+      "power": 0.6,
+      "rating": "I",
+      "reload": 5,
+      "rof": 1,
+      "shotspeed": 250,
+      "thermload": 55,
+      "symbol": "Hpt_AdvancedTorpPylon_Fixed_Large"
     }
   ]
 }

modules/index.js

@@ -33,8 +33,14 @@ module.exports = {
     ec: require('./hardpoints/electronic_countermeasure').ec,
     hs: require('./hardpoints/heat_sink_launcher').hs,
     po: require('./hardpoints/point_defence').po,
+    gpc: require('./hardpoints/guardian_plasma_charger').gpc,
+    ggc: require('./hardpoints/guardian_gauss_cannon').ggc,
     sfn: require('./hardpoints/shutdown_field_neutraliser').sfn,
-    xs: require('./hardpoints/xeno_scanner').xs
+    xs: require('./hardpoints/xeno_scanner').xs,
+    tbsc: require('./hardpoints/shock_cannon').tbsc,
+    tbem: require('./hardpoints/enzyme_missile_rack.json').tbem,
+    tbrfl: require('./hardpoints/remote_release_flechette_launcher.json').tbrfl,
+    gsc: require('./hardpoints/guardian_shard_cannon').gsc
   },
   internal: {
     am: require('./internal/auto_field_maintenance_unit').am,
@@ -42,6 +48,7 @@ module.exports = {
     cr: require('./internal/cargo_rack').cr,
     cc: require('./internal/collector_limpet_controllers').cc,
     dc: require('./internal/docking_computer').dc,
+    dtl: require('./internal/decontamination_limpet_controller.json').dtl,
     fh: require('./internal/fighter_hangar').fh,
     fi: require('./internal/frame_shift_drive_interdictor').fi,
     fs: require('./internal/fuel_scoop').fs,
@@ -49,6 +56,7 @@ module.exports = {
     fx: require('./internal/fuel_transfer_limpet_controllers').fx,
     hb: require('./internal/hatch_breaker_limpet_controller').hb,
     hr: require('./internal/hull_reinforcement_package').hr,
+    mahr: require('./internal/meta_alloy_hull_reinforcement_package.json').mahr,
     mrp: require('./internal/module_reinforcement_package').mrp,
     pv: require('./internal/planetary_vehicle_hanger').pv,
     psg: require('./internal/pristmatic_shield_generator').psg,
@@ -62,6 +70,12 @@ module.exports = {
     scb: require('./internal/shield_cell_bank').scb,
     sg: require('./internal/shield_generator').sg,
     ss: require('./internal/surface_scanner').ss,
-    rpl: require('./internal/repair_limpet_controller').rpl
+    rpl: require('./internal/repair_limpet_controller').rpl,
+    rcpl: require('./internal/recon_limpet_controllers').rcpl,
+    rsl: require('./internal/research_limpet_controller.json').rsl,
+    gsrp: require('./internal/guardian_shield_reinforcement_package').gsrp,
+    gfsb: require('./internal/guardian_fsd_booster').gfsb,
+    ghrp: require('./internal/guardian_hull_reinforcement_package').ghrp,
+    gmrp: require('./internal/guardian_module_reinforcement_package').gmrp
   }
 }

modules/internal/bi_weave_shield_generator.json

@@ -153,7 +153,7 @@
     {
       "brokenregen": 11,
       "class": 7,
-      "cost": 8548200,
+      "cost": 8548186,
       "distdraw": 0.6,
       "edID": 128671337,
       "eddbID": 1536,
@@ -201,4 +201,4 @@
       "symbol": "Int_ShieldGenerator_Size8_Class3_Fast"
     }
   ]
-}
+}

modules/internal/business_passenger_cabin.json

@@ -2,7 +2,7 @@
   "pci": [
     {
       "class": 3,
-      "cost": 26720,
+      "cost": 26707,
       "edID": 128734692,
       "eddbID": 1568,
       "grp": "pci",
@@ -49,4 +49,4 @@
       "symbol": "Int_PassengerCabin_Size6_Class2"
     }
   ]
-}
+}

modules/internal/cargo_rack.json

@@ -9,6 +9,7 @@
       "grp": "cr",
       "id": "00",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size1_Class1"
     },
     {
@@ -20,6 +21,7 @@
       "grp": "cr",
       "id": "01",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size2_Class1"
     },
     {
@@ -31,6 +33,7 @@
       "grp": "cr",
       "id": "02",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size3_Class1"
     },
     {
@@ -42,6 +45,7 @@
       "grp": "cr",
       "id": "03",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size4_Class1"
     },
     {
@@ -53,6 +57,7 @@
       "grp": "cr",
       "id": "04",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size5_Class1"
     },
     {
@@ -64,6 +69,7 @@
       "grp": "cr",
       "id": "05",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size6_Class1"
     },
     {
@@ -75,6 +81,7 @@
       "grp": "cr",
       "id": "06",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size7_Class1"
     },
     {
@@ -86,6 +93,7 @@
       "grp": "cr",
       "id": "07",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CargoRack_Size8_Class1"
     },
     {
@@ -98,6 +106,7 @@
       "id": "1w",
       "name": "Corrosion Resistant",
       "rating": "E",
+      "mass": 0,
       "symbol": "Int_CorrosionProofCargoRack_Size1_Class1"
     },
     {
@@ -110,7 +119,34 @@
       "id": "1y",
       "name": "Corrosion Resistant",
       "rating": "F",
+      "mass": 0,
       "symbol": "Int_CorrosionProofCargoRack_Size1_Class2"
+    },
+    {
+      "cargo": 4,
+      "class": 2,
+      "cost": 12563,
+      "edID": 128681992,
+      "eddbID": 1552,
+      "grp": "cr",
+      "id": "0V",
+      "name": "Corrosion Resistant",
+      "rating": "F",
+      "mass": 0,
+      "symbol": "Int_CorrosionProofCargoRack_Size2_Class1"
+    },
+    {
+      "cargo": 16,
+      "class": 4,
+      "cost": 94330,
+      "edID": 128833944,
+      "eddbID": 1552,
+      "grp": "cr",
+      "id": "0W",
+      "name": "Corrosion Resistant",
+      "rating": "E",
+      "mass": 0,
+      "symbol": "Int_CorrosionProofCargoRack_Size4_Class1"
     }
   ]
-}
+}

modules/internal/decontamination_limpet_controller.json

@@ -0,0 +1,60 @@
+{
+  "dtl": [
+    {
+      "class": 1,
+      "cost": 3600,
+      "edID": 128793941,
+      "eddbID": 0,
+      "grp": "dtl",
+      "id": "y1",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Decontamination_Size1_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 16201,
+      "edID": 128793942,
+      "eddbID": 0,
+      "grp": "dtl",
+      "id": "y2",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 0.88,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Decontamination_Size3_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 145801,
+      "edID": 128793943,
+      "eddbID": 0,
+      "grp": "dtl",
+      "id": "y3",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.5,
+      "range": 1.3,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Decontamination_Size5_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 1312201,
+      "edID": 128793944,
+      "eddbID": 0,
+      "grp": "dtl",
+      "id": "y4",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "E",
+      "symbol": "Int_DroneControl_Decontamination_Size7_Class1"
+    }
+  ]
+}

modules/internal/economy_passenger_cabin.json

@@ -14,7 +14,7 @@
     },
     {
       "class": 3,
-      "cost": 8670,
+      "cost": 8659,
       "edID": 128734691,
       "eddbID": 1564,
       "grp": "pce",
@@ -61,4 +61,4 @@
       "symbol": "Int_PassengerCabin_Size6_Class1"
     }
   ]
-}
+}

modules/internal/fighter_hangar.json

@@ -3,7 +3,7 @@
     {
       "bays": 1,
       "class": 5,
-      "cost": 575660,
+      "cost": 575644,
       "edID": 128727930,
       "eddbID": 1562,
       "fightercost": 1030,
@@ -49,4 +49,4 @@
       "symbol": "Int_FighterBay_Size7_Class1"
     }
   ]
-}
+}

modules/internal/first_passenger_cabin.json

@@ -2,7 +2,7 @@
   "pcm": [
     {
       "class": 4,
-      "cost": 170600,
+      "cost": 170587,
       "edID": 128727924,
       "eddbID": 1572,
       "grp": "pcm",
@@ -14,7 +14,7 @@
     },
     {
       "class": 5,
-      "cost": 340540,
+      "cost": 340528,
       "edID": 128734695,
       "eddbID": 1573,
       "grp": "pcm",
@@ -37,4 +37,4 @@
       "symbol": "Int_PassengerCabin_Size6_Class3"
     }
   ]
-}
+}

modules/internal/fuel_scoop.json

@@ -470,7 +470,7 @@
     },
     {
       "class": 8,
-      "cost": 289042540,
+      "cost": 289042642,
       "edID": 128666683,
       "eddbID": 1285,
       "grp": "fs",
@@ -481,4 +481,4 @@
       "symbol": "Int_FuelScoop_Size8_Class5"
     }
   ]
-}
+}

modules/internal/guardian_fsd_booster.json

@@ -0,0 +1,74 @@
+{
+  "gfsb": [
+    {
+      "jumpboost": 4,
+      "integrity": 32,
+      "class": 1,
+      "cost": 405022,
+      "edID": 128833975,
+      "power": 0.75,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1H",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size1"
+    },
+    {
+      "jumpboost": 6,
+      "integrity": 32,
+      "class": 2,
+      "cost": 810521,
+      "edID": 128833976,
+      "power": 0.98,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1M",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size2"
+    },
+    {
+      "jumpboost": 7.75,
+      "integrity": 32,
+      "class": 3,
+      "cost": 1620431,
+      "edID": 128833977,
+      "power": 1.27,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1N",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size3"
+    },
+    {
+      "jumpboost": 9.25,
+      "integrity": 32,
+      "class": 4,
+      "cost": 3245013,
+      "edID": 128833978,
+      "power": 1.65,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1P",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size4"
+    },
+    {
+      "jumpboost": 10.5,
+      "integrity": 32,
+      "class": 5,
+      "cost": 6483101,
+      "edID": 128833979,
+      "power": 2.14,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1O",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size5"
+    }
+  ]
+}

modules/internal/guardian_hull_reinforcement_package.json

@@ -0,0 +1,174 @@
+{
+  "ghrp": [
+    {
+      "rating": "D",
+      "class": "1",
+      "mass": 1,
+      "id": "1V",
+      "edID": 128833946,
+      "eddbID": 0,
+      "power": 0.56,
+      "hullreinforcement": 138,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 30000,
+      "symbol": "Int_GuardianHullReinforcement_Size1_Class2",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "E",
+      "class": "1",
+      "mass": 2,
+      "id": "1W",
+      "edID": 128833945,
+      "eddbID": 0,
+      "power": 0.45,
+      "hullreinforcement": 100,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 10000,
+      "symbol": "Int_GuardianHullReinforcement_Size1_Class1",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "D",
+      "class": "2",
+      "mass": 2,
+      "id": "1X",
+      "edID": 128833948,
+      "eddbID": 0,
+      "power": 0.79,
+      "hullreinforcement": 238,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 72000,
+      "symbol": "Int_GuardianHullReinforcement_Size2_Class2",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "E",
+      "class": "2",
+      "mass": 4,
+      "id": "1Y",
+      "edID": 128833947,
+      "eddbID": 0,
+      "power": 0.68,
+      "hullreinforcement": 188,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 24000,
+      "symbol": "Int_GuardianHullReinforcement_Size2_Class1",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "D",
+      "class": "3",
+      "mass": 4,
+      "id": "1Z",
+      "edID": 128833950,
+      "eddbID": 0,
+      "power": 1.01,
+      "hullreinforcement": 325,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 172800,
+      "symbol": "Int_GuardianHullReinforcement_Size3_Class2",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "E",
+      "class": "3",
+      "mass": 8,
+      "id": "2A",
+      "edID": 128833949,
+      "eddbID": 0,
+      "power": 0.9,
+      "hullreinforcement": 288,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 57600,
+      "symbol": "Int_GuardianHullReinforcement_Size3_Class1",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "D",
+      "class": "4",
+      "mass": 8,
+      "edID": 128833952,
+      "eddbID": 0,
+      "power": 1.24,
+      "hullreinforcement": 413,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 414720,
+      "id": "2R",
+      "symbol": "Int_GuardianHullReinforcement_Size4_Class2",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "E",
+      "class": "4",
+      "mass": 16,
+      "edID": 128833951,
+      "eddbID": 0,
+      "power": 1.13,
+      "hullreinforcement": 375,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 138240,
+      "id": "2B",
+      "symbol": "Int_GuardianHullReinforcement_Size4_Class1",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "D",
+      "class": "5",
+      "mass": 16,
+      "edID": 128833954,
+      "eddbID": 0,
+      "power": 1.46,
+      "hullreinforcement": 488,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 995330,
+      "id": "2C",
+      "symbol": "Int_GuardianHullReinforcement_Size5_Class2",
+      "grp": "ghrp"
+    },
+    {
+      "rating": "E",
+      "class": "5",
+      "mass": 32,
+      "edID": 128833953,
+      "eddbID": 0,
+      "power": 1.35,
+      "hullreinforcement": 450,
+      "causres": 0.05,
+      "explres": 0,
+      "kinres": 0,
+      "thermres": 0.02,
+      "cost": 331778,
+      "id": "2D",
+      "symbol": "Int_GuardianHullReinforcement_Size5_Class1",
+      "grp": "ghrp"
+    }
+  ]
+}

modules/internal/guardian_module_reinforcement_package.json

@@ -0,0 +1,144 @@
+{
+  "gmrp": [
+    {
+      "rating": "D",
+      "class": "1",
+      "mass": 1,
+      "eddbID": 0,
+      "power": 0.34,
+      "protection": 0.6,
+      "integrity": 77,
+      "cost": 30000,
+      "id": "2E",
+      "edID": 128833956,
+      "symbol": "Int_GuardianModuleReinforcement_Size1_Class2",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "E",
+      "class": "1",
+      "mass": 2,
+      "eddbID": 0,
+      "power": 0.27,
+      "protection": 0.3,
+      "integrity": 85,
+      "cost": 10000,
+      "id": "2F",
+      "edID": 128833955,
+      "symbol": "Int_GuardianModuleReinforcement_Size1_Class1",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "D",
+      "class": "2",
+      "mass": 2,
+      "eddbID": 0,
+      "power": 0.47,
+      "protection": 0.6,
+      "integrity": 116,
+      "cost": 72000,
+      "id": "2G",
+      "edID": 128833958,
+      "symbol": "Int_GuardianModuleReinforcement_Size2_Class2",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "E",
+      "class": "2",
+      "mass": 4,
+      "eddbID": 0,
+      "power": 0.41,
+      "protection": 0.3,
+      "integrity": 127,
+      "cost": 24000,
+      "id": "2S",
+      "edID": 128833957,
+      "symbol": "Int_GuardianModuleReinforcement_Size2_Class1",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "D",
+      "class": "3",
+      "mass": 4,
+      "eddbID": 0,
+      "power": 0.61,
+      "protection": 0.6,
+      "integrity": 171,
+      "cost": 172800,
+      "id": "2H",
+      "edID": 128833960,
+      "symbol": "Int_GuardianModuleReinforcement_Size3_Class2",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "E",
+      "class": "3",
+      "mass": 8,
+      "eddbID": 0,
+      "power": 0.54,
+      "protection": 0.3,
+      "integrity": 187,
+      "cost": 57600,
+      "id": "2I",
+      "edID": 128833959,
+      "symbol": "Int_GuardianModuleReinforcement_Size3_Class1",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "D",
+      "class": "4",
+      "mass": 8,
+      "eddbID": 0,
+      "power": 0.74,
+      "protection": 0.6,
+      "integrity": 259,
+      "cost": 414720,
+      "id": "2J",
+      "edID": 128833962,
+      "symbol": "Int_GuardianModuleReinforcement_Size4_Class2",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "E",
+      "class": "4",
+      "mass": 16,
+      "eddbID": 0,
+      "power": 0.68,
+      "protection": 0.3,
+      "integrity": 286,
+      "cost": 138240,
+      "id": "2K",
+      "edID": 128833961,
+      "symbol": "Int_GuardianModuleReinforcement_Size4_Class1",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "D",
+      "class": "5",
+      "mass": 16,
+      "eddbID": 0,
+      "power": 0.88,
+      "protection": 0.6,
+      "integrity": 385,
+      "cost": 995330,
+      "id": "2L",
+      "edID": 128833964,
+      "symbol": "Int_GuardianModuleReinforcement_Size5_Class2",
+      "grp": "gmrp"
+    },
+    {
+      "rating": "E",
+      "class": "5",
+      "mass": 32,
+      "eddbID": 0,
+      "power": 0.81,
+      "protection": 0.3,
+      "integrity": 424,
+      "cost": 331778,
+      "id": "2M",
+      "edID": 128833963,
+      "symbol": "Int_GuardianModuleReinforcement_Size5_Class1",
+      "grp": "gmrp"
+    }
+  ]
+}

modules/internal/guardian_shield_reinforcement_package.json

@@ -0,0 +1,144 @@
+{
+  "gsrp": [
+    {
+      "shieldaddition": 44,
+      "integrity": 36,
+      "class": 1,
+      "cost": 10000,
+      "edID": 128833965,
+      "power": 0.35,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "0Z",
+      "mass": 2,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size1_Class1"
+    },
+    {
+      "shieldaddition": 61,
+      "integrity": 36,
+      "class": 1,
+      "cost": 30000,
+      "edID": 128833966,
+      "power": 0.46,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "0y",
+      "mass": 1,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size1_Class2"
+    },
+    {
+      "shieldaddition": 83,
+      "integrity": 36,
+      "class": 2,
+      "cost": 24000,
+      "edID": 128833967,
+      "power": 0.56,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "0z",
+      "mass": 4,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size2_Class1"
+    },
+    {
+      "shieldaddition": 105,
+      "integrity": 36,
+      "class": 2,
+      "cost": 72000,
+      "edID": 128833968,
+      "power": 0.67,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1E",
+      "mass": 2,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size2_Class2"
+    },
+    {
+      "shieldaddition": 143,
+      "integrity": 36,
+      "class": 3,
+      "cost": 172800,
+      "edID": 128833970,
+      "power": 0.84,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1F",
+      "mass": 4,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size3_Class2"
+    },
+    {
+      "shieldaddition": 127,
+      "integrity": 36,
+      "class": 3,
+      "cost": 57600,
+      "edID": 128833969,
+      "power": 0.74,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1G",
+      "mass": 8,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size3_Class1"
+    },
+    {
+      "shieldaddition": 165,
+      "integrity": 36,
+      "class": 4,
+      "cost": 138240,
+      "edID": 128833971,
+      "power": 0.95,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1I",
+      "mass": 16,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size4_Class1"
+    },
+    {
+      "shieldaddition": 182,
+      "integrity": 36,
+      "class": 4,
+      "cost": 414720,
+      "edID": 128833972,
+      "power": 1.05,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1J",
+      "mass": 8,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size4_Class2"
+    },
+    {
+      "shieldaddition": 215,
+      "integrity": 36,
+      "class": 5,
+      "cost": 995330,
+      "edID": 128833974,
+      "power": 1.26,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1K",
+      "mass": 16,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size5_Class2"
+    },
+    {
+      "shieldaddition": 198,
+      "integrity": 36,
+      "class": 5,
+      "cost": 331778,
+      "edID": 128833973,
+      "power": 1.16,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1L",
+      "mass": 32,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size5_Class1"
+    }
+  ]
+}

modules/internal/hatch_breaker_limpet_controller.json

@@ -292,7 +292,7 @@
       "eddbID": 1226,
       "grp": "hb",
       "id": "79",
-      "mass": 90,
+      "mass": 80,
       "maximum": 12,
       "power": 0.98,
       "range": 6.02,
@@ -301,4 +301,4 @@
       "symbol": "Int_DroneControl_ResourceSiphon_Size7_Class5"
     }
   ]
-}
+}

modules/internal/hull_reinforcement_package.json

@@ -6,6 +6,7 @@
       "cost": 5000,
       "edID": 128668537,
       "eddbID": 1373,
+      "causres": 0,
       "explres": 0.005,
       "grp": "hr",
       "id": "26",
@@ -21,6 +22,7 @@
       "cost": 15000,
       "edID": 128668538,
       "eddbID": 1374,
+      "causres": 0,
       "explres": 0.005,
       "grp": "hr",
       "id": "25",
@@ -36,6 +38,7 @@
       "cost": 12000,
       "edID": 128668539,
       "eddbID": 1375,
+      "causres": 0,
       "explres": 0.01,
       "grp": "hr",
       "id": "28",
@@ -51,6 +54,7 @@
       "cost": 36000,
       "edID": 128668540,
       "eddbID": 1376,
+      "causres": 0,
       "explres": 0.01,
       "grp": "hr",
       "id": "27",
@@ -66,6 +70,7 @@
       "cost": 28000,
       "edID": 128668541,
       "eddbID": 1377,
+      "causres": 0,
       "explres": 0.015,
       "grp": "hr",
       "id": "2a",
@@ -81,6 +86,7 @@
       "cost": 84000,
       "edID": 128668542,
       "eddbID": 1378,
+      "causres": 0,
       "explres": 0.015,
       "grp": "hr",
       "id": "29",
@@ -96,6 +102,7 @@
       "cost": 65000,
       "edID": 128668543,
       "eddbID": 1379,
+      "causres": 0,
       "explres": 0.02,
       "grp": "hr",
       "id": "2c",
@@ -111,6 +118,7 @@
       "cost": 195000,
       "edID": 128668544,
       "eddbID": 1380,
+      "causres": 0,
       "explres": 0.02,
       "grp": "hr",
       "id": "2b",
@@ -126,6 +134,7 @@
       "cost": 150000,
       "edID": 128668545,
       "eddbID": 1381,
+      "causres": 0,
       "explres": 0.025,
       "grp": "hr",
       "id": "2e",
@@ -141,6 +150,7 @@
       "cost": 450000,
       "edID": 128668546,
       "eddbID": 1382,
+      "causres": 0,
       "explres": 0.025,
       "grp": "hr",
       "id": "2d",
@@ -151,4 +161,4 @@
       "symbol": "Int_HullReinforcement_Size5_Class2"
     }
   ]
-}
+}

modules/internal/internal_fuel_tank.json

@@ -79,7 +79,7 @@
     },
     {
       "class": 8,
-      "cost": 5428400,
+      "cost": 5428431,
       "edID": 128064353,
       "eddbID": 1206,
       "fuel": 256,
@@ -89,4 +89,4 @@
       "symbol": "Int_FuelTank_Size8_Class3"
     }
   ]
-}
+}

modules/internal/luxury_passenger_cabin.json

@@ -14,7 +14,7 @@
     },
     {
       "class": 6,
-      "cost": 4974300,
+      "cost": 4974288,
       "edID": 128727929,
       "eddbID": 1576,
       "grp": "pcq",
@@ -25,4 +25,4 @@
       "symbol": "Int_PassengerCabin_Size6_Class4"
     }
   ]
-}
+}

modules/internal/meta_alloy_hull_reinforcement_package.json

@@ -0,0 +1,164 @@
+{
+  "mahr": [
+    {
+      "hullreinforcement": 72,
+      "class": 1,
+      "cost": 7501,
+      "edID": 128793117,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "y5",
+      "kinres": 0,
+      "mass": 2,
+      "rating": "E",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size1_Class1"
+    },
+    {
+      "hullreinforcement": 99,
+      "class": 1,
+      "cost": 22501,
+      "edID": 128793118,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "y6",
+      "kinres": 0,
+      "mass": 2,
+      "rating": "D",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size1_Class2"
+    },
+    {
+      "hullreinforcement": 135,
+      "class": 2,
+      "cost": 18000,
+      "edID": 128793119,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "y7",
+      "kinres": 0,
+      "mass": 4,
+      "rating": "E",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size2_Class1"
+    },
+    {
+      "hullreinforcement": 171,
+      "class": 2,
+      "cost": 54000,
+      "edID": 128793120,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "y8",
+      "kinres": 0,
+      "mass": 2,
+      "rating": "D",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size2_Class2"
+    },
+    {
+      "hullreinforcement": 207,
+      "class": 3,
+      "cost": 42000,
+      "edID": 128793121,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "y9",
+      "kinres": 0,
+      "mass": 8,
+      "rating": "E",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size3_Class1"
+    },
+    {
+      "hullreinforcement": 234,
+      "class": 3,
+      "cost": 126000,
+      "edID": 128793122,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "yA",
+      "kinres": 0,
+      "mass": 4,
+      "rating": "D",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size3_Class2"
+    },
+    {
+      "hullreinforcement": 270,
+      "class": 4,
+      "cost": 97501,
+      "edID": 128793123,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "yB",
+      "kinres": 0,
+      "mass": 16,
+      "rating": "E",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size4_Class1"
+    },
+    {
+      "hullreinforcement": 297,
+      "class": 4,
+      "cost": 292501,
+      "edID": 128793124,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "yC",
+      "kinres": 0,
+      "mass": 8,
+      "rating": "D",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size4_Class2"
+    },
+    {
+      "hullreinforcement": 324,
+      "class": 5,
+      "cost": 225001,
+      "edID": 128793125,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "yD",
+      "kinres": 0,
+      "mass": 32,
+      "rating": "E",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size5_Class1"
+    },
+    {
+      "hullreinforcement": 351,
+      "class": 5,
+      "cost": 675001,
+      "edID": 128793126,
+      "eddbID": 0,
+      "explres": 0,
+      "grp": "mahr",
+      "id": "yE",
+      "kinres": 0,
+      "mass": 16,
+      "rating": "D",
+      "thermres": 0,
+      "causres": 0.03,
+      "symbol": "Int_MetaAlloyHullReinforcement_Size5_Class2"
+    }
+  ]
+}

modules/internal/recon_limpet_controllers.json

@@ -0,0 +1,68 @@
+{
+  "rcpl": [
+    {
+      "class": 1,
+      "cost": 2600,
+      "edID": 128837858,
+      "eddbID": 1636,
+      "grp": "rcpl",
+      "id": "0L",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 1.2,
+      "rating": "E",
+      "integrity": 24,
+      "hacktime": 22,
+      "symbol": "Int_DroneControl_Recon_Size1_Class1"
+    },
+    {
+      "class": 3,
+      "cost": 8200,
+      "edID": 128841592,
+      "eddbID": 1637,
+      "grp": "rcpl",
+      "id": "0M",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.2,
+      "range": 1.4,
+      "rating": "E",
+      "integrity": 51,
+      "hacktime": 17,
+      "symbol": "Int_DroneControl_Recon_Size3_Class1"
+    },
+    {
+      "class": 5,
+      "cost": 75800,
+      "edID": 128841593,
+      "eddbID": 1638,
+      "grp": "rcpl",
+      "id": "0N",
+      "mass": 20,
+      "maximum": 1,
+      "power": 0.5,
+      "range": 1.7,
+      "rating": "E",
+      "integrity": 96,
+      "hacktime": 13,
+      "symbol": "Int_DroneControl_Recon_Size5_Class1"
+    },
+    {
+      "class": 7,
+      "cost": 612200,
+      "edID": 128841594,
+      "eddbID": 1639,
+      "grp": "rcpl",
+      "id": "0O",
+      "mass": 128,
+      "maximum": 1,
+      "power": 0.97,
+      "range": 2,
+      "rating": "E",
+      "integrity": 157,
+      "hacktime": 10,
+      "symbol": "Int_DroneControl_Recon_Size7_Class1"
+    }
+  ]
+}

modules/internal/research_limpet_controller.json

@@ -0,0 +1,20 @@
+{
+  "rsl": [
+    {
+      "rating": "E",
+      "class": 1,
+      "grp": "rsl",
+      "id": "0",
+      "eddbID": 1617,
+      "edID": 128793116,
+      "cost": 1749600,
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.4,
+      "range": 2000,
+      "symbol": "Int_DroneControl_UnkVesselResearch",
+      "time": 300,
+      "integrity": 20
+    }
+  ]
+}

modules/internal/shield_cell_bank.json

@@ -292,7 +292,7 @@
       "boot": 25,
       "class": 3,
       "clip": 1,
-      "cost": 61909,
+      "cost": 63333,
       "duration": 2,
       "edID": 128064311,
       "eddbID": 1164,
@@ -490,7 +490,7 @@
       "boot": 25,
       "class": 5,
       "clip": 1,
-      "cost": 194143,
+      "cost": 198612,
       "duration": 5,
       "edID": 128064320,
       "eddbID": 1173,
@@ -534,7 +534,7 @@
       "boot": 25,
       "class": 5,
       "clip": 1,
-      "cost": 1210285,
+      "cost": 1241319,
       "duration": 5,
       "edID": 128064322,
       "eddbID": 1175,
@@ -881,4 +881,4 @@
       "symbol": "Int_ShieldCellBank_Size8_Class5"
     }
   ]
-}
+}

modules/standard/frame_shift_drive.json

@@ -2,7 +2,7 @@
   "fsd": [
     {
       "class": 8,
-      "cost": 0,
+      "cost": 2007242,
       "edID": 128064133,
       "eddbID": 991,
       "fuelmul": 0.011,
@@ -13,13 +13,13 @@
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
-      "power": 0,
+      "power": 0.56,
       "rating": "E",
       "symbol": "Int_Hyperdrive_Size8_Class1"
     },
     {
       "class": 8,
-      "cost": 0,
+      "cost": 6021723,
       "edID": 128064134,
       "eddbID": 992,
       "fuelmul": 0.01,
@@ -30,13 +30,13 @@
       "mass": 64,
       "maxfuel": 0,
       "optmass": 0,
-      "power": 0,
+      "power": 0.63,
       "rating": "D",
       "symbol": "Int_Hyperdrive_Size8_Class2"
     },
     {
       "class": 8,
-      "cost": 0,
+      "cost": 18065166,
       "edID": 128064135,
       "eddbID": 993,
       "fuelmul": 0.008,
@@ -47,13 +47,13 @@
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
-      "power": 0,
+      "power": 0.7,
       "rating": "C",
       "symbol": "Int_Hyperdrive_Size8_Class3"
     },
     {
       "class": 8,
-      "cost": 0,
+      "cost": 54195496,
       "edID": 128064136,
       "eddbID": 994,
       "fuelmul": 0.01,
@@ -64,13 +64,13 @@
       "mass": 256,
       "maxfuel": 0,
       "optmass": 0,
-      "power": 0,
+      "power": 0.88,
       "rating": "B",
       "symbol": "Int_Hyperdrive_Size8_Class4"
     },
     {
       "class": 8,
-      "cost": 0,
+      "cost": 162586488,
       "edID": 128064137,
       "eddbID": 995,
       "fuelmul": 0.012,
@@ -81,7 +81,7 @@
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
-      "power": 0,
+      "power": 1.05,
       "rating": "A",
       "symbol": "Int_Hyperdrive_Size8_Class5"
     },
@@ -596,4 +596,4 @@
       "symbol": "Int_Hyperdrive_Size2_Class5"
     }
   ]
-}
+}

modules/standard/fuel_tank.json

@@ -6,6 +6,7 @@
       "edID": 128064346,
       "eddbID": 1199,
       "fuel": 2,
+      "mass": 0,
       "grp": "ft",
       "id": "f1",
       "rating": "C",
@@ -17,6 +18,7 @@
       "edID": 128064347,
       "eddbID": 1200,
       "fuel": 4,
+      "mass": 0,
       "grp": "ft",
       "id": "f2",
       "rating": "C",
@@ -28,6 +30,7 @@
       "edID": 128064348,
       "eddbID": 1201,
       "fuel": 8,
+      "mass": 0,
       "grp": "ft",
       "id": "f3",
       "rating": "C",
@@ -39,6 +42,7 @@
       "edID": 128064349,
       "eddbID": 1202,
       "fuel": 16,
+      "mass": 0,
       "grp": "ft",
       "id": "f4",
       "rating": "C",
@@ -50,6 +54,7 @@
       "edID": 128064350,
       "eddbID": 1203,
       "fuel": 32,
+      "mass": 0,
       "grp": "ft",
       "id": "f5",
       "rating": "C",
@@ -61,6 +66,7 @@
       "edID": 128064351,
       "eddbID": 1204,
       "fuel": 64,
+      "mass": 0,
       "grp": "ft",
       "id": "f6",
       "rating": "C",
@@ -72,6 +78,7 @@
       "edID": 128064352,
       "eddbID": 1205,
       "fuel": 128,
+      "mass": 0,
       "grp": "ft",
       "id": "f7",
       "rating": "C",
@@ -79,14 +86,15 @@
     },
     {
       "class": 8,
-      "cost": 5428400,
+      "cost": 5428431,
       "edID": 128064353,
       "eddbID": 1206,
       "fuel": 256,
+      "mass": 0,
       "grp": "ft",
       "id": "f8",
       "rating": "C",
       "symbol": "Int_FuelTank_Size8_Class3"
     }
   ]
-}
+}

modules/standard/life_support.json

@@ -48,7 +48,7 @@
     {
       "boot": 1,
       "class": 8,
-      "cost": 10899770,
+      "cost": 10899757,
       "edID": 128064176,
       "eddbID": 1034,
       "grp": "ls",
@@ -601,4 +601,4 @@
       "symbol": "Int_LifeSupport_Size1_Class5"
     }
   ]
-}
+}

modules/standard/power_distributor.json

@@ -759,6 +759,166 @@
       "wepcap": 14,
       "weprate": 1.8,
       "symbol": "Int_PowerDistributor_Size1_Class5"
+    },
+    {
+      "class": 1,
+      "cost": 40957,
+      "edID": 128833980,
+      "eddbID": 1040,
+      "engcap": 9,
+      "engrate": 0.8,
+      "grp": "pd",
+      "id": "0T",
+      "integrity": 56,
+      "mass": 1.4,
+      "power": 0.62,
+      "rating": "A",
+      "syscap": 10,
+      "sysrate": 0.8,
+      "wepcap": 10,
+      "weprate": 2.5,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size1"
+    },
+    {
+      "class": 2,
+      "cost": 111600,
+      "edID": 128833981,
+      "eddbID": 1040,
+      "engcap": 9,
+      "engrate": 0.8,
+      "grp": "pd",
+      "id": "0U",
+      "integrity": 56,
+      "mass": 2.6,
+      "power": 0.73,
+      "rating": "A",
+      "syscap": 10,
+      "sysrate": 0.8,
+      "wepcap": 10,
+      "weprate": 2.5,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size2"
+    },
+    {
+      "class": 3,
+      "cost": 311365,
+      "edID": 128833982,
+      "eddbID": 1040,
+      "engcap": 14,
+      "engrate": 1.7,
+      "grp": "pd",
+      "id": "0X",
+      "integrity": 56,
+      "mass": 5.25,
+      "power": 0.78,
+      "rating": "A",
+      "syscap": 14,
+      "sysrate": 1.7,
+      "wepcap": 13,
+      "weprate": 3.1,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size3"
+    },
+    {
+      "class": 4,
+      "cost": 868708,
+      "edID": 128833983,
+      "eddbID": 1040,
+      "engcap": 17,
+      "engrate": 2.5,
+      "grp": "pd",
+      "id": "1A",
+      "integrity": 56,
+      "mass": 10.5,
+      "power": 0.87,
+      "rating": "A",
+      "syscap": 14,
+      "sysrate": 1.7,
+      "wepcap": 22,
+      "weprate": 4.9,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size4"
+    },
+    {
+      "class": 5,
+      "cost": 2423690,
+      "edID": 128833984,
+      "eddbID": 1040,
+      "engcap": 22,
+      "engrate": 3.3,
+      "grp": "pd",
+      "id": "1E",
+      "integrity": 56,
+      "mass": 21,
+      "power": 0.96,
+      "rating": "A",
+      "syscap": 22,
+      "sysrate": 3.3,
+      "wepcap": 29,
+      "weprate": 6,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size5"
+    },
+    {
+      "class": 6,
+      "cost": 6762091,
+      "edID": 128833985,
+      "eddbID": 1040,
+      "engcap": 26,
+      "engrate": 4.2,
+      "grp": "pd",
+      "id": "1B",
+      "integrity": 56,
+      "mass": 42,
+      "power": 1.07,
+      "rating": "A",
+      "syscap": 26,
+      "sysrate": 4.2,
+      "wepcap": 35,
+      "weprate": 7.3,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size6"
+    },
+    {
+      "class": 7,
+      "cost": 18866235,
+      "edID": 128833986,
+      "eddbID": 1040,
+      "engcap": 31,
+      "engrate": 5.2,
+      "grp": "pd",
+      "id": "1C",
+      "integrity": 56,
+      "mass": 84,
+      "power": 1.16,
+      "rating": "A",
+      "syscap": 31,
+      "sysrate": 5.2,
+      "wepcap": 43,
+      "weprate": 8.5,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size7"
+    },
+    {
+      "class": 8,
+      "cost": 52636793,
+      "edID": 128833987,
+      "eddbID": 1040,
+      "engcap": 36,
+      "engrate": 6.2,
+      "grp": "pd",
+      "id": "1D",
+      "integrity": 56,
+      "mass": 168,
+      "power": 1.25,
+      "rating": "A",
+      "syscap": 36,
+      "sysrate": 6.2,
+      "wepcap": 50,
+      "weprate": 10.1,
+      "name": "Guardian Power Distributor",
+      "symbol": "Int_GuardianPowerDistributor_Size8"
     }
   ]
-}
+}

modules/standard/power_plant.json

@@ -2,7 +2,7 @@
   "pp": [
     {
       "class": 8,
-      "cost": 2007240,
+      "cost": 1441234,
       "edID": 128064063,
       "eddbID": 921,
       "eff": 1,
@@ -16,7 +16,7 @@
     },
     {
       "class": 8,
-      "cost": 6021720,
+      "cost": 4323700,
       "edID": 128064064,
       "eddbID": 922,
       "eff": 0.75,
@@ -30,7 +30,7 @@
     },
     {
       "class": 8,
-      "cost": 18065170,
+      "cost": 12971099,
       "edID": 128064065,
       "eddbID": 923,
       "eff": 0.5,
@@ -44,7 +44,7 @@
     },
     {
       "class": 8,
-      "cost": 54195500,
+      "cost": 38913291,
       "edID": 128064066,
       "eddbID": 924,
       "eff": 0.45,
@@ -58,7 +58,7 @@
     },
     {
       "class": 8,
-      "cost": 162586490,
+      "cost": 116739874,
       "edID": 128064067,
       "eddbID": 925,
       "eff": 0.4,
@@ -72,7 +72,7 @@
     },
     {
       "class": 7,
-      "cost": 633200,
+      "cost": 480411,
       "edID": 128064058,
       "eddbID": 916,
       "eff": 1,
@@ -86,7 +86,7 @@
     },
     {
       "class": 7,
-      "cost": 1899600,
+      "cost": 1441234,
       "edID": 128064059,
       "eddbID": 917,
       "eff": 0.75,
@@ -100,7 +100,7 @@
     },
     {
       "class": 7,
-      "cost": 5698790,
+      "cost": 4323700,
       "edID": 128064060,
       "eddbID": 918,
       "eff": 0.5,
@@ -114,7 +114,7 @@
     },
     {
       "class": 7,
-      "cost": 17096370,
+      "cost": 12971099,
       "edID": 128064061,
       "eddbID": 919,
       "eff": 0.45,
@@ -128,7 +128,7 @@
     },
     {
       "class": 7,
-      "cost": 51289110,
+      "cost": 38913291,
       "edID": 128064062,
       "eddbID": 920,
       "eff": 0.4,
@@ -142,7 +142,7 @@
     },
     {
       "class": 6,
-      "cost": 199750,
+      "cost": 160138,
       "edID": 128064053,
       "eddbID": 911,
       "eff": 1,
@@ -156,7 +156,7 @@
     },
     {
       "class": 6,
-      "cost": 599240,
+      "cost": 480411,
       "edID": 128064054,
       "eddbID": 912,
       "eff": 0.75,
@@ -170,7 +170,7 @@
     },
     {
       "class": 6,
-      "cost": 1797730,
+      "cost": 1441234,
       "edID": 128064055,
       "eddbID": 913,
       "eff": 0.5,
@@ -184,7 +184,7 @@
     },
     {
       "class": 6,
-      "cost": 5393180,
+      "cost": 4323700,
       "edID": 128064056,
       "eddbID": 914,
       "eff": 0.45,
@@ -198,7 +198,7 @@
     },
     {
       "class": 6,
-      "cost": 16179530,
+      "cost": 12971099,
       "edID": 128064057,
       "eddbID": 915,
       "eff": 0.4,
@@ -212,7 +212,7 @@
     },
     {
       "class": 5,
-      "cost": 63010,
+      "cost": 53380,
       "edID": 128064048,
       "eddbID": 906,
       "eff": 1,
@@ -226,7 +226,7 @@
     },
     {
       "class": 5,
-      "cost": 189040,
+      "cost": 160138,
       "edID": 128064049,
       "eddbID": 907,
       "eff": 0.75,
@@ -240,7 +240,7 @@
     },
     {
       "class": 5,
-      "cost": 567110,
+      "cost": 480411,
       "edID": 128064050,
       "eddbID": 908,
       "eff": 0.5,
@@ -254,7 +254,7 @@
     },
     {
       "class": 5,
-      "cost": 1701320,
+      "cost": 1441234,
       "edID": 128064051,
       "eddbID": 909,
       "eff": 0.45,
@@ -268,7 +268,7 @@
     },
     {
       "class": 5,
-      "cost": 5103950,
+      "cost": 4323700,
       "edID": 128064052,
       "eddbID": 910,
       "eff": 0.4,
@@ -282,7 +282,7 @@
     },
     {
       "class": 4,
-      "cost": 19880,
+      "cost": 17794,
       "edID": 128064043,
       "eddbID": 901,
       "eff": 1,
@@ -296,7 +296,7 @@
     },
     {
       "class": 4,
-      "cost": 59630,
+      "cost": 53380,
       "edID": 128064044,
       "eddbID": 902,
       "eff": 0.75,
@@ -310,7 +310,7 @@
     },
     {
       "class": 4,
-      "cost": 178900,
+      "cost": 160138,
       "edID": 128064045,
       "eddbID": 903,
       "eff": 0.5,
@@ -324,7 +324,7 @@
     },
     {
       "class": 4,
-      "cost": 536690,
+      "cost": 480411,
       "edID": 128064046,
       "eddbID": 904,
       "eff": 0.45,
@@ -338,7 +338,7 @@
     },
     {
       "class": 4,
-      "cost": 1610080,
+      "cost": 1441234,
       "edID": 128064047,
       "eddbID": 905,
       "eff": 0.4,
@@ -352,7 +352,7 @@
     },
     {
       "class": 3,
-      "cost": 6270,
+      "cost": 5932,
       "edID": 128064038,
       "eddbID": 896,
       "eff": 1,
@@ -366,7 +366,7 @@
     },
     {
       "class": 3,
-      "cost": 18810,
+      "cost": 17794,
       "edID": 128064039,
       "eddbID": 897,
       "eff": 0.75,
@@ -380,7 +380,7 @@
     },
     {
       "class": 3,
-      "cost": 56440,
+      "cost": 53380,
       "edID": 128064040,
       "eddbID": 898,
       "eff": 0.5,
@@ -394,7 +394,7 @@
     },
     {
       "class": 3,
-      "cost": 169300,
+      "cost": 160138,
       "edID": 128064041,
       "eddbID": 899,
       "eff": 0.45,
@@ -408,7 +408,7 @@
     },
     {
       "class": 3,
-      "cost": 507910,
+      "cost": 480411,
       "edID": 128064042,
       "eddbID": 900,
       "eff": 0.4,
@@ -464,7 +464,7 @@
     },
     {
       "class": 2,
-      "cost": 53410,
+      "cost": 53380,
       "edID": 128064036,
       "eddbID": 894,
       "eff": 0.45,
@@ -478,7 +478,7 @@
     },
     {
       "class": 2,
-      "cost": 160220,
+      "cost": 160138,
       "edID": 128064037,
       "eddbID": 895,
       "eff": 0.4,
@@ -489,6 +489,111 @@
       "pgen": 9.6,
       "rating": "A",
       "symbol": "Int_Powerplant_Size2_Class5"
+    },
+    {
+      "class": 2,
+      "cost": 192165,
+      "edID": 128833988,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0A",
+      "integrity": 56,
+      "mass": 1.5,
+      "pgen": 12.7,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size2"
+    },
+    {
+      "class": 3,
+      "cost": 576493,
+      "edID": 128833989,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0B",
+      "integrity": 70,
+      "mass": 2.9,
+      "pgen": 15.8,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size3"
+    },
+    {
+      "class": 4,
+      "cost": 1729480,
+      "edID": 128833990,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0C",
+      "integrity": 88,
+      "mass": 5.9,
+      "pgen": 20.6,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size4"
+    },
+    {
+      "class": 5,
+      "cost": 5188441,
+      "edID": 128833991,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0D",
+      "integrity": 106,
+      "mass": 11.7,
+      "pgen": 26.9,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size5"
+    },
+    {
+      "class": 6,
+      "cost": 15565317,
+      "edID": 128833992,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0E",
+      "integrity": 124,
+      "mass": 23.4,
+      "pgen": 33.3,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size6"
+    },
+    {
+      "class": 7,
+      "cost": 46695951,
+      "edID": 128833993,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0F",
+      "integrity": 144,
+      "mass": 46.8,
+      "pgen": 39.6,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size7"
+    },
+    {
+      "class": 8,
+      "cost": 140087850,
+      "edID": 128833994,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0G",
+      "integrity": 165,
+      "mass": 93.6,
+      "pgen": 47.5,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size8"
     }
   ]
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.9.1",
+  "version": "2.9.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"

ships/adder.json

@@ -15,7 +15,7 @@
       "hardness": 35,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.13625,
+      "pipSpeed": 0.13636363636364,
       "pitch": 38,
       "roll": 100,
       "yaw": 14,
@@ -23,11 +23,11 @@
     },
     "retailCost": 87810,
     "bulkheads": [
-      { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
-      { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5  }
+      { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
+      { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5  }
     ],
     "slots": {
       "standard": [3, 3, 3, 1, 2, 3, 3],

ships/alliance_challenger.json

@@ -0,0 +1,50 @@
+{
+  "alliance_challenger": {
+    "edID": 128816588,
+    "eddbID": 34,
+    "properties": {
+      "name": "Alliance Challenger",
+      "manufacturer": "Lakon",
+      "class": 2,
+      "hullCost": 28041035,
+      "speed": 130,
+      "boost": 310,
+      "boostEnergy": 19,
+      "baseShieldStrength": 220,
+      "baseArmour": 300,
+      "hardness": 65,
+      "hullMass": 450,
+      "masslock": 13,
+      "pipSpeed": 0.088709677419355,
+      "pitch": 32,
+      "roll": 90,
+      "yaw": 16,
+      "crew": 2
+    },
+    "retailCost": 30472265,
+    "requirements": {
+      "horizons": true
+    },
+    "bulkheads": [
+      { "id": "0K", "edID": 128816590, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "0P", "edID": 128816591, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "0Q", "edID": 128816592, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "0R", "edID": 128816593, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "0S", "edID": 128816594, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [6, 6, 5, 5, 6, 4, 4],
+      "hardpoints": [3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0],
+      "internal": [6, 6, 3, 3, 2, 2,
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
+      ]
+    },
+    "defaults": {
+      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["04", "4h", "01", "01", "2h", "", "", "", ""]
+    }
+  }
+}

ships/alliance_chieftain.json

@@ -1,7 +1,7 @@
 {
   "alliance_chieftain": {
     "edID": 128816574,
-    "eddbID": 12,
+    "eddbID": 33,
     "properties": {
       "name": "Alliance Chieftain",
       "manufacturer": "Lakon",
@@ -10,12 +10,12 @@
       "speed": 230,
       "boost": 330,
       "boostEnergy": 19,
-      "baseShieldStrength": 154,
+      "baseShieldStrength": 200,
       "baseArmour": 280,
       "hardness": 65,
       "hullMass": 400,
       "masslock": 13,
-      "pipSpeed": 0.03875,
+      "pipSpeed": 0.08695652173913,
       "pitch": 39,
       "roll": 92,
       "yaw": 16,
@@ -26,25 +26,25 @@
       "horizons": true
     },
     "bulkheads": [
-      { "id": "CI", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "CK", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "CL", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "CM", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "CI", "edID": 128816576, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "CJ", "edID": 128816577, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "CK", "edID": 128816578, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "CL", "edID": 128816579, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "CM", "edID": 128816580, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
       "hardpoints": [3, 3, 2, 1, 1, 1, 0, 0, 0, 0],
       "internal": [6, 5, 4, 2, 2,
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
       ]
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
-      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "4e", "02", "", "2h"]
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["04", "4e", "02", "", "2h", "", "", ""]
     }
   }
 }

ships/alliance_crusader.json

@@ -0,0 +1,51 @@
+{
+  "alliance_crusader": {
+    "edID": 128816581,
+    "eddbID": 0,
+    "properties": {
+      "name": "Alliance Crusader",
+      "manufacturer": "Lakon",
+      "class": 2,
+      "hullCost": 22866341,
+      "speed": 180,
+      "boost": 300,
+      "boostEnergy": 19,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
+      "hardness": 65,
+      "hullMass": 500,
+	  "masslock": 13,
+	  "fighterHangars": true,
+      "pipSpeed": 0.15833333333333,
+      "pitch": 32,
+      "roll": 80,
+      "yaw": 16,
+      "crew": 3
+    },
+    "retailCost": 19382252,
+    "requirements": {
+      "horizons": true
+    },
+    "bulkheads": [
+      { "id": "CI", "edID": 128816583, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "CJ", "edID": 128816584, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "CK", "edID": 128816585, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "CL", "edID": 128816586, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "CM", "edID": 128816587, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [6, 6, 5, 5, 6, 4, 4],
+      "hardpoints": [3, 2, 2, 1, 1, 1, 0, 0, 0, 0],
+      "internal": [6, 5, 3, 3, 2, 2,
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
+      ]
+    },
+    "defaults": {
+      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["04", "4e", "02", "", "2h", "", "", ""]
+    }
+  }
+}

ships/anaconda.json

@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 400,
       "masslock": 23,
-      "pipSpeed": 0.13875,
+      "pipSpeed": 0.13888888888889,
       "fighterHangars": true,
       "pitch": 25,
       "roll": 60,
@@ -24,18 +24,18 @@
     },
     "retailCost": 146969450,
     "bulkheads": [
-      { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],
       "hardpoints": [4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
       "internal": [
         7, 6, 6, 6, 5, 5, 5,
-        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 4, 4, 2
       ]
     },

ships/asp.json

@@ -23,11 +23,11 @@
     },
     "retailCost": 6661150,
     "bulkheads": [
-      { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [5, 5, 5, 4, 4, 5, 5],

ships/asp_scout.json

@@ -23,11 +23,11 @@
     },
     "retailCost": 3961150,
     "bulkheads": [
-      { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 4, 4, 4],

ships/beluga.json

@@ -28,11 +28,11 @@
       "horizons": true
     },
     "bulkheads": [
-      { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 7, 7, 8, 6, 5, 7],

ships/cobra_mk_iii.json

@@ -23,11 +23,11 @@
     },
     "retailCost": 349720,
     "bulkheads": [
-      { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 3, 3, 4],

ships/cobra_mk_iv.json

@@ -19,18 +19,18 @@
       "pitch": 30,
       "roll": 90,
       "yaw": 10,
-      "crew": 2 
+      "crew": 2
     },
     "retailCost": 747660,
     "requirements": {
       "horizonsEarlyAdoption": true
     },
     "bulkheads": [
-      { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 3, 3, 4],

ships/diamondback_explorer.json

@@ -15,7 +15,7 @@
       "hardness": 42,
       "hullMass": 260,
       "masslock": 10,
-      "pipSpeed": 0.09625,
+      "pipSpeed": 0.098214285714286,
       "pitch": 35,
       "roll": 90,
       "yaw": 13,
@@ -23,11 +23,11 @@
     },
     "retailCost": 1894760,
     "bulkheads": [
-      { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 4, 5, 3, 4, 3, 5],

ships/diamondback_scout.json

@@ -15,7 +15,7 @@
       "hardness": 40,
       "hullMass": 170,
       "masslock": 8,
-      "pipSpeed": 0.09875,
+      "pipSpeed": 0.096153846153846,
       "pitch": 42,
       "roll": 100,
       "yaw": 15,
@@ -23,11 +23,11 @@
     } ,
     "retailCost": 564330,
     "bulkheads": [
-      { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 4, 4, 2, 3, 2, 4],

ships/dolphin.json

@@ -27,11 +27,11 @@
       "horizons": true
     },
     "bulkheads": [
-      { "id": "cq", "edID": 128049292, "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "cr", "edID": 128049293, "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "cs", "edID": 128049294, "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "ct", "edID": 128049295, "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "cu", "edID": 128049296, "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "cq", "edID": 128049292, "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cr", "edID": 128049293, "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cs", "edID": 128049294, "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ct", "edID": 128049295, "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cu", "edID": 128049296, "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 5, 4, 4, 3, 3, 4],

ships/eagle.json

@@ -23,18 +23,18 @@
     },
     "retailCost": 44800,
     "bulkheads": [
-      { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 3, 3, 1, 2, 2, 2],
       "hardpoints": [1, 1, 1, 0],
       "internal": [
         3, 2, 
-        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 2, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         1, 1
       ]
     },

ships/federal_assault_ship.json

@@ -15,7 +15,7 @@
       "hardness": 60,
       "hullMass": 480,
       "masslock": 14,
-      "pipSpeed": 0.11125,
+      "pipSpeed": 0.071428571428571,
       "pitch": 38,
       "roll": 90,
       "yaw": 19,
@@ -26,19 +26,19 @@
       "federationRank": 5
     },
     "bulkheads": [
-      { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
       "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
       "internal": [
         5, 5, 4, 
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         3, 2, 2
       ]
     },

ships/federal_corvette.json

@@ -20,26 +20,26 @@
       "pitch": 28,
       "roll": 75,
       "yaw": 8,
-      "crew": 3 
+      "crew": 3
     },
     "retailCost": 187969450,
     "requirements": {
       "federationRank": 12
     },
     "bulkheads": [
-      { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],
       "hardpoints": [4, 4, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
       "internal": [
         7, 7, 7, 6, 6, 5, 5,
-        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 4, 3
       ]
     },

ships/federal_dropship.json

@@ -15,7 +15,7 @@
       "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.0725,
+      "pipSpeed": 0.11111111111111,
       "pitch": 30,
       "roll": 80,
       "yaw": 14,
@@ -26,19 +26,19 @@
       "federationRank": 3
     },
     "bulkheads": [
-      { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
       "hardpoints": [3, 2, 2, 2, 2, 0, 0, 0, 0],
       "internal": [
         6, 5, 5, 4,
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         3, 3, 2
       ]
     },

ships/federal_gunship.json

@@ -15,7 +15,7 @@
       "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.1025,
+      "pipSpeed": 0.10294117647059,
       "fighterHangars": true,
       "pitch": 25,
       "roll": 80,
@@ -27,20 +27,20 @@
       "federationRank": 7
     },
     "bulkheads": [
-      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 7, 5, 4],
       "hardpoints": [3, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0],
       "internal": [
         6, 6, 5,
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         2, 2
       ]
     },

ships/fer_de_lance.json

@@ -15,7 +15,7 @@
       "hardness": 70,
       "hullMass": 250,
       "masslock": 12,
-      "pipSpeed": 0.03875,
+      "pipSpeed": 0.038461538461538,
       "pitch": 38,
       "roll": 90,
       "yaw": 12,
@@ -23,11 +23,11 @@
     },
     "retailCost": 51567040,
     "bulkheads": [
-      { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 5, 4, 4, 6, 4, 3],

ships/hauler.json

@@ -23,11 +23,11 @@
     },
     "retailCost": 52720,
     "bulkheads": [
-      { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 2, 2, 1, 1, 1, 2],

ships/imperial_clipper.json

@@ -26,11 +26,11 @@
       "empireRank": 7
     },
     "bulkheads": [
-      { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 5, 4],

ships/imperial_courier.json

@@ -15,7 +15,7 @@
       "hardness": 30,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.05375,
+      "pipSpeed": 0.053571428571429,
       "pitch": 38,
       "roll": 90,
       "yaw": 16,
@@ -26,11 +26,11 @@
       "empireRank": 3
     },
     "bulkheads": [
-      { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 3, 3, 1, 3, 2, 3],

ships/imperial_cutter.json

@@ -20,26 +20,26 @@
       "pitch": 18,
       "roll": 45,
       "yaw": 8,
-      "crew": 3 
+      "crew": 3
     },
     "retailCost": 208969450,
     "requirements": {
       "empireRank": 12
     },
     "bulkheads": [
-      { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 8, 7, 7, 7, 7, 6],
       "hardpoints": [4, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0],
       "internal": [
         8, 8, 6, 6, 6, 5, 5,
-        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
-        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 3
       ]
     },

ships/imperial_eagle.json

@@ -4,7 +4,7 @@
     "eddbID": 15,
     "properties": {
       "name": "Imperial Eagle",
-      "manufacturer": "Core Dynamics",
+      "manufacturer": "Gutamaya",
       "class": 1,
       "hullCost": 72180,
       "speed": 300,
@@ -23,18 +23,18 @@
     },
     "retailCost": 110830,
     "bulkheads": [
-      { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [3, 3, 3, 1, 2, 2, 2],
       "hardpoints": [2, 1, 1, 0],
       "internal": [
         3, 2, 
-        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 2, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         1, 1
       ]
     },

ships/index.js

@@ -1,6 +1,8 @@
 module.exports = {
   adder: require('./adder').adder,
   alliance_chieftain: require('./alliance_chieftain').alliance_chieftain,
+  alliance_challenger: require('./alliance_challenger').alliance_challenger,
+  alliance_crusader: require('./alliance_crusader').alliance_crusader,
   anaconda: require('./anaconda').anaconda,
   asp: require('./asp').asp,
   asp_scout: require('./asp_scout').asp_scout,
@@ -22,6 +24,7 @@ module.exports = {
   imperial_cutter: require('./imperial_cutter').imperial_cutter,
   imperial_eagle: require('./imperial_eagle').imperial_eagle,
   keelback: require('./keelback').keelback,
+  krait_mkii: require('./krait_mkii').krait_mkii,
   orca: require('./orca').orca,
   python: require('./python').python,
   sidewinder: require('./sidewinder').sidewinder,

ships/keelback.json

@@ -24,11 +24,11 @@
     },
     "retailCost": 3126150,
     "bulkheads": [
-      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 1, 3, 2, 4],

ships/krait_mkii.json

@@ -0,0 +1,44 @@
+{
+  "krait_mkii": {
+    "edID": 128816567,
+    "eddbID": 35,
+    "properties": {
+      "name": "Krait Mk II",
+      "manufacturer": "Faulcon DeLacy",
+      "class": 2,
+      "hullCost": 42409425,
+      "speed": 240,
+      "boost": 330,
+      "boostEnergy": 13,
+      "baseShieldStrength": 220,
+      "baseArmour": 220,
+      "hardness": 55,
+      "hullMass": 320,
+      "masslock": 17,
+      "pipSpeed": 0.09375,
+      "fighterHangars": true,
+      "pitch": 26,
+      "roll": 90,
+      "yaw": 10,
+      "crew": 3
+    },
+    "retailCost": 45814205,
+    "bulkheads": [
+      { "id": "bO", "edID": 128816569, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bP", "edID": 128816570, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 36, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bQ", "edID": 128816571, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 67, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bR", "edID": 128816572, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 67, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bS", "edID": 128816573, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 67, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [7, 6, 5, 4, 7, 6, 5],
+      "hardpoints": [3, 3, 3, 2, 2, 0, 0, 0, 0],
+      "internal": [6, 6, 5, 5, 4, 3, 3, 2]
+    },
+    "defaults": {
+      "standard": ["7E", "6E", "5E", "4E", "7E", "6E", "5C"],
+      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0],
+      "internal": ["4h", "04", "04", "03", 0, "2h", 0, "00"]
+    }
+  }
+}

ships/orca.json

@@ -15,7 +15,7 @@
       "hardness": 55,
       "hullMass": 290,
       "masslock": 16,
-      "pipSpeed": 0.08375,
+      "pipSpeed": 0.083333333333333,
       "luxuryCabins": true,
       "pitch": 25,
       "roll": 55,
@@ -24,11 +24,11 @@
     },
     "retailCost": 48539900,
     "bulkheads": [
-      { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [5, 6, 5, 6, 5, 4, 5],

ships/python.json

@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 350,
       "masslock": 17,
-      "pipSpeed": 0.0975,
+      "pipSpeed": 0.097826086956522,
       "pitch": 29,
       "roll": 90,
       "yaw": 10,
@@ -23,11 +23,11 @@
     },
     "retailCost": 56978180,
     "bulkheads": [
-      { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bR", "edID": 128049343, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 53, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bS", "edID": 128049344, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 53, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bR", "edID": 128049343, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 53, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bS", "edID": 128049344, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 53, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [7, 6, 5, 4, 7, 6, 5],

ships/sidewinder.json

@@ -15,7 +15,7 @@
       "hardness": 20,
       "hullMass": 25,
       "masslock": 6,
-      "pipSpeed": 0.1375,
+      "pipSpeed": 0.13636363636364,
       "pitch": 42,
       "roll": 110,
       "yaw": 16,
@@ -23,11 +23,11 @@
     },
     "retailCost": 32000,
     "bulkheads": [
-      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "b3", "edID": 128049253, "eddbID": 741, "grp": "bh", "cost": 132060, "mass": 4, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "b4", "edID": 128049254, "eddbID": 742, "grp": "bh", "cost": 139420, "mass": 4, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "b3", "edID": 128049253, "eddbID": 741, "grp": "bh", "cost": 132060, "mass": 4, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "b4", "edID": 128049254, "eddbID": 742, "grp": "bh", "cost": 139420, "mass": 4, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 2, 2, 1, 1, 1, 1],

ships/type_10_defender.json

@@ -15,7 +15,7 @@
         "hardness": 75,
         "hullMass": 1200,
         "masslock": 26,
-        "pipSpeed": 0.17375,
+        "pipSpeed": 0.041666666666667,
         "fighterHangars": true,
         "pitch": 20,
         "roll": 20,
@@ -24,16 +24,16 @@
       },
       "retailCost": 121454652,
       "bulkheads": [
-        { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-        { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-        { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-        { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-        { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+        { "id": "1Q", "edID": 128785621, "eddbID": 1627, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+        { "id": "1R", "edID": 128785622, "eddbID": 1628, "grp": "bh", "cost": 30622340, "mass": 75, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+        { "id": "1S", "edID": 128785623, "eddbID": 1629, "grp": "bh", "cost": 68900260, "mass": 150, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+        { "id": "1T", "edID": 128785624, "eddbID": 1630, "grp": "bh", "cost": 162834280, "mass": 150, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+        { "id": "1U", "edID": 128785625, "eddbID": 1631, "grp": "bh", "cost": 180442120, "mass": 150, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
       ],
       "slots": {
         "standard": [8, 7, 7, 5, 7, 4, 6],
         "hardpoints": [3, 3, 3, 3, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
-        "internal": [8, 7, 6, 5, 4, 4, 3, 3, 2,{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }]
+        "internal": [8, 7, 6, 5, 4, 4, 3, 3, 2,{ "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }]
       },
       "defaults": {
         "standard": ["6E", "7E", "6E", "5E", "7E", "4E", "6C"],
@@ -42,4 +42,3 @@
       }
     }
   }
-  

ships/type_6_transporter.json

@@ -15,7 +15,7 @@
       "hardness": 35,
       "hullMass": 155,
       "masslock": 8,
-      "pipSpeed": 0.1475,
+      "pipSpeed": 0.14772727272727,
       "pitch": 30,
       "roll": 100,
       "yaw": 17,
@@ -23,11 +23,11 @@
     },
     "retailCost": 1045950,
     "bulkheads": [
-      { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "Bq", "edID": 128049289, "eddbID": 771, "grp": "bh", "cost": 2224730, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "Br", "edID": 128049290, "eddbID": 772, "grp": "bh", "cost": 2465290, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bq", "edID": 128049289, "eddbID": 771, "grp": "bh", "cost": 2224730, "mass": 23, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Br", "edID": 128049290, "eddbID": 772, "grp": "bh", "cost": 2465290, "mass": 23, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [3, 4, 4, 2, 3, 2, 4],

ships/type_7_transport.json

@@ -15,7 +15,7 @@
       "hardness": 54,
       "hullMass": 350,
       "masslock": 10,
-      "pipSpeed": 0.16625,
+      "pipSpeed": 0.16666666666667,
       "pitch": 22,
       "roll": 60,
       "yaw": 22,
@@ -23,11 +23,11 @@
     },
     "retailCost": 17472260,
     "bulkheads": [
-      { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "Bv", "edID": 128049301, "eddbID": 776, "grp": "bh", "cost": 37163480, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bv", "edID": 128049301, "eddbID": 776, "grp": "bh", "cost": 37163480, "mass": 63, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [5, 5, 5, 4, 4, 3, 5],

ships/type_9_heavy.json

@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 850,
       "masslock": 16,
-      "pipSpeed": 0.17375,
+      "pipSpeed": 0.17307692307692,
       "fighterHangars": true,
       "pitch": 20,
       "roll": 20,
@@ -24,11 +24,11 @@
     },
     "retailCost": 76555840,
     "bulkheads": [
-      { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 7, 6, 5, 6, 4, 6],

ships/viper.json

@@ -23,18 +23,18 @@
     },
     "retailCost": 142930,
     "bulkheads": [
-      { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "B6", "edID": 128049277, "eddbID": 761, "grp": "bh", "cost": 304010, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "B7", "edID": 128049278, "eddbID": 762, "grp": "bh", "cost": 336890, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "B6", "edID": 128049277, "eddbID": 761, "grp": "bh", "cost": 304010, "mass": 9, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "B7", "edID": 128049278, "eddbID": 762, "grp": "bh", "cost": 336890, "mass": 9, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [3, 3, 3, 2, 3, 3, 2],
       "hardpoints": [2, 2, 1, 1, 0, 0],
       "internal": [
         3, 3,
-        { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 3, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         2, 1
       ]
     },

ships/viper_mk_iv.json

@@ -15,7 +15,7 @@
       "hardness": 35,
       "hullMass": 190,
       "masslock": 7,
-      "pipSpeed": 0.0875,
+      "pipSpeed": 0.087962962962963,
       "pitch": 30,
       "roll": 90,
       "yaw": 12,
@@ -23,18 +23,18 @@
     },
     "retailCost": 437930,
     "bulkheads": [
-      { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "c9", "edID": 128672260, "eddbID": 1511, "grp": "bh", "cost": 931490, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "ca", "edID": 128672261, "eddbID": 1512, "grp": "bh", "cost": 1033210, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "c9", "edID": 128672260, "eddbID": 1511, "grp": "bh", "cost": 931490, "mass": 9, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "ca", "edID": 128672261, "eddbID": 1512, "grp": "bh", "cost": 1033210, "mass": 9, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 2, 3, 3, 4],
       "hardpoints": [2, 2, 1, 1, 0, 0],
       "internal": [
         4, 4, 3,
-        { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 3, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         2, 2, 1
       ]
     },

ships/vulture.json

@@ -15,7 +15,7 @@
       "hardness": 55,
       "hullMass": 230,
       "masslock": 10,
-      "pipSpeed": 0.02375,
+      "pipSpeed": 0.023809523809524,
       "pitch": 42,
       "roll": 110,
       "yaw": 17,
@@ -23,18 +23,18 @@
     },
     "retailCost": 4925620,
     "bulkheads": [
-      { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "Bb", "edID": 128049313, "eddbID": 786, "grp": "bh", "cost": 10476780, "mass": 35, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "Bc", "edID": 128049314, "eddbID": 787, "grp": "bh", "cost": 11609670, "mass": 35, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bb", "edID": 128049313, "eddbID": 786, "grp": "bh", "cost": 10476780, "mass": 35, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bc", "edID": 128049314, "eddbID": 787, "grp": "bh", "cost": 11609670, "mass": 35, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 5, 4, 3, 5, 4, 3],
       "hardpoints": [3, 3, 0, 0, 0, 0],
       "internal": [
         5, 
-        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 2, 1, 1
       ]
     },

spec/data-spec.js

@@ -1,232 +1,230 @@
-var Modules = require('../modules');
-var Ships = require('../ships');
-var Modifications = require('../modifications');
+const Modules = require('../modules');
+const Ships = require('../ships');
+const Modifications = require('../modifications');
 
-describe('JSON Data', function() {
+describe('JSON Data', () => {
+	const shipProperties = [
+		'name',
+		'manufacturer',
+		'class',
+		'hullCost',
+		'speed',
+		'boost',
+		'boostEnergy',
+		'baseShieldStrength',
+		'baseArmour',
+		'hardness',
+		'hullMass',
+		'masslock',
+		'pipSpeed',
+		'pitch',
+		'roll',
+		'yaw',
+		'crew'
+	];
 
-  var shipProperties = [
-    'name',
-    'manufacturer',
-    'class',
-    'hullCost',
-    'speed',
-    'boost',
-    'boostEnergy',
-    'baseShieldStrength',
-    'baseArmour',
-    'hardness',
-    'hullMass',
-    'masslock',
-    'pipSpeed',
-    'pitch',
-    'roll',
-    'yaw',
-    'crew'
-  ];
+	const edIDs = {};
+	const eddbIDs = {};
 
-  var edIDs = {};
-  var eddbIDs = {};
+	it('has an up-to-date distribution', () => {
+		const dist = require('../dist');
+		expect(dist.Ships).toEqual(Ships, 'Distribution ships does not match. Did you run `npm start`?');
+		expect(dist.Modules).toEqual(Modules, 'Distribution modules does not match. Did you run `npm start`?');
+	});
 
-  it('has an up-to-date distribution', function() {
-    var dist = require('../dist/index.js');
-    expect(dist.Ships).toEqual(Ships, 'Distribution ships does not match. Did you run `npm start`?');
-    expect(dist.Modules).toEqual(Modules, 'Distribution modules does not match. Did you run `npm start`?');
-  });
-
-  it('has valid standard modules', function() {
-    var ids = {};
-    for (var s in Modules.standard) {
-      var group = Modules.standard[s];
-      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 > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
-        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
-        if (s != 'ft' && s != 'pas' ) {
-          expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
-        }
-        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}`);
-        if (group[i].eddbID) {
-          eddbIDs[group[i].eddbID] = true;
-        }
-        if (group[i].edID) {
-          edIDs[group[i].edID] = true;
-        }
-        ids[id] = true;
-      }
-    }
-  });
-
-  it('has valid hardpoints', function() {
-    var ids = {};
-
-    for (var g in Modules.hardpoints) {
-      var group = Modules.hardpoints[g];
-      for (var i = 0; i < group.length; i++) {
-        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].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).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+	it('has valid standard modules', () => {
+		const ids = {};
+		for (const s in Modules.standard) {
+			const group = Modules.standard[s];
+			for (let i = 0; i < group.length; i++) {
+				const id = group[i].id;
+				expect(ids[id]).toBeFalsy('ID already exists: ' + id);
+				expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
+				expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+				if (s != 'ft' && s != 'pas') {
+					expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
+				}
+				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: ${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 : ''}`);
-        if (group[i].eddbID) {
-          eddbIDs[group[i].eddbID] = true;
-        }
-        if (group[i].edID) {
-          edIDs[group[i].edID] = true;
-        }
-        if (group[i].damage) {
-          expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
-          expect(group[i].damagedist).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage distribution`);
-          if (group[i].grp != 'po') {
-            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
-            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].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`);
-            expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`);
-            expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`);
-          }
-        }
-        if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
-          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;
-      }
-    }
-  });
+				if (group[i].eddbID) {
+					eddbIDs[group[i].eddbID] = true;
+				}
+				if (group[i].edID) {
+					edIDs[group[i].edID] = true;
+				}
+				ids[id] = true;
+			}
+		}
+	});
 
-  it('has valid internal modules', function() {
-    var ids = {};
+	it('has valid hardpoints', () => {
+		const ids = {};
 
-    for (var g in Modules.internal) {
-      var group = Modules.internal[g];
-      for (var i = 0; i < group.length; i++) {
-        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 > 0).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}`);
-        }
-        if (group[i].eddbID) {
-          eddbIDs[group[i].eddbID] = true;
-        }
-        if (group[i].edID) {
-          edIDs[group[i].edID] = true;
-        }
-        ids[id] = true;
-      }
-    }
-  });
+		for (const g in Modules.hardpoints) {
+			const group = Modules.hardpoints[g];
+			for (let i = 0; i < group.length; i++) {
+				const 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].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).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 : ''}`);
+				if (group[i].eddbID) {
+					eddbIDs[group[i].eddbID] = true;
+				}
+				if (group[i].edID) {
+					edIDs[group[i].edID] = true;
+				}
+				if (group[i].damage) {
+					expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+					expect(group[i].damagedist).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage distribution`);
+					if (group[i].grp != 'po') {
+						expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
+						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].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`);
+						expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`);
+						expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`);
+					}
+				}
+				if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
+					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;
+			}
+		}
+	});
 
-  it('has data for every ship', function() {
-    var bulkheadIds = {};
+	it('has valid internal modules', () => {
+		const ids = {};
 
-    for (var s in Ships) {
-      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 > 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');
-      expect(Ships[s].slots.hardpoints.length).toEqual(Ships[s].defaults.hardpoints.length, s + ' hardpoint slots and defaults dont match');
-      expect(Ships[s].slots.internal.length).toEqual(Ships[s].defaults.internal.length, s + ' internal slots and defaults dont match');
-      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');
-      if (Ships[s].edID) {
-        edIDs[Ships[s].edID] = true;
-      }
+		for (const g in Modules.internal) {
+			const group = Modules.internal[g];
+			for (let i = 0; i < group.length; i++) {
+				const 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 > 0).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}`);
+				}
+				if (group[i].eddbID) {
+					eddbIDs[group[i].eddbID] = true;
+				}
+				if (group[i].edID) {
+					edIDs[group[i].edID] = true;
+				}
+				ids[id] = 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 > 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 > 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}]`);
-        if (b.eddbID) {
-          eddbIDs[b.eddbID] = true;
-        }
-        if (b.edID) {
-          edIDs[b.edID] = true;
-        }
-        bulkheadIds[b.id] = true;
-      }
-    }
-  });
+	it('has data for every ship', () => {
+		const bulkheadIds = {};
 
-  it('has valid blueprints', function() {
-    var ids = {};
-    var names = {};
+		for (const s in Ships) {
+			for (let p = 0; p < shipProperties.length; p++) {
+				expect(Ships[s].properties[shipProperties[p]]).toBeDefined(shipProperties[p] + ' is missing for ' + s);
+			}
+			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');
+			expect(Ships[s].slots.hardpoints.length).toEqual(Ships[s].defaults.hardpoints.length, s + ' hardpoint slots and defaults dont match');
+			expect(Ships[s].slots.internal.length).toEqual(Ships[s].defaults.internal.length, s + ' internal slots and defaults dont match');
+			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');
+			if (Ships[s].edID) {
+				edIDs[Ships[s].edID] = true;
+			}
 
-    for (var blueprintname in Modifications.blueprints) {
-      const blueprint = Modifications.blueprints[blueprintname];
-      expect(names[blueprintname]).toBeFalsy('Name already exists: ' + blueprintname);
-      names[blueprintname] = true;
-      expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
-      ids[blueprint.id] = true;
-      expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
-      expect(blueprint.grades).toBeDefined('Blueprint has no grades, ID:' + blueprint.id);
+			for (let i = 0; i < Ships[s].bulkheads.length; i++) {
+				const 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 > 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 > 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}]`);
+				if (b.eddbID) {
+					eddbIDs[b.eddbID] = true;
+				}
+				if (b.edID) {
+					edIDs[b.edID] = true;
+				}
+				bulkheadIds[b.id] = true;
+			}
+		}
+	});
 
-      grades = {}
-      for (var grade in blueprint.grades) {
-        expect(grades[grade]).toBeFalsy('Grade already exists: ' + grade + ' for ' + blueprintname);
-        grades[grade] = true;
+	it('has valid blueprints', () => {
+		const ids = {};
+		const names = {};
 
-        const blueprintgrade = blueprint.grades[grade];
-        expect(blueprintgrade.components).toBeDefined('Blueprint grade ' + grade + ' has no components for ' + blueprintname);
-        expect(blueprintgrade.features).toBeDefined('Blueprint grade ' + grade + ' has no features for ' + blueprintname);
-      }
-    }
-  });
+		for (const blueprintname in Modifications.blueprints) {
+			const blueprint = Modifications.blueprints[blueprintname];
+			expect(names[blueprintname]).toBeFalsy('Name already exists: ' + blueprintname);
+			names[blueprintname] = true;
+			expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
+			ids[blueprint.id] = true;
+			expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
+			expect(blueprint.grades).toBeDefined('Blueprint has no grades, ID:' + blueprint.id);
 
-  it('has valid modifications', function() {
-    var ids = {};
+			grades = {};
+			for (const grade in blueprint.grades) {
+				expect(grades[grade]).toBeFalsy('Grade already exists: ' + grade + ' for ' + blueprintname);
+				grades[grade] = true;
 
-    for (var k in Modifications.modifications) {
-      const modification = Modifications.modifications[k];
-      expect(ids[modification.id]).toBeFalsy('ID already exists: ' + modification.id);
-      expect(modification.name).toBeDefined('Modification has no name, ID:' + modification.id);
-      expect(modification.type).toBeDefined('Modification has no type, ID:' + modification.id);
-      expect(modification.method).toBeDefined('Modification has no method, ID:' + modification.id);
-      ids[modification.id] = true;
-    }
-  });
+				const blueprintgrade = blueprint.grades[grade];
+				expect(blueprintgrade.components).toBeDefined('Blueprint grade ' + grade + ' has no components for ' + blueprintname);
+				expect(blueprintgrade.features).toBeDefined('Blueprint grade ' + grade + ' has no features for ' + blueprintname);
+			}
+		}
+	});
 
-  it('has valid module modifications', function() {
-    for (var m in Modifications.modules) {
-      const module = Modifications.modules[m];
-      for (var bp in module.blueprints) {
-        expect(Modifications.blueprints[bp]).toBeDefined('Missing ' + bp + ' for ' + m);
-        for (var grade in module.blueprints[bp].grades) {
-          expect(Modifications.blueprints[bp].grades[grade]).toBeDefined('Missing ' + bp + ' grade ' + grade + ' for ' + m);
-        }
-      }
-    }
-  });
+	it('has valid modifications', () => {
+		const ids = {};
 
-  it('has valid specials', function() {
-    var ids = {};
+		for (const k in Modifications.modifications) {
+			const modification = Modifications.modifications[k];
+			expect(ids[modification.id]).toBeFalsy('ID already exists: ' + modification.id);
+			expect(modification.name).toBeDefined('Modification has no name, ID:' + modification.id);
+			expect(modification.type).toBeDefined('Modification has no type, ID:' + modification.id);
+			expect(modification.method).toBeDefined('Modification has no method, ID:' + modification.id);
+			ids[modification.id] = true;
+		}
+	});
 
-    for (var k in Modifications.specials) {
-      const special = Modifications.specials[k];
-      expect(ids[special.id]).toBeFalsy('ID already exists: ' + special.id);
-      expect(special.name).toBeDefined('Special has no name, ID:' + special.id);
-      ids[special.id] = true;
-    }
-  });
+	it('has valid module modifications', () => {
+		for (const m in Modifications.modules) {
+			const module = Modifications.modules[m];
+			for (const bp in module.blueprints) {
+				expect(Modifications.blueprints[bp]).toBeDefined('Missing ' + bp + ' for ' + m);
+				for (const grade in module.blueprints[bp].grades) {
+					expect(Modifications.blueprints[bp].grades[grade]).toBeDefined('Missing ' + bp + ' grade ' + grade + ' for ' + m);
+				}
+			}
+		}
+	});
 
+	it('has valid specials', () => {
+		const ids = {};
+
+		for (const k in Modifications.specials) {
+			const special = Modifications.specials[k];
+			expect(ids[special.id]).toBeFalsy('ID already exists: ' + special.id);
+			expect(special.name).toBeDefined('Special has no name, ID:' + special.id);
+			ids[special.id] = true;
+		}
+	});
 });