Merge branch 'release/2.2.6'

Bump package number
Merge branch 'feature/changes' into develop
2025-12-08 15:13:23 +00:00 · 2017-01-10 19:15:09 +00:00 · 2017-01-10 19:15:03 +00:00 · 2017-01-10 19:13:54 +00:00 · 2017-01-10 19:06:36 +00:00 · 2017-01-10 18:11:32 +00:00
68 changed files with 11227 additions and 9758 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,25 @@
+#2.2.6
+  * Update weapons with changed values for 2.2.03
+  * Add individual pitch/roll/yaw statistics for each ship
+  * Remove old and meaningless agility stat
+  * Use sane order for multi-module JSON - coriolis can re-order as it sees fit when displaying modules
+  * Fix cost of fighter hangars
+  * Update Powerplay weapons with current statistics
+  * Add separate min/opt/max multipliers for enhanced thrusters for speed, acceleration and rotation
+  * Add module reinforcement packages
+  * Add military compartments
+  * Fix missing damage value for 2B dumbfires
+  * Update shield recharge rates
+  * Reduce hull mass of Viper to 50T
+  * Fix incorrect optimal mass value for 8A thrusters
+  * Add power draw for detailed surface scanner
+
+#2.2.5
+  * Fix incorrect ID for emissive munitions special
+  * Fix rate of fire for burst lasers
+  * Add fragment cannon modifications
+  * Fix internal name of dazzle shell
+
 #2.2.4
  * Fix incorrect ID for class 5 luxury passenger cabin
  * Add damage type modifier
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.json
+++ b/dist/index.json
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -63,7 +63,7 @@
  "PowerPlant_Armoured": { "id": 62, "name": "Armoured" },
  "PowerPlant_Boosted": { "id": 63, "name": "Overcharged" },
  "PowerPlant_Stealth": { "id": 64, "name": "Low emissions" },
-  "ProspectingLimpet_LightWeight": { "id": 63, "name": "Lightweight" },
+  "ProspectingLimpet_LightWeight": { "id": 65, "name": "Lightweight" },
  "ProspectingLimpet_Reinforced": { "id": 66, "name": "Reinforced" },
  "ProspectingLimpet_Shielded": { "id": 67, "name": "Shielded" },
  "ShieldBooster_Explosive": { "id": 68, "name": "Blast resistant" },
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -1,43 +1,44 @@
 {
-    "ammo": {"id": 0, "name": "ammo", "type": "numeric", "method": "multiplicative"},
-    "boot": {"id": 1, "name": "boot", "type": "numeric", "method": "multiplicative"},
-    "brokenregen": {"id": 2, "name": "brokenregen", "type": "numeric", "method": "multiplicative"},
+    "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative"},
+    "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative"},
+    "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative"},
    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "multiplicative"},
-    "clip": {"id": 4, "name": "clip", "type": "numeric", "method": "multiplicative"},
-    "damage": {"id": 5, "name": "damage", "type": "numeric", "method": "multiplicative"},
-    "distdraw": {"id": 6, "name": "distdraw", "type": "numeric", "method": "multiplicative"},
-    "duration": {"id": 7, "name": "duration", "type": "numeric", "method": "multiplicative"},
-    "eff": {"id": 8, "name": "eff", "type": "numeric", "method": "multiplicative"},
-    "engcap": {"id": 9, "name": "engcap", "type": "numeric", "method": "multiplicative"},
-    "engrate": {"id": 10, "name": "engrate", "type": "numeric", "method": "multiplicative"},
-    "explres": {"id": 11, "name": "explres", "type": "numeric", "method": "additive"},
-    "facinglimit": {"id": 12, "name": "facinglimit", "type": "numeric", "method": "multiplicative"},
-    "hullboost": {"id": 13, "name": "hullboost", "type": "numeric", "method": "multiplicative"},
-    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "numeric", "method": "multiplicative"},
-    "integrity": {"id": 15, "name": "integrity", "type": "numeric", "method": "multiplicative"},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "percentage", "method": "multiplicative"},
+    "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative"},
+    "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
+    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative"},
+    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
+    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
+    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative"},
+    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
+    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
+    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
+    "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
+    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
+    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative"},
    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative"},
-    "kinres": {"id": 17, "name": "kinres", "type": "numeric", "method": "additive"},
-    "mass": {"id": 18, "name": "mass", "type": "numeric", "method": "multiplicative"},
-    "maxfuel": {"id": 19, "name": "maxfuel", "type": "numeric", "method": "multiplicative"},
-    "optmass": {"id": 20, "name": "optmass", "type": "numeric", "method": "multiplicative"},
-    "optmul": {"id": 21, "name": "optmul", "type": "numeric", "method": "multiplicative"},
-    "pgen": {"id": 22, "name": "pgen", "type": "numeric", "method": "multiplicative"},
-    "piercing": {"id": 23, "name": "piercing", "type": "numeric", "method": "multiplicative"},
-    "power": {"id": 24, "name": "power", "type": "numeric", "method": "multiplicative"},
-    "range": {"id": 25, "name": "range", "type": "numeric", "method": "multiplicative"},
-    "ranget": {"id": 26, "name": "ranget", "type": "numeric", "method": "multiplicative"},
-    "regen": {"id": 27, "name": "regen", "type": "numeric", "method": "multiplicative"},
-    "reload": {"id": 28, "name": "reload", "type": "numeric", "method": "multiplicative"},
-    "rof": {"id": 29, "name": "rof", "type": "numeric", "method": "multiplicative"},
-    "shield": {"id": 30, "name": "shield", "type": "numeric", "method": "multiplicative"},
-    "shieldboost": {"id": 31, "name": "shieldboost", "type": "numeric", "method": "multiplicative"},
-    "spinup": {"id": 32, "name": "spinup", "type": "numeric", "method": "multiplicative"},
-    "syscap": {"id": 33, "name": "syscap", "type": "numeric", "method": "multiplicative"},
-    "sysrate": {"id": 34, "name": "sysrate", "type": "numeric", "method": "multiplicative"},
-    "thermload": {"id": 35, "name": "thermload", "type": "numeric", "method": "multiplicative"},
-    "thermres": {"id": 36, "name": "thermres", "type": "numeric", "method": "additive"},
-    "wepcap": {"id": 37, "name": "wepcap", "type": "numeric", "method": "multiplicative"},
-    "weprate": {"id": 38, "name": "weprate", "type": "numeric", "method": "multiplicative"},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "numeric", "method": "multiplicative"},
+    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive"},
+    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative"},
+    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative"},
+    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative"},
+    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative"},
+    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
+    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
+    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
+    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
+    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
+    "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},
+    "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative"},
+    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"},
+    "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"},
+    "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"},
+    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"},
+    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"},
+    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"},
+    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative"},
+    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive"},
+    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative"},
+    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative"},
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"},
    "type": {"id": 40, "name": "type", "type": "alphabetic", "method": "overwrite"}
 }
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -159,11 +159,18 @@
  "mod_weapon_burst_interval": {
    "rof": 1
  },
-  "mod_weapon_burst_rof": {},
-  "mod_weapon_burst_size": {},
+  "mod_weapon_burst_rof": {
+    "burstrof": 1
+  },
+  "mod_weapon_burst_size": {
+    "burst": 1
+  },
  "mod_weapon_clip_size": {
    "clip": 1
  },
+  "mod_weapon_clip_size_override": {
+    "clip": 1
+  },
  "mod_weapon_damage": {
    "damage": 1
  },
@@ -188,7 +195,6 @@
    "ammo": -0.2
  },
  "special_dispersal_field": {
-    "damage": -0.1
  },
  "special_distortion_field": {},
  "special_drag_munitions": {},
@@ -202,8 +208,10 @@
    "thermload": 2,
    "type": "T"
  },
+  "special_inertial_impact": {
+    "type": "KT"
+  },
  "special_overload_munitions": {
-    "ammo": -0.2
  },
  "special_phasing_sequence": {},
  "special_radiant_canister": {
@@ -213,6 +221,9 @@
  "special_scramble_spectrum": {
    "rof": 0.1111111111111111
  },
+  "special_screening_shell": {
+    "reload": -0.5
+  },
  "special_shiftlock_canister": {
    "damage": -0.2
  },
--- a/modifications/specials.json
+++ b/modifications/specials.json
@@ -3,15 +3,16 @@
    "special_choke_canister": {"id": 1, "name": "Choke canister"},
    "special_concordant_sequence": {"id": 2, "name": "Concordant sequence"},
    "special_corrosive_shell": {"id": 3, "name": "Corrosive shell"},
-    "special_dazzle_shell": {"id": 4, "name": "Dazzle shell"},
+    "special_blinding_shell": {"id": 4, "name": "Dazzle shell"},
    "special_dispersal_field": {"id": 5, "name": "Dispersal field"},
    "special_distortion_field": {"id": 6, "name": "Distortion field"},
    "special_drag_munitions": {"id": 7, "name": "Drag munitions"},
-    "special_emissive_munitions": {"id": 9, "name": "Emissive munitions"},
+    "special_emissive_munitions": {"id": 8, "name": "Emissive munitions"},
    "special_feedback_cascade": {"id": 9, "name": "Feedback cascade"},
    "special_force_shell": {"id": 10, "name": "Force shell"},
    "special_high_yield_shell": {"id": 11, "name": "High yield shell"},
    "special_incendiary_rounds": {"id": 12, "name": "Incendiary rounds"},
+    "special_inertial_impact": {"id": 32, "name": "Inertial impact"},
    "special_ion_disruptor": {"id": 13, "name": "Ion disruptor"},
    "special_mass_lock_munition": {"id": 14, "name": "Mass lock munition"},
    "special_overload_munitions": {"id": 15, "name": "Overload munitions"},
--- a/modifications/validity.json
+++ b/modifications/validity.json
@@ -76,6 +76,7 @@
  "fc": [
    "ammo",
    "burst",
+    "burstrof",
    "clip",
    "damage",
    "distdraw",
@@ -338,6 +339,7 @@
  ],
  "ul": [
    "burst",
+    "burstrof",
    "damage",
    "distdraw",
    "integrity",
--- a/modules/hardpoints/beam_laser.json
+++ b/modules/hardpoints/beam_laser.json
@@ -7,7 +7,7 @@
      "class": 1,
      "cost": 37430,
      "damage": 9.8,
-      "distdraw": 2.16,
+      "distdraw": 1.94,
      "edID": 128049428,
      "eddbID": 841,
      "grp": "bl",
@@ -16,7 +16,7 @@
      "mass": 2,
      "mount": "F",
      "piercing": 18,
-      "power": 0.69,
+      "power": 0.62,
      "range": 3000,
      "rating": "E",
      "thermload": 3.5,
@@ -38,7 +38,7 @@
      "mass": 2,
      "mount": "G",
      "piercing": 18,
-      "power": 0.67,
+      "power": 0.6,
      "range": 3000,
      "rating": "E",
      "thermload": 3.6,
@@ -62,7 +62,7 @@
      "mass": 2,
      "mount": "T",
      "piercing": 18,
-      "power": 0.63,
+      "power": 0.57,
      "range": 3000,
      "rating": "F",
      "thermload": 2.4,
@@ -75,7 +75,7 @@
      "class": 1,
      "cost": 56150,
      "damage": 4.9,
-      "distdraw": 2.8,
+      "distdraw": 2.52,
      "edID": 128671346,
      "eddbID": 1476,
      "grp": "bl",
@@ -85,7 +85,7 @@
      "mount": "F",
      "name": "Retributor",
      "piercing": 18,
-      "power": 0.69,
+      "power": 0.62,
      "pp": "Edmund Mahon",
      "range": 3000,
      "rating": "E",
@@ -99,7 +99,7 @@
      "class": 2,
      "cost": 299520,
      "damage": 15.96,
-      "distdraw": 3.51,
+      "distdraw": 3.16,
      "edID": 128049429,
      "eddbID": 842,
      "grp": "bl",
@@ -108,7 +108,7 @@
      "mass": 4,
      "mount": "F",
      "piercing": 35,
-      "power": 1.12,
+      "power": 1.01,
      "range": 3000,
      "rating": "D",
      "thermload": 5.1,
@@ -130,7 +130,7 @@
      "mass": 4,
      "mount": "G",
      "piercing": 35,
-      "power": 1.1,
+      "power": 0.99,
      "range": 3000,
      "rating": "D",
      "thermload": 5.3,
@@ -152,7 +152,7 @@
      "mass": 4,
      "mount": "T",
      "piercing": 35,
-      "power": 1.03,
+      "power": 0.93,
      "range": 3000,
      "rating": "E",
      "thermload": 3.5,
@@ -165,7 +165,7 @@
      "class": 3,
      "cost": 1177600,
      "damage": 25.78,
-      "distdraw": 5.67,
+      "distdraw": 5.1,
      "edID": 128049430,
      "eddbID": 843,
      "grp": "bl",
@@ -174,7 +174,7 @@
      "mass": 8,
      "mount": "F",
      "piercing": 50,
-      "power": 1.8,
+      "power": 1.62,
      "range": 3000,
      "rating": "C",
      "thermload": 7.2,
@@ -196,7 +196,7 @@
      "mass": 8,
      "mount": "G",
      "piercing": 50,
-      "power": 1.78,
+      "power": 1.6,
      "range": 3000,
      "rating": "C",
      "thermload": 7.6,
@@ -218,7 +218,7 @@
      "mass": 8,
      "mount": "T",
      "piercing": 50,
-      "power": 1.68,
+      "power": 1.51,
      "range": 3000,
      "rating": "D",
      "thermload": 5.1,
@@ -231,7 +231,7 @@
      "class": 4,
      "cost": 2396160,
      "damage": 41.38,
-      "distdraw": 9.1,
+      "distdraw": 8.19,
      "edID": 128049431,
      "eddbID": 1540,
      "grp": "bl",
@@ -240,7 +240,7 @@
      "mass": 16,
      "mount": "F",
      "piercing": 60,
-      "power": 2.9,
+      "power": 2.61,
      "range": 3000,
      "rating": "A",
      "thermload": 9.9,
@@ -262,7 +262,7 @@
      "mass": 16,
      "mount": "G",
      "piercing": 60,
-      "power": 2.86,
+      "power": 2.57,
      "range": 3000,
      "rating": "A",
      "thermload": 10.6,
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -9,7 +9,7 @@
      "class": 1,
      "cost": 4400,
      "damage": 1.72,
-      "distdraw": 0.31,
+      "distdraw": 0.24,
      "edID": 128049400,
      "eddbID": 832,
      "grp": "ul",
@@ -21,7 +21,7 @@
      "power": 0.65,
      "range": 3000,
      "rating": "F",
-      "rof": 4.735,
+      "rof": 2,
      "thermload": 0.4,
      "type": "T"
    },
@@ -33,8 +33,8 @@
      "burstrof": 17,
      "class": 1,
      "cost": 8600,
-      "damage": 1.22,
-      "distdraw": 0.27,
+      "damage": 1.2,
+      "distdraw": 0.23,
      "edID": 128049404,
      "eddbID": 835,
      "grp": "ul",
@@ -46,7 +46,7 @@
      "power": 0.64,
      "range": 3000,
      "rating": "G",
-      "rof": 5.28,
+      "rof": 2.23,
      "thermload": 0.3,
      "type": "T"
    },
@@ -59,7 +59,7 @@
      "class": 1,
      "cost": 52800,
      "damage": 0.87,
-      "distdraw": 0.16,
+      "distdraw": 0.136,
      "edID": 128049407,
      "eddbID": 838,
      "grp": "ul",
@@ -71,25 +71,26 @@
      "power": 0.6,
      "range": 3000,
      "rating": "G",
-      "rof": 4.795,
+      "rof": 1.92,
      "thermload": 0.2,
      "type": "T"
    },
    {
-      "breachdmg": 1.5,
+      "breachdmg": 2,
      "breachmax": 0,
      "breachmin": 0,
-      "burst": 3,
-      "burstrof": 15,
+      "burst": 8,
+      "burstrof": 20,
      "class": 1,
      "cost": 8800,
      "damage": 2.4,
-      "distdraw": 0.4,
+      "distdraw": 0.31,
      "edID": 128671449,
      "eddbID": 1477,
      "grp": "ul",
      "id": "cy",
      "integrity": 40,
+      "jitter": 3.5,
      "mass": 2,
      "mount": "F",
      "name": "Cytoscrambler",
@@ -98,7 +99,7 @@
      "pp": "Archon Delaine",
      "range": 600,
      "rating": "F",
-      "rof": 7.615,
+      "rof": 6.6,
      "thermload": 0.3,
      "type": "T"
    },
@@ -110,8 +111,8 @@
      "burstrof": 11,
      "class": 2,
      "cost": 23000,
-      "damage": 3.53,
-      "distdraw": 0.63,
+      "damage": 3.5,
+      "distdraw": 0.482,
      "edID": 128049401,
      "eddbID": 833,
      "grp": "ul",
@@ -123,7 +124,7 @@
      "power": 1.05,
      "range": 3000,
      "rating": "E",
-      "rof": 3.695,
+      "rof": 1.6,
      "thermload": 0.8,
      "type": "T"
    },
@@ -136,7 +137,7 @@
      "class": 2,
      "cost": 48500,
      "damage": 2.45,
-      "distdraw": 0.55,
+      "distdraw": 0.468,
      "edID": 128049405,
      "eddbID": 836,
      "grp": "ul",
@@ -148,7 +149,7 @@
      "power": 1.04,
      "range": 3000,
      "rating": "F",
-      "rof": 4.2,
+      "rof": 1.78,
      "thermload": 0.7,
      "type": "T"
    },
@@ -160,8 +161,8 @@
      "burstrof": 15,
      "class": 2,
      "cost": 162800,
-      "damage": 1.72,
-      "distdraw": 0.31,
+      "damage": 1.74,
+      "distdraw": 0.26,
      "edID": 128049408,
      "eddbID": 839,
      "grp": "ul",
@@ -173,7 +174,7 @@
      "power": 0.98,
      "range": 3000,
      "rating": "F",
-      "rof": 3.93,
+      "rof": 1.57,
      "thermload": 0.4,
      "type": "T"
    },
@@ -185,8 +186,8 @@
      "burstrof": 7,
      "class": 3,
      "cost": 140400,
-      "damage": 7.74,
-      "distdraw": 1.39,
+      "damage": 7.75,
+      "distdraw": 1.06,
      "edID": 128049402,
      "eddbID": 834,
      "grp": "ul",
@@ -198,7 +199,7 @@
      "power": 1.66,
      "range": 3000,
      "rating": "D",
-      "rof": 2.685,
+      "rof": 1.2,
      "thermload": 1.7,
      "type": "T"
    },
@@ -210,8 +211,8 @@
      "burstrof": 9,
      "class": 3,
      "cost": 281600,
-      "damage": 5.16,
-      "distdraw": 1.16,
+      "damage": 5.18,
+      "distdraw": 0.986,
      "edID": 128049406,
      "eddbID": 837,
      "grp": "ul",
@@ -223,7 +224,7 @@
      "power": 1.65,
      "range": 3000,
      "rating": "E",
-      "rof": 3.215,
+      "rof": 1.4,
      "thermload": 1.4,
      "type": "T"
    },
@@ -235,8 +236,8 @@
      "burstrof": 11,
      "class": 3,
      "cost": 800400,
-      "damage": 3.53,
-      "distdraw": 0.63,
+      "damage": 3.54,
+      "distdraw": 0.536,
      "edID": 128049409,
      "eddbID": 840,
      "grp": "ul",
@@ -248,7 +249,7 @@
      "power": 1.57,
      "range": 3000,
      "rating": "E",
-      "rof": 3.115,
+      "rof": 1.272,
      "thermload": 0.8,
      "type": "T"
    },
@@ -261,7 +262,7 @@
      "class": 4,
      "cost": 281600,
      "damage": 20.6,
-      "distdraw": 3.71,
+      "distdraw": 2.84,
      "edID": 128049403,
      "eddbID": 1549,
      "grp": "ul",
@@ -273,7 +274,7 @@
      "power": 2.58,
      "range": 3000,
      "rating": "E",
-      "rof": 1.565,
+      "rof": 0.8,
      "thermload": 4.5,
      "type": "T"
    },
@@ -286,7 +287,7 @@
      "class": 4,
      "cost": 1245600,
      "damage": 12.1,
-      "distdraw": 2.72,
+      "distdraw": 2.31,
      "edID": 128727920,
      "eddbID": 1550,
      "grp": "ul",
@@ -298,7 +299,7 @@
      "power": 2.59,
      "range": 3000,
      "rating": "E",
-      "rof": 2.14,
+      "rof": 1,
      "thermload": 3.3,
      "type": "T"
    }
--- a/modules/hardpoints/cannon.json
+++ b/modules/hardpoints/cannon.json
@@ -1,14 +1,14 @@
 {
  "c": [
    {
-      "ammo": 100,
+      "ammo": 120,
      "breachdmg": 17.1,
      "breachmax": 0.8,
      "breachmin": 0.6,
      "class": 1,
-      "clip": 5,
+      "clip": 6,
      "cost": 21100,
-      "damage": 18,
+      "damage": 22.5,
      "distdraw": 0.46,
      "edID": 128049438,
      "eddbID": 850,
@@ -21,7 +21,7 @@
      "power": 0.34,
      "range": 3000,
      "rating": "D",
-      "reload": 4,
+      "reload": 3,
      "rof": 0.5,
      "speed": 1200,
      "thermload": 1.4,
@@ -35,7 +35,7 @@
      "class": 1,
      "clip": 5,
      "cost": 42200,
-      "damage": 13.9,
+      "damage": 16,
      "distdraw": 0.48,
      "edID": 128049442,
      "eddbID": 854,
@@ -62,7 +62,7 @@
      "class": 1,
      "clip": 5,
      "cost": 506400,
-      "damage": 11.1,
+      "damage": 12.75,
      "distdraw": 0.22,
      "edID": 128049445,
      "eddbID": 857,
@@ -71,7 +71,7 @@
      "integrity": 40,
      "mass": 2,
      "mount": "T",
-      "piercing": 90,
+      "piercing": 35,
      "power": 0.32,
      "range": 3000,
      "rating": "F",
@@ -82,14 +82,14 @@
      "type": "K"
    },
    {
-      "ammo": 100,
+      "ammo": 120,
      "breachdmg": 28,
      "breachmax": 0.8,
      "breachmin": 0.6,
      "class": 2,
-      "clip": 5,
+      "clip": 6,
      "cost": 168430,
-      "damage": 29.2,
+      "damage": 36.5,
      "distdraw": 0.7,
      "edID": 128049439,
      "eddbID": 851,
@@ -98,11 +98,11 @@
      "integrity": 51,
      "mass": 4,
      "mount": "F",
-      "piercing": 90,
+      "piercing": 50,
      "power": 0.49,
      "range": 3500,
      "rating": "D",
-      "reload": 4,
+      "reload": 3,
      "rof": 0.465,
      "speed": 1051,
      "thermload": 2.1,
@@ -116,7 +116,7 @@
      "class": 2,
      "clip": 5,
      "cost": 337600,
-      "damage": 21.3,
+      "damage": 24.5,
      "distdraw": 0.75,
      "edID": 128049443,
      "eddbID": 855,
@@ -125,7 +125,7 @@
      "integrity": 51,
      "mass": 4,
      "mount": "G",
-      "piercing": 90,
+      "piercing": 50,
      "power": 0.54,
      "range": 3500,
      "rating": "D",
@@ -143,7 +143,7 @@
      "class": 2,
      "clip": 5,
      "cost": 4051200,
-      "damage": 17.19,
+      "damage": 19.77,
      "distdraw": 0.34,
      "edID": 128049446,
      "eddbID": 858,
@@ -152,7 +152,7 @@
      "integrity": 51,
      "mass": 4,
      "mount": "T",
-      "piercing": 90,
+      "piercing": 50,
      "power": 0.45,
      "range": 3500,
      "rating": "E",
@@ -163,14 +163,14 @@
      "type": "K"
    },
    {
-      "ammo": 100,
+      "ammo": 120,
      "breachdmg": 42.3,
      "breachmax": 0.8,
      "breachmin": 0.6,
      "class": 3,
-      "clip": 5,
+      "clip": 6,
      "cost": 675200,
-      "damage": 43.95,
+      "damage": 54.94,
      "distdraw": 1.07,
      "edID": 128049440,
      "eddbID": 852,
@@ -179,11 +179,11 @@
      "integrity": 64,
      "mass": 8,
      "mount": "F",
-      "piercing": 90,
+      "piercing": 70,
      "power": 0.67,
      "range": 4000,
      "rating": "C",
-      "reload": 4,
+      "reload": 3,
      "rof": 0.425,
      "speed": 959,
      "thermload": 3.2,
@@ -197,7 +197,7 @@
      "class": 3,
      "clip": 5,
      "cost": 1350400,
-      "damage": 32.51,
+      "damage": 37.39,
      "distdraw": 1.14,
      "edID": 128671120,
      "eddbID": 1383,
@@ -208,7 +208,7 @@
      "integrity": 64,
      "mass": 8,
      "mount": "G",
-      "piercing": 90,
+      "piercing": 70,
      "power": 0.75,
      "range": 4000,
      "rating": "C",
@@ -226,7 +226,7 @@
      "class": 3,
      "clip": 5,
      "cost": 16204800,
-      "damage": 26.4,
+      "damage": 30.4,
      "distdraw": 0.53,
      "edID": 128049447,
      "eddbID": 859,
@@ -235,7 +235,7 @@
      "integrity": 64,
      "mass": 8,
      "mount": "T",
-      "piercing": 90,
+      "piercing": 70,
      "power": 0.64,
      "range": 4000,
      "rating": "D",
@@ -246,14 +246,14 @@
      "type": "K"
    },
    {
-      "ammo": 100,
+      "ammo": 120,
      "breachdmg": 63.2,
      "breachmax": 0.8,
      "breachmin": 0.6,
      "class": 4,
-      "clip": 5,
+      "clip": 6,
      "cost": 2700800,
-      "damage": 65.66,
+      "damage": 82.1,
      "distdraw": 1.61,
      "edID": 128049441,
      "eddbID": 853,
@@ -268,7 +268,7 @@
      "power": 0.92,
      "range": 4500,
      "rating": "B",
-      "reload": 5,
+      "reload": 3,
      "rof": 0.385,
      "speed": 900,
      "thermload": 4.8,
@@ -282,7 +282,7 @@
      "class": 4,
      "clip": 5,
      "cost": 5401600,
-      "damage": 49.2,
+      "damage": 56.58,
      "distdraw": 1.72,
      "edID": 128049444,
      "eddbID": 856,
--- a/modules/hardpoints/fragment_cannon.json
+++ b/modules/hardpoints/fragment_cannon.json
@@ -1,7 +1,7 @@
 {
  "fc": [
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 1.3,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -22,7 +22,7 @@
      "power": 0.45,
      "range": 2000,
      "rating": "E",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 5.555,
      "roundspershot": 12,
      "speed": 667,
@@ -30,7 +30,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 0.9,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -51,7 +51,7 @@
      "power": 0.59,
      "range": 2000,
      "rating": "E",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 5.88,
      "roundspershot": 12,
      "speed": 667,
@@ -59,7 +59,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 0.5,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -80,7 +80,7 @@
      "power": 0.42,
      "range": 2000,
      "rating": "E",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 4.76,
      "roundspershot": 12,
      "speed": 667,
@@ -88,7 +88,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 2.3,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -105,11 +105,11 @@
      "jitter": 0.5,
      "mass": 4,
      "mount": "F",
-      "piercing": 35,
+      "piercing": 30,
      "power": 0.74,
      "range": 2000,
      "rating": "A",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 5,
      "roundspershot": 12,
      "speed": 667,
@@ -117,7 +117,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 1.8,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -134,11 +134,11 @@
      "jitter": 0.5,
      "mass": 4,
      "mount": "G",
-      "piercing": 35,
+      "piercing": 30,
      "power": 1.03,
      "range": 2000,
      "rating": "D",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 5.26,
      "roundspershot": 12,
      "speed": 667,
@@ -146,7 +146,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 1.3,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -163,11 +163,11 @@
      "jitter": 0.5,
      "mass": 4,
      "mount": "T",
-      "piercing": 35,
+      "piercing": 30,
      "power": 0.79,
      "range": 2000,
      "rating": "D",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 4.345,
      "roundspershot": 12,
      "speed": 667,
@@ -175,7 +175,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 3.5,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -192,11 +192,11 @@
      "jitter": 0.5,
      "mass": 8,
      "mount": "F",
-      "piercing": 52,
+      "piercing": 45,
      "power": 1.02,
      "range": 2000,
      "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 4.545,
      "roundspershot": 12,
      "speed": 667,
@@ -204,7 +204,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 2.9,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -221,11 +221,11 @@
      "jitter": 0.5,
      "mass": 8,
      "mount": "G",
-      "piercing": 52,
+      "piercing": 45,
      "power": 1.55,
      "range": 2000,
      "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 4.76,
      "roundspershot": 12,
      "speed": 667,
@@ -233,7 +233,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 2.3,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -250,11 +250,11 @@
      "jitter": 0.5,
      "mass": 8,
      "mount": "T",
-      "piercing": 52,
+      "piercing": 45,
      "power": 1.29,
      "range": 2000,
      "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 4,
      "roundspershot": 12,
      "speed": 667,
@@ -262,7 +262,7 @@
      "type": "K"
    },
    {
-      "ammo": 90,
+      "ammo": 180,
      "breachdmg": 3.1,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -276,15 +276,17 @@
      "grp": "fc",
      "id": "pa",
      "integrity": 64,
+      "jitter": 1.7,
      "mass": 8,
      "mount": "F",
      "name": "Pacifier",
-      "piercing": 52,
+      "piercing": 45,
      "power": 1.02,
      "pp": "Zachary Hudson",
      "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
      "rof": 4.5,
+      "roundspershot": 12,
      "speed": 1000,
      "thermload": 1.1,
      "type": "K"
--- a/modules/hardpoints/mining_laser.json
+++ b/modules/hardpoints/mining_laser.json
@@ -7,7 +7,7 @@
      "class": 1,
      "cost": 6800,
      "damage": 2,
-      "distdraw": 1.5,
+      "distdraw": 1.35,
      "edID": 128049525,
      "eddbID": 888,
      "grp": "ml",
@@ -17,11 +17,12 @@
      "mount": "F",
      "piercing": 18,
      "power": 0.5,
+      "range": 500,
      "rating": "D",
      "thermload": 2
    },
    {
-      "breachdmg": 0.6,
+      "breachdmg": 1.2,
      "breachmax": 0.2,
      "breachmin": 0.1,
      "class": 1,
@@ -35,9 +36,10 @@
      "mass": 2,
      "mount": "F",
      "name": "Mining Lance",
-      "piercing": "D",
+      "piercing": 18,
      "power": 0.7,
      "pp": "Zemina Torval",
+      "range": 2000,
      "rating": "D",
      "thermload": 6,
      "type": "T"
@@ -59,6 +61,7 @@
      "mount": "F",
      "piercing": 18,
      "power": 0.75,
+      "range": 500,
      "rating": "D",
      "thermload": 4
    }
--- a/modules/hardpoints/missile_rack.json
+++ b/modules/hardpoints/missile_rack.json
@@ -3,8 +3,8 @@
    {
      "ammo": 16,
      "breachdmg": 20,
-      "breachmax": 1,
-      "breachmin": 1,
+      "breachmax": 0,
+      "breachmin": 0,
      "class": 1,
      "clip": 8,
      "cost": 32180,
@@ -57,12 +57,13 @@
    {
      "ammo": 48,
      "breachdmg": 20,
-      "breachmax": 1,
-      "breachmin": 1,
+      "breachmax": 0,
+      "breachmin": 0,
      "class": 2,
      "clip": 12,
      "cost": 240400,
-      "dps": 25,
+      "damage": 50,
+      "distdraw": 0.24,
      "edID": 128666725,
      "eddbID": 1327,
      "eps": 0.12,
@@ -79,6 +80,7 @@
      "reload": 5,
      "rof": 0.5,
      "speed": 750,
+      "thermload": 3.6,
      "type": "E"
    },
    {
@@ -140,7 +142,7 @@
    },
    {
      "ammo": 120,
-      "breachdmg": 6,
+      "breachdmg": 3,
      "breachmax": 0,
      "breachmin": 0,
      "class": 2,
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -6,7 +6,7 @@
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 1,
-      "clip": 90,
+      "clip": 100,
      "cost": 9500,
      "damage": 1.12,
      "distdraw": 0.06,
@@ -48,7 +48,7 @@
      "power": 0.37,
      "range": 4000,
      "rating": "G",
-      "reload": 4,
+      "reload": 5,
      "rof": 8.33,
      "speed": 1600,
      "thermload": 0.1,
@@ -83,13 +83,13 @@
    },
    {
      "ammo": 1000,
-      "breachdmg": 2.7,
+      "breachdmg": 2.6,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 1,
      "clip": 60,
      "cost": 13980,
-      "damage": 3,
+      "damage": 2.9,
      "distdraw": 0.12,
      "eddbID": 1481,
      "grp": "mc",
@@ -98,12 +98,12 @@
      "mass": 2,
      "mount": "F",
      "name": "Enforcer",
-      "piercing": "A",
+      "piercing": 30,
      "power": 0.28,
      "pp": "Pranav Antal",
      "range": 4500,
      "rating": "F",
-      "reload": 8,
+      "reload": 4,
      "rof": 4.3,
      "speed": 1800,
      "thermload": 0.2,
@@ -115,7 +115,7 @@
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 2,
-      "clip": 90,
+      "clip": 100,
      "cost": 38000,
      "damage": 2.19,
      "distdraw": 0.11,
@@ -157,7 +157,7 @@
      "power": 0.64,
      "range": 4000,
      "rating": "F",
-      "reload": 4,
+      "reload": 5,
      "rof": 7.69,
      "speed": 1600,
      "thermload": 0.2,
@@ -196,7 +196,7 @@
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 3,
-      "clip": 90,
+      "clip": 100,
      "cost": 140400,
      "damage": 3.93,
      "distdraw": 0.18,
@@ -238,7 +238,7 @@
      "power": 0.97,
      "range": 4000,
      "rating": "C",
-      "reload": 4,
+      "reload": 5,
      "rof": 6.665,
      "speed": 1600,
      "thermload": 0.3,
@@ -250,7 +250,7 @@
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 4,
-      "clip": 90,
+      "clip": 100,
      "cost": 1177600,
      "damage": 4.62,
      "distdraw": 0.24,
@@ -293,7 +293,7 @@
      "power": 1.22,
      "range": 4000,
      "rating": "A",
-      "reload": 4,
+      "reload": 5,
      "rof": 3.365,
      "roundspershot": 2,
      "speed": 1600,
--- a/modules/hardpoints/plasma_accelerator.json
+++ b/modules/hardpoints/plasma_accelerator.json
@@ -8,7 +8,7 @@
      "class": 2,
      "clip": 5,
      "cost": 834200,
-      "damage": 52,
+      "damage": 54.3,
      "distdraw": 8.65,
      "edID": 128049465,
      "eddbID": 873,
@@ -17,15 +17,15 @@
      "integrity": 51,
      "mass": 4,
      "mount": "F",
-      "piercing": 55,
+      "piercing": 100,
      "power": 1.43,
      "range": 3500,
      "rating": "C",
-      "reload": 8,
+      "reload": 6,
      "rof": 0.33,
      "speed": 875,
      "thermload": 15.6,
-      "type": "KT"
+      "type": "A"
    },
    {
      "ammo": 100,
@@ -35,7 +35,7 @@
      "class": 3,
      "clip": 5,
      "cost": 3051200,
-      "damage": 79.93,
+      "damage": 83.4,
      "distdraw": 13.6,
      "edID": 128049466,
      "eddbID": 874,
@@ -44,25 +44,25 @@
      "integrity": 64,
      "mass": 8,
      "mount": "F",
-      "piercing": 70,
+      "piercing": 100,
      "power": 1.97,
      "range": 3500,
      "rating": "B",
-      "reload": 8,
+      "reload": 6,
      "rof": 0.29,
      "speed": 875,
      "thermload": 21.8,
-      "type": "KT"
+      "type": "A"
    },
    {
      "ammo": 300,
-      "breachdmg": 28.1,
+      "breachdmg": 30.9,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 3,
      "clip": 20,
      "cost": 4119120,
-      "damage": 33,
+      "damage": 34.5,
      "distdraw": 5.5,
      "edID": 128671339,
      "eddbID": 1482,
@@ -72,16 +72,16 @@
      "mass": 8,
      "mount": "F",
      "name": "Advanced Plasma Accelerator",
-      "piercing": 70,
+      "piercing": 100,
      "power": 1.97,
      "pp": "Denton Patreus",
      "range": 3500,
      "rating": "B",
-      "reload": 8,
+      "reload": 6,
      "rof": 0.8,
      "speed": 875,
      "thermload": 11,
-      "type": "KT"
+      "type": "A"
    },
    {
      "ammo": 100,
@@ -91,7 +91,7 @@
      "class": 4,
      "clip": 5,
      "cost": 13793600,
-      "damage": 120,
+      "damage": 125.2,
      "distdraw": 21.04,
      "edID": 128049467,
      "eddbID": 875,
@@ -100,15 +100,15 @@
      "integrity": 80,
      "mass": 16,
      "mount": "F",
-      "piercing": 85,
+      "piercing": 100,
      "power": 2.63,
      "range": 3500,
      "rating": "A",
-      "reload": 8,
+      "reload": 6,
      "rof": 0.25,
      "speed": 875,
      "thermload": 29.5,
-      "type": "KT"
+      "type": "A"
    }
  ]
 }
--- a/modules/hardpoints/pulse_laser.json
+++ b/modules/hardpoints/pulse_laser.json
@@ -7,7 +7,7 @@
      "class": 1,
      "cost": 2200,
      "damage": 2.04,
-      "distdraw": 0.33,
+      "distdraw": 0.30,
      "edID": 128049381,
      "eddbID": 823,
      "grp": "pl",
@@ -76,7 +76,7 @@
      "class": 2,
      "cost": 17600,
      "damage": 3.49,
-      "distdraw": 0.56,
+      "distdraw": 0.5,
      "edID": 128049382,
      "eddbID": 824,
      "grp": "pl",
@@ -145,7 +145,7 @@
      "class": 2,
      "cost": 26400,
      "damage": 2.8,
-      "distdraw": 1,
+      "distdraw": 0.9,
      "eddbID": 1483,
      "grp": "pl",
      "id": "PL",
@@ -153,7 +153,7 @@
      "mass": 4,
      "mount": "F",
      "name": "Disruptor",
-      "piercing": "A",
+      "piercing": 35,
      "power": 0.7,
      "pp": "Felicia Winters",
      "rating": "E",
@@ -168,7 +168,7 @@
      "class": 3,
      "cost": 70400,
      "damage": 5.98,
-      "distdraw": 0.96,
+      "distdraw": 0.86,
      "edID": 128049383,
      "eddbID": 825,
      "grp": "pl",
@@ -237,7 +237,7 @@
      "class": 4,
      "cost": 177600,
      "damage": 10.23,
-      "distdraw": 1.64,
+      "distdraw": 1.48,
      "edID": 128049384,
      "eddbID": 1539,
      "grp": "pl",
--- a/modules/hardpoints/rail_gun.json
+++ b/modules/hardpoints/rail_gun.json
@@ -1,7 +1,7 @@
 {
  "rg": [
    {
-      "ammo": 30,
+      "ammo": 80,
      "breachdmg": 22.2,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -27,7 +27,7 @@
      "type": "KT"
    },
    {
-      "ammo": 30,
+      "ammo": 80,
      "breachdmg": 39.5,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -72,9 +72,10 @@
      "mass": 4,
      "mount": "F",
      "name": "Imperial Hammer",
-      "piercing": "A",
+      "piercing": 150,
      "power": 1.63,
      "pp": "Arissa Lavigny-Duval",
+      "range": 3000,
      "rating": "B",
      "reload": 1,
      "rof": 4.1,
--- a/modules/index.js
+++ b/modules/index.js
@@ -44,6 +44,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,
+    mrp: require('./internal/module_reinforcement_package').mrp,
    pv: require('./internal/planetary_vehicle_hanger').pv,
    psg: require('./internal/pristmatic_shield_generator').psg,
    pc: require('./internal/prospector_limpet_controllers').pc,
--- a/modules/internal/auto_field_maintenance_unit.json
+++ b/modules/internal/auto_field_maintenance_unit.json
@@ -1,394 +1,69 @@
 {
  "am": [
    {
-      "ammo": 10000,
+      "ammo": 1000,
      "ammocost": 1,
-      "class": 8,
-      "cost": 612220,
-      "edID": 128667605,
-      "eddbID": 1335,
+      "class": 1,
+      "cost": 10000,
+      "edID": 128667598,
+      "eddbID": 1328,
      "grp": "am",
-      "id": "1f",
-      "power": 1.8,
+      "id": "0c",
+      "power": 0.54,
      "rating": "E",
-      "repair": 120
+      "repair": 12
    },
    {
-      "ammo": 9000,
+      "ammo": 900,
      "ammocost": 1,
-      "class": 8,
-      "cost": 1836660,
-      "edID": 128667613,
-      "eddbID": 1343,
+      "class": 1,
+      "cost": 30000,
+      "edID": 128667606,
+      "eddbID": 1336,
      "grp": "am",
-      "id": "1e",
-      "power": 2.4,
+      "id": "0b",
+      "power": 0.72,
      "rating": "D",
-      "repair": 144
+      "repair": 14.4
    },
    {
-      "ammo": 10000,
+      "ammo": 1000,
      "ammocost": 1,
-      "class": 8,
-      "cost": 5509980,
-      "edID": 128667621,
-      "eddbID": 1351,
+      "class": 1,
+      "cost": 90000,
+      "edID": 128667614,
+      "eddbID": 1344,
      "grp": "am",
-      "id": "1d",
-      "power": 3,
+      "id": "0a",
+      "power": 0.9,
      "rating": "C",
-      "repair": 200
+      "repair": 20
    },
    {
-      "ammo": 12000,
+      "ammo": 1200,
      "ammocost": 1,
-      "class": 8,
-      "cost": 16529940,
-      "edID": 128667629,
-      "eddbID": 1359,
+      "class": 1,
+      "cost": 270000,
+      "edID": 128667622,
+      "eddbID": 1352,
      "grp": "am",
-      "id": "1c",
-      "power": 3.45,
+      "id": "09",
+      "power": 1.04,
      "rating": "B",
-      "repair": 276
+      "repair": 27.6
    },
    {
-      "ammo": 11000,
+      "ammo": 1100,
      "ammocost": 1,
-      "class": 8,
-      "cost": 49589820,
-      "edID": 128667637,
-      "eddbID": 1367,
+      "class": 1,
+      "cost": 810000,
+      "edID": 128667630,
+      "eddbID": 1360,
      "grp": "am",
-      "id": "1b",
-      "power": 4.2,
+      "id": "08",
+      "power": 1.26,
      "rating": "A",
-      "repair": 308
-    },
-    {
-      "ammo": 8700,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 340120,
-      "edID": 128667604,
-      "eddbID": 1334,
-      "grp": "am",
-      "id": "1a",
-      "power": 1.58,
-      "rating": "E",
-      "repair": 104.4
-    },
-    {
-      "ammo": 7800,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 1020370,
-      "edID": 128667612,
-      "eddbID": 1342,
-      "grp": "am",
-      "id": "19",
-      "power": 2.1,
-      "rating": "D",
-      "repair": 124.8
-    },
-    {
-      "ammo": 8700,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 3061100,
-      "edID": 128667620,
-      "eddbID": 1350,
-      "grp": "am",
-      "id": "18",
-      "power": 2.63,
-      "rating": "C",
-      "repair": 174
-    },
-    {
-      "ammo": 10400,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 9183300,
-      "edID": 128667628,
-      "eddbID": 1358,
-      "grp": "am",
-      "id": "17",
-      "power": 3.02,
-      "rating": "B",
-      "repair": 239.2
-    },
-    {
-      "ammo": 9600,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 27549900,
-      "edID": 128667636,
-      "eddbID": 1366,
-      "grp": "am",
-      "id": "16",
-      "power": 3.68,
-      "rating": "A",
-      "repair": 268.8
-    },
-    {
-      "ammo": 7400,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 188960,
-      "edID": 128667603,
-      "eddbID": 1333,
-      "grp": "am",
-      "id": "15",
-      "power": 1.4,
-      "rating": "E",
-      "repair": 88.8
-    },
-    {
-      "ammo": 6700,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 566870,
-      "edID": 128667611,
-      "eddbID": 1341,
-      "grp": "am",
-      "id": "14",
-      "power": 1.86,
-      "rating": "D",
-      "repair": 107.2
-    },
-    {
-      "ammo": 7400,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 1700610,
-      "edID": 128667619,
-      "eddbID": 1349,
-      "grp": "am",
-      "id": "13",
-      "power": 2.33,
-      "rating": "C",
-      "repair": 148
-    },
-    {
-      "ammo": 8900,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 5101830,
-      "edID": 128667627,
-      "eddbID": 1357,
-      "grp": "am",
-      "id": "12",
-      "power": 2.67,
-      "rating": "B",
-      "repair": 204.7
-    },
-    {
-      "ammo": 8100,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 15305500,
-      "edID": 128667635,
-      "eddbID": 1365,
-      "grp": "am",
-      "id": "11",
-      "power": 3.26,
-      "rating": "A",
-      "repair": 226.8
-    },
-    {
-      "ammo": 6100,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 104980,
-      "edID": 128667602,
-      "eddbID": 1332,
-      "grp": "am",
-      "id": "10",
-      "power": 1.17,
-      "rating": "E",
-      "repair": 73.2
-    },
-    {
-      "ammo": 5500,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 314930,
-      "edID": 128667610,
-      "eddbID": 1340,
-      "grp": "am",
-      "id": "0v",
-      "power": 1.56,
-      "rating": "D",
-      "repair": 88
-    },
-    {
-      "ammo": 6100,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 944780,
-      "edID": 128667618,
-      "eddbID": 1348,
-      "grp": "am",
-      "id": "0u",
-      "power": 1.95,
-      "rating": "C",
-      "repair": 122
-    },
-    {
-      "ammo": 7300,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 2834350,
-      "edID": 128667626,
-      "eddbID": 1356,
-      "grp": "am",
-      "id": "0t",
-      "power": 2.24,
-      "rating": "B",
-      "repair": 167.9
-    },
-    {
-      "ammo": 6700,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 8503060,
-      "edID": 128667634,
-      "eddbID": 1364,
-      "grp": "am",
-      "id": "0s",
-      "power": 2.73,
-      "rating": "A",
-      "repair": 187.6
-    },
-    {
-      "ammo": 4900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 58320,
-      "edID": 128667601,
-      "eddbID": 1331,
-      "grp": "am",
-      "id": "0r",
-      "power": 0.99,
-      "rating": "E",
-      "repair": 58.8
-    },
-    {
-      "ammo": 4400,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 174960,
-      "edID": 128667609,
-      "eddbID": 1339,
-      "grp": "am",
-      "id": "0q",
-      "power": 1.32,
-      "rating": "D",
-      "repair": 70.4
-    },
-    {
-      "ammo": 4900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 524880,
-      "edID": 128667617,
-      "eddbID": 1347,
-      "grp": "am",
-      "id": "0p",
-      "power": 1.65,
-      "rating": "C",
-      "repair": 98
-    },
-    {
-      "ammo": 5900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 1574640,
-      "edID": 128667625,
-      "eddbID": 1355,
-      "grp": "am",
-      "id": "0o",
-      "power": 1.9,
-      "rating": "B",
-      "repair": 135.7
-    },
-    {
-      "ammo": 5400,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 4723920,
-      "edID": 128667633,
-      "eddbID": 1363,
-      "grp": "am",
-      "id": "0n",
-      "power": 2.31,
-      "rating": "A",
-      "repair": 151.2
-    },
-    {
-      "ammo": 3600,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 32400,
-      "edID": 128667600,
-      "eddbID": 1330,
-      "grp": "am",
-      "id": "0m",
-      "power": 0.81,
-      "rating": "E",
-      "repair": 43.2
-    },
-    {
-      "ammo": 3200,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 97200,
-      "edID": 128667608,
-      "eddbID": 1338,
-      "grp": "am",
-      "id": "0l",
-      "power": 1.08,
-      "rating": "D",
-      "repair": 51.2
-    },
-    {
-      "ammo": 3600,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 291600,
-      "edID": 128667616,
-      "eddbID": 1346,
-      "grp": "am",
-      "id": "0k",
-      "power": 1.35,
-      "rating": "C",
-      "repair": 72
-    },
-    {
-      "ammo": 4300,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 874800,
-      "edID": 128667624,
-      "eddbID": 1354,
-      "grp": "am",
-      "id": "0j",
-      "power": 1.55,
-      "rating": "B",
-      "repair": 98.9
-    },
-    {
-      "ammo": 4000,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 2624400,
-      "edID": 128667632,
-      "eddbID": 1362,
-      "grp": "am",
-      "id": "0i",
-      "power": 1.89,
-      "rating": "A",
-      "repair": 112
+      "repair": 30.8
    },
    {
      "ammo": 2300,
@@ -456,69 +131,394 @@
      "repair": 70
    },
    {
-      "ammo": 1000,
+      "ammo": 3600,
      "ammocost": 1,
-      "class": 1,
-      "cost": 10000,
-      "edID": 128667598,
-      "eddbID": 1328,
+      "class": 3,
+      "cost": 32400,
+      "edID": 128667600,
+      "eddbID": 1330,
      "grp": "am",
-      "id": "0c",
-      "power": 0.54,
+      "id": "0m",
+      "power": 0.81,
      "rating": "E",
-      "repair": 12
+      "repair": 43.2
    },
    {
-      "ammo": 900,
+      "ammo": 3200,
      "ammocost": 1,
-      "class": 1,
-      "cost": 30000,
-      "edID": 128667606,
-      "eddbID": 1336,
+      "class": 3,
+      "cost": 97200,
+      "edID": 128667608,
+      "eddbID": 1338,
      "grp": "am",
-      "id": "0b",
-      "power": 0.72,
+      "id": "0l",
+      "power": 1.08,
      "rating": "D",
-      "repair": 14.4
+      "repair": 51.2
    },
    {
-      "ammo": 1000,
+      "ammo": 3600,
      "ammocost": 1,
-      "class": 1,
-      "cost": 90000,
-      "edID": 128667614,
-      "eddbID": 1344,
+      "class": 3,
+      "cost": 291600,
+      "edID": 128667616,
+      "eddbID": 1346,
      "grp": "am",
-      "id": "0a",
-      "power": 0.9,
+      "id": "0k",
+      "power": 1.35,
      "rating": "C",
-      "repair": 20
+      "repair": 72
    },
    {
-      "ammo": 1200,
+      "ammo": 4300,
      "ammocost": 1,
-      "class": 1,
-      "cost": 270000,
-      "edID": 128667622,
-      "eddbID": 1352,
+      "class": 3,
+      "cost": 874800,
+      "edID": 128667624,
+      "eddbID": 1354,
      "grp": "am",
-      "id": "09",
-      "power": 1.04,
+      "id": "0j",
+      "power": 1.55,
      "rating": "B",
-      "repair": 27.6
+      "repair": 98.9
    },
    {
-      "ammo": 1100,
+      "ammo": 4000,
      "ammocost": 1,
-      "class": 1,
-      "cost": 810000,
-      "edID": 128667630,
-      "eddbID": 1360,
+      "class": 3,
+      "cost": 2624400,
+      "edID": 128667632,
+      "eddbID": 1362,
      "grp": "am",
-      "id": "08",
-      "power": 1.26,
+      "id": "0i",
+      "power": 1.89,
      "rating": "A",
-      "repair": 30.8
+      "repair": 112
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 58320,
+      "edID": 128667601,
+      "eddbID": 1331,
+      "grp": "am",
+      "id": "0r",
+      "power": 0.99,
+      "rating": "E",
+      "repair": 58.8
+    },
+    {
+      "ammo": 4400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 174960,
+      "edID": 128667609,
+      "eddbID": 1339,
+      "grp": "am",
+      "id": "0q",
+      "power": 1.32,
+      "rating": "D",
+      "repair": 70.4
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 524880,
+      "edID": 128667617,
+      "eddbID": 1347,
+      "grp": "am",
+      "id": "0p",
+      "power": 1.65,
+      "rating": "C",
+      "repair": 98
+    },
+    {
+      "ammo": 5900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 1574640,
+      "edID": 128667625,
+      "eddbID": 1355,
+      "grp": "am",
+      "id": "0o",
+      "power": 1.9,
+      "rating": "B",
+      "repair": 135.7
+    },
+    {
+      "ammo": 5400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 4723920,
+      "edID": 128667633,
+      "eddbID": 1363,
+      "grp": "am",
+      "id": "0n",
+      "power": 2.31,
+      "rating": "A",
+      "repair": 151.2
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 104980,
+      "edID": 128667602,
+      "eddbID": 1332,
+      "grp": "am",
+      "id": "10",
+      "power": 1.17,
+      "rating": "E",
+      "repair": 73.2
+    },
+    {
+      "ammo": 5500,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 314930,
+      "edID": 128667610,
+      "eddbID": 1340,
+      "grp": "am",
+      "id": "0v",
+      "power": 1.56,
+      "rating": "D",
+      "repair": 88
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 944780,
+      "edID": 128667618,
+      "eddbID": 1348,
+      "grp": "am",
+      "id": "0u",
+      "power": 1.95,
+      "rating": "C",
+      "repair": 122
+    },
+    {
+      "ammo": 7300,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 2834350,
+      "edID": 128667626,
+      "eddbID": 1356,
+      "grp": "am",
+      "id": "0t",
+      "power": 2.24,
+      "rating": "B",
+      "repair": 167.9
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 8503060,
+      "edID": 128667634,
+      "eddbID": 1364,
+      "grp": "am",
+      "id": "0s",
+      "power": 2.73,
+      "rating": "A",
+      "repair": 187.6
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 188960,
+      "edID": 128667603,
+      "eddbID": 1333,
+      "grp": "am",
+      "id": "15",
+      "power": 1.4,
+      "rating": "E",
+      "repair": 88.8
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 566870,
+      "edID": 128667611,
+      "eddbID": 1341,
+      "grp": "am",
+      "id": "14",
+      "power": 1.86,
+      "rating": "D",
+      "repair": 107.2
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 1700610,
+      "edID": 128667619,
+      "eddbID": 1349,
+      "grp": "am",
+      "id": "13",
+      "power": 2.33,
+      "rating": "C",
+      "repair": 148
+    },
+    {
+      "ammo": 8900,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 5101830,
+      "edID": 128667627,
+      "eddbID": 1357,
+      "grp": "am",
+      "id": "12",
+      "power": 2.67,
+      "rating": "B",
+      "repair": 204.7
+    },
+    {
+      "ammo": 8100,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 15305500,
+      "edID": 128667635,
+      "eddbID": 1365,
+      "grp": "am",
+      "id": "11",
+      "power": 3.26,
+      "rating": "A",
+      "repair": 226.8
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 340120,
+      "edID": 128667604,
+      "eddbID": 1334,
+      "grp": "am",
+      "id": "1a",
+      "power": 1.58,
+      "rating": "E",
+      "repair": 104.4
+    },
+    {
+      "ammo": 7800,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 1020370,
+      "edID": 128667612,
+      "eddbID": 1342,
+      "grp": "am",
+      "id": "19",
+      "power": 2.1,
+      "rating": "D",
+      "repair": 124.8
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 3061100,
+      "edID": 128667620,
+      "eddbID": 1350,
+      "grp": "am",
+      "id": "18",
+      "power": 2.63,
+      "rating": "C",
+      "repair": 174
+    },
+    {
+      "ammo": 10400,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 9183300,
+      "edID": 128667628,
+      "eddbID": 1358,
+      "grp": "am",
+      "id": "17",
+      "power": 3.02,
+      "rating": "B",
+      "repair": 239.2
+    },
+    {
+      "ammo": 9600,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 27549900,
+      "edID": 128667636,
+      "eddbID": 1366,
+      "grp": "am",
+      "id": "16",
+      "power": 3.68,
+      "rating": "A",
+      "repair": 268.8
+    },
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 612220,
+      "edID": 128667605,
+      "eddbID": 1335,
+      "grp": "am",
+      "id": "1f",
+      "power": 1.8,
+      "rating": "E",
+      "repair": 120
+    },
+    {
+      "ammo": 9000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 1836660,
+      "edID": 128667613,
+      "eddbID": 1343,
+      "grp": "am",
+      "id": "1e",
+      "power": 2.4,
+      "rating": "D",
+      "repair": 144
+    },
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 5509980,
+      "edID": 128667621,
+      "eddbID": 1351,
+      "grp": "am",
+      "id": "1d",
+      "power": 3,
+      "rating": "C",
+      "repair": 200
+    },
+    {
+      "ammo": 12000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 16529940,
+      "edID": 128667629,
+      "eddbID": 1359,
+      "grp": "am",
+      "id": "1c",
+      "power": 3.45,
+      "rating": "B",
+      "repair": 276
+    },
+    {
+      "ammo": 11000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 49589820,
+      "edID": 128667637,
+      "eddbID": 1367,
+      "grp": "am",
+      "id": "1b",
+      "power": 4.2,
+      "rating": "A",
+      "repair": 308
    }
  ]
 }
--- a/modules/internal/bi_weave_shield_generator.json
+++ b/modules/internal/bi_weave_shield_generator.json
@@ -1,8 +1,10 @@
 {
  "bsg": [
    {
+      "brokenregen": 2.4,
      "class": 1,
      "cost": 7710,
+      "distdraw": 0.6,
      "edID": 128671331,
      "eddbID": 1530,
      "explres": 0.5,
@@ -18,12 +20,14 @@
      "optmul": 0.9,
      "power": 1.2,
      "rating": "C",
-      "recover": 2.4,
+      "regen": 1.8,
      "thermres": -0.2
    },
    {
+      "brokenregen": 2.4,
      "class": 2,
      "cost": 26710,
+      "distdraw": 0.6,
      "edID": 128671332,
      "eddbID": 1531,
      "explres": 0.5,
@@ -39,12 +43,14 @@
      "optmul": 0.9,
      "power": 1.5,
      "rating": "C",
-      "recover": 2.4,
+      "regen": 1.8,
      "thermres": -0.2
    },
    {
+      "brokenregen": 2.8,
      "class": 3,
      "cost": 84650,
+      "distdraw": 0.6,
      "edID": 128671333,
      "eddbID": 1532,
      "explres": 0.5,
@@ -60,12 +66,14 @@
      "optmul": 0.9,
      "power": 1.8,
      "rating": "C",
-      "recover": 2.4,
+      "regen": 2.2,
      "thermres": -0.2
    },
    {
+      "brokenregen": 3.8,
      "class": 4,
      "cost": 268350,
+      "distdraw": 0.6,
      "edID": 128671334,
      "eddbID": 1533,
      "explres": 0.5,
@@ -81,12 +89,14 @@
      "optmul": 0.9,
      "power": 2.2,
      "rating": "C",
-      "recover": 2.85,
+      "regen": 1.8,
      "thermres": -0.2
    },
    {
+      "brokenregen": 5.6,
      "class": 5,
      "cost": 850660,
+      "distdraw": 0.6,
      "edID": 128671335,
      "eddbID": 1534,
      "explres": 0.5,
@@ -102,12 +112,14 @@
      "optmul": 0.9,
      "power": 2.6,
      "rating": "C",
-      "recover": 3.75,
+      "regen": 2.2,
      "thermres": -0.2
    },
    {
+      "brokenregen": 8,
      "class": 6,
      "cost": 2696600,
+      "distdraw": 0.6,
      "edID": 128671336,
      "eddbID": 1535,
      "explres": 0.5,
@@ -123,12 +135,14 @@
      "optmul": 0.9,
      "power": 3.1,
      "rating": "C",
-      "recover": 4.8,
+      "regen": 3.2,
      "thermres": -0.2
    },
    {
+      "brokenregen": 11,
      "class": 7,
      "cost": 8548200,
+      "distdraw": 0.6,
      "edID": 128671337,
      "eddbID": 1536,
      "explres": 0.5,
@@ -144,12 +158,14 @@
      "optmul": 0.9,
      "power": 3.5,
      "rating": "C",
-      "recover": 6,
+      "regen": 4.4,
      "thermres": -0.2
    },
    {
+      "brokenregen": 14.4,
      "class": 8,
      "cost": 27097750,
+      "distdraw": 0.6,
      "edID": 128671338,
      "eddbID": 1537,
      "explres": 0.5,
@@ -165,7 +181,7 @@
      "optmul": 0.9,
      "power": 4,
      "rating": "C",
-      "recover": 7.2,
+      "regen": 5.8,
      "thermres": -0.2
    }
  ]
--- a/modules/internal/collector_limpet_controllers.json
+++ b/modules/internal/collector_limpet_controllers.json
@@ -1,142 +1,72 @@
 {
  "cc": [
    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671244,
-      "eddbID": 1409,
+      "class": 1,
+      "cost": 600,
+      "edID": 128671229,
+      "eddbID": 1394,
      "grp": "cc",
-      "id": "Cf",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.41,
-      "range": 1.36,
+      "id": "C1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 0.8,
      "rating": "E",
      "time": 300
    },
    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671245,
-      "eddbID": 1410,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671230,
+      "eddbID": 1395,
      "grp": "cc",
-      "id": "Cg",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.55,
-      "range": 1.02,
+      "id": "C2",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
      "rating": "D",
      "time": 600
    },
    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671246,
-      "eddbID": 1411,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671231,
+      "eddbID": 1396,
      "grp": "cc",
-      "id": "Ch",
-      "mass": 80,
-      "maximum": 4,
-      "power": 0.69,
-      "range": 1.7,
+      "id": "C3",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
      "rating": "C",
      "time": 510
    },
    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671247,
-      "eddbID": 1412,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671232,
+      "eddbID": 1397,
      "grp": "cc",
-      "id": "Ci",
-      "mass": 128,
-      "maximum": 4,
-      "power": 0.83,
-      "range": 2.38,
+      "id": "C4",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 1.4,
      "rating": "B",
      "time": 420
    },
    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671248,
-      "eddbID": 1413,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671233,
+      "eddbID": 1398,
      "grp": "cc",
-      "id": "Cj",
-      "mass": 128,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 2.04,
-      "rating": "A",
-      "time": 720
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671239,
-      "eddbID": 1404,
-      "grp": "cc",
-      "id": "Ca",
-      "mass": 8,
-      "maximum": 3,
-      "power": 0.3,
-      "range": 1.04,
-      "rating": "E",
-      "time": 300
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671240,
-      "eddbID": 1405,
-      "grp": "cc",
-      "id": "Cb",
-      "mass": 8,
-      "maximum": 3,
-      "power": 0.4,
-      "range": 0.78,
-      "rating": "D",
-      "time": 600
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671241,
-      "eddbID": 1406,
-      "grp": "cc",
-      "id": "Cc",
-      "mass": 20,
-      "maximum": 3,
-      "power": 0.5,
-      "range": 1.3,
-      "rating": "C",
-      "time": 510
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671242,
-      "eddbID": 1407,
-      "grp": "cc",
-      "id": "Cd",
-      "mass": 32,
-      "maximum": 3,
-      "power": 0.6,
-      "range": 1.82,
-      "rating": "B",
-      "time": 420
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671243,
-      "eddbID": 1408,
-      "grp": "cc",
-      "id": "Ce",
-      "mass": 32,
-      "maximum": 3,
-      "power": 0.7,
-      "range": 1.56,
+      "id": "C5",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
      "rating": "A",
      "time": 720
    },
@@ -211,72 +141,142 @@
      "time": 720
    },
    {
-      "class": 1,
-      "cost": 600,
-      "edID": 128671229,
-      "eddbID": 1394,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671239,
+      "eddbID": 1404,
      "grp": "cc",
-      "id": "C1",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.14,
-      "range": 0.8,
+      "id": "Ca",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 1.04,
      "rating": "E",
      "time": 300
    },
    {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128671230,
-      "eddbID": 1395,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671240,
+      "eddbID": 1405,
      "grp": "cc",
-      "id": "C2",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.18,
-      "range": 0.6,
+      "id": "Cb",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.4,
+      "range": 0.78,
      "rating": "D",
      "time": 600
    },
    {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128671231,
-      "eddbID": 1396,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671241,
+      "eddbID": 1406,
      "grp": "cc",
-      "id": "C3",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.23,
-      "range": 1,
+      "id": "Cc",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.5,
+      "range": 1.3,
      "rating": "C",
      "time": 510
    },
    {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128671232,
-      "eddbID": 1397,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671242,
+      "eddbID": 1407,
      "grp": "cc",
-      "id": "C4",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 1.4,
+      "id": "Cd",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.6,
+      "range": 1.82,
      "rating": "B",
      "time": 420
    },
    {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128671233,
-      "eddbID": 1398,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671243,
+      "eddbID": 1408,
      "grp": "cc",
-      "id": "C5",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.32,
-      "range": 1.2,
+      "id": "Ce",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.7,
+      "range": 1.56,
+      "rating": "A",
+      "time": 720
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671244,
+      "eddbID": 1409,
+      "grp": "cc",
+      "id": "Cf",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671245,
+      "eddbID": 1410,
+      "grp": "cc",
+      "id": "Cg",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "D",
+      "time": 600
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671246,
+      "eddbID": 1411,
+      "grp": "cc",
+      "id": "Ch",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C",
+      "time": 510
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671247,
+      "eddbID": 1412,
+      "grp": "cc",
+      "id": "Ci",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "B",
+      "time": 420
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671248,
+      "eddbID": 1413,
+      "grp": "cc",
+      "id": "Cj",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 2.04,
      "rating": "A",
      "time": 720
    }
--- a/modules/internal/fighter_hangar.json
+++ b/modules/internal/fighter_hangar.json
@@ -1,18 +1,18 @@
 {
  "fh": [
    {
-      "bays": 2,
-      "class": 7,
+      "bays": 1,
+      "class": 5,
      "cost": 575660,
-      "edID": 128727932,
-      "eddbID": 1562,
+      "edID": 128727930,
+      "eddbID": 1560,
      "fightercost": 1030,
      "grp": "fh",
-      "id": "fh",
-      "mass": 60,
-      "power": 0.35,
+      "id": "fr",
+      "mass": 20,
+      "power": 0.25,
      "rating": "D",
-      "rebuildsperbay": 15
+      "rebuildsperbay": 6
    },
    {
      "bays": 2,
@@ -29,18 +29,18 @@
      "rebuildsperbay": 8
    },
    {
-      "bays": 1,
-      "class": 5,
+      "bays": 2,
+      "class": 7,
+      "edID": 128727932,
      "cost": 2369330,
-      "edID": 128727930,
-      "eddbID": 1560,
+      "eddbID": 1562,
      "fightercost": 1030,
      "grp": "fh",
-      "id": "fr",
-      "mass": 20,
-      "power": 0.25,
+      "id": "fh",
+      "mass": 60,
+      "power": 0.35,
      "rating": "D",
-      "rebuildsperbay": 6
+      "rebuildsperbay": 15
    }
  ]
 }
--- a/modules/internal/fuel_scoop.json
+++ b/modules/internal/fuel_scoop.json
@@ -1,333 +1,58 @@
 {
  "fs": [
    {
-      "class": 8,
-      "cost": 1083910,
-      "edID": 128666651,
-      "eddbID": 1253,
+      "class": 1,
+      "cost": 310,
+      "edID": 128666644,
+      "eddbID": 1246,
      "grp": "fs",
-      "id": "3q",
-      "power": 0.48,
-      "rate": 720,
+      "id": "2n",
+      "power": 0.14,
+      "rate": 18,
      "rating": "E"
    },
    {
-      "class": 8,
-      "cost": 4516290,
-      "edID": 128666659,
-      "eddbID": 1261,
+      "class": 1,
+      "cost": 1290,
+      "edID": 128666652,
+      "eddbID": 1254,
      "grp": "fs",
-      "id": "3p",
-      "power": 0.64,
-      "rate": 960,
+      "id": "2m",
+      "power": 0.18,
+      "rate": 24,
      "rating": "D"
    },
    {
-      "class": 8,
-      "cost": 18065160,
-      "edID": 128666667,
-      "eddbID": 1269,
+      "class": 1,
+      "cost": 5140,
+      "edID": 128666660,
+      "eddbID": 1262,
      "grp": "fs",
-      "id": "3o",
-      "power": 0.8,
-      "rate": 1200,
+      "id": "2l",
+      "power": 0.23,
+      "rate": 30,
      "rating": "C"
    },
    {
-      "class": 8,
-      "cost": 72260660,
-      "edID": 128666675,
-      "eddbID": 1277,
+      "class": 1,
+      "cost": 20570,
+      "edID": 128666668,
+      "eddbID": 1270,
      "grp": "fs",
-      "id": "3n",
-      "power": 0.96,
-      "rate": 1440,
+      "id": "2k",
+      "power": 0.28,
+      "rate": 36,
      "rating": "B"
    },
    {
-      "class": 8,
-      "cost": 289042540,
-      "edID": 128666683,
-      "eddbID": 1285,
+      "class": 1,
+      "cost": 82270,
+      "edID": 128666676,
+      "eddbID": 1278,
      "grp": "fs",
-      "id": "3m",
-      "power": 1.12,
-      "rate": 1680,
-      "rating": "A"
-    },
-    {
-      "class": 7,
-      "cost": 341930,
-      "edID": 128666650,
-      "eddbID": 1252,
-      "grp": "fs",
-      "id": "3l",
-      "power": 0.41,
-      "rate": 534,
-      "rating": "E"
-    },
-    {
-      "class": 7,
-      "cost": 1424700,
-      "edID": 128666658,
-      "eddbID": 1260,
-      "grp": "fs",
-      "id": "3k",
-      "power": 0.55,
-      "rate": 712,
-      "rating": "D"
-    },
-    {
-      "class": 7,
-      "cost": 5698790,
-      "edID": 128666666,
-      "eddbID": 1268,
-      "grp": "fs",
-      "id": "3j",
-      "power": 0.69,
-      "rate": 890,
-      "rating": "C"
-    },
-    {
-      "class": 7,
-      "cost": 22795160,
-      "edID": 128666674,
-      "eddbID": 1276,
-      "grp": "fs",
-      "id": "3i",
-      "power": 0.83,
-      "rate": 1068,
-      "rating": "B"
-    },
-    {
-      "class": 7,
-      "cost": 91180640,
-      "edID": 128666682,
-      "eddbID": 1284,
-      "grp": "fs",
-      "id": "3h",
-      "power": 0.97,
-      "rate": 1245,
-      "rating": "A"
-    },
-    {
-      "class": 6,
-      "cost": 107860,
-      "edID": 128666649,
-      "eddbID": 1251,
-      "grp": "fs",
-      "id": "3g",
-      "power": 0.35,
-      "rate": 376,
-      "rating": "E"
-    },
-    {
-      "class": 6,
-      "cost": 449430,
-      "edID": 128666657,
-      "eddbID": 1259,
-      "grp": "fs",
-      "id": "3f",
-      "power": 0.47,
-      "rate": 502,
-      "rating": "D"
-    },
-    {
-      "class": 6,
-      "cost": 1797730,
-      "edID": 128666665,
-      "eddbID": 1267,
-      "grp": "fs",
-      "id": "3e",
-      "power": 0.59,
-      "rate": 627,
-      "rating": "C"
-    },
-    {
-      "class": 6,
-      "cost": 7190900,
-      "edID": 128666673,
-      "eddbID": 1275,
-      "grp": "fs",
-      "id": "3d",
-      "power": 0.71,
-      "rate": 752,
-      "rating": "B"
-    },
-    {
-      "class": 6,
-      "cost": 28763610,
-      "edID": 128666681,
-      "eddbID": 1283,
-      "grp": "fs",
-      "id": "3c",
-      "power": 0.83,
-      "rate": 878,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 34030,
-      "edID": 128666648,
-      "eddbID": 1250,
-      "grp": "fs",
-      "id": "3b",
-      "power": 0.3,
-      "rate": 247,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 141780,
-      "edID": 128666656,
-      "eddbID": 1258,
-      "grp": "fs",
-      "id": "3a",
-      "power": 0.4,
-      "rate": 330,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 567110,
-      "edID": 128666664,
-      "eddbID": 1266,
-      "grp": "fs",
-      "id": "39",
-      "power": 0.5,
-      "rate": 412,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 2268420,
-      "edID": 128666672,
-      "eddbID": 1274,
-      "grp": "fs",
-      "id": "38",
-      "power": 0.6,
-      "rate": 494,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 9073690,
-      "edID": 128666680,
-      "eddbID": 1282,
-      "grp": "fs",
-      "id": "37",
-      "power": 0.7,
-      "rate": 577,
-      "rating": "A"
-    },
-    {
-      "class": 4,
-      "cost": 10730,
-      "edID": 128666647,
-      "eddbID": 1249,
-      "grp": "fs",
-      "id": "36",
-      "power": 0.25,
-      "rate": 147,
-      "rating": "E"
-    },
-    {
-      "class": 4,
-      "cost": 44720,
-      "edID": 128666655,
-      "eddbID": 1257,
-      "grp": "fs",
-      "id": "35",
-      "power": 0.33,
-      "rate": 196,
-      "rating": "D"
-    },
-    {
-      "class": 4,
-      "cost": 178900,
-      "edID": 128666663,
-      "eddbID": 1265,
-      "grp": "fs",
-      "id": "34",
-      "power": 0.41,
-      "rate": 245,
-      "rating": "C"
-    },
-    {
-      "class": 4,
-      "cost": 715590,
-      "edID": 128666671,
-      "eddbID": 1273,
-      "grp": "fs",
-      "id": "33",
-      "power": 0.49,
-      "rate": 294,
-      "rating": "B"
-    },
-    {
-      "class": 4,
-      "cost": 2862360,
-      "edID": 128666679,
-      "eddbID": 1281,
-      "grp": "fs",
-      "id": "32",
-      "power": 0.57,
-      "rate": 342,
-      "rating": "A"
-    },
-    {
-      "class": 3,
-      "cost": 3390,
-      "edID": 128666646,
-      "eddbID": 1248,
-      "grp": "fs",
-      "id": "31",
-      "power": 0.2,
-      "rate": 75,
-      "rating": "E"
-    },
-    {
-      "class": 3,
-      "cost": 14110,
-      "edID": 128666654,
-      "eddbID": 1256,
-      "grp": "fs",
-      "id": "30",
-      "power": 0.27,
-      "rate": 100,
-      "rating": "D"
-    },
-    {
-      "class": 3,
-      "cost": 56440,
-      "edID": 128666662,
-      "eddbID": 1264,
-      "grp": "fs",
-      "id": "2v",
-      "power": 0.34,
-      "rate": 126,
-      "rating": "C"
-    },
-    {
-      "class": 3,
-      "cost": 225740,
-      "edID": 128666670,
-      "eddbID": 1272,
-      "grp": "fs",
-      "id": "2u",
-      "power": 0.41,
-      "rate": 151,
-      "rating": "B"
-    },
-    {
-      "class": 3,
-      "cost": 902950,
-      "edID": 128666678,
-      "eddbID": 1280,
-      "grp": "fs",
-      "id": "2t",
-      "power": 0.48,
-      "rate": 176,
+      "id": "2j",
+      "power": 0.32,
+      "rate": 42,
      "rating": "A"
    },
    {
@@ -386,58 +111,333 @@
      "rating": "A"
    },
    {
-      "class": 1,
-      "cost": 310,
-      "edID": 128666644,
-      "eddbID": 1246,
+      "class": 3,
+      "cost": 3390,
+      "edID": 128666646,
+      "eddbID": 1248,
      "grp": "fs",
-      "id": "2n",
-      "power": 0.14,
-      "rate": 18,
+      "id": "31",
+      "power": 0.2,
+      "rate": 75,
      "rating": "E"
    },
    {
-      "class": 1,
-      "cost": 1290,
-      "edID": 128666652,
-      "eddbID": 1254,
+      "class": 3,
+      "cost": 14110,
+      "edID": 128666654,
+      "eddbID": 1256,
      "grp": "fs",
-      "id": "2m",
-      "power": 0.18,
-      "rate": 24,
+      "id": "30",
+      "power": 0.27,
+      "rate": 100,
      "rating": "D"
    },
    {
-      "class": 1,
-      "cost": 5140,
-      "edID": 128666660,
-      "eddbID": 1262,
+      "class": 3,
+      "cost": 56440,
+      "edID": 128666662,
+      "eddbID": 1264,
      "grp": "fs",
-      "id": "2l",
-      "power": 0.23,
-      "rate": 30,
+      "id": "2v",
+      "power": 0.34,
+      "rate": 126,
      "rating": "C"
    },
    {
-      "class": 1,
-      "cost": 20570,
-      "edID": 128666668,
-      "eddbID": 1270,
+      "class": 3,
+      "cost": 225740,
+      "edID": 128666670,
+      "eddbID": 1272,
      "grp": "fs",
-      "id": "2k",
-      "power": 0.28,
-      "rate": 36,
+      "id": "2u",
+      "power": 0.41,
+      "rate": 151,
      "rating": "B"
    },
    {
-      "class": 1,
-      "cost": 82270,
-      "edID": 128666676,
-      "eddbID": 1278,
+      "class": 3,
+      "cost": 902950,
+      "edID": 128666678,
+      "eddbID": 1280,
      "grp": "fs",
-      "id": "2j",
-      "power": 0.32,
-      "rate": 42,
+      "id": "2t",
+      "power": 0.48,
+      "rate": 176,
+      "rating": "A"
+    },
+    {
+      "class": 4,
+      "cost": 10730,
+      "edID": 128666647,
+      "eddbID": 1249,
+      "grp": "fs",
+      "id": "36",
+      "power": 0.25,
+      "rate": 147,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 44720,
+      "edID": 128666655,
+      "eddbID": 1257,
+      "grp": "fs",
+      "id": "35",
+      "power": 0.33,
+      "rate": 196,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 178900,
+      "edID": 128666663,
+      "eddbID": 1265,
+      "grp": "fs",
+      "id": "34",
+      "power": 0.41,
+      "rate": 245,
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 715590,
+      "edID": 128666671,
+      "eddbID": 1273,
+      "grp": "fs",
+      "id": "33",
+      "power": 0.49,
+      "rate": 294,
+      "rating": "B"
+    },
+    {
+      "class": 4,
+      "cost": 2862360,
+      "edID": 128666679,
+      "eddbID": 1281,
+      "grp": "fs",
+      "id": "32",
+      "power": 0.57,
+      "rate": 342,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 34030,
+      "edID": 128666648,
+      "eddbID": 1250,
+      "grp": "fs",
+      "id": "3b",
+      "power": 0.3,
+      "rate": 247,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 141780,
+      "edID": 128666656,
+      "eddbID": 1258,
+      "grp": "fs",
+      "id": "3a",
+      "power": 0.4,
+      "rate": 330,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 567110,
+      "edID": 128666664,
+      "eddbID": 1266,
+      "grp": "fs",
+      "id": "39",
+      "power": 0.5,
+      "rate": 412,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 2268420,
+      "edID": 128666672,
+      "eddbID": 1274,
+      "grp": "fs",
+      "id": "38",
+      "power": 0.6,
+      "rate": 494,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 9073690,
+      "edID": 128666680,
+      "eddbID": 1282,
+      "grp": "fs",
+      "id": "37",
+      "power": 0.7,
+      "rate": 577,
+      "rating": "A"
+    },
+    {
+      "class": 6,
+      "cost": 107860,
+      "edID": 128666649,
+      "eddbID": 1251,
+      "grp": "fs",
+      "id": "3g",
+      "power": 0.35,
+      "rate": 376,
+      "rating": "E"
+    },
+    {
+      "class": 6,
+      "cost": 449430,
+      "edID": 128666657,
+      "eddbID": 1259,
+      "grp": "fs",
+      "id": "3f",
+      "power": 0.47,
+      "rate": 502,
+      "rating": "D"
+    },
+    {
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128666665,
+      "eddbID": 1267,
+      "grp": "fs",
+      "id": "3e",
+      "power": 0.59,
+      "rate": 627,
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 7190900,
+      "edID": 128666673,
+      "eddbID": 1275,
+      "grp": "fs",
+      "id": "3d",
+      "power": 0.71,
+      "rate": 752,
+      "rating": "B"
+    },
+    {
+      "class": 6,
+      "cost": 28763610,
+      "edID": 128666681,
+      "eddbID": 1283,
+      "grp": "fs",
+      "id": "3c",
+      "power": 0.83,
+      "rate": 878,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 341930,
+      "edID": 128666650,
+      "eddbID": 1252,
+      "grp": "fs",
+      "id": "3l",
+      "power": 0.41,
+      "rate": 534,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 1424700,
+      "edID": 128666658,
+      "eddbID": 1260,
+      "grp": "fs",
+      "id": "3k",
+      "power": 0.55,
+      "rate": 712,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128666666,
+      "eddbID": 1268,
+      "grp": "fs",
+      "id": "3j",
+      "power": 0.69,
+      "rate": 890,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 22795160,
+      "edID": 128666674,
+      "eddbID": 1276,
+      "grp": "fs",
+      "id": "3i",
+      "power": 0.83,
+      "rate": 1068,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 91180640,
+      "edID": 128666682,
+      "eddbID": 1284,
+      "grp": "fs",
+      "id": "3h",
+      "power": 0.97,
+      "rate": 1245,
+      "rating": "A"
+    },
+    {
+      "class": 8,
+      "cost": 1083910,
+      "edID": 128666651,
+      "eddbID": 1253,
+      "grp": "fs",
+      "id": "3q",
+      "power": 0.48,
+      "rate": 720,
+      "rating": "E"
+    },
+    {
+      "class": 8,
+      "cost": 4516290,
+      "edID": 128666659,
+      "eddbID": 1261,
+      "grp": "fs",
+      "id": "3p",
+      "power": 0.64,
+      "rate": 960,
+      "rating": "D"
+    },
+    {
+      "class": 8,
+      "cost": 18065160,
+      "edID": 128666667,
+      "eddbID": 1269,
+      "grp": "fs",
+      "id": "3o",
+      "power": 0.8,
+      "rate": 1200,
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 72260660,
+      "edID": 128666675,
+      "eddbID": 1277,
+      "grp": "fs",
+      "id": "3n",
+      "power": 0.96,
+      "rate": 1440,
+      "rating": "B"
+    },
+    {
+      "class": 8,
+      "cost": 289042540,
+      "edID": 128666683,
+      "eddbID": 1285,
+      "grp": "fs",
+      "id": "3m",
+      "power": 1.12,
+      "rate": 1680,
      "rating": "A"
    }
  ]
--- a/modules/internal/fuel_transfer_limpet_controllers.json
+++ b/modules/internal/fuel_transfer_limpet_controllers.json
@@ -1,133 +1,68 @@
 {
  "fx": [
    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671264,
-      "eddbID": 1429,
+      "class": 1,
+      "cost": 600,
+      "edID": 128671249,
+      "eddbID": 1414,
      "grp": "fx",
-      "id": "Ff",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.55,
-      "range": 1.02,
+      "id": "F0",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
      "rating": "E"
    },
    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671265,
-      "eddbID": 1430,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671250,
+      "eddbID": 1415,
      "grp": "fx",
-      "id": "Fg",
-      "mass": 32,
-      "maximum": 8,
-      "power": 0.41,
-      "range": 1.36,
+      "id": "F1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 0.8,
      "rating": "D"
    },
    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671266,
-      "eddbID": 1431,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671251,
+      "eddbID": 1416,
      "grp": "fx",
-      "id": "Fh",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.69,
-      "range": 1.7,
+      "id": "F2",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
      "rating": "C"
    },
    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671267,
-      "eddbID": 1432,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671252,
+      "eddbID": 1417,
      "grp": "fx",
-      "id": "Fi",
-      "mass": 128,
-      "maximum": 8,
-      "power": 0.97,
-      "range": 2.04,
+      "id": "F3",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
      "rating": "B"
    },
    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671268,
-      "eddbID": 1433,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671253,
+      "eddbID": 1418,
      "grp": "fx",
-      "id": "Fj",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.83,
-      "range": 2.38,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671259,
-      "eddbID": 1424,
-      "grp": "fx",
-      "id": "Fa",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.4,
-      "range": 0.78,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671260,
-      "eddbID": 1425,
-      "grp": "fx",
-      "id": "Fb",
-      "mass": 8,
-      "maximum": 4,
-      "power": 0.3,
-      "range": 1.04,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671261,
-      "eddbID": 1426,
-      "grp": "fx",
-      "id": "Fc",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.5,
-      "range": 1.3,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671262,
-      "eddbID": 1427,
-      "grp": "fx",
-      "id": "Fd",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 1.56,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671263,
-      "eddbID": 1428,
-      "grp": "fx",
-      "id": "Fe",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.6,
-      "range": 1.82,
+      "id": "F4",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 1.4,
      "rating": "A"
    },
    {
@@ -196,68 +131,133 @@
      "rating": "A"
    },
    {
-      "class": 1,
-      "cost": 600,
-      "edID": 128671249,
-      "eddbID": 1414,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671259,
+      "eddbID": 1424,
      "grp": "fx",
-      "id": "F0",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.18,
-      "range": 0.6,
+      "id": "Fa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 0.78,
      "rating": "E"
    },
    {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128671250,
-      "eddbID": 1415,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671260,
+      "eddbID": 1425,
      "grp": "fx",
-      "id": "F1",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.14,
-      "range": 0.8,
+      "id": "Fb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 1.04,
      "rating": "D"
    },
    {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128671251,
-      "eddbID": 1416,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671261,
+      "eddbID": 1426,
      "grp": "fx",
-      "id": "F2",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.23,
-      "range": 1,
+      "id": "Fc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 1.3,
      "rating": "C"
    },
    {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128671252,
-      "eddbID": 1417,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671262,
+      "eddbID": 1427,
      "grp": "fx",
-      "id": "F3",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.32,
-      "range": 1.2,
+      "id": "Fd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 1.56,
      "rating": "B"
    },
    {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128671253,
-      "eddbID": 1418,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671263,
+      "eddbID": 1428,
      "grp": "fx",
-      "id": "F4",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 1.4,
+      "id": "Fe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671264,
+      "eddbID": 1429,
+      "grp": "fx",
+      "id": "Ff",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671265,
+      "eddbID": 1430,
+      "grp": "fx",
+      "id": "Fg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671266,
+      "eddbID": 1431,
+      "grp": "fx",
+      "id": "Fh",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671267,
+      "eddbID": 1432,
+      "grp": "fx",
+      "id": "Fi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671268,
+      "eddbID": 1433,
+      "grp": "fx",
+      "id": "Fj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 2.38,
      "rating": "A"
    }
  ]
--- a/modules/internal/hatch_breaker_limpet_controller.json
+++ b/modules/internal/hatch_breaker_limpet_controller.json
@@ -1,145 +1,75 @@
 {
  "hb": [
    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128066547,
-      "eddbID": 1222,
+      "class": 1,
+      "cost": 600,
+      "edID": 128066532,
+      "eddbID": 1207,
      "grp": "hb",
-      "id": "7d",
-      "mass": 80,
-      "maximum": 18,
-      "power": 0.42,
-      "range": 2.58,
+      "id": "6u",
+      "mass": 1.3,
+      "maximum": 2,
+      "power": 0.12,
+      "range": 1.5,
      "rating": "E",
-      "time": 25
+      "time": 42
    },
    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128066548,
-      "eddbID": 1223,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128066533,
+      "eddbID": 1208,
      "grp": "hb",
-      "id": "7c",
-      "mass": 32,
-      "maximum": 12,
-      "power": 0.56,
-      "range": 3.44,
+      "id": "6t",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.16,
+      "range": 2,
      "rating": "D",
-      "time": 22
+      "time": 36
    },
    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128066549,
-      "eddbID": 1224,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128066534,
+      "eddbID": 1209,
      "grp": "hb",
-      "id": "7b",
-      "mass": 80,
-      "maximum": 15,
-      "power": 0.7,
-      "range": 4.3,
+      "id": "6s",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.2,
+      "range": 2.5,
      "rating": "C",
-      "time": 18
+      "time": 30
    },
    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128066550,
-      "eddbID": 1225,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128066535,
+      "eddbID": 1210,
      "grp": "hb",
-      "id": "7a",
-      "mass": 128,
-      "maximum": 18,
-      "power": 0.84,
-      "range": 5.16,
+      "id": "6r",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.24,
+      "range": 3,
      "rating": "B",
-      "time": 14
+      "time": 24
    },
    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128066551,
-      "eddbID": 1226,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128066536,
+      "eddbID": 1211,
      "grp": "hb",
-      "id": "79",
-      "mass": 90,
-      "maximum": 12,
-      "power": 0.98,
-      "range": 6.02,
+      "id": "6q",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 3.5,
      "rating": "A",
-      "time": 11
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128066542,
-      "eddbID": 1217,
-      "grp": "hb",
-      "id": "78",
-      "mass": 20,
-      "maximum": 9,
-      "power": 0.3,
-      "range": 1.98,
-      "rating": "E",
-      "time": 31
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128066543,
-      "eddbID": 1218,
-      "grp": "hb",
-      "id": "77",
-      "mass": 8,
-      "maximum": 6,
-      "power": 0.4,
-      "range": 2.64,
-      "rating": "D",
-      "time": 26
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128066544,
-      "eddbID": 1219,
-      "grp": "hb",
-      "id": "76",
-      "mass": 20,
-      "maximum": 7,
-      "power": 0.5,
-      "range": 3.3,
-      "rating": "C",
-      "time": 22
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128066545,
-      "eddbID": 1220,
-      "grp": "hb",
-      "id": "75",
-      "mass": 32,
-      "maximum": 9,
-      "power": 0.6,
-      "range": 3.96,
-      "rating": "B",
      "time": 18
    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128066546,
-      "eddbID": 1221,
-      "grp": "hb",
-      "id": "74",
-      "mass": 20,
-      "maximum": 6,
-      "power": 0.7,
-      "range": 4.62,
-      "rating": "A",
-      "time": 13
-    },
    {
      "class": 3,
      "cost": 5400,
@@ -211,74 +141,144 @@
      "time": 16
    },
    {
-      "class": 1,
-      "cost": 600,
-      "edID": 128066532,
-      "eddbID": 1207,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128066542,
+      "eddbID": 1217,
      "grp": "hb",
-      "id": "6u",
-      "mass": 1.3,
-      "maximum": 2,
-      "power": 0.12,
-      "range": 1.5,
+      "id": "78",
+      "mass": 20,
+      "maximum": 9,
+      "power": 0.3,
+      "range": 1.98,
      "rating": "E",
-      "time": 42
+      "time": 31
    },
    {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128066533,
-      "eddbID": 1208,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128066543,
+      "eddbID": 1218,
      "grp": "hb",
-      "id": "6t",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.16,
-      "range": 2,
+      "id": "77",
+      "mass": 8,
+      "maximum": 6,
+      "power": 0.4,
+      "range": 2.64,
      "rating": "D",
-      "time": 36
+      "time": 26
    },
    {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128066534,
-      "eddbID": 1209,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128066544,
+      "eddbID": 1219,
      "grp": "hb",
-      "id": "6s",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.2,
-      "range": 2.5,
+      "id": "76",
+      "mass": 20,
+      "maximum": 7,
+      "power": 0.5,
+      "range": 3.3,
      "rating": "C",
-      "time": 30
+      "time": 22
    },
    {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128066535,
-      "eddbID": 1210,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128066545,
+      "eddbID": 1220,
      "grp": "hb",
-      "id": "6r",
-      "mass": 2,
-      "maximum": 2,
-      "power": 0.24,
-      "range": 3,
+      "id": "75",
+      "mass": 32,
+      "maximum": 9,
+      "power": 0.6,
+      "range": 3.96,
      "rating": "B",
-      "time": 24
+      "time": 18
    },
    {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128066536,
-      "eddbID": 1211,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128066546,
+      "eddbID": 1221,
      "grp": "hb",
-      "id": "6q",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 3.5,
+      "id": "74",
+      "mass": 20,
+      "maximum": 6,
+      "power": 0.7,
+      "range": 4.62,
      "rating": "A",
+      "time": 13
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128066547,
+      "eddbID": 1222,
+      "grp": "hb",
+      "id": "7d",
+      "mass": 80,
+      "maximum": 18,
+      "power": 0.42,
+      "range": 2.58,
+      "rating": "E",
+      "time": 25
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128066548,
+      "eddbID": 1223,
+      "grp": "hb",
+      "id": "7c",
+      "mass": 32,
+      "maximum": 12,
+      "power": 0.56,
+      "range": 3.44,
+      "rating": "D",
+      "time": 22
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128066549,
+      "eddbID": 1224,
+      "grp": "hb",
+      "id": "7b",
+      "mass": 80,
+      "maximum": 15,
+      "power": 0.7,
+      "range": 4.3,
+      "rating": "C",
      "time": 18
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128066550,
+      "eddbID": 1225,
+      "grp": "hb",
+      "id": "7a",
+      "mass": 128,
+      "maximum": 18,
+      "power": 0.84,
+      "range": 5.16,
+      "rating": "B",
+      "time": 14
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128066551,
+      "eddbID": 1226,
+      "grp": "hb",
+      "id": "79",
+      "mass": 90,
+      "maximum": 12,
+      "power": 0.98,
+      "range": 6.02,
+      "rating": "A",
+      "time": 11
    }
  ]
 }
--- a/modules/internal/hull_reinforcement_package.json
+++ b/modules/internal/hull_reinforcement_package.json
@@ -1,117 +1,5 @@
 {
  "hr": [
-    {
-      "hullreinforcement": 360,
-      "class": 5,
-      "cost": 150000,
-      "edID": 128668545,
-      "eddbID": 1381,
-      "explres": 0.025,
-      "grp": "hr",
-      "id": "2e",
-      "kinres": 0.025,
-      "mass": 64,
-      "rating": "E",
-      "thermres": 0.025
-    },
-    {
-      "hullreinforcement": 390,
-      "class": 5,
-      "cost": 450000,
-      "edID": 128668546,
-      "eddbID": 1382,
-      "explres": 0.025,
-      "grp": "hr",
-      "id": "2d",
-      "kinres": 0.025,
-      "mass": 32,
-      "rating": "D",
-      "thermres": 0.025
-    },
-    {
-      "hullreinforcement": 300,
-      "class": 4,
-      "cost": 65000,
-      "edID": 128668543,
-      "eddbID": 1379,
-      "explres": 0.02,
-      "grp": "hr",
-      "id": "2c",
-      "kinres": 0.02,
-      "mass": 32,
-      "rating": "E",
-      "thermres": 0.02
-    },
-    {
-      "hullreinforcement": 330,
-      "class": 4,
-      "cost": 195000,
-      "edID": 128668544,
-      "eddbID": 1380,
-      "explres": 0.02,
-      "grp": "hr",
-      "id": "2b",
-      "kinres": 0.02,
-      "mass": 16,
-      "rating": "D",
-      "thermres": 0.02
-    },
-    {
-      "hullreinforcement": 230,
-      "class": 3,
-      "cost": 28000,
-      "edID": 128668541,
-      "eddbID": 1377,
-      "explres": 0.015,
-      "grp": "hr",
-      "id": "2a",
-      "kinres": 0.015,
-      "mass": 16,
-      "rating": "E",
-      "thermres": 0.015
-    },
-    {
-      "hullreinforcement": 260,
-      "class": 3,
-      "cost": 84000,
-      "edID": 128668542,
-      "eddbID": 1378,
-      "explres": 0.015,
-      "grp": "hr",
-      "id": "29",
-      "kinres": 0.015,
-      "mass": 8,
-      "rating": "D",
-      "thermres": 0.015
-    },
-    {
-      "hullreinforcement": 150,
-      "class": 2,
-      "cost": 12000,
-      "edID": 128668539,
-      "eddbID": 1375,
-      "explres": 0.01,
-      "grp": "hr",
-      "id": "28",
-      "kinres": 0.01,
-      "mass": 8,
-      "rating": "E",
-      "thermres": 0.01
-    },
-    {
-      "hullreinforcement": 190,
-      "class": 2,
-      "cost": 36000,
-      "edID": 128668540,
-      "eddbID": 1376,
-      "explres": 0.01,
-      "grp": "hr",
-      "id": "27",
-      "kinres": 0.01,
-      "mass": 4,
-      "rating": "D",
-      "thermres": 0.01
-    },
    {
      "hullreinforcement": 80,
      "class": 1,
@@ -122,7 +10,7 @@
      "grp": "hr",
      "id": "26",
      "kinres": 0.005,
-      "mass": 4,
+      "mass": 2,
      "rating": "E",
      "thermres": 0.005
    },
@@ -136,9 +24,121 @@
      "grp": "hr",
      "id": "25",
      "kinres": 0.005,
-      "mass": 2,
+      "mass": 1,
      "rating": "D",
      "thermres": 0.005
+    },
+    {
+      "hullreinforcement": 150,
+      "class": 2,
+      "cost": 12000,
+      "edID": 128668539,
+      "eddbID": 1375,
+      "explres": 0.01,
+      "grp": "hr",
+      "id": "28",
+      "kinres": 0.01,
+      "mass": 4,
+      "rating": "E",
+      "thermres": 0.01
+    },
+    {
+      "hullreinforcement": 190,
+      "class": 2,
+      "cost": 36000,
+      "edID": 128668540,
+      "eddbID": 1376,
+      "explres": 0.01,
+      "grp": "hr",
+      "id": "27",
+      "kinres": 0.01,
+      "mass": 2,
+      "rating": "D",
+      "thermres": 0.01
+    },
+    {
+      "hullreinforcement": 230,
+      "class": 3,
+      "cost": 28000,
+      "edID": 128668541,
+      "eddbID": 1377,
+      "explres": 0.015,
+      "grp": "hr",
+      "id": "2a",
+      "kinres": 0.015,
+      "mass": 8,
+      "rating": "E",
+      "thermres": 0.015
+    },
+    {
+      "hullreinforcement": 260,
+      "class": 3,
+      "cost": 84000,
+      "edID": 128668542,
+      "eddbID": 1378,
+      "explres": 0.015,
+      "grp": "hr",
+      "id": "29",
+      "kinres": 0.015,
+      "mass": 4,
+      "rating": "D",
+      "thermres": 0.015
+    },
+    {
+      "hullreinforcement": 300,
+      "class": 4,
+      "cost": 65000,
+      "edID": 128668543,
+      "eddbID": 1379,
+      "explres": 0.02,
+      "grp": "hr",
+      "id": "2c",
+      "kinres": 0.02,
+      "mass": 16,
+      "rating": "E",
+      "thermres": 0.02
+    },
+    {
+      "hullreinforcement": 330,
+      "class": 4,
+      "cost": 195000,
+      "edID": 128668544,
+      "eddbID": 1380,
+      "explres": 0.02,
+      "grp": "hr",
+      "id": "2b",
+      "kinres": 0.02,
+      "mass": 8,
+      "rating": "D",
+      "thermres": 0.02
+    },
+    {
+      "hullreinforcement": 360,
+      "class": 5,
+      "cost": 150000,
+      "edID": 128668545,
+      "eddbID": 1381,
+      "explres": 0.025,
+      "grp": "hr",
+      "id": "2e",
+      "kinres": 0.025,
+      "mass": 32,
+      "rating": "E",
+      "thermres": 0.025
+    },
+    {
+      "hullreinforcement": 390,
+      "class": 5,
+      "cost": 450000,
+      "edID": 128668546,
+      "eddbID": 1382,
+      "explres": 0.025,
+      "grp": "hr",
+      "id": "2d",
+      "kinres": 0.025,
+      "mass": 16,
+      "rating": "D",
+      "thermres": 0.025
    }
  ]
 }
--- a/modules/internal/module_reinforcement_package.json
+++ b/modules/internal/module_reinforcement_package.json
@@ -0,0 +1,124 @@
+{
+  "mrp": [
+    {
+      "class": 1,
+      "cost": 5000,
+      "eddbID": 1577,
+      "edID": 128737270,
+      "grp": "mrp",
+      "id": "m0",
+      "integrity": 70,
+      "mass": 2,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 15000,
+      "eddbID": 1578,
+      "edID": 128737271,
+      "grp": "mrp",
+      "id": "m1",
+      "integrity": 30,
+      "mass": 1,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 2,
+      "cost": 12000,
+      "eddbID": 1579,
+      "edID": 128737272,
+      "grp": "mrp",
+      "id": "m2",
+      "integrity": 105,
+      "mass": 4,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 2,
+      "cost": 36000,
+      "eddbID": 1580,
+      "edID": 128737273,
+      "grp": "mrp",
+      "id": "m3",
+      "integrity": 45,
+      "mass": 2,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 28000,
+      "eddbID": 1581,
+      "edID": 128737274,
+      "grp": "mrp",
+      "id": "m4",
+      "integrity": 155,
+      "mass": 8,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 84000,
+      "eddbID": 1582,
+      "edID": 128737275,
+      "grp": "mrp",
+      "id": "m5",
+      "integrity": 65,
+      "mass": 4,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 65000,
+      "eddbID": 1583,
+      "edID": 128737276,
+      "grp": "mrp",
+      "id": "m6",
+      "integrity": 235,
+      "mass": 16,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 195000,
+      "eddbID": 1584,
+      "edID": 128737277,
+      "grp": "mrp",
+      "id": "m7",
+      "integrity": 95,
+      "mass": 8,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 150000,
+      "eddbID": 1585,
+      "edID": 128737278,
+      "grp": "mrp",
+      "id": "m8",
+      "integrity": 350,
+      "mass": 32,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 450000,
+      "eddbID": 1586,
+      "edID": 128737279,
+      "grp": "mrp",
+      "id": "m9",
+      "integrity": 145,
+      "mass": 16,
+      "protection": 0.6,
+      "rating": "D"
+    }
+  ]
+}
--- a/modules/internal/planetary_vehicle_hanger.json
+++ b/modules/internal/planetary_vehicle_hanger.json
@@ -1,27 +1,27 @@
 {
  "pv": [
    {
-      "bays": 4,
-      "class": 6,
-      "cost": 576000,
-      "edID": 128672292,
-      "eddbID": 1524,
+      "bays": 1,
+      "class": 2,
+      "cost": 18000,
+      "edID": 128672288,
+      "eddbID": 1528,
      "grp": "pv",
-      "id": "v1",
-      "mass": 34,
-      "power": 0.6,
+      "id": "v5",
+      "mass": 12,
+      "power": 0.25,
      "rating": "H"
    },
    {
-      "bays": 4,
-      "class": 6,
-      "cost": 691200,
-      "edID": 128672293,
-      "eddbID": 1525,
+      "bays": 1,
+      "class": 2,
+      "cost": 21600,
+      "edID": 128672289,
+      "eddbID": 1529,
      "grp": "pv",
-      "id": "v2",
-      "mass": 17,
-      "power": 1.8,
+      "id": "v6",
+      "mass": 6,
+      "power": 0.75,
      "rating": "G"
    },
    {
@@ -49,27 +49,27 @@
      "rating": "G"
    },
    {
-      "bays": 1,
-      "class": 2,
-      "cost": 18000,
-      "edID": 128672288,
-      "eddbID": 1528,
+      "bays": 4,
+      "class": 6,
+      "cost": 576000,
+      "edID": 128672292,
+      "eddbID": 1524,
      "grp": "pv",
-      "id": "v5",
-      "mass": 12,
-      "power": 0.25,
+      "id": "v1",
+      "mass": 34,
+      "power": 0.6,
      "rating": "H"
    },
    {
-      "bays": 1,
-      "class": 2,
-      "cost": 21600,
-      "edID": 128672289,
-      "eddbID": 1529,
+      "bays": 4,
+      "class": 6,
+      "cost": 691200,
+      "edID": 128672293,
+      "eddbID": 1525,
      "grp": "pv",
-      "id": "v6",
-      "mass": 6,
-      "power": 0.75,
+      "id": "v2",
+      "mass": 17,
+      "power": 1.8,
      "rating": "G"
    }
  ]
--- a/modules/internal/pristmatic_shield_generator.json
+++ b/modules/internal/pristmatic_shield_generator.json
@@ -1,6 +1,7 @@
 {
  "psg": [
    {
+      "brokenregen": 1.2,
      "class": 1,
      "cost": 132200,
      "edID": 128671323,
@@ -19,10 +20,11 @@
      "power": 2.52,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 1.2,
+      "regen": 1,
      "thermres": -0.2
    },
    {
+      "brokenregen": 1.2,
      "class": 2,
      "cost": 240340,
      "edID": 128671324,
@@ -41,10 +43,11 @@
      "power": 3.15,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 1.2,
+      "regen": 1,
      "thermres": -0.2
    },
    {
+      "brokenregen": 1.3,
      "class": 3,
      "cost": 761870,
      "edID": 128671325,
@@ -63,10 +66,11 @@
      "power": 3.78,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 1.2,
+      "regen": 1,
      "thermres": -0.2
    },
    {
+      "brokenregen": 1.7,
      "class": 4,
      "cost": 2415120,
      "edID": 128671326,
@@ -85,10 +89,11 @@
      "power": 4.62,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 1.425,
+      "regen": 1,
      "thermres": -0.2
    },
    {
+      "brokenregen": 2.3,
      "class": 5,
      "cost": 7655930,
      "edID": 128671327,
@@ -107,10 +112,11 @@
      "power": 5.46,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 1.875,
+      "regen": 1,
      "thermres": -0.2
    },
    {
+      "brokenregen": 3.2,
      "class": 6,
      "cost": 24269300,
      "edID": 128671328,
@@ -129,10 +135,11 @@
      "power": 6.51,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 2.4,
+      "regen": 1.3,
      "thermres": -0.2
    },
    {
+      "brokenregen": 4.2,
      "class": 7,
      "cost": 76933670,
      "edID": 128671329,
@@ -151,10 +158,11 @@
      "power": 7.35,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 3,
+      "regen": 1.7,
      "thermres": -0.2
    },
    {
+      "brokenregen": 5.4,
      "class": 8,
      "cost": 243879730,
      "edID": 128671330,
@@ -173,7 +181,7 @@
      "power": 8.4,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 3.6,
+      "regen": 2.2,
      "thermres": -0.2
    }
  ]
--- a/modules/internal/prospector_limpet_controllers.json
+++ b/modules/internal/prospector_limpet_controllers.json
@@ -1,133 +1,68 @@
 {
  "pc": [
    {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671284,
-      "eddbID": 1449,
+      "class": 1,
+      "cost": 600,
+      "edID": 128671269,
+      "eddbID": 1434,
      "grp": "pc",
-      "id": "Pf",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.55,
-      "range": 5.1,
+      "id": "P0",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 3,
      "rating": "E"
    },
    {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671285,
-      "eddbID": 1450,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671270,
+      "eddbID": 1435,
      "grp": "pc",
-      "id": "Pg",
-      "mass": 32,
-      "maximum": 8,
-      "power": 0.41,
-      "range": 6.8,
+      "id": "P1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 4,
      "rating": "D"
    },
    {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671286,
-      "eddbID": 1451,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671271,
+      "eddbID": 1436,
      "grp": "pc",
-      "id": "Ph",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.69,
-      "range": 8.5,
+      "id": "P2",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 5,
      "rating": "C"
    },
    {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671287,
-      "eddbID": 1452,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671272,
+      "eddbID": 1437,
      "grp": "pc",
-      "id": "Pi",
-      "mass": 128,
-      "maximum": 8,
-      "power": 0.97,
-      "range": 10.2,
+      "id": "P3",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 6,
      "rating": "B"
    },
    {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671288,
-      "eddbID": 1453,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671273,
+      "eddbID": 1438,
      "grp": "pc",
-      "id": "Pj",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.83,
-      "range": 11.9,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671279,
-      "eddbID": 1444,
-      "grp": "pc",
-      "id": "Pa",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.4,
-      "range": 3.9,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671280,
-      "eddbID": 1445,
-      "grp": "pc",
-      "id": "Pb",
-      "mass": 8,
-      "maximum": 4,
-      "power": 0.3,
-      "range": 5.2,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671281,
-      "eddbID": 1446,
-      "grp": "pc",
-      "id": "Pc",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.5,
-      "range": 6.5,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671282,
-      "eddbID": 1447,
-      "grp": "pc",
-      "id": "Pd",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 7.8,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671283,
-      "eddbID": 1448,
-      "grp": "pc",
-      "id": "Pe",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.6,
-      "range": 9.1,
+      "id": "P4",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 7,
      "rating": "A"
    },
    {
@@ -196,68 +131,133 @@
      "rating": "A"
    },
    {
-      "class": 1,
-      "cost": 600,
-      "edID": 128671269,
-      "eddbID": 1434,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671279,
+      "eddbID": 1444,
      "grp": "pc",
-      "id": "P0",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.18,
-      "range": 3,
+      "id": "Pa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 3.9,
      "rating": "E"
    },
    {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128671270,
-      "eddbID": 1435,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671280,
+      "eddbID": 1445,
      "grp": "pc",
-      "id": "P1",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.14,
-      "range": 4,
+      "id": "Pb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 5.2,
      "rating": "D"
    },
    {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128671271,
-      "eddbID": 1436,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671281,
+      "eddbID": 1446,
      "grp": "pc",
-      "id": "P2",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.23,
-      "range": 5,
+      "id": "Pc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 6.5,
      "rating": "C"
    },
    {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128671272,
-      "eddbID": 1437,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671282,
+      "eddbID": 1447,
      "grp": "pc",
-      "id": "P3",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.32,
-      "range": 6,
+      "id": "Pd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 7.8,
      "rating": "B"
    },
    {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128671273,
-      "eddbID": 1438,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671283,
+      "eddbID": 1448,
      "grp": "pc",
-      "id": "P4",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 7,
+      "id": "Pe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 9.1,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671284,
+      "eddbID": 1449,
+      "grp": "pc",
+      "id": "Pf",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 5.1,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671285,
+      "eddbID": 1450,
+      "grp": "pc",
+      "id": "Pg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 6.8,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671286,
+      "eddbID": 1451,
+      "grp": "pc",
+      "id": "Ph",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 8.5,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671287,
+      "eddbID": 1452,
+      "grp": "pc",
+      "id": "Pi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 10.2,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671288,
+      "eddbID": 1453,
+      "grp": "pc",
+      "id": "Pj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 11.9,
      "rating": "A"
    }
  ]
--- a/modules/internal/refinery.json
+++ b/modules/internal/refinery.json
@@ -1,113 +1,58 @@
 {
  "rf": [
    {
-      "bins": 4,
-      "class": 4,
-      "cost": 55570,
-      "edID": 128666687,
-      "eddbID": 1289,
+      "bins": 1,
+      "class": 1,
+      "cost": 6000,
+      "edID": 128666684,
+      "eddbID": 1286,
      "grp": "rf",
-      "id": "23",
-      "power": 0.25,
+      "id": "1k",
+      "power": 0.14,
      "rating": "E"
    },
    {
-      "bins": 5,
-      "class": 4,
-      "cost": 166700,
-      "edID": 128666691,
-      "eddbID": 1293,
+      "bins": 1,
+      "class": 1,
+      "cost": 18000,
+      "edID": 128666688,
+      "eddbID": 1290,
      "grp": "rf",
-      "id": "22",
-      "power": 0.33,
+      "id": "1j",
+      "power": 0.18,
      "rating": "D"
    },
    {
-      "bins": 7,
-      "class": 4,
-      "cost": 500090,
-      "edID": 128666695,
-      "eddbID": 1297,
+      "bins": 2,
+      "class": 1,
+      "cost": 54000,
+      "edID": 128666692,
+      "eddbID": 1294,
      "grp": "rf",
-      "id": "21",
-      "power": 0.41,
+      "id": "1i",
+      "power": 0.23,
      "rating": "C"
    },
-    {
-      "bins": 9,
-      "class": 4,
-      "cost": 1500280,
-      "edID": 128666699,
-      "eddbID": 1301,
-      "grp": "rf",
-      "id": "20",
-      "power": 0.49,
-      "rating": "B"
-    },
-    {
-      "bins": 10,
-      "class": 4,
-      "cost": 4500850,
-      "edID": 128666703,
-      "eddbID": 1305,
-      "grp": "rf",
-      "id": "1v",
-      "power": 0.57,
-      "rating": "A"
-    },
    {
      "bins": 3,
-      "class": 3,
-      "cost": 26460,
-      "edID": 128666686,
-      "eddbID": 1288,
+      "class": 1,
+      "cost": 162000,
+      "edID": 128666696,
+      "eddbID": 1298,
      "grp": "rf",
-      "id": "1u",
-      "power": 0.2,
-      "rating": "E"
-    },
-    {
-      "bins": 4,
-      "class": 3,
-      "cost": 79380,
-      "edID": 128666690,
-      "eddbID": 1292,
-      "grp": "rf",
-      "id": "1t",
-      "power": 0.27,
-      "rating": "D"
-    },
-    {
-      "bins": 6,
-      "class": 3,
-      "cost": 238140,
-      "edID": 128666694,
-      "eddbID": 1296,
-      "grp": "rf",
-      "id": "1s",
-      "power": 0.34,
-      "rating": "C"
-    },
-    {
-      "bins": 7,
-      "class": 3,
-      "cost": 714420,
-      "edID": 128666698,
-      "eddbID": 1300,
-      "grp": "rf",
-      "id": "1r",
-      "power": 0.41,
+      "id": "1h",
+      "power": 0.28,
      "rating": "B"
    },
    {
-      "bins": 8,
-      "class": 3,
-      "cost": 2143260,
-      "edID": 128666702,
-      "eddbID": 1304,
+      "bins": 4,
+      "class": 1,
+      "cost": 486000,
+      "edID": 128666700,
+      "eddbID": 1302,
      "grp": "rf",
-      "id": "1q",
-      "power": 0.48,
+      "id": "1g",
+      "power": 0.32,
      "rating": "A"
    },
    {
@@ -166,58 +111,113 @@
      "rating": "A"
    },
    {
-      "bins": 1,
-      "class": 1,
-      "cost": 6000,
-      "edID": 128666684,
-      "eddbID": 1286,
+      "bins": 3,
+      "class": 3,
+      "cost": 26460,
+      "edID": 128666686,
+      "eddbID": 1288,
      "grp": "rf",
-      "id": "1k",
-      "power": 0.14,
+      "id": "1u",
+      "power": 0.2,
      "rating": "E"
    },
    {
-      "bins": 1,
-      "class": 1,
-      "cost": 18000,
-      "edID": 128666688,
-      "eddbID": 1290,
+      "bins": 4,
+      "class": 3,
+      "cost": 79380,
+      "edID": 128666690,
+      "eddbID": 1292,
      "grp": "rf",
-      "id": "1j",
-      "power": 0.18,
+      "id": "1t",
+      "power": 0.27,
      "rating": "D"
    },
    {
-      "bins": 2,
-      "class": 1,
-      "cost": 54000,
-      "edID": 128666692,
-      "eddbID": 1294,
+      "bins": 6,
+      "class": 3,
+      "cost": 238140,
+      "edID": 128666694,
+      "eddbID": 1296,
      "grp": "rf",
-      "id": "1i",
-      "power": 0.23,
+      "id": "1s",
+      "power": 0.34,
      "rating": "C"
    },
    {
-      "bins": 3,
-      "class": 1,
-      "cost": 162000,
-      "edID": 128666696,
-      "eddbID": 1298,
+      "bins": 7,
+      "class": 3,
+      "cost": 714420,
+      "edID": 128666698,
+      "eddbID": 1300,
      "grp": "rf",
-      "id": "1h",
-      "power": 0.28,
+      "id": "1r",
+      "power": 0.41,
      "rating": "B"
    },
    {
-      "bins": 4,
-      "class": 1,
-      "cost": 486000,
-      "edID": 128666700,
-      "eddbID": 1302,
+      "bins": 8,
+      "class": 3,
+      "cost": 2143260,
+      "edID": 128666702,
+      "eddbID": 1304,
      "grp": "rf",
-      "id": "1g",
-      "power": 0.32,
+      "id": "1q",
+      "power": 0.48,
+      "rating": "A"
+    },
+    {
+      "bins": 4,
+      "class": 4,
+      "cost": 55570,
+      "edID": 128666687,
+      "eddbID": 1289,
+      "grp": "rf",
+      "id": "23",
+      "power": 0.25,
+      "rating": "E"
+    },
+    {
+      "bins": 5,
+      "class": 4,
+      "cost": 166700,
+      "edID": 128666691,
+      "eddbID": 1293,
+      "grp": "rf",
+      "id": "22",
+      "power": 0.33,
+      "rating": "D"
+    },
+    {
+      "bins": 7,
+      "class": 4,
+      "cost": 500090,
+      "edID": 128666695,
+      "eddbID": 1297,
+      "grp": "rf",
+      "id": "21",
+      "power": 0.41,
+      "rating": "C"
+    },
+    {
+      "bins": 9,
+      "class": 4,
+      "cost": 1500280,
+      "edID": 128666699,
+      "eddbID": 1301,
+      "grp": "rf",
+      "id": "20",
+      "power": 0.49,
+      "rating": "B"
+    },
+    {
+      "bins": 10,
+      "class": 4,
+      "cost": 4500850,
+      "edID": 128666703,
+      "eddbID": 1305,
+      "grp": "rf",
+      "id": "1v",
+      "power": 0.57,
      "rating": "A"
    }
  ]
--- a/modules/internal/scanner.json
+++ b/modules/internal/scanner.json
@@ -48,7 +48,7 @@
      "id": "2i",
      "mass": 1.3,
      "name": "Detailed Surface Scanner",
-      "power": 0,
+      "power": 0.6,
      "rating": "C"
    }
  ]
--- a/modules/internal/shield_cell_bank.json
+++ b/modules/internal/shield_cell_bank.json
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
--- a/modules/standard/thrusters.json
+++ b/modules/standard/thrusters.json
@@ -85,7 +85,7 @@
      "maxmul": 1.16,
      "minmass": 1680,
      "minmul": 0.96,
-      "optmass": 5040,
+      "optmass": 3360,
      "optmul": 1,
      "power": 10.8,
      "rating": "A"
@@ -622,9 +622,9 @@
      "integrity": 56,
      "mass": 2.5,
      "maxmass": 108,
-      "maxmul": 0.96,
+      "maxmul": 1.16,
      "minmass": 36,
-      "minmul": 1.16,
+      "minmul": 0.96,
      "optmass": 72,
      "optmul": 1,
      "power": 3,
@@ -640,12 +640,21 @@
      "integrity": 55,
      "mass": 5,
      "maxmass": 200,
-      "maxmul": 1.6,
+      "maxmul": 1.367,
+      "maxmulacceleration": 1.20,
+      "maxmulrotation": 1.30,
+      "maxmulspeed": 1.60,
      "minmass": 70,
      "minmul": 0.9,
+      "minmulacceleration": 0.9,
+      "minmulrotation": 0.9,
+      "minmulspeed": 0.9,
      "name": "Enhanced Performance",
      "optmass": 90,
-      "optmul": 1.25,
+      "optmul": 1.15,
+      "optmulacceleration": 1.10,
+      "optmulrotation": 1.10,
+      "optmulspeed": 1.25,
      "power": 5,
      "rating": "A"
    },
@@ -659,12 +668,21 @@
      "integrity": 40,
      "mass": 2.5,
      "maxmass": 120,
-      "maxmul": 1.6,
+      "maxmul": 1.367,
+      "maxmulacceleration": 1.20,
+      "maxmulrotation": 1.30,
+      "maxmulspeed": 1.60,
      "minmass": 50,
      "minmul": 0.9,
+      "minmulacceleration": 0.9,
+      "minmulrotation": 0.9,
+      "minmulspeed": 0.9,
      "name": "Enhanced Performance",
      "optmass": 60,
-      "optmul": 1.25,
+      "optmul": 1.15,
+      "optmulacceleration": 1.10,
+      "optmulrotation": 1.10,
+      "optmulspeed": 1.25,
      "power": 4,
      "rating": "A"
    }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.2.4",
+  "version": "2.2.6",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -10,12 +10,15 @@
      "speed": 220,
      "boost": 320,
      "boostEnergy": 9,
-      "agility": 8,
      "baseShieldStrength": 60,
      "baseArmour": 90,
+      "hardness": 35,
      "hullMass": 35,
      "masslock": 7,
-      "pipSpeed": 0.13625
+      "pipSpeed": 0.13625,
+      "pitch": 38,
+      "roll": 100,
+      "yaw": 14
    },
    "retailCost": 87810,
    "bulkheads": [
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -10,13 +10,16 @@
      "speed": 180,
      "boost": 240,
      "boostEnergy": 27,
-      "agility": 2,
      "baseShieldStrength": 350,
      "baseArmour": 525,
+      "hardness": 65,
      "hullMass": 400,
      "masslock": 23,
      "pipSpeed": 0.13875,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 60,
+      "yaw": 10
    },
    "retailCost": 146969450,
    "bulkheads": [
@@ -29,12 +32,16 @@
    "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, 4, 4, 4, 2]
+      "internal": [
+        7, 6, 6, 6, 5, 5, 5,
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 4, 4, 2
+      ]
    },
    "defaults": {
      "standard": ["8E", "7E", "6E", "5E", "8E", "8E", "5C"],
      "hardpoints": [0, 0, 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, "2h", "00"]
+      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, "2h", "00"]
    }
  }
 }
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -10,12 +10,15 @@
      "speed": 250,
      "boost": 340,
      "boostEnergy": 13,
-      "agility": 6,
      "baseShieldStrength": 140,
      "baseArmour": 210,
+      "hardness": 52,
      "hullMass": 280,
      "masslock": 11,
-      "pipSpeed": 0.13
+      "pipSpeed": 0.13,
+      "pitch": 38,
+      "roll": 100,
+      "yaw": 10
    },
    "retailCost": 6661150,
    "bulkheads": [
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -10,12 +10,15 @@
      "speed": 220,
      "boost": 300,
      "boostEnergy": 13,
-      "agility": 8,
      "baseShieldStrength": 120,
      "baseArmour": 180,
+      "hardness": 52,
      "hullMass": 150,
      "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 40,
+      "roll": 110,
+      "yaw": 15
    },
    "retailCost": 3961150,
    "bulkheads": [
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -10,14 +10,17 @@
      "speed": 200,
      "boost": 280,
      "boostEnergy": 19,
-      "agility": 2,
      "baseShieldStrength": 280,
      "baseArmour": 280,
+      "hardness": 60,
      "hullMass": 1100,
      "masslock": 18,
-      "pipSpeed": -1,
+      "pipSpeed": 0.1125,
      "luxuryCabins": true,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 60,
+      "yaw": 17 
    },
    "retailCost": 84532770,
    "bulkheads": [
@@ -32,10 +35,10 @@
      "hardpoints": [2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0],
      "internal": [
        6, 6,
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
        4, 3, 3, 3, 3
      ]
    },
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -10,12 +10,15 @@
      "speed": 280,
      "boost": 400,
      "boostEnergy": 10,
-      "agility": 6,
      "baseShieldStrength": 80,
      "baseArmour": 120,
+      "hardness": 35,
      "hullMass": 180,
      "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 40,
+      "roll": 100,
+      "yaw": 10
    },
    "retailCost": 349720,
    "bulkheads": [
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -10,12 +10,15 @@
      "speed": 200,
      "boost": 300,
      "boostEnergy": 10,
-      "agility": 4,
      "baseShieldStrength": 120,
      "baseArmour": 120,
+      "hardness": 35,
      "hullMass": 210,
      "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 30,
+      "roll": 90,
+      "yaw": 10 
    },
    "retailCost": 747660,
    "bulkheads": [
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -9,12 +9,15 @@
      "speed": 260,
      "boost": 340,
      "boostEnergy": 13,
-      "agility": 5,
      "baseShieldStrength": 150,
      "baseArmour": 150,
+      "hardness": 42,
      "hullMass": 298,
      "masslock": 10,
-      "pipSpeed": 0.09625
+      "pipSpeed": 0.09625,
+      "pitch": 35,
+      "roll": 90,
+      "yaw": 13
    },
    "retailCost": 1894760,
    "bulkheads": [
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -10,13 +10,16 @@
      "speed": 280,
      "boost": 380,
      "boostEnergy": 10,
-      "agility": 8,
      "baseShieldStrength": 120,
      "baseArmour": 120,
+      "hardness": 40,
      "hullMass": 170,
      "masslock": 8,
-      "pipSpeed": 0.09875
-    },
+      "pipSpeed": 0.09875,
+      "pitch": 42,
+      "roll": 100,
+      "yaw": 15 
+    } ,
    "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 },
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -10,12 +10,15 @@
      "speed": 240,
      "boost": 350,
      "boostEnergy": 8,
-      "agility": 10,
      "baseShieldStrength": 60,
      "baseArmour": 40,
+      "hardness": 28,
      "hullMass": 50,
      "masslock": 6,
-      "pipSpeed": 0.0625
+      "pipSpeed": 0.0625,
+      "pitch": 50,
+      "roll": 120,
+      "yaw": 18
    },
    "retailCost": 44800,
    "bulkheads": [
@@ -28,12 +31,16 @@
    "slots": {
      "standard": [2, 3, 3, 1, 2, 2, 2],
      "hardpoints": [1, 1, 1, 0],
-      "internal": [3, 2, 1, 1]
+      "internal": [
+        3, 2, 
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        1, 1
+      ]
    },
    "defaults": {
      "standard": ["2E", "3E", "3E", "1E", "2E", "2E", "2C"],
      "hardpoints": [17, 17, 0, 0],
-      "internal": ["44", "00", "2h", 0]
+      "internal": ["44", "00", 0, "2h", 0]
    }
  }
 }
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -9,12 +9,15 @@
      "speed": 210,
      "boost": 350,
      "boostEnergy": 19,
-      "agility": 6,
      "baseShieldStrength": 200,
      "baseArmour": 300,
+      "hardness": 60,
      "hullMass": 480,
      "masslock": 14,
-      "pipSpeed": 0.11125
+      "pipSpeed": 0.11125,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 19
    },
    "retailCost": 19814210,
    "bulkheads": [
@@ -27,12 +30,17 @@
    "slots": {
      "standard": [6, 6, 5, 5, 6, 4, 4],
      "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
-      "internal": [5, 5, 4, 3, 2, 2]
+      "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 } },
+        3, 2, 2
+      ]
    },
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
      "hardpoints": [0, 0, 17, 17, 0, 0, 0, 0],
-      "internal": ["4e", "03", "02", "02", 0, 0]
+      "internal": ["4e", "03", "02", 0, 0, "02", 0, 0]
    }
  }
 }
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -10,13 +10,16 @@
      "speed": 200,
      "boost": 260,
      "boostEnergy": 27,
-      "agility": 2,
-      "baseShieldStrength": 555,
+      "baseShieldStrength": 610.5,
      "baseArmour": 370,
+      "hardness": 70,
      "hullMass": 900,
      "masslock": 24,
      "pipSpeed": 0.125,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 28,
+      "roll": 75,
+      "yaw": 8 
    },
    "retailCost": 187969450,
    "bulkheads": [
@@ -29,12 +32,17 @@
    "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, 4, 4, 3]
+      "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 } },
+        4, 4, 3
+      ]
    },
    "defaults": {
      "standard": ["8E", "7E" ,"6E", "5E", "8E", "8E", "5C"],
      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4o", "05", 0, 0, 0, 0, 0, "02", "01", "2h"]
+      "internal": ["4o", "05", 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h"]
    }
  }
 }
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -10,12 +10,15 @@
      "speed": 180,
      "boost": 300,
      "boostEnergy": 19,
-      "agility": 2,
      "baseShieldStrength": 200,
      "baseArmour": 300,
+      "hardness": 60,
      "hullMass": 580,
      "masslock": 14,
-      "pipSpeed": 0.0725
+      "pipSpeed": 0.0725,
+      "pitch": 30,
+      "roll": 80,
+      "yaw": 14
    },
    "retailCost": 14314210,
    "bulkheads": [
@@ -28,12 +31,17 @@
    "slots": {
      "standard": [6, 6, 5, 5, 6, 4, 4],
      "hardpoints": [3, 2, 2, 2, 2, 0, 0, 0, 0],
-      "internal": [6, 5, 5, 4, 3, 3, 2]
+      "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 } },
+        3, 3, 2
+      ]
    },
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["04", "03", "4e", "02", 0, 0, 0, 0, "2h"]
    }
  }
 }
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -10,13 +10,16 @@
      "speed": 170,
      "boost": 280,
      "boostEnergy": 23,
-      "agility": 2,
      "baseShieldStrength": 250,
      "baseArmour": 350,
+      "hardness": 60,
      "hullMass": 580,
      "masslock": 14,
      "pipSpeed": 0.1025,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 80,
+      "yaw": 18
    },
    "retailCost": 35814210,
    "bulkheads": [
@@ -29,12 +32,18 @@
    "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, 2, 2]
+      "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 } },
+        2, 2
+      ]
    },
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "7E", "5E", "4C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [0, "4j", "03", 0, "2h"]
+      "internal": [0, "4j", "03", 0, 0, 0, 0, "2h"]
    }
  }
 }
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -10,12 +10,15 @@
      "speed": 260,
      "boost": 350,
      "boostEnergy": 19,
-      "agility": 6,
      "baseShieldStrength": 300,
      "baseArmour": 225,
+      "hardness": 70,
      "hullMass": 250,
      "masslock": 12,
-      "pipSpeed": 0.03875
+      "pipSpeed": 0.03875,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 12
    },
    "retailCost": 51567040,
    "bulkheads": [
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -9,13 +9,16 @@
      "hullCost": 29790,
      "speed": 200,
      "boost": 300,
-      "agility": 6,
      "boostEnergy": 7,
      "baseShieldStrength": 50,
-      "baseArmour": 50,
+      "baseArmour": 100,
+      "hardness": 20,
      "hullMass": 14,
      "masslock": 6,
-      "pipSpeed": 0.1625
+      "pipSpeed": 0.1625,
+      "pitch": 36,
+      "roll": 100,
+      "yaw": 14
    },
    "retailCost": 52720,
    "bulkheads": [
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -10,12 +10,15 @@
      "speed": 300,
      "boost": 380,
      "boostEnergy": 19,
-      "agility": 2,
      "baseShieldStrength": 180,
      "baseArmour": 270,
+      "hardness": 60,
      "hullMass": 400,
      "masslock": 12,
-      "pipSpeed": 0.1
+      "pipSpeed": 0.1,
+      "pitch": 40,
+      "roll": 80,
+      "yaw": 18
    },
    "retailCost": 22296860,
      "bulkheads": [
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -9,12 +9,15 @@
      "speed": 280,
      "boost": 380,
      "boostEnergy": 10,
-      "agility": 6,
      "baseShieldStrength": 200,
      "baseArmour": 80,
+      "hardness": 30,
      "hullMass": 35,
      "masslock": 7,
-      "pipSpeed": 0.05375
+      "pipSpeed": 0.05375,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 16
    },
    "retailCost": 2542930,
    "bulkheads": [
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -9,13 +9,16 @@
      "speed": 200,
      "boost": 320,
      "boostEnergy": 23,
-      "agility": 2,
-      "baseShieldStrength": 600,
+      "baseShieldStrength": 690,
      "baseArmour": 400,
+      "hardness": 70,
      "hullMass": 1100,
      "masslock": 27,
      "pipSpeed": 0.05,
-       "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 18,
+      "roll": 45,
+      "yaw":8 
    },
    "retailCost": 208969450,
    "bulkheads": [
@@ -28,12 +31,17 @@
    "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, 4, 3]
+      "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 } },
+        4, 3
+      ]
    },
    "defaults": {
      "standard": ["8E", "8E", "7E", "7E", "7E", "7E", "6C"],
      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4t", "06", "04", 0, 0, 0, 0, "01", "2h"]
+      "internal": ["4t", "06", "04", 0, 0, 0, 0, 0, 0, "01", "2h"]
    }
  }
 }
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -10,12 +10,15 @@
      "speed": 300,
      "boost": 400,
      "boostEnergy": 8,
-      "agility": 6,
      "baseShieldStrength": 80,
      "baseArmour": 60,
+      "hardness": 28,
      "hullMass": 50,
      "masslock": 6,
-      "pipSpeed": 0.075
+      "pipSpeed": 0.075,
+      "pitch": 40,
+      "roll": 100,
+      "yaw": 15
    },
    "retailCost": 110830,
    "bulkheads": [
@@ -28,12 +31,16 @@
    "slots": {
      "standard": [3, 3, 3, 1, 2, 2, 2],
      "hardpoints": [2, 1, 1, 0],
-      "internal": [3, 2, 1, 1]
+      "internal": [
+        3, 2, 
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        1, 1
+      ]
    },
    "defaults": {
      "standard": ["3E", "3E", "3E", "1E", "2E", "2E", "2C"],
      "hardpoints": [0, 17, 17, 0],
-      "internal": ["44", "00", "2h", 0]
+      "internal": ["44", "00", 0, "2h", 0]
    }
  }
 }
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -10,13 +10,16 @@
      "speed": 200,
      "boost": 300,
      "boostEnergy": 10,
-      "agility": 2,
      "baseShieldStrength": 135,
-      "baseArmour": 135,
+      "baseArmour": 270,
+      "hardness": 45,
      "hullMass": 180,
      "masslock": 8,
      "pipSpeed": 0.1375,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 27,
+      "roll": 100,
+      "yaw": 15
    },
    "retailCost": 3126160,
    "bulkheads": [
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -10,13 +10,16 @@
      "speed": 300,
      "boost": 380,
      "boostEnergy": 16,
-      "agility": 2,
      "baseShieldStrength": 220,
      "baseArmour": 220,
+      "hardness": 55,
      "hullMass": 580,
      "masslock": 13,
      "pipSpeed": 0.08375,
-      "luxuryCabins": true
+      "luxuryCabins": true,
+      "pitch": 25,
+      "roll": 55,
+      "yaw": 18
    },
    "retailCost": 48539900,
    "bulkheads": [
@@ -30,8 +33,8 @@
      "standard": [5, 6, 5, 6, 5, 4, 5],
      "hardpoints": [3, 2, 2, 0, 0, 0, 0],
      "internal": [
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
        5, 5, 4, 3, 2, 2
      ]
    },
--- a/ships/python.json
+++ b/ships/python.json
@@ -10,12 +10,15 @@
      "speed": 230,
      "boost": 300,
      "boostEnergy": 23,
-      "agility": 6,
      "baseShieldStrength": 260,
      "baseArmour": 260,
+      "hardness": 65,
      "hullMass": 350,
      "masslock": 17,
-      "pipSpeed": 0.0975
+      "pipSpeed": 0.0975,
+      "pitch": 29,
+      "roll": 90,
+      "yaw": 10
    },
    "retailCost": 56978180,
    "bulkheads": [
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -10,12 +10,15 @@
      "speed": 220,
      "boost": 320,
      "boostEnergy": 7,
-      "agility": 8,
      "baseShieldStrength": 40,
      "baseArmour": 60,
+      "hardness": 20,
      "hullMass": 25,
      "masslock": 6,
-      "pipSpeed": 0.1375
+      "pipSpeed": 0.1375,
+      "pitch": 42,
+      "roll": 110,
+      "yaw": 16
    },
    "retailCost": 40800,
    "bulkheads": [
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -10,12 +10,15 @@
      "speed": 220,
      "boost": 350,
      "boostEnergy": 10,
-      "agility": 3,
      "baseShieldStrength": 90,
-      "baseArmour": 90,
+      "baseArmour": 180,
+      "hardness": 35,
      "hullMass": 155,
      "masslock": 8,
-      "pipSpeed": 0.1475
+      "pipSpeed": 0.1475,
+      "pitch": 30,
+      "roll": 100,
+      "yaw": 17
    },
    "retailCost": 1045950,
    "bulkheads": [
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -10,12 +10,15 @@
      "speed": 180,
      "boost": 300,
      "boostEnergy": 10,
-      "agility": 2,
      "baseShieldStrength": 155,
-      "baseArmour": 170,
+      "baseArmour": 340,
+      "hardness": 54,
      "hullMass": 420,
      "masslock": 10,
-      "pipSpeed": 0.16625
+      "pipSpeed": 0.16625,
+      "pitch": 22,
+      "roll": 60,
+      "yaw": 22
    },
    "retailCost": 17472260,
    "bulkheads": [
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -10,13 +10,16 @@
      "speed": 130,
      "boost": 200,
      "boostEnergy": 19,
-      "agility": 0,
      "baseShieldStrength": 240,
-      "baseArmour": 240,
+      "baseArmour": 480,
+      "hardness": 65,
      "hullMass": 1000,
      "masslock": 16,
      "pipSpeed": 0.17375,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 20,
+      "roll": 20,
+      "yaw": 8
    },
    "retailCost": 76555840,
    "bulkheads": [
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -10,12 +10,15 @@
      "speed": 320,
      "boost": 400,
      "boostEnergy": 10,
-      "agility": 6,
      "baseShieldStrength": 105,
      "baseArmour": 70,
-      "hullMass": 60,
+      "hardness": 35,
+      "hullMass": 50,
      "masslock": 7,
-      "pipSpeed": 0.09375
+      "pipSpeed": 0.09375,
+      "pitch": 35,
+      "roll": 90,
+      "yaw": 15
    },
    "retailCost": 142930,
    "bulkheads": [
@@ -28,12 +31,16 @@
    "slots": {
      "standard": [3, 3, 3, 2, 3, 3, 2],
      "hardpoints": [2, 2, 1, 1, 0, 0],
-      "internal": [3, 3, 2, 1]
+      "internal": [
+        3, 3,
+        { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        2, 1
+      ]
    },
    "defaults": {
      "standard": ["3E", "3E", "3E", "2E", "3E", "3E", "2C"],
      "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["01", "44", 0, "2h"]
+      "internal": ["01", "44", 0, 0, "2h"]
    }
  }
 }
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -10,12 +10,15 @@
      "speed": 270,
      "boost": 340,
      "boostEnergy": 10,
-      "agility": 4,
      "baseShieldStrength": 150,
      "baseArmour": 150,
+      "hardness": 35,
      "hullMass": 190,
      "masslock": 7,
-      "pipSpeed": 0.0875
+      "pipSpeed": 0.0875,
+      "pitch": 30,
+      "roll": 90,
+      "yaw": 12
    },
    "retailCost": 437930,
    "bulkheads": [
@@ -28,12 +31,16 @@
    "slots": {
      "standard": [4, 4, 4, 2, 3, 3, 4],
      "hardpoints": [2, 2, 1, 1, 0, 0],
-      "internal": [4, 4, 3, 2, 2, 1]
+      "internal": [
+        4, 4, 3,
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        2, 2, 1
+      ]
    },
    "defaults": {
      "standard": ["4E", "4E", "4E", "2E", "3E", "3E", "4C"],
      "hardpoints": [0, 0, 17, 17, 0, 0],
-      "internal": ["02", "02", "44", "00", 0, "2h"]
+      "internal": ["02", "02", "44", 0, "00", 0, "2h"]
    }
  }
 }
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -10,12 +10,15 @@
      "speed": 210,
      "boost": 340,
      "boostEnergy": 16,
-      "agility": 9,
      "baseShieldStrength": 240,
      "baseArmour": 160,
+      "hardness": 55,
      "hullMass": 230,
      "masslock": 10,
-      "pipSpeed": 0.02375
+      "pipSpeed": 0.02375,
+      "pitch": 42,
+      "roll": 110,
+      "yaw": 17
    },
    "retailCost": 4925620,
    "bulkheads": [
@@ -28,12 +31,16 @@
    "slots": {
      "standard": [4, 5, 4, 3, 5, 4, 3],
      "hardpoints": [3, 3, 0, 0, 0, 0],
-      "internal": [5, 4, 2, 1, 1]
+      "internal": [
+        5, 
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 2, 1, 1
+      ]
    },
    "defaults": {
      "standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"],
      "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["4e", "02", 0, 0, "2h"]
+      "internal": ["4e", 0, 0, "02", 0, "2h"]
    }
  }
 }
--- a/spec/data-spec.js
+++ b/spec/data-spec.js
@@ -12,12 +12,15 @@ describe('JSON Data', function() {
    'speed',
    'boost',
    'boostEnergy',
-    'agility',
    'baseShieldStrength',
    'baseArmour',
+    'hardness',
    'hullMass',
    'masslock',
-    'pipSpeed'
+    'pipSpeed',
+    'pitch',
+    'roll',
+    'yaw'
  ];

  var edIDs = {};
@@ -168,7 +171,31 @@ describe('JSON Data', function() {
      const blueprint = Modifications.blueprints[k];
      expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
      expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
-      ids[blueprint.idid] = true;
+      ids[blueprint.id] = true;
+    }
+  });
+
+  it('has valid modifications', function() {
+    var ids = {};
+
+    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;
+    }
+  });
+
+  it('has valid specials', function() {
+    var ids = {};
+
+    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;
    }
  });
Author	SHA1	Message	Date
Cmdr McDonald	648cd56e5e	Merge branch 'release/2.2.6'	2017-01-10 19:15:09 +00:00
Cmdr McDonald	ba24a652cc	Bump package number	2017-01-10 19:15:03 +00:00
Cmdr McDonald	f10c11da81	Merge branch 'feature/changes' into develop	2017-01-10 19:13:54 +00:00
Cmdr McDonald	c1f9fafa1a	Updates for 2.2.03	2017-01-10 19:06:36 +00:00
Cmdr McDonald	6ea24b9790	Fixes for 2.2.03	2017-01-10 18:11:32 +00:00
Cmdr McDonald	8aca422468	Add updated values for hull and module reinforcement packages	2017-01-10 16:36:58 +00:00
Cmdr McDonald	e23cdfb7bb	Updates for 2.2.03	2017-01-10 16:29:43 +00:00
Cmdr McDonald	5610697456	Add power draw for Detailed Surface Scanner	2017-01-07 16:10:54 +00:00
Cmdr McDonald	7dd58fd085	Changelog	2016-12-31 09:03:13 +00:00
Cmdr McDonald	81334fccba	Fix incorrect thrusters value	2016-12-31 09:02:52 +00:00
Cmdr McDonald	d4242e6846	Updates	2016-12-24 22:03:47 +00:00
Cmdr McDonald	c52f3d239c	Update missile racks	2016-12-20 13:57:20 +00:00
Cmdr McDonald	34ec4b4214	Fix missing damage value for 2B dumbfires	2016-12-16 22:29:41 +00:00
Cmdr McDonald	2112c04353	Update piercing	2016-12-16 20:36:36 +00:00
Cmdr McDonald	243d366e89	Add hardness to ship data	2016-12-16 16:25:17 +00:00
Cmdr McDonald	be86618cc1	Add module reinforcement packages; add military compartments	2016-12-13 20:16:58 +00:00
Cmdr McDonald	2a0665e468	Add separate min/opt/max multipliers for enhanced thrusters for speed, acceleration and rotation	2016-12-12 13:38:45 +00:00
Cmdr McDonald	1cb8c7c988	Use sane internal ordering of modules	2016-12-12 10:39:18 +00:00
Cmdr McDonald	fd188237ca	Updates for 2.2.03 changes; add pitch/yaw/roll to ships	2016-12-11 21:47:39 +00:00
Cmdr McDonald	c69582f389	Initial updates for upcoming modifications	2016-12-03 16:12:15 +00:00
Cmdr McDonald	30d536aeb5	Merge branch 'release/2.2.5' into develop	2016-12-03 15:05:38 +00:00
Cmdr McDonald	36b528c482	Merge branch 'release/2.2.5'	2016-12-03 15:05:33 +00:00
Cmdr McDonald	da843cfc38	Bump version number	2016-12-03 15:04:54 +00:00
Cmdr McDonald	52ab7efbbe	Merge branch 'feature/rebalance' into develop	2016-12-01 10:27:03 +00:00
Cmdr McDonald	38cbf29c7d	Fix internal name of dazzle shell	2016-11-30 14:46:15 +00:00
Cmdr McDonald	93717247e3	Updates for burst lasers	2016-11-30 14:28:07 +00:00
Cmdr McDonald	72b206cfef	Add fragment cannon modifications	2016-11-30 12:18:47 +00:00
Cmdr McDonald	0257098a08	Fix rate of fire for burst lasers	2016-11-30 12:18:05 +00:00
Cmdr McDonald	808747a748	Merge branch 'hotfix/2.2.4-a' into develop	2016-11-29 15:14:49 +00:00
Cmdr McDonald	a0633f80d8	Merge branch 'hotfix/2.2.4-a'	2016-11-29 15:14:45 +00:00
Cmdr McDonald	a04e81f165	Fix incorrect ID for emissive munitions special	2016-11-29 15:14:35 +00:00
Cmdr McDonald	c802a570a0	Merge branch 'release/2.2.4' into develop	2016-11-28 16:48:03 +00:00