Merge branch 'release/2.3.5'

Version bump
Fix typo
2025-12-08 23:23:23 +00:00 · 2017-05-17 07:30:32 +01:00 · 2017-05-17 07:30:26 +01:00 · 2017-05-15 16:07:24 +01:00 · 2017-05-15 10:11:58 +01:00 · 2017-05-12 00:29:38 +01:00
68 changed files with 38240 additions and 12374 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,89 @@
+#2.3.5
+  * Fix list of available blueprints for Point Defence
+  * Fix integrity values for class 6 power plants
+  * Add shot speed for long range weapon
+  * Fix components for dirty drive grade 3
+  * Update values for Cytoscrambler
+
+#2.3.4
+  * Add missing Long Range blueprint to multi-cannon
+  * Fix values for thermal load of focused weapon grade 4
+  * Fix internal module information for power plant blueprints
+  * Add 'FSD Interrupt' special to dumbfire missile racks; this module now has `specials_S` and `specials_D` keys for specials to differentiate
+
+#2.3.3
+  * Add Felicity Farseer to list of engineers that supply sensor and detailed surface scanner modifications
+
+#2.3.2
+  * Update ownership of module blueprints for sensors and scanners
+  * Update railgun penetration
+
+#2.3.1
+  * Separate scan time and scan range
+  * Add Frontier IDs for new items in 2.3
+
+#2.3.0
+  * Add Dolphin
+  * Add turreted mining lasers
+  * Add long range / wide angle / fast scan scanner blueprints
+  * Fix EDDB IDs for class 5 and 7 fighter hangars for correct shopping list
+  * Fix cost for rocket-propelled FSD disruptor
+  * Add module names for blueprints
+  * Fix erroneous value for grade 5 kinetic shield booster
+  * Add missing integrity values for some modules
+  * Update module reinforcement package integrity
+  * Update specs of Beluga as per 2.3
+  * Update specs of Asp Scout as per 2.3
+  * Update specs of Diamondback Explorer as per 2.3
+  * Add ED ID for Rocket Propelled FSD Disruptor
+  * Fix ED name for target lock breaker special
+  * Update scan range and angle information for sensors
+  * Tidy up shield cell bank information to allow for accurate calculations with modifications
+  * Update mine launcher stats
+  * Add appropriate engineers to per-module blueprint information
+
+#2.2.19
+  * Remove shot speed modification - it is directly tied to range
+  * Fix incorrect minimal mass for 3C bi-weave shield generator
+
+#2.2.18
+  * Correct lower efficiency value to be better, not worse
+
+#2.2.17
+  * Add mass as potential SCB modification
+  * Fix mining laser statistics
+  * Remove non-existent grade 4 and 5 wake scanner modifications
+  * Add number of crew for each ship
+
+#2.2.16
+  * Fix incorrect thermal load modifiers for dirty drives
+  * Provide explicit information about if values are higher numeric value == better or not
+
+#2.2.15
+  * Fix location of initial cargo rack for Vulture
+  * Fix broken regeneration rate for 6B shield generators
+  * Tidy up breach damage values
+
+#2.2.14
+  * Alter blueprint structure to combine components and features
+  * Make hidden value of modifications its own attribute
+  * Fix incorrect ED ID for class 6 passenger cabins
+
+#2.2.13
+  * Add plasma slug special effect for plasma accelerator
+  * Tweak hull costs of ships
+
+#2.2.12
+  * Add special effects for each blueprint
+  * Add IDs for most Powerplay modules
+
+#2.2.11
+  * Remove non-existant chaff launcher capacity blueprint grades
+  * Fix incorrect values for charge enhanced power distributor
+  * Remove incorrect AFMU blueprints
+  * Correct fragment cannon Double Shot blueprint information
+  * Correct Focused weapon blueprint information
+
 #2.2.10
  * Fix incorrect base shield values for Cutter and Corvette
  * Update weapons to have %-based damage distributions
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.json
+++ b/dist/index.json
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -1,46 +1,51 @@
 {
-    "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"},
-    "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"},
-    "damagedist": {"id": 40, "name": "damage", "type": "hidden", "method": "overwrite"},
-    "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"},
-    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "hidden", "method": "overwrite"},
-    "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": "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"},
-    "shotspeed": {"id": 43, "name": "shotspeed", "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"}
+    "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite", "higherbetter": true},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": false},
+    "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
+    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
+    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "numeric", "hidden": true, "method": "overwrite"},
+    "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "additive", "higherbetter": false},
+    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive", "higherbetter": true},
+    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "angle": {"id": 46, "name": "angle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "scanrate": {"id": 49, "name": "scanrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
+    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true}
 }
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -211,6 +211,10 @@
    "jitter": 1,
    "speed": -0.1667
  },
+  "special_fsd_interrupt": {
+    "damage": -0.3,
+    "rof": 0.5
+  },
  "special_high_yield_shell": {
    "rof": 0.1111111111111111
  },
@@ -223,13 +227,17 @@
  },
  "special_inertial_impact": {
    "damage": 0.5,
-    "jitter": 1,
+    "jitter": 3,
    "damagedist": { 
      "K": 0.5,
      "T": 0.5
    }
  },
  "special_overload_munitions": {
+    "damagedist": {
+      "E": 0.5,
+      "T": 0.5
+    }
  },
  "special_phasing_sequence": {
    "damage": -0.1
@@ -266,8 +274,16 @@
  "special_thermalshock": {
    "damage": -0.2
  },
-  "trade_cell_heat_cell_units": {},
-  "trade_defence_health_add_defence_global_mult": {},
+  "trade_cell_heat_cell_units": {
+    "shieldreinforcement": -1,
+    "thermload": -1
+  },
+  "trade_defence_health_add_defence_global_mult": {
+    "explres": 0.4,
+    "hullreinforcement": 1,
+    "kinres": 0.4,
+    "thermres": 0.4
+  },
  "trade_distributor_engine_charge_system_charge": {
    "engcap": 1,
    "syscap": -1
--- a/modifications/modules.json
+++ b/modifications/modules.json
--- a/modifications/specials.json
+++ b/modifications/specials.json
@@ -1,35 +1,36 @@
 {
-    "special_auto_loader": {"id": 0, "name": "Auto loader"},
-    "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_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": 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"},
-    "special_penetrator_payload": {"id": 16, "name": "Penetrator payload"},
-    "special_phasing_sequence": {"id": 17, "name": "Phasing sequence"},
-    "special_plasma_slug": {"id": 18, "name": "Plasma slug"},
-    "special_radiant_canister": {"id": 19, "name": "Radiant Canister"},
-    "special_regeneration_sequence": {"id": 20, "name": "Regeneration sequence"},
-    "special_reverberating_cascade": {"id": 21, "name": "Reverberating cascade"},
-    "special_scramble_spectrum": {"id": 22, "name": "Scramble spectrum"},
-    "special_screening_shell": {"id": 23, "name": "Screening shell"},
-    "special_shiftlock_canister": {"id": 24, "name": "Shift-lock canister"},
-    "special_smart_rounds": {"id": 25, "name": "Smart rounds"},
-    "special_super_penetrator": {"id": 26, "name": "Super penetrator"},
-    "special_target_lock_breaker": {"id": 27, "name": "Target lock breaker"},
-    "special_thermal_cascade": {"id": 28, "name": "Thermal cascade"},
-    "special_thermal_conduit": {"id": 29, "name": "Thermal conduit"},
-    "special_thermal_vent": {"id": 30, "name": "Thermal vent"},
-    "special_thermalshock": {"id": 31, "name": "Thermal shock"}
+    "special_auto_loader": {"id": 0, "edname": "special_auto_loader", "name": "Auto loader"},
+    "special_choke_canister": {"id": 1, "edname": "special_choke_canister", "name": "Choke canister"},
+    "special_concordant_sequence": {"id": 2, "edname": "special_concordant_sequence", "name": "Concordant sequence"},
+    "special_corrosive_shell": {"id": 3, "edname": "special_corrosive_shell", "name": "Corrosive shell"},
+    "special_blinding_shell": {"id": 4, "edname": "special_blinding_shell", "name": "Dazzle shell"},
+    "special_dispersal_field": {"id": 5, "edname": "special_dispersal_field", "name": "Dispersal field"},
+    "special_distortion_field": {"id": 6, "edname": "special_distortion_field", "name": "Distortion field"},
+    "special_drag_munitions": {"id": 7, "edname": "special_drag_munitions", "name": "Drag munitions"},
+    "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
+    "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
+    "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
+    "special_fsd_interrupt": {"id": 33, "edname": "special_fsd_interrupt", "name": "FSD interrupt"},
+    "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
+    "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
+    "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},
+    "special_ion_disruptor": {"id": 13, "edname": "special_ion_disruptor", "name": "Ion disruptor"},
+    "special_mass_lock_munition": {"id": 14, "edname": "special_mass_lock_munition", "name": "Mass lock munition"},
+    "special_overload_munitions": {"id": 15, "edname": "special_overload_munitions", "name": "Overload munitions"},
+    "special_penetrator_payload": {"id": 16, "edname": "special_penetrator_payload", "name": "Penetrator payload"},
+    "special_phasing_sequence": {"id": 17, "edname": "special_phasing_sequence", "name": "Phasing sequence"},
+    "special_plasma_slug": {"id": 18, "edname": "special_plasma_slug", "name": "Plasma slug"},
+    "special_radiant_canister": {"id": 19, "edname": "special_radiant_canister", "name": "Radiant Canister"},
+    "special_regeneration_sequence": {"id": 20, "edname": "special_regeneration_sequence", "name": "Regeneration sequence"},
+    "special_reverberating_cascade": {"id": 21, "edname": "special_reverberating_cascade", "name": "Reverberating cascade"},
+    "special_scramble_spectrum": {"id": 22, "edname": "special_scramble_spectrum", "name": "Scramble spectrum"},
+    "special_screening_shell": {"id": 23, "edname": "special_screening_shell", "name": "Screening shell"},
+    "special_shiftlock_canister": {"id": 24, "edname": "special_shiftlock_canister", "name": "Shift-lock canister"},
+    "special_smart_rounds": {"id": 25, "edname": "special_smart_rounds", "name": "Smart rounds"},
+    "special_super_penetrator": {"id": 26, "edname": "special_super_penetrator", "name": "Super penetrator"},
+    "special_lock_breaker": {"id": 27, "edname": "special_lock_breaker", "name": "Target lock breaker"},
+    "special_thermal_cascade": {"id": 28, "edname": "special_thermal_cascade", "name": "Thermal cascade"},
+    "special_thermal_conduit": {"id": 29, "edname": "special_thermal_conduit", "name": "Thermal conduit"},
+    "special_thermal_vent": {"id": 30, "edname": "special_thermal_vent", "name": "Thermal vent"},
+    "special_thermalshock": {"id": 31, "edname": "special_thermalshock", "name": "Thermal shock"}
 }
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -1,7 +1,7 @@
 {
  "ul": [
    {
-      "breachdmg": 7.05,
+      "breachdmg": 1.5,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -12,7 +12,7 @@
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.24,
+      "distdraw": 0.25,
      "edID": 128049400,
      "eddbID": 832,
      "falloff": 500,
@@ -26,21 +26,21 @@
      "range": 3000,
      "rating": "F",
      "rof": 2,
-      "thermload": 0.4
+      "thermload": 0.38
    },
    {
-      "breachdmg": 5.3,
+      "breachdmg": 1,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
      "burstrof": 17,
      "class": 1,
      "cost": 8600,
-      "damage": 1.2,
+      "damage": 1.22,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.23,
+      "distdraw": 0.24,
      "edID": 128049404,
      "eddbID": 835,
      "falloff": 500,
@@ -54,12 +54,12 @@
      "range": 3000,
      "rating": "G",
      "rof": 2.23,
-      "thermload": 0.3
+      "thermload": 0.34
    },
    {
-      "breachdmg": 1.92,
+      "breachdmg": 0.4,
      "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
      "burst": 3,
      "burstrof": 19,
      "class": 1,
@@ -68,7 +68,7 @@
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.136,
+      "distdraw": 0.14,
      "edID": 128049407,
      "eddbID": 838,
      "falloff": 500,
@@ -82,24 +82,24 @@
      "range": 3000,
      "rating": "G",
      "rof": 1.92,
-      "thermload": 0.2
+      "thermload": 0.19
    },
    {
-      "breachdmg": 2,
+      "breachdmg": 3.1,
      "breachmax": 0,
      "breachmin": 0,
      "burst": 8,
      "burstrof": 20,
      "class": 1,
      "cost": 8800,
-      "damage": 2.4,
+      "damage": 3.6,
      "damagedist": {
        "T": 1
      },
      "distdraw": 0.31,
      "edID": 128671449,
      "eddbID": 1477,
-      "falloff": 500,
+      "falloff": 600,
      "grp": "ul",
      "id": "cy",
      "integrity": 40,
@@ -110,24 +110,24 @@
      "piercing": 1,
      "power": 0.8,
      "pp": "Archon Delaine",
-      "range": 600,
+      "range": 3000,
      "rating": "F",
-      "rof": 6.6,
+      "rof": 7.6,
      "thermload": 0.3
    },
    {
-      "breachdmg": 11.1,
+      "breachdmg": 3,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
      "burstrof": 11,
      "class": 2,
      "cost": 23000,
-      "damage": 3.5,
+      "damage": 3.53,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.482,
+      "distdraw": 0.5,
      "edID": 128049401,
      "eddbID": 833,
      "falloff": 500,
@@ -141,10 +141,10 @@
      "range": 3000,
      "rating": "E",
      "rof": 1.6,
-      "thermload": 0.8
+      "thermload": 0.78
    },
    {
-      "breachdmg": 8.82,
+      "breachdmg": 2.1,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -155,7 +155,7 @@
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.468,
+      "distdraw": 0.49,
      "edID": 128049405,
      "eddbID": 836,
      "falloff": 500,
@@ -169,21 +169,21 @@
      "range": 3000,
      "rating": "F",
      "rof": 1.78,
-      "thermload": 0.7
+      "thermload": 0.67
    },
    {
-      "breachdmg": 3.51,
+      "breachdmg": 0.9,
      "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
      "burst": 3,
      "burstrof": 15,
      "class": 2,
      "cost": 162800,
-      "damage": 1.74,
+      "damage": 1.72,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.26,
+      "distdraw": 0.28,
      "edID": 128049408,
      "eddbID": 839,
      "falloff": 500,
@@ -197,21 +197,21 @@
      "range": 3000,
      "rating": "F",
      "rof": 1.57,
-      "thermload": 0.4
+      "thermload": 0.38
    },
    {
-      "breachdmg": 10.53,
+      "breachdmg": 3.9,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
      "burstrof": 7,
      "class": 3,
      "cost": 140400,
-      "damage": 7.75,
+      "damage": 7.73,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 1.06,
+      "distdraw": 1.11,
      "edID": 128049402,
      "eddbID": 834,
      "falloff": 500,
@@ -228,18 +228,18 @@
      "thermload": 1.7
    },
    {
-      "breachdmg": 14.08,
+      "breachdmg": 4.4,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
      "burstrof": 9,
      "class": 3,
      "cost": 281600,
-      "damage": 5.18,
+      "damage": 5.16,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.986,
+      "distdraw": 1.03,
      "edID": 128049406,
      "eddbID": 837,
      "falloff": 500,
@@ -253,21 +253,21 @@
      "range": 3000,
      "rating": "E",
      "rof": 1.4,
-      "thermload": 1.4
+      "thermload": 1.42
    },
    {
-      "breachdmg": 5.58,
+      "breachdmg": 1.8,
      "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
      "burst": 3,
      "burstrof": 11,
      "class": 3,
      "cost": 800400,
-      "damage": 3.54,
+      "damage": 3.53,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 0.536,
+      "distdraw": 0.56,
      "edID": 128049409,
      "eddbID": 840,
      "falloff": 500,
@@ -281,21 +281,21 @@
      "range": 3000,
      "rating": "E",
      "rof": 1.272,
-      "thermload": 0.8
+      "thermload": 0.78
    },
    {
-      "breachdmg": 28,
+      "breachdmg": 17.5,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
      "burstrof": 3,
      "class": 4,
      "cost": 281600,
-      "damage": 20.6,
+      "damage": 20.61,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 2.84,
+      "distdraw": 2.98,
      "edID": 128049403,
      "eddbID": 1549,
      "falloff": 500,
@@ -309,21 +309,21 @@
      "range": 3000,
      "rating": "E",
      "rof": 0.8,
-      "thermload": 4.5
+      "thermload": 4.53
    },
    {
-      "breachdmg": 21.63,
+      "breachdmg": 10.3,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
      "burstrof": 5,
      "class": 4,
      "cost": 1245600,
-      "damage": 12.1,
+      "damage": 12.09,
      "damagedist": {
        "T": 1
      },
-      "distdraw": 2.31,
+      "distdraw": 2.41,
      "edID": 128727920,
      "eddbID": 1550,
      "falloff": 500,
@@ -337,7 +337,7 @@
      "range": 3000,
      "rating": "E",
      "rof": 1,
-      "thermload": 3.3
+      "thermload": 3.33
    }
  ]
 }
--- a/modules/hardpoints/cargo_scanner.json
+++ b/modules/hardpoints/cargo_scanner.json
@@ -13,7 +13,7 @@
      "power": 0.2,
      "range": 2000,
      "rating": "E",
-      "time": 10
+      "scantime": 10
    },
    {
      "angle": 15,
@@ -28,7 +28,7 @@
      "power": 0.4,
      "range": 2500,
      "rating": "D",
-      "time": 10
+      "scantime": 10
    },
    {
      "angle": 15,
@@ -43,7 +43,7 @@
      "power": 0.8,
      "range": 3000,
      "rating": "C",
-      "time": 10
+      "scantime": 10
    },
    {
      "angle": 15,
@@ -58,7 +58,7 @@
      "power": 1.6,
      "range": 3500,
      "rating": "B",
-      "time": 10
+      "scantime": 10
    },
    {
      "angle": 15,
@@ -73,7 +73,7 @@
      "power": 3.2,
      "range": 4000,
      "rating": "A",
-      "time": 10
+      "scantime": 10
    }
  ]
 }
--- a/modules/hardpoints/fragment_cannon.json
+++ b/modules/hardpoints/fragment_cannon.json
@@ -19,14 +19,14 @@
      "grp": "fc",
      "id": "20",
      "integrity": 40,
-      "jitter": 0.5,
+      "jitter":5,
      "mass": 2,
      "mount": "F",
      "piercing": 20,
      "power": 0.45,
      "range": 2000,
      "rating": "E",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 5.555,
      "roundspershot": 12,
      "shotspeed": 667,
@@ -51,14 +51,14 @@
      "grp": "fc",
      "id": "21",
      "integrity": 40,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 2,
      "mount": "G",
      "piercing": 20,
      "power": 0.59,
      "range": 2000,
      "rating": "E",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 5.88,
      "roundspershot": 12,
      "shotspeed": 667,
@@ -83,14 +83,14 @@
      "grp": "fc",
      "id": "22",
      "integrity": 40,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 2,
      "mount": "T",
      "piercing": 20,
      "power": 0.42,
      "range": 2000,
      "rating": "E",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 4.76,
      "roundspershot": 12,
      "shotspeed": 667,
@@ -104,7 +104,7 @@
      "class": 2,
      "clip": 3,
      "cost": 291840,
-      "damage": 2.56,
+      "damage": 3,
      "damagedist": {
        "K": 1
      },
@@ -115,15 +115,15 @@
      "grp": "fc",
      "id": "1s",
      "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 4,
      "mount": "F",
      "piercing": 30,
      "power": 0.74,
      "range": 2000,
      "rating": "A",
-      "reload": 2.5,
-      "rof": 5,
+      "reload": 5,
+      "rof": 4.975,
      "roundspershot": 12,
      "shotspeed": 667,
      "thermload": 0.7
@@ -136,7 +136,7 @@
      "class": 2,
      "clip": 3,
      "cost": 437800,
-      "damage": 1.95,
+      "damage": 2.275,
      "damagedist": {
        "K": 1
      },
@@ -147,14 +147,14 @@
      "grp": "fc",
      "id": "7e",
      "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 4,
      "mount": "G",
      "piercing": 30,
      "power": 1.03,
      "range": 2000,
      "rating": "D",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 5.26,
      "roundspershot": 12,
      "shotspeed": 667,
@@ -168,7 +168,7 @@
      "class": 2,
      "clip": 3,
      "cost": 1459200,
-      "damage": 1.43,
+      "damage": 1.7,
      "damagedist": {
        "K": 1
      },
@@ -179,15 +179,15 @@
      "grp": "fc",
      "id": "7f",
      "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 4,
      "mount": "T",
      "piercing": 30,
      "power": 0.79,
      "range": 2000,
      "rating": "D",
-      "reload": 2.5,
-      "rof": 4.345,
+      "reload": 5,
+      "rof": 4.26,
      "roundspershot": 12,
      "shotspeed": 667,
      "thermload": 0.4
@@ -200,7 +200,7 @@
      "class": 3,
      "clip": 3,
      "cost": 1167360,
-      "damage": 3.92,
+      "damage": 4.57,
      "damagedist": {
        "K": 1
      },
@@ -211,14 +211,14 @@
      "grp": "fc",
      "id": "1t",
      "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 8,
      "mount": "F",
      "piercing": 45,
      "power": 1.02,
      "range": 2000,
      "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 4.545,
      "roundspershot": 12,
      "shotspeed": 667,
@@ -232,7 +232,7 @@
      "class": 3,
      "clip": 3,
      "cost": 1751040,
-      "damage": 3.23,
+      "damage": 3.77,
      "damagedist": {
        "K": 1
      },
@@ -243,14 +243,14 @@
      "grp": "fc",
      "id": "1u",
      "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 8,
      "mount": "G",
      "piercing": 45,
      "power": 1.55,
      "range": 2000,
      "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 4.76,
      "roundspershot": 12,
      "shotspeed": 667,
@@ -264,7 +264,7 @@
      "class": 3,
      "clip": 3,
      "cost": 5836800,
-      "damage": 2.56,
+      "damage": 2.98,
      "damagedist": {
        "K": 1
      },
@@ -275,14 +275,14 @@
      "grp": "fc",
      "id": "1v",
      "integrity": 80,
-      "jitter": 0.5,
+      "jitter": 5,
      "mass": 8,
      "mount": "T",
      "piercing": 45,
      "power": 1.29,
      "range": 2000,
      "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 4,
      "roundspershot": 12,
      "shotspeed": 667,
@@ -315,7 +315,7 @@
      "power": 1.02,
      "pp": "Zachary Hudson",
      "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
      "rof": 4.5,
      "roundspershot": 12,
      "shotspeed": 1000,
--- a/modules/hardpoints/frame_shift_wake_scanner.json
+++ b/modules/hardpoints/frame_shift_wake_scanner.json
@@ -12,7 +12,7 @@
      "power": 0.2,
      "range": 2000,
      "rating": "E",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -26,7 +26,7 @@
      "power": 0.4,
      "range": 2500,
      "rating": "D",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -40,7 +40,7 @@
      "power": 0.8,
      "range": 3000,
      "rating": "C",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -54,7 +54,7 @@
      "power": 1.6,
      "range": 3500,
      "rating": "B",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -68,7 +68,7 @@
      "power": 3.2,
      "range": 4000,
      "rating": "A",
-      "time": 10
+      "scantime": 10
    }
  ]
 }
--- a/modules/hardpoints/kill_warrant_scanner.json
+++ b/modules/hardpoints/kill_warrant_scanner.json
@@ -12,7 +12,7 @@
      "power": 0.2,
      "range": 2000,
      "rating": "E",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -26,7 +26,7 @@
      "power": 0.4,
      "range": 2500,
      "rating": "D",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -40,7 +40,7 @@
      "power": 0.8,
      "range": 3000,
      "rating": "C",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -54,7 +54,7 @@
      "power": 1.6,
      "range": 3500,
      "rating": "B",
-      "time": 10
+      "scantime": 10
    },
    {
      "class": 0,
@@ -68,7 +68,7 @@
      "power": 3.2,
      "range": 4000,
      "rating": "A",
-      "time": 10
+      "scantime": 10
    }
  ]
 }
--- a/modules/hardpoints/mine_launcher.json
+++ b/modules/hardpoints/mine_launcher.json
@@ -6,7 +6,7 @@
      "breachmax": 0,
      "breachmin": 0,
      "class": 1,
-      "clip": 3,
+      "clip": 1,
      "cost": 24260,
      "damage": 44,
      "damagedist": {
@@ -34,7 +34,7 @@
      "breachmax": 0,
      "breachmin": 0,
      "class": 1,
-      "clip": 3,
+      "clip": 1,
      "cost": 36400,
      "damage": 32,
      "damagedist": {
@@ -58,7 +58,7 @@
      "thermload": 5
    },
    {
-      "ammo": 36,
+      "ammo": 72,
      "breachdmg": 0,
      "breachmax": 0,
      "breachmin": 0,
@@ -81,7 +81,7 @@
      "piercing": 60,
      "power": 0.4,
      "rating": "I",
-      "reload": 2,
+      "reload": 6.6,
      "rof": 1,
      "thermload": 7.5
    }
--- a/modules/hardpoints/mining_laser.json
+++ b/modules/hardpoints/mining_laser.json
@@ -7,8 +7,10 @@
      "class": 1,
      "cost": 6800,
      "damage": 2,
-      "damagedist": {},
-      "distdraw": 1.35,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.5,
      "edID": 128049525,
      "eddbID": 888,
      "falloff": 300,
@@ -23,6 +25,31 @@
      "rating": "D",
      "thermload": 2
    },
+    {
+      "breachdmg": 0.3,
+      "breachmax": 0.2,
+      "breachmin": 0.1,
+      "class": 1,
+      "cost": 9400,
+      "damage": 2,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.5,
+      "edID": 128740819,
+      "eddbID": 1587,
+      "falloff": 300,
+      "grp": "ml",
+      "id": "w0",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 18,
+      "power": 0.5,
+      "range": 500,
+      "rating": "D",
+      "thermload": 2
+    },
    {
      "breachdmg": 1.2,
      "breachmax": 0.2,
@@ -34,6 +61,7 @@
        "T": 1
      },
      "distdraw": 1.75,
+      "edID": 128671347,
      "eddbID": 1479,
      "falloff": 400,
      "grp": "ml",
@@ -50,14 +78,16 @@
      "thermload": 6
    },
    {
-      "breachdmg": 1.2,
+      "breachdmg": 0.6,
      "breachmax": 0.2,
      "breachmin": 0.1,
      "class": 2,
      "cost": 22580,
-      "damage": 8,
-      "damagedist": {},
-      "distdraw": 1.75,
+      "damage": 4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3,
      "edID": 128049526,
      "eddbID": 889,
      "falloff": 300,
@@ -71,6 +101,31 @@
      "range": 500,
      "rating": "D",
      "thermload": 4
+    },
+    {
+      "breachdmg": 0.6,
+      "breachmax": 0.2,
+      "breachmin": 0.1,
+      "class": 2,
+      "cost": 32590,
+      "damage": 4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3,
+      "edID": 128740820,
+      "eddbID": 1588,
+      "falloff": 300,
+      "grp": "ml",
+      "id": "w1",
+      "integrity": 51,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 18,
+      "power": 0.75,
+      "range": 500,
+      "rating": "D",
+      "thermload": 4
    }
  ]
 }
--- a/modules/hardpoints/missile_rack.json
+++ b/modules/hardpoints/missile_rack.json
@@ -127,7 +127,7 @@
      "breachmin": 0,
      "class": 2,
      "clip": 12,
-      "cost": 190227,
+      "cost": 1951040,
      "damage": 40,
      "damagedist": {
        "E": 1
@@ -135,6 +135,7 @@
      "distdraw": 0.24,
      "eddbID": 1559,
      "grp": "mr",
+      "edID": 128732552,
      "id": "1z",
      "integrity": 51,
      "mass": 4,
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -28,7 +28,7 @@
      "reload": 4,
      "rof": 7.69,
      "shotspeed": 1600,
-      "thermload": 0.1
+      "thermload": 0.09
    },
    {
      "ammo": 2100,
@@ -88,7 +88,7 @@
      "reload": 4,
      "rof": 7.14,
      "shotspeed": 1600,
-      "thermload": 0
+      "thermload": 0.04
    },
    {
      "ammo": 1000,
@@ -103,6 +103,7 @@
        "K": 1
      },
      "distdraw": 0.12,
+      "edID": 128671345,
      "eddbID": 1481,
      "falloff": 1800,
      "grp": "mc",
@@ -149,7 +150,7 @@
      "reload": 4,
      "rof": 7.14,
      "shotspeed": 1600,
-      "thermload": 0.2
+      "thermload": 0.18
    },
    {
      "ammo": 2100,
@@ -209,7 +210,7 @@
      "reload": 4,
      "rof": 6.25,
      "shotspeed": 1600,
-      "thermload": 0.1
+      "thermload": 0.09
    },
    {
      "ammo": 2100,
@@ -219,7 +220,7 @@
      "class": 3,
      "clip": 100,
      "cost": 140400,
-      "damage": 3.93,
+      "damage": 3.92,
      "damagedist": {
        "K": 1
      },
@@ -237,9 +238,9 @@
      "range": 4000,
      "rating": "C",
      "reload": 4,
-      "rof": 5.88,
+      "rof": 5.884,
      "shotspeed": 1600,
-      "thermload": 0.3
+      "thermload": 0.28
    },
    {
      "ammo": 2100,
@@ -269,7 +270,7 @@
      "reload": 5,
      "rof": 6.665,
      "shotspeed": 1600,
-      "thermload": 0.3
+      "thermload": 0.34
    },
    {
      "ammo": 2100,
@@ -279,7 +280,7 @@
      "class": 4,
      "clip": 100,
      "cost": 1177600,
-      "damage": 4.62,
+      "damage": 4.625,
      "damagedist": {
        "K": 1
      },
@@ -300,7 +301,7 @@
      "rof": 3.03,
      "roundspershot": 2,
      "shotspeed": 1600,
-      "thermload": 0.4
+      "thermload": 0.39
    },
    {
      "ammo": 2100,
@@ -331,7 +332,7 @@
      "rof": 3.365,
      "roundspershot": 2,
      "shotspeed": 1600,
-      "thermload": 0.5
+      "thermload": 0.51
    }
  ]
 }
--- a/modules/hardpoints/pulse_laser.json
+++ b/modules/hardpoints/pulse_laser.json
@@ -1,12 +1,12 @@
 {
  "pl": [
    {
-      "breachdmg": 2.04,
+      "breachdmg": 1.7,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 1,
      "cost": 2200,
-      "damage": 2.04,
+      "damage": 2.05,
      "damagedist": {
        "T": 1
      },
@@ -23,8 +23,8 @@
      "power": 0.39,
      "range": 3000,
      "rating": "F",
-      "rof": 3.847,
-      "thermload": 0.3
+      "rof": 3.85,
+      "thermload": 0.33
    },
    {
      "breachdmg": 1.3,
@@ -49,8 +49,8 @@
      "power": 0.39,
      "range": 3000,
      "rating": "G",
-      "rof": 3.987,
-      "thermload": 0.3
+      "rof": 4,
+      "thermload": 0.31
    },
    {
      "breachdmg": 1,
@@ -58,7 +58,7 @@
      "breachmin": 0.4,
      "class": 1,
      "cost": 26000,
-      "damage": 1.18,
+      "damage": 1.19,
      "damagedist": {
        "T": 1
      },
@@ -75,8 +75,8 @@
      "power": 0.38,
      "range": 3000,
      "rating": "G",
-      "rof": 3.339,
-      "thermload": 0.2
+      "rof": 3.33,
+      "thermload": 0.19
    },
    {
      "breachdmg": 3,
@@ -84,7 +84,7 @@
      "breachmin": 0.4,
      "class": 2,
      "cost": 17600,
-      "damage": 3.49,
+      "damage": 3.5,
      "damagedist": {
        "T": 1
      },
@@ -100,9 +100,9 @@
      "piercing": 35,
      "power": 0.6,
      "range": 3000,
-      "rating": "F",
-      "rof": 3.448,
-      "thermload": 0.6
+      "rating": "E",
+      "rof": 3.45,
+      "thermload": 0.56
    },
    {
      "breachdmg": 2.3,
@@ -127,8 +127,8 @@
      "power": 0.6,
      "range": 3000,
      "rating": "F",
-      "rof": 3.567,
-      "thermload": 0.5
+      "rof": 3.57,
+      "thermload": 0.54
    },
    {
      "breachdmg": 1.7,
@@ -136,7 +136,7 @@
      "breachmin": 0.4,
      "class": 2,
      "cost": 132800,
-      "damage": 2.04,
+      "damage": 2.05,
      "damagedist": {
        "T": 1
      },
@@ -153,8 +153,8 @@
      "power": 0.58,
      "range": 3000,
      "rating": "F",
-      "rof": 3.037,
-      "thermload": 0.3
+      "rof": 3.03,
+      "thermload": 0.33
    },
    {
      "breachdmg": 2.4,
@@ -167,6 +167,7 @@
        "T": 1
      },
      "distdraw": 0.9,
+      "edID": 128671342,
      "eddbID": 1483,
      "falloff": 500,
      "grp": "pl",
@@ -205,8 +206,8 @@
      "power": 0.9,
      "range": 3000,
      "rating": "D",
-      "rof": 3.3,
-      "thermload": 1
+      "rof": 3.03,
+      "thermload": 0.96
    },
    {
      "breachdmg": 3.9,
@@ -231,8 +232,8 @@
      "power": 0.92,
      "range": 3000,
      "rating": "E",
-      "rof": 3.223,
-      "thermload": 0.9
+      "rof": 3.23,
+      "thermload": 0.92
    },
    {
      "breachdmg": 3,
@@ -240,7 +241,7 @@
      "breachmin": 0.4,
      "class": 3,
      "cost": 400400,
-      "damage": 3.49,
+      "damage": 3.5,
      "damagedist": {
        "T": 1
      },
@@ -257,8 +258,8 @@
      "power": 0.89,
      "range": 3000,
      "rating": "F",
-      "rof": 2.705,
-      "thermload": 0.6
+      "rof": 2.7,
+      "thermload": 0.56
    },
    {
      "breachdmg": 8.7,
@@ -266,7 +267,7 @@
      "breachmin": 0.4,
      "class": 4,
      "cost": 177600,
-      "damage": 10.23,
+      "damage": 10.24,
      "damagedist": {
        "T": 1
      },
@@ -283,8 +284,8 @@
      "power": 1.33,
      "range": 3000,
      "rating": "A",
-      "rof": 2.633,
-      "thermload": 1.6
+      "rof": 2.63,
+      "thermload": 1.64
    },
    {
      "breachdmg": 6.6,
@@ -309,8 +310,8 @@
      "power": 1.37,
      "range": 3000,
      "rating": "A",
-      "rof": 2.777,
-      "thermload": 1.6
+      "rof": 2.78,
+      "thermload": 1.56
    }
  ]
 }
--- a/modules/hardpoints/rail_gun.json
+++ b/modules/hardpoints/rail_gun.json
@@ -8,7 +8,7 @@
      "class": 1,
      "clip": 1,
      "cost": 51600,
-      "damage": 23.3,
+      "damage": 23.25,
      "damagedist": {
        "K": 0.5,
        "T": 0.5
@@ -22,13 +22,13 @@
      "integrity": 40,
      "mass": 2,
      "mount": "F",
-      "piercing": 30,
+      "piercing": 100,
      "power": 1.15,
      "range": 3000,
      "rating": "D",
      "reload": 1,
      "rof": 1.6,
-      "thermload": 17.8
+      "thermload": 12
    },
    {
      "ammo": 80,
@@ -52,16 +52,16 @@
      "integrity": 51,
      "mass": 4,
      "mount": "F",
-      "piercing": 48,
+      "piercing": 100,
      "power": 1.63,
      "range": 3000,
      "rating": "B",
      "reload": 1,
      "rof": 1.2,
-      "thermload": 30
+      "thermload": 20
    },
    {
-      "ammo": 90,
+      "ammo": 240,
      "breachdmg": 14.3,
      "breachmax": 0.8,
      "breachmin": 0.4,
@@ -85,14 +85,14 @@
      "mass": 4,
      "mount": "F",
      "name": "Imperial Hammer",
-      "piercing": 150,
+      "piercing": 100,
      "power": 1.63,
      "pp": "Arissa Lavigny-Duval",
      "range": 3000,
      "rating": "B",
      "reload": 1,
      "rof": 4.1,
-      "thermload": 16
+      "thermload": 11
    }
  ]
 }
--- a/modules/index.js
+++ b/modules/index.js
@@ -55,6 +55,7 @@ module.exports = {
    rf: require('./internal/refinery').rf,
    sc: require('./internal/scanner').sc,
    scb: require('./internal/shield_cell_bank').scb,
-    sg: require('./internal/shield_generator').sg
+    sg: require('./internal/shield_generator').sg,
+    ss: require('./internal/surface_scanner').ss
  }
 };
--- a/modules/internal/bi_weave_shield_generator.json
+++ b/modules/internal/bi_weave_shield_generator.json
@@ -10,6 +10,7 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B6",
+      "integrity": 40,
      "kinres": 0.4,
      "mass": 1.3,
      "maxmass": 63,
@@ -33,11 +34,12 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B5",
+      "integrity": 51,
      "kinres": 0.4,
      "mass": 2.5,
      "maxmass": 138,
      "maxmul": 1.4,
-      "minmass": 23,
+      "minmass": 28,
      "minmul": 0.4,
      "optmass": 55,
      "optmul": 0.9,
@@ -56,6 +58,7 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B4",
+      "integrity": 64,
      "kinres": 0.4,
      "mass": 5,
      "maxmass": 413,
@@ -66,7 +69,7 @@
      "optmul": 0.9,
      "power": 1.8,
      "rating": "C",
-      "regen": 2.2,
+      "regen": 1.8,
      "thermres": -0.2
    },
    {
@@ -79,6 +82,7 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B3",
+      "integrity": 80,
      "kinres": 0.4,
      "mass": 10,
      "maxmass": 713,
@@ -102,6 +106,7 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B2",
+      "integrity": 96,
      "kinres": 0.4,
      "mass": 20,
      "maxmass": 1013,
@@ -125,6 +130,7 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B1",
+      "integrity": 113,
      "kinres": 0.4,
      "mass": 40,
      "maxmass": 1350,
@@ -148,6 +154,7 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B0",
+      "integrity": 131,
      "kinres": 0.4,
      "mass": 80,
      "maxmass": 2650,
@@ -171,6 +178,7 @@
      "explres": 0.5,
      "grp": "bsg",
      "id": "B7",
+      "integrity": 150,
      "kinres": 0.4,
      "mass": 160,
      "maxmass": 4500,
--- a/modules/internal/docking_computer.json
+++ b/modules/internal/docking_computer.json
@@ -7,6 +7,7 @@
      "eddbID": 890,
      "grp": "dc",
      "id": "24",
+      "integrity": 10,
      "name": "Standard Docking Computer",
      "power": 0.39,
      "rating": "E"
--- a/modules/internal/economy_passenger_cabin.json
+++ b/modules/internal/economy_passenger_cabin.json
@@ -47,7 +47,7 @@
    {
      "class": 6,
      "cost": 61420,
-      "edID": 12872926,
+      "edID": 128727926,
      "eddbID": 1567,
      "grp": "pce",
      "id": "me",
--- a/modules/internal/fighter_hangar.json
+++ b/modules/internal/fighter_hangar.json
@@ -5,10 +5,11 @@
      "class": 5,
      "cost": 575660,
      "edID": 128727930,
-      "eddbID": 1560,
+      "eddbID": 1562,
      "fightercost": 1030,
      "grp": "fh",
      "id": "fr",
+      "integrity": 60,
      "mass": 20,
      "power": 0.25,
      "rating": "D",
@@ -23,6 +24,7 @@
      "fightercost": 1030,
      "grp": "fh",
      "id": "fm",
+      "integrity": 80,
      "mass": 40,
      "power": 0.35,
      "rating": "D",
@@ -33,10 +35,11 @@
      "class": 7,
      "edID": 128727932,
      "cost": 2369330,
-      "eddbID": 1562,
+      "eddbID": 1560,
      "fightercost": 1030,
      "grp": "fh",
      "id": "fh",
+      "integrity": 120,
      "mass": 60,
      "power": 0.35,
      "rating": "D",
--- a/modules/internal/frame_shift_drive_interdictor.json
+++ b/modules/internal/frame_shift_drive_interdictor.json
@@ -9,6 +9,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6a",
+      "integrity": 32,
      "mass": 1.3,
      "power": 0.14,
      "ranget": 3, 
@@ -23,6 +24,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "69",
+      "integrity": 24,
      "mass": 0.5,
      "power": 0.18,
      "ranget": 4, 
@@ -37,6 +39,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "68",
+      "integrity": 40,
      "mass": 1.3,
      "power": 0.23,
      "ranget": 5, 
@@ -51,6 +54,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "67",
+      "integrity": 56,
      "mass": 2,
      "power": 0.28,
      "ranget": 6, 
@@ -65,6 +69,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "66",
+      "integrity": 48,
      "mass": 1.3,
      "power": 0.32,
      "ranget": 7, 
@@ -79,6 +84,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6f",
+      "integrity": 41,
      "mass": 2.5,
      "power": 0.17,
      "ranget": 6, 
@@ -93,6 +99,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6e",
+      "integrity": 51,
      "mass": 1,
      "power": 0.22,
      "ranget": 7, 
@@ -107,6 +114,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6d",
+      "integrity": 51,
      "mass": 2.5,
      "power": 0.28,
      "ranget": 8, 
@@ -121,6 +129,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6c",
+      "integrity": 71,
      "mass": 4,
      "power": 0.34,
      "ranget": 9, 
@@ -135,6 +144,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6b",
+      "integrity": 61,
      "mass": 2.5,
      "power": 0.39,
      "ranget": 10, 
@@ -149,6 +159,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6k",
+      "integrity": 51,
      "mass": 5,
      "power": 0.2,
      "ranget": 9, 
@@ -163,6 +174,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6j",
+      "integrity": 38,
      "mass": 2,
      "power": 0.27,
      "ranget": 10, 
@@ -177,6 +189,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6i",
+      "integrity": 64,
      "mass": 5,
      "power": 0.34,
      "ranget": 11, 
@@ -191,6 +204,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6h",
+      "integrity": 90,
      "mass": 8,
      "power": 0.41,
      "ranget": 12, 
@@ -205,6 +219,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6g",
+      "integrity": 77,
      "mass": 5,
      "power": 0.48,
      "ranget": 13, 
@@ -219,6 +234,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6p",
+      "integrity": 64,
      "mass": 10,
      "power": 0.25,
      "ranget": 12, 
@@ -233,6 +249,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6o",
+      "integrity": 48,
      "mass": 4,
      "power": 0.33,
      "ranget": 13, 
@@ -247,6 +264,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6n",
+      "integrity": 80,
      "mass": 10,
      "power": 0.41,
      "ranget": 14, 
@@ -261,6 +279,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6m",
+      "integrity": 112,
      "mass": 16,
      "power": 0.49,
      "ranget": 15, 
@@ -275,6 +294,7 @@
      "facinglimit": 50,
      "grp": "fi",
      "id": "6l",
+      "integrity": 96,
      "mass": 10,
      "power": 0.57,
      "ranget": 16, 
--- a/modules/internal/module_reinforcement_package.json
+++ b/modules/internal/module_reinforcement_package.json
@@ -7,7 +7,7 @@
      "edID": 128737270,
      "grp": "mrp",
      "id": "m0",
-      "integrity": 70,
+      "integrity": 77,
      "mass": 2,
      "protection": 0.3,
      "rating": "E"
@@ -19,7 +19,7 @@
      "edID": 128737271,
      "grp": "mrp",
      "id": "m1",
-      "integrity": 30,
+      "integrity": 70,
      "mass": 1,
      "protection": 0.6,
      "rating": "D"
@@ -31,7 +31,7 @@
      "edID": 128737272,
      "grp": "mrp",
      "id": "m2",
-      "integrity": 105,
+      "integrity": 115,
      "mass": 4,
      "protection": 0.3,
      "rating": "E"
@@ -43,7 +43,7 @@
      "edID": 128737273,
      "grp": "mrp",
      "id": "m3",
-      "integrity": 45,
+      "integrity": 105,
      "mass": 2,
      "protection": 0.6,
      "rating": "D"
@@ -55,7 +55,7 @@
      "edID": 128737274,
      "grp": "mrp",
      "id": "m4",
-      "integrity": 155,
+      "integrity": 170,
      "mass": 8,
      "protection": 0.3,
      "rating": "E"
@@ -67,7 +67,7 @@
      "edID": 128737275,
      "grp": "mrp",
      "id": "m5",
-      "integrity": 65,
+      "integrity": 155,
      "mass": 4,
      "protection": 0.6,
      "rating": "D"
@@ -79,7 +79,7 @@
      "edID": 128737276,
      "grp": "mrp",
      "id": "m6",
-      "integrity": 235,
+      "integrity": 260,
      "mass": 16,
      "protection": 0.3,
      "rating": "E"
@@ -91,7 +91,7 @@
      "edID": 128737277,
      "grp": "mrp",
      "id": "m7",
-      "integrity": 95,
+      "integrity": 235,
      "mass": 8,
      "protection": 0.6,
      "rating": "D"
@@ -103,7 +103,7 @@
      "edID": 128737278,
      "grp": "mrp",
      "id": "m8",
-      "integrity": 350,
+      "integrity": 385,
      "mass": 32,
      "protection": 0.3,
      "rating": "E"
@@ -115,7 +115,7 @@
      "edID": 128737279,
      "grp": "mrp",
      "id": "m9",
-      "integrity": 145,
+      "integrity": 350,
      "mass": 16,
      "protection": 0.6,
      "rating": "D"
--- a/modules/internal/planetary_vehicle_hanger.json
+++ b/modules/internal/planetary_vehicle_hanger.json
@@ -8,6 +8,7 @@
      "eddbID": 1528,
      "grp": "pv",
      "id": "v5",
+      "integrity": 30,
      "mass": 12,
      "power": 0.25,
      "rating": "H"
@@ -20,6 +21,7 @@
      "eddbID": 1529,
      "grp": "pv",
      "id": "v6",
+      "integrity": 30,
      "mass": 6,
      "power": 0.75,
      "rating": "G"
@@ -32,6 +34,7 @@
      "eddbID": 1526,
      "grp": "pv",
      "id": "v3",
+      "integrity": 30,
      "mass": 20,
      "power": 0.4,
      "rating": "H"
@@ -44,6 +47,7 @@
      "eddbID": 1527,
      "grp": "pv",
      "id": "v4",
+      "integrity": 30,
      "mass": 10,
      "power": 1.2,
      "rating": "G"
@@ -56,6 +60,7 @@
      "eddbID": 1524,
      "grp": "pv",
      "id": "v1",
+      "integrity": 30,
      "mass": 34,
      "power": 0.6,
      "rating": "H"
@@ -68,6 +73,7 @@
      "eddbID": 1525,
      "grp": "pv",
      "id": "v2",
+      "integrity": 30,
      "mass": 17,
      "power": 1.8,
      "rating": "G"
--- a/modules/internal/pristmatic_shield_generator.json
+++ b/modules/internal/pristmatic_shield_generator.json
@@ -10,6 +10,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p6",
+      "integrity": 48,
      "kinres": 0.4,
      "mass": 2.5,
      "maxmass": 63,
@@ -34,6 +35,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p5",
+      "integrity": 61,
      "kinres": 0.4,
      "mass": 5,
      "maxmass": 138,
@@ -58,6 +60,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p4",
+      "integrity": 77,
      "kinres": 0.4,
      "mass": 10,
      "maxmass": 413,
@@ -82,6 +85,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p3",
+      "integrity": 96,
      "kinres": 0.4,
      "mass": 20,
      "maxmass": 713,
@@ -106,6 +110,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p2",
+      "integrity": 115,
      "kinres": 0.4,
      "mass": 40,
      "maxmass": 1013,
@@ -130,6 +135,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p1",
+      "integrity": 136,
      "kinres": 0.4,
      "mass": 80,
      "maxmass": 1350,
@@ -154,6 +160,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p0",
+      "integrity": 157,
      "kinres": 0.4,
      "mass": 160,
      "maxmass": 2650,
@@ -178,6 +185,7 @@
      "explres": 0.5,
      "grp": "psg",
      "id": "p7",
+      "integrity": 180,
      "kinres": 0.4,
      "mass": 320,
      "maxmass": 4500,
--- a/modules/internal/scanner.json
+++ b/modules/internal/scanner.json
@@ -7,6 +7,7 @@
      "eddbID": 1244,
      "grp": "sc",
      "id": "2f",
+      "integrity": 40,
      "mass": 2,
      "name": "Advanced Discovery Scanner",
      "power": 0,
@@ -20,6 +21,7 @@
      "eddbID": 1243,
      "grp": "sc",
      "id": "2g",
+      "integrity": 40,
      "mass": 2,
      "name": "Intermediate Discovery Scanner",
      "power": 0,
@@ -33,23 +35,12 @@
      "eddbID": 1242,
      "grp": "sc",
      "id": "2h",
+      "integrity": 40,
      "mass": 2,
      "name": "Basic Discovery Scanner",
      "power": 0,
      "rangeLS": 500,
      "rating": "E"
-    },
-    {
-      "class": 1,
-      "cost": 250000,
-      "edID": 128666634,
-      "eddbID": 1245,
-      "grp": "sc",
-      "id": "2i",
-      "mass": 1.3,
-      "name": "Detailed Surface Scanner",
-      "power": 0,
-      "rating": "C"
    }
  ]
 }
--- a/modules/internal/shield_cell_bank.json
+++ b/modules/internal/shield_cell_bank.json
@@ -1,10 +1,11 @@
 {
  "scb": [
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 1,
+      "clip": 1,
      "cost": 517,
      "duration": 1,
      "edID": 128064298,
@@ -21,10 +22,11 @@
      "thermload": 170
    },
    {
+      "ammo": 0,
      "ammocost": 300,
      "boot": 25,
-      "cells": 1,
      "class": 1,
+      "clip": 1,
      "cost": 1293,
      "duration": 1,
      "edID": 128064299,
@@ -41,10 +43,11 @@
      "thermload": 170
    },
    {
+      "ammo": 2,
      "ammocost": 300,
      "boot": 25,
-      "cells": 3,
      "class": 1,
+      "clip": 1,
      "cost": 3231,
      "duration": 1,
      "edID": 128064300,
@@ -61,10 +64,11 @@
      "thermload": 170
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 1,
+      "clip": 1,
      "cost": 8078,
      "duration": 1,
      "edID": 128064301,
@@ -81,10 +85,11 @@
      "thermload": 170
    },
    {
+      "ammo": 2,
      "ammocost": 300,
      "boot": 25,
-      "cells": 3,
      "class": 1,
+      "clip": 1,
      "cost": 20195,
      "duration": 1,
      "edID": 128064302,
@@ -101,10 +106,11 @@
      "thermload": 170
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 2,
+      "clip": 1,
      "cost": 1448,
      "duration": 2,
      "edID": 128064303,
@@ -115,16 +121,17 @@
      "mass": 2.5,
      "power": 0.5,
      "rating": "E",
-      "shieldreinforcement": 28,
+      "shieldreinforcement": 14,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 240
    },
    {
+      "ammo": 2,
      "ammocost": 300,
      "boot": 25,
-      "cells": 3,
      "class": 2,
+      "clip": 1,
      "cost": 3619,
      "duration": 2,
      "edID": 128064304,
@@ -135,16 +142,17 @@
      "mass": 1,
      "power": 0.67,
      "rating": "D",
-      "shieldreinforcement": 36,
+      "shieldreinforcement": 18,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 240
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 2,
+      "clip": 1,
      "cost": 9048,
      "duration": 2,
      "edID": 128064305,
@@ -155,16 +163,17 @@
      "mass": 2.5,
      "power": 0.84,
      "rating": "C",
-      "shieldreinforcement": 46,
+      "shieldreinforcement": 23,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 240
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 2,
+      "clip": 1,
      "cost": 22619,
      "duration": 2,
      "edID": 128064306,
@@ -175,16 +184,17 @@
      "mass": 4,
      "power": 1.01,
      "rating": "B",
-      "shieldreinforcement": 56,
+      "shieldreinforcement": 28,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 240
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 2,
+      "clip": 1,
      "cost": 56547,
      "duration": 2,
      "edID": 128064307,
@@ -195,16 +205,17 @@
      "mass": 2.5,
      "power": 1.18,
      "rating": "A",
-      "shieldreinforcement": 64,
+      "shieldreinforcement": 32,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 240
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 3,
+      "clip": 1,
      "cost": 4053,
      "duration": 2,
      "edID": 128064308,
@@ -215,16 +226,17 @@
      "mass": 5,
      "power": 0.61,
      "rating": "E",
-      "shieldreinforcement": 34,
+      "shieldreinforcement": 17,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 340
    },
    {
+      "ammo": 2,
      "ammocost": 300,
      "boot": 25,
-      "cells": 3,
      "class": 3,
+      "clip": 1,
      "cost": 10133,
      "duration": 2,
      "edID": 128064309,
@@ -235,16 +247,17 @@
      "mass": 2,
      "power": 0.82,
      "rating": "D",
-      "shieldreinforcement": 46,
+      "shieldreinforcement": 23,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 340
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 3,
+      "clip": 1,
      "cost": 25333,
      "duration": 2,
      "edID": 128064310,
@@ -255,16 +268,17 @@
      "mass": 5,
      "power": 1.02,
      "rating": "C",
-      "shieldreinforcement": 58,
+      "shieldreinforcement": 29,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 340
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 3,
+      "clip": 1,
      "cost": 61909,
      "duration": 2,
      "edID": 128064311,
@@ -275,16 +289,17 @@
      "mass": 8,
      "power": 1.22,
      "rating": "B",
-      "shieldreinforcement": 70,
+      "shieldreinforcement": 35,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 340
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 3,
+      "clip": 1,
      "cost": 158331,
      "duration": 2,
      "edID": 128064312,
@@ -295,16 +310,17 @@
      "mass": 5,
      "power": 1.43,
      "rating": "A",
-      "shieldreinforcement": 82,
+      "shieldreinforcement": 41,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 340
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 4,
+      "clip": 1,
      "cost": 11349,
      "duration": 3,
      "edID": 128064313,
@@ -315,16 +331,17 @@
      "mass": 10,
      "power": 0.74,
      "rating": "E",
-      "shieldreinforcement": 60,
+      "shieldreinforcement": 20,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 410
    },
    {
+      "ammo": 2,
      "ammocost": 300,
      "boot": 25,
-      "cells": 3,
      "class": 4,
+      "clip": 1,
      "cost": 28373,
      "duration": 3,
      "edID": 128064314,
@@ -335,16 +352,17 @@
      "mass": 4,
      "power": 0.98,
      "rating": "D",
-      "shieldreinforcement": 78,
+      "shieldreinforcement": 26,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 410
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 4,
+      "clip": 1,
      "cost": 70932,
      "duration": 3,
      "edID": 128064315,
@@ -355,16 +373,17 @@
      "mass": 10,
      "power": 1.23,
      "rating": "C",
-      "shieldreinforcement": 99,
+      "shieldreinforcement": 33,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 410
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 4,
+      "clip": 1,
      "cost": 177331,
      "duration": 3,
      "edID": 128064316,
@@ -375,16 +394,17 @@
      "mass": 16,
      "power": 1.48,
      "rating": "B",
-      "shieldreinforcement": 117,
+      "shieldreinforcement": 39,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 410
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 4,
+      "clip": 1,
      "cost": 443328,
      "duration": 3,
      "edID": 128064317,
@@ -395,16 +415,17 @@
      "mass": 10,
      "power": 1.72,
      "rating": "A",
-      "shieldreinforcement": 138,
+      "shieldreinforcement": 46,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 410
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 5,
+      "clip": 1,
      "cost": 31778,
      "duration": 5,
      "edID": 128064318,
@@ -415,16 +436,17 @@
      "mass": 20,
      "power": 0.9,
      "rating": "E",
-      "shieldreinforcement": 105,
+      "shieldreinforcement": 21,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 540
    },
    {
+      "ammo": 2,
      "ammocost": 300,
      "boot": 25,
-      "cells": 3,
      "class": 5,
+      "clip": 1,
      "cost": 79444,
      "duration": 5,
      "edID": 128064319,
@@ -435,16 +457,17 @@
      "mass": 8,
      "power": 1.2,
      "rating": "D",
-      "shieldreinforcement": 140,
+      "shieldreinforcement": 28,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 540
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 5,
+      "clip": 1,
      "cost": 194143,
      "duration": 5,
      "edID": 128064320,
@@ -455,16 +478,17 @@
      "mass": 20,
      "power": 1.5,
      "rating": "C",
-      "shieldreinforcement": 175,
+      "shieldreinforcement": 35,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 540
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 5,
+      "clip": 1,
      "cost": 496527,
      "duration": 5,
      "edID": 128064321,
@@ -475,16 +499,17 @@
      "mass": 32,
      "power": 1.8,
      "rating": "B",
-      "shieldreinforcement": 205,
+      "shieldreinforcement": 41,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 540
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 5,
+      "clip": 1,
      "cost": 1210285,
      "duration": 5,
      "edID": 128064322,
@@ -495,16 +520,17 @@
      "mass": 20,
      "power": 2.1,
      "rating": "A",
-      "shieldreinforcement": 240,
+      "shieldreinforcement": 48,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 540
    },
    {
+      "ammo": 5,
      "ammocost": 300,
      "boot": 25,
-      "cells": 6,
      "class": 6,
+      "clip": 1,
      "cost": 88987,
      "duration": 8,
      "edID": 128064323,
@@ -515,16 +541,17 @@
      "mass": 40,
      "power": 1.06,
      "rating": "E",
-      "shieldreinforcement": 160,
+      "shieldreinforcement": 20,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 640
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 6,
+      "clip": 1,
      "cost": 222444,
      "duration": 8,
      "edID": 128064324,
@@ -535,16 +562,17 @@
      "mass": 16,
      "power": 1.42,
      "rating": "D",
-      "shieldreinforcement": 208,
+      "shieldreinforcement": 26,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 640
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 6,
+      "clip": 1,
      "cost": 556110,
      "duration": 8,
      "edID": 128064325,
@@ -555,16 +583,17 @@
      "mass": 40,
      "power": 1.77,
      "rating": "C",
-      "shieldreinforcement": 264,
+      "shieldreinforcement": 33,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 640
    },
    {
+      "ammo": 5,
      "ammocost": 300,
      "boot": 25,
-      "cells": 6,
      "class": 6,
+      "clip": 1,
      "cost": 1390275,
      "duration": 8,
      "edID": 128064326,
@@ -575,16 +604,17 @@
      "mass": 64,
      "power": 2.12,
      "rating": "B",
-      "shieldreinforcement": 312,
+      "shieldreinforcement": 39,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 640
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 6,
+      "clip": 1,
      "cost": 3475688,
      "duration": 8,
      "edID": 128064327,
@@ -595,16 +625,17 @@
      "mass": 40,
      "power": 2.48,
      "rating": "A",
-      "shieldreinforcement": 368,
+      "shieldreinforcement": 46,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 640
    },
    {
+      "ammo": 5,
      "ammocost": 300,
      "boot": 25,
-      "cells": 6,
      "class": 7,
+      "clip": 1,
      "cost": 249137,
      "duration": 11,
      "edID": 128064328,
@@ -615,16 +646,17 @@
      "mass": 80,
      "power": 1.24,
      "rating": "E",
-      "shieldreinforcement": 264,
+      "shieldreinforcement": 24,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 720
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 7,
+      "clip": 1,
      "cost": 622843,
      "duration": 11,
      "edID": 128064329,
@@ -635,16 +667,17 @@
      "mass": 32,
      "power": 1.66,
      "rating": "D",
-      "shieldreinforcement": 352,
+      "shieldreinforcement": 32,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 720
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 7,
+      "clip": 1,
      "cost": 1557108,
      "duration": 11,
      "edID": 128064330,
@@ -655,16 +688,17 @@
      "mass": 80,
      "power": 2.07,
      "rating": "C",
-      "shieldreinforcement": 451,
+      "shieldreinforcement": 41,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 720
    },
    {
+      "ammo": 5,
      "ammocost": 300,
      "boot": 25,
-      "cells": 6,
      "class": 7,
+      "clip": 1,
      "cost": 3892770,
      "duration": 11,
      "edID": 128064331,
@@ -675,16 +709,17 @@
      "mass": 128,
      "power": 2.48,
      "rating": "B",
-      "shieldreinforcement": 539,
+      "shieldreinforcement": 49,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 720
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 7,
+      "clip": 1,
      "cost": 9731925,
      "duration": 11,
      "edID": 128064332,
@@ -695,16 +730,17 @@
      "mass": 80,
      "power": 2.9,
      "rating": "A",
-      "shieldreinforcement": 627,
+      "shieldreinforcement": 57,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 720
    },
    {
+      "ammo": 5,
      "ammocost": 300,
      "boot": 25,
-      "cells": 6,
      "class": 8,
+      "clip": 1,
      "cost": 697584,
      "duration": 17,
      "edID": 128064333,
@@ -715,16 +751,17 @@
      "mass": 160,
      "power": 1.44,
      "rating": "E",
-      "shieldreinforcement": 476,
+      "shieldreinforcement": 28,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 800
    },
    {
+      "ammo": 3,
      "ammocost": 300,
      "boot": 25,
-      "cells": 4,
      "class": 8,
+      "clip": 1,
      "cost": 1743961,
      "duration": 17,
      "edID": 128064334,
@@ -735,16 +772,17 @@
      "mass": 64,
      "power": 1.92,
      "rating": "D",
-      "shieldreinforcement": 629,
+      "shieldreinforcement": 37,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 800
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 8,
+      "clip": 1,
      "cost": 4359903,
      "duration": 17,
      "edID": 128064335,
@@ -755,16 +793,17 @@
      "mass": 160,
      "power": 2.4,
      "rating": "C",
-      "shieldreinforcement": 799,
+      "shieldreinforcement": 47,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 800
    },
    {
+      "ammo": 5,
      "ammocost": 300,
      "boot": 25,
-      "cells": 6,
      "class": 8,
+      "clip": 1,
      "cost": 10899756,
      "duration": 17,
      "edID": 128064336,
@@ -775,16 +814,17 @@
      "mass": 256,
      "power": 2.88,
      "rating": "B",
-      "shieldreinforcement": 952,
+      "shieldreinforcement": 56,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 800
    },
    {
+      "ammo": 4,
      "ammocost": 300,
      "boot": 25,
-      "cells": 5,
      "class": 8,
+      "clip": 1,
      "cost": 27249391,
      "duration": 17,
      "edID": 128064337,
@@ -795,7 +835,7 @@
      "mass": 160,
      "power": 3.36,
      "rating": "A",
-      "shieldreinforcement": 1105,
+      "shieldreinforcement": 65,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 800
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
@@ -10,6 +10,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "1x",
+      "integrity": 48,
      "kinres": 0.4,
      "mass": 1.3,
      "maxmass": 63,
@@ -33,6 +34,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "3v",
+      "integrity": 41,
      "kinres": 0.4,
      "mass": 2.5,
      "maxmass": 138,
@@ -56,6 +58,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "3u",
+      "integrity": 31,
      "kinres": 0.4,
      "mass": 1,
      "maxmass": 138,
@@ -79,6 +82,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "3t",
+      "integrity": 51,
      "kinres": 0.4,
      "mass": 2.5,
      "maxmass": 138,
@@ -102,6 +106,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "3s",
+      "integrity": 71,
      "kinres": 0.4,
      "mass": 4,
      "maxmass": 138,
@@ -125,6 +130,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "3r",
+      "integrity": 61,
      "kinres": 0.4,
      "mass": 2.5,
      "maxmass": 138,
@@ -148,6 +154,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "44",
+      "integrity": 51,
      "kinres": 0.4,
      "mass": 5,
      "maxmass": 413,
@@ -171,6 +178,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "43",
+      "integrity": 38,
      "kinres": 0.4,
      "mass": 2,
      "maxmass": 413,
@@ -194,6 +202,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "42",
+      "integrity": 64,
      "kinres": 0.4,
      "mass": 5,
      "maxmass": 413,
@@ -217,6 +226,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "41",
+      "integrity": 90,
      "kinres": 0.4,
      "mass": 8,
      "maxmass": 413,
@@ -240,6 +250,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "40",
+      "integrity": 77,
      "kinres": 0.4,
      "mass": 5,
      "maxmass": 413,
@@ -263,6 +274,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "49",
+      "integrity": 64,
      "kinres": 0.4,
      "mass": 10,
      "maxmass": 713,
@@ -286,6 +298,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "48",
+      "integrity": 48,
      "kinres": 0.4,
      "mass": 4,
      "maxmass": 713,
@@ -309,6 +322,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "47",
+      "integrity": 80,
      "kinres": 0.4,
      "mass": 10,
      "maxmass": 713,
@@ -332,6 +346,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "46",
+      "integrity": 112,
      "kinres": 0.4,
      "mass": 16,
      "maxmass": 713,
@@ -355,6 +370,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "45",
+      "integrity": 96,
      "kinres": 0.4,
      "mass": 10,
      "maxmass": 713,
@@ -378,6 +394,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4e",
+      "integrity": 77,
      "kinres": 0.4,
      "mass": 20,
      "maxmass": 1013,
@@ -401,6 +418,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4d",
+      "integrity": 58,
      "kinres": 0.4,
      "mass": 8,
      "maxmass": 1013,
@@ -424,6 +442,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4c",
+      "integrity": 96,
      "kinres": 0.4,
      "mass": 20,
      "maxmass": 1013,
@@ -447,6 +466,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4b",
+      "integrity": 134,
      "kinres": 0.4,
      "mass": 32,
      "maxmass": 1013,
@@ -470,6 +490,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4a",
+      "integrity": 115,
      "kinres": 0.4,
      "mass": 20,
      "maxmass": 1013,
@@ -493,6 +514,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4j",
+      "integrity": 90,
      "kinres": 0.4,
      "mass": 40,
      "maxmass": 1350,
@@ -516,6 +538,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4i",
+      "integrity": 68,
      "kinres": 0.4,
      "mass": 16,
      "maxmass": 1350,
@@ -539,6 +562,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4h",
+      "integrity": 113,
      "kinres": 0.4,
      "mass": 40,
      "maxmass": 1350,
@@ -562,6 +586,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4g",
+      "integrity": 158,
      "kinres": 0.4,
      "mass": 64,
      "maxmass": 1350,
@@ -572,7 +597,7 @@
      "optmul": 1.1,
      "power": 3.72,
      "rating": "B",
-      "regen": 3.1,
+      "regen": 1.3,
      "thermres": -0.2
    },
    {
@@ -585,6 +610,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4f",
+      "integrity": 136,
      "kinres": 0.4,
      "mass": 40,
      "maxmass": 1350,
@@ -608,6 +634,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4o",
+      "integrity": 105,
      "kinres": 0.4,
      "mass": 80,
      "maxmass": 2650,
@@ -631,6 +658,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4n",
+      "integrity": 79,
      "kinres": 0.4,
      "mass": 32,
      "maxmass": 2650,
@@ -654,6 +682,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4m",
+      "integrity": 131,
      "kinres": 0.4,
      "mass": 80,
      "maxmass": 2650,
@@ -677,6 +706,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4l",
+      "integrity": 183,
      "kinres": 0.4,
      "mass": 128,
      "maxmass": 2650,
@@ -700,6 +730,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4k",
+      "integrity": 157,
      "kinres": 0.4,
      "mass": 80,
      "maxmass": 2650,
@@ -723,6 +754,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4t",
+      "integrity": 120,
      "kinres": 0.4,
      "mass": 160,
      "maxmass": 4500,
@@ -746,6 +778,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4s",
+      "integrity": 90,
      "kinres": 0.4,
      "mass": 64,
      "maxmass": 4500,
@@ -769,6 +802,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4r",
+      "integrity": 150,
      "kinres": 0.4,
      "mass": 160,
      "maxmass": 4500,
@@ -792,6 +826,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4q",
+      "integrity": 210,
      "kinres": 0.4,
      "mass": 256,
      "maxmass": 4500,
@@ -815,6 +850,7 @@
      "explres": 0.5,
      "grp": "sg",
      "id": "4p",
+      "integrity": 180,
      "kinres": 0.4,
      "mass": 160,
      "maxmass": 4500,
--- a/modules/internal/surface_scanner.json
+++ b/modules/internal/surface_scanner.json
@@ -0,0 +1,16 @@
+{
+  "ss": [
+    {
+      "class": 1,
+      "cost": 250000,
+      "edID": 128666634,
+      "eddbID": 1245,
+      "grp": "ss",
+      "id": "2i",
+      "mass": 1.3,
+      "name": "Detailed Surface Scanner",
+      "power": 0,
+      "rating": "C"
+    }
+  ]
+}
--- a/modules/standard/power_plant.json
+++ b/modules/standard/power_plant.json
@@ -138,7 +138,7 @@
      "eff": 1,
      "grp": "pp",
      "id": "po",
-      "integrity": 90,
+      "integrity": 102,
      "mass": 40,
      "pgen": 16.8,
      "rating": "E"
@@ -151,7 +151,7 @@
      "eff": 0.75,
      "grp": "pp",
      "id": "pn",
-      "integrity": 113,
+      "integrity": 90,
      "mass": 16,
      "pgen": 18.9,
      "rating": "D"
@@ -164,7 +164,7 @@
      "eff": 0.5,
      "grp": "pp",
      "id": "pm",
-      "integrity": 136,
+      "integrity": 113,
      "mass": 20,
      "pgen": 21,
      "rating": "C"
@@ -177,7 +177,7 @@
      "eff": 0.45,
      "grp": "pp",
      "id": "pl",
-      "integrity": 124,
+      "integrity": 136,
      "mass": 32,
      "pgen": 23.1,
      "rating": "B"
@@ -190,7 +190,7 @@
      "eff": 0.4,
      "grp": "pp",
      "id": "pk",
-      "integrity": 118,
+      "integrity": 124,
      "mass": 20,
      "pgen": 25.2,
      "rating": "A"
--- a/modules/standard/sensors.json
+++ b/modules/standard/sensors.json
@@ -1,6 +1,7 @@
 {
  "s": [
    {
+      "angle": 30,
      "class": 8,
      "cost": 697580,
      "edID": 128064253,
@@ -14,6 +15,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 8,
      "cost": 1743960,
      "edID": 128064254,
@@ -27,6 +29,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 8,
      "cost": 4359900,
      "edID": 128064255,
@@ -40,6 +43,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 8,
      "cost": 10899760,
      "edID": 128064256,
@@ -53,6 +57,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 8,
      "cost": 27249390,
      "edID": 128064257,
@@ -66,6 +71,7 @@
      "rating": "A"
    },
    {
+      "angle": 30,
      "class": 7,
      "cost": 249140,
      "edID": 128064248,
@@ -79,6 +85,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 7,
      "cost": 622840,
      "edID": 128064249,
@@ -92,6 +99,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 7,
      "cost": 1557110,
      "edID": 128064250,
@@ -105,6 +113,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 7,
      "cost": 3892770,
      "edID": 128064251,
@@ -118,6 +127,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 7,
      "cost": 9731930,
      "edID": 128064252,
@@ -131,6 +141,7 @@
      "rating": "A"
    },
    {
+      "angle": 30,
      "class": 6,
      "cost": 88980,
      "edID": 128064243,
@@ -144,6 +155,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 6,
      "cost": 222440,
      "edID": 128064244,
@@ -157,6 +169,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 6,
      "cost": 556110,
      "edID": 128064245,
@@ -170,6 +183,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 6,
      "cost": 1390280,
      "edID": 128064246,
@@ -183,6 +197,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 6,
      "cost": 3475690,
      "edID": 128064247,
@@ -196,6 +211,7 @@
      "rating": "A"
    },
    {
+      "angle": 30,
      "class": 5,
      "cost": 31780,
      "edID": 128064238,
@@ -209,6 +225,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 5,
      "cost": 79440,
      "edID": 128064239,
@@ -222,6 +239,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 5,
      "cost": 198610,
      "edID": 128064240,
@@ -235,6 +253,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 5,
      "cost": 496530,
      "edID": 128064241,
@@ -248,6 +267,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 5,
      "cost": 1241320,
      "edID": 128064242,
@@ -261,6 +281,7 @@
      "rating": "A"
    },
    {
+      "angle": 30,
      "class": 4,
      "cost": 11350,
      "edID": 128064233,
@@ -274,6 +295,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 4,
      "cost": 28370,
      "edID": 128064234,
@@ -287,6 +309,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 4,
      "cost": 70930,
      "edID": 128064235,
@@ -300,6 +323,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 4,
      "cost": 177330,
      "edID": 128064236,
@@ -313,6 +337,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 4,
      "cost": 443330,
      "edID": 128064237,
@@ -326,6 +351,7 @@
      "rating": "A"
    },
    {
+      "angle": 30,
      "class": 3,
      "cost": 4050,
      "edID": 128064228,
@@ -339,6 +365,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 3,
      "cost": 10130,
      "edID": 128064229,
@@ -352,6 +379,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 3,
      "cost": 25330,
      "edID": 128064230,
@@ -365,6 +393,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 3,
      "cost": 63330,
      "edID": 128064231,
@@ -378,6 +407,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 3,
      "cost": 158330,
      "edID": 128064232,
@@ -391,6 +421,7 @@
      "rating": "A"
    },
    {
+      "angle": 30,
      "class": 2,
      "cost": 1450,
      "edID": 128064223,
@@ -404,6 +435,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 2,
      "cost": 3620,
      "edID": 128064224,
@@ -417,6 +449,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 2,
      "cost": 9050,
      "edID": 128064225,
@@ -430,6 +463,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 2,
      "cost": 22620,
      "edID": 128064226,
@@ -443,6 +477,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 2,
      "cost": 56550,
      "edID": 128064227,
@@ -456,6 +491,7 @@
      "rating": "A"
    },
    {
+      "angle": 30,
      "class": 1,
      "cost": 520,
      "edID": 128064218,
@@ -469,6 +505,7 @@
      "rating": "E"
    },
    {
+      "angle": 30,
      "class": 1,
      "cost": 1290,
      "edID": 128064219,
@@ -482,6 +519,7 @@
      "rating": "D"
    },
    {
+      "angle": 30,
      "class": 1,
      "cost": 3230,
      "edID": 128064220,
@@ -495,6 +533,7 @@
      "rating": "C"
    },
    {
+      "angle": 30,
      "class": 1,
      "cost": 8080,
      "edID": 128064221,
@@ -508,6 +547,7 @@
      "rating": "B"
    },
    {
+      "angle": 30,
      "class": 1,
      "cost": 20200,
      "edID": 128064222,
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.2.10",
+  "version": "2.3.5",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.13625,
      "pitch": 38,
      "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
    },
    "retailCost": 87810,
    "bulkheads": [
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 25,
      "roll": 60,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 3
    },
    "retailCost": 146969450,
    "bulkheads": [
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.13,
      "pitch": 38,
      "roll": 100,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
    },
    "retailCost": 6661150,
    "bulkheads": [
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.125,
      "pitch": 40,
      "roll": 110,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 2
    },
    "retailCost": 3961150,
    "bulkheads": [
@@ -31,12 +32,12 @@
    "slots": {
      "standard": [4, 4, 4, 3, 4, 4, 4],
      "hardpoints": [2, 2, 1, 1, 0, 0],
-      "internal": [4, 4, 3, 3, 2]
+      "internal": [5, 4, 3, 3, 2, 2]
    },
    "defaults": {
      "standard": ["4E", "4E", "4E", "3E", "4E", "4E", "4C"],
      "hardpoints": [0, 0, 17, 17, 0, 0],
-      "internal": ["02", "02", "44", 0, 0]
+      "internal": ["02", "02", "44", 0, 0, 0]
    }
  }
 }
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -13,14 +13,15 @@
      "baseShieldStrength": 280,
      "baseArmour": 280,
      "hardness": 60,
-      "hullMass": 1100,
+      "hullMass": 950,
      "masslock": 18,
      "pipSpeed": 0.1125,
      "luxuryCabins": true,
      "fighterHangars": true,
      "pitch": 25,
      "roll": 60,
-      "yaw": 17 
+      "yaw": 17,
+      "crew": 3
    },
    "retailCost": 84532770,
    "bulkheads": [
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.125,
      "pitch": 40,
      "roll": 100,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
    },
    "retailCost": 349720,
    "bulkheads": [
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.125,
      "pitch": 30,
      "roll": 90,
-      "yaw": 10 
+      "yaw": 10,
+      "crew": 2 
    },
    "retailCost": 747660,
    "bulkheads": [
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -1,6 +1,7 @@
 {
  "diamondback_explorer": {
-    "edID": 128671831, "eddbID": 5,
+    "edID": 128671831,
+    "eddbID": 5,
    "properties": {
      "name": "Diamondback Explorer",
      "manufacturer": "Lakon",
@@ -12,12 +13,13 @@
      "baseShieldStrength": 150,
      "baseArmour": 150,
      "hardness": 42,
-      "hullMass": 298,
+      "hullMass": 260,
      "masslock": 10,
      "pipSpeed": 0.09625,
      "pitch": 35,
      "roll": 90,
-      "yaw": 13
+      "yaw": 13,
+      "crew": 1
    },
    "retailCost": 1894760,
    "bulkheads": [
@@ -30,12 +32,12 @@
    "slots": {
      "standard": [ 4, 4, 5, 3, 4, 3, 5],
      "hardpoints": [ 3, 2, 2, 0, 0, 0, 0],
-      "internal": [ 4, 4, 3, 3, 2]
+      "internal": [ 4, 4, 3, 3, 2, 2]
    },
    "defaults": {
      "standard": ["4E", "4E", "5E", "3E", "4E", "3E", "5C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["49", "02", "01", 0, "2h"]
+      "internal": ["49", "02", "01", 0, "2h", 0]
    }
  }
 }
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.09875,
      "pitch": 42,
      "roll": 100,
-      "yaw": 15 
+      "yaw": 15,
+      "crew": 1
    } ,
    "retailCost": 564330,
    "bulkheads": [
--- a/ships/dolphin.json
+++ b/ships/dolphin.json
@@ -0,0 +1,47 @@
+{
+  "dolphin": {
+    "edID": 128049291,
+    "eddbID": 31,
+    "properties": {
+      "name": "Dolphin",
+      "manufacturer": "Saud Kruger",
+      "class": 1,
+      "hullCost": 1115330,
+      "speed": 250,
+      "boost": 350,
+      "boostEnergy": 10,
+      "baseShieldStrength": 110,
+      "baseArmour": 110,
+      "hardness": 35,
+      "hullMass": 140,
+      "masslock": 9,
+      "pipSpeed": 0.13,
+      "luxuryCabins": true,
+      "pitch": 30,
+      "roll": 100,
+      "yaw": 20,
+      "crew": 1
+    },
+    "retailCost": 1337330,
+    "bulkheads": [
+      { "id": "cq", "edID": 128049292, "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cr", "edID": 128049293, "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cs", "edID": 128049294, "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ct", "edID": 128049295, "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cu", "edID": 128049296, "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [4, 5, 4, 4, 3, 3, 4],
+      "hardpoints": [1, 1, 0, 0, 0],
+      "internal": [
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        4, 4, 3, 2, 2, 2
+      ]
+    },
+    "defaults": {
+      "standard": ["4E", "5E", "4E", "4E", "3E", "3E", "4C"],
+      "hardpoints": [17, 17, 0, 0, 0],
+      "internal": ["md", "02", "49", "01", "00", 0, "2h"]
+    }
+  }
+}
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0625,
      "pitch": 50,
      "roll": 120,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 1
    },
    "retailCost": 44800,
    "bulkheads": [
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -1,6 +1,7 @@
 {
  "federal_assault_ship": {
-    "edID": 128672145, "eddbID": 8,
+    "edID": 128672145,
+    "eddbID": 8,
    "properties": {
      "name": "Federal Assault Ship",
      "manufacturer": "Core Dynamics",
@@ -17,7 +18,8 @@
      "pipSpeed": 0.11125,
      "pitch": 38,
      "roll": 90,
-      "yaw": 19
+      "yaw": 19,
+      "crew": 2
    },
    "retailCost": 19814210,
    "bulkheads": [
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 28,
      "roll": 75,
-      "yaw": 8 
+      "yaw": 8,
+      "crew": 3 
    },
    "retailCost": 187969450,
    "bulkheads": [
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0725,
      "pitch": 30,
      "roll": 80,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
    },
    "retailCost": 14314210,
    "bulkheads": [
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 25,
      "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
    },
    "retailCost": 35814210,
    "bulkheads": [
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.03875,
      "pitch": 38,
      "roll": 90,
-      "yaw": 12
+      "yaw": 12,
+      "crew": 2
    },
    "retailCost": 51567040,
    "bulkheads": [
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.1625,
      "pitch": 36,
      "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 1
    },
    "retailCost": 52720,
    "bulkheads": [
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.1,
      "pitch": 40,
      "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
    },
    "retailCost": 22296860,
      "bulkheads": [
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -1,6 +1,7 @@
 {
  "imperial_courier": {
-    "edID": 128671223, "eddbID": 14,
+    "edID": 128671223,
+    "eddbID": 14,
    "properties": {
      "name": "Imperial Courier",
      "manufacturer": "Gutamaya",
@@ -17,7 +18,8 @@
      "pipSpeed": 0.05375,
      "pitch": 38,
      "roll": 90,
-      "yaw": 16
+      "yaw": 16,
+      "crew": 1
    },
    "retailCost": 2542930,
    "bulkheads": [
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -1,6 +1,7 @@
 {
  "imperial_cutter": {
-    "edID": 128049375, "eddbID": 26,
+    "edID": 128049375,
+    "eddbID": 26,
    "properties": {
      "name": "Imperial Cutter",
      "manufacturer": "Gutamaya",
@@ -18,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 18,
      "roll": 45,
-      "yaw":8 
+      "yaw": 8,
+      "crew": 3 
    },
    "retailCost": 208969450,
    "bulkheads": [
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.075,
      "pitch": 40,
      "roll": 100,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
    },
    "retailCost": 110830,
    "bulkheads": [
--- a/ships/index.js
+++ b/ships/index.js
@@ -8,6 +8,7 @@ module.exports = {
  cobra_mk_iv: require('./cobra_mk_iv').cobra_mk_iv,
  diamondback_explorer: require('./diamondback_explorer').diamondback_explorer,
  diamondback: require('./diamondback_scout').diamondback,
+  dolphin: require('./dolphin').dolphin,
  eagle: require('./eagle').eagle,
  federal_assault_ship: require('./federal_assault_ship').federal_assault_ship,
  federal_corvette: require('./federal_corvette').federal_corvette,
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -6,7 +6,7 @@
      "name": "Keelback",
      "manufacturer": "Lakon",
      "class": 2,
-      "hullCost": 2943880,
+      "hullCost": 2943870,
      "speed": 200,
      "boost": 300,
      "boostEnergy": 10,
@@ -19,9 +19,10 @@
      "fighterHangars": true,
      "pitch": 27,
      "roll": 100,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
    },
-    "retailCost": 3126160,
+    "retailCost": 3126150,
    "bulkheads": [
      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -13,13 +13,14 @@
      "baseShieldStrength": 220,
      "baseArmour": 220,
      "hardness": 55,
-      "hullMass": 580,
+      "hullMass": 290,
      "masslock": 13,
      "pipSpeed": 0.08375,
      "luxuryCabins": true,
      "pitch": 25,
      "roll": 55,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
    },
    "retailCost": 48539900,
    "bulkheads": [
--- a/ships/python.json
+++ b/ships/python.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0975,
      "pitch": 29,
      "roll": 90,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
    },
    "retailCost": 56978180,
    "bulkheads": [
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -6,7 +6,7 @@
      "name": "Sidewinder",
      "manufacturer": "Faulcon DeLacy",
      "class": 1,
-      "hullCost": 12870,
+      "hullCost": 4070,
      "speed": 220,
      "boost": 320,
      "boostEnergy": 7,
@@ -18,9 +18,10 @@
      "pipSpeed": 0.1375,
      "pitch": 42,
      "roll": 110,
-      "yaw": 16
+      "yaw": 16,
+      "crew": 1
    },
-    "retailCost": 40800,
+    "retailCost": 32000,
    "bulkheads": [
      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
      { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.1475,
      "pitch": 30,
      "roll": 100,
-      "yaw": 17
+      "yaw": 17,
+      "crew": 1
    },
    "retailCost": 1045950,
    "bulkheads": [
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.16625,
      "pitch": 22,
      "roll": 60,
-      "yaw": 22
+      "yaw": 22,
+      "crew": 1
    },
    "retailCost": 17472260,
    "bulkheads": [
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 20,
      "roll": 20,
-      "yaw": 8
+      "yaw": 8,
+      "crew": 3
    },
    "retailCost": 76555840,
    "bulkheads": [
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.09375,
      "pitch": 35,
      "roll": 90,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
    },
    "retailCost": 142930,
    "bulkheads": [
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0875,
      "pitch": 30,
      "roll": 90,
-      "yaw": 12
+      "yaw": 12,
+      "crew": 1
    },
    "retailCost": 437930,
    "bulkheads": [
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.02375,
      "pitch": 42,
      "roll": 110,
-      "yaw": 17
+      "yaw": 17,
+      "crew": 2
    },
    "retailCost": 4925620,
    "bulkheads": [
@@ -40,7 +41,7 @@
    "defaults": {
      "standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"],
      "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["4e", 0, 0, "02", 0, "2h"]
+      "internal": ["4e", 0, "02", 0, 0, "2h"]
    }
  }
 }
--- a/spec/data-spec.js
+++ b/spec/data-spec.js
@@ -20,7 +20,8 @@ describe('JSON Data', function() {
    'pipSpeed',
    'pitch',
    'roll',
-    'yaw'
+    'yaw',
+    'crew'
  ];

  var edIDs = {};
@@ -40,7 +41,7 @@ describe('JSON Data', function() {
        var id = group[i].id;
        expect(ids[id]).toBeFalsy('ID already exists: ' + id);
        expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
        if (s != 'ft' && s != 'pas' ) {
          expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
        }
@@ -70,7 +71,7 @@ describe('JSON Data', function() {
        expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`);
        expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`);
        expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
-        expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+        expect(group[i].edID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
        expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
        expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
        if (group[i].eddbID) {
@@ -110,7 +111,7 @@ describe('JSON Data', function() {
        var id = group[i].id;
        expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
        expect(ids[id]).toBeFalsy('ID already exists: ' + id);
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
+        expect(group[i].eddbID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
        expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
        if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs
          expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists:  ${id}`);
@@ -169,23 +170,26 @@ describe('JSON Data', function() {

  it('has valid blueprints', function() {
    var ids = {};
+    var names = {};

-    for (var k in Modifications.blueprints) {
-      const blueprint = Modifications.blueprints[k];
+    for (var blueprintname in Modifications.blueprints) {
+      const blueprint = Modifications.blueprints[blueprintname];
+      expect(names[blueprintname]).toBeFalsy('Name already exists: ' + blueprintname);
+      names[blueprintname] = true;
      expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
-      expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
-
-      for (var x in blueprint.features) {
-        var b = blueprint.features[x];
-        var bfs = {};
-        for (var bf in b) {
-          expect(bfs[bf]).toBeFalsy(`Blueprint feature [${bf}] already exists: ${blueprint.name}`);
-          expect(Modifications.modifications[bf]).toBeDefined(`Blueprint feature [${bf}] uknown: ${blueprint.name}`);
-          bfs[bf] = true;
-        }
-      }
-
      ids[blueprint.id] = true;
+      expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
+      expect(blueprint.grades).toBeDefined('Blueprint has no grades, ID:' + blueprint.id);
+
+      grades = {}
+      for (var grade in blueprint.grades) {
+        expect(grades[grade]).toBeFalsy('Grade already exists: ' + grade + ' for ' + blueprintname);
+        grades[grade] = true;
+
+        const blueprintgrade = blueprint.grades[grade];
+        expect(blueprintgrade.components).toBeDefined('Blueprint grade ' + grade + ' has no components for ' + blueprintname);
+        expect(blueprintgrade.features).toBeDefined('Blueprint grade ' + grade + ' has no features for ' + blueprintname);
+      }
    }
  });

@@ -200,7 +204,18 @@ describe('JSON Data', function() {
      expect(modification.method).toBeDefined('Modification has no method, ID:' + modification.id);
      ids[modification.id] = true;
    }
+  });

+  it('has valid module modifications', function() {
+    for (var m in Modifications.modules) {
+      const module = Modifications.modules[m];
+      for (var bp in module.blueprints) {
+        expect(Modifications.blueprints[bp]).toBeDefined('Missing ' + bp + ' for ' + m);
+        for (var grade in module.blueprints[bp].grades) {
+          expect(Modifications.blueprints[bp].grades[grade]).toBeDefined('Missing ' + bp + ' grade ' + grade + ' for ' + m);
+        }
+      }
+    }
  });

  it('has valid specials', function() {
Author	SHA1	Message	Date
Cmdr McDonald	f8faf11e3c	Merge branch 'release/2.3.5'	2017-05-17 07:30:32 +01:00
Cmdr McDonald	c029ed0e0d	Version bump	2017-05-17 07:30:26 +01:00
Cmdr McDonald	5570c66010	Fix typo	2017-05-15 16:07:24 +01:00
Cmdr McDonald	0af85f4d31	Fixes	2017-05-15 10:11:58 +01:00
Cmdr McDonald	3597ae4093	Add shot speed for long-range weapon	2017-05-12 00:29:38 +01:00
Cmdr McDonald	662efeaace	Fix integrity for class 6 power plants	2017-05-07 10:23:50 +01:00
Cmdr McDonald	8250994ebe	Fix blueprints for point defence	2017-05-06 10:29:10 +01:00
Cmdr McDonald	ba08e5184f	Add values for FSD interrupt	2017-05-03 14:33:06 +01:00
Cmdr McDonald	839b9b80a9	Merge branch 'release/2.3.4' into develop	2017-05-03 12:38:42 +01:00
Cmdr McDonald	f11ce05c03	Merge branch 'release/2.3.4'	2017-05-03 12:38:39 +01:00
Cmdr McDonald	355d2ef88d	Version bump	2017-05-03 12:38:32 +01:00
Cmdr McDonald	6a5817237d	Separate specials for dumbfire and seeker missiles	2017-05-03 10:15:54 +01:00
Cmdr McDonald	9825474117	Add FSD interrupt special	2017-05-03 09:57:56 +01:00
Cmdr McDonald	64b7ca503a	Fix internal names for power plant blueprints	2017-04-27 06:59:06 -04:00
Cmdr McDonald	d7922eda7f	Fix thermal load of focused grade 4	2017-04-27 06:56:05 -04:00
Cmdr McDonald	d51c2a7562	Add long-range blueprint to multi-cannon	2017-04-25 07:33:03 +01:00
Cmdr McDonald	74e5b8298f	Merge branch 'release/2.3.3' into develop	2017-04-15 20:46:09 +01:00
Cmdr McDonald	c56ee502e9	Merge branch 'release/2.3.3'	2017-04-15 20:46:06 +01:00
Cmdr McDonald	55350abd2d	Bump version	2017-04-15 20:46:01 +01:00
Cmdr McDonald	e9d8ecc79f	Add Felicity Farseer to s and ss modifications	2017-04-15 20:29:32 +01:00
Cmdr McDonald	bb47e289ce	Merge branch 'release/2.3.2' into develop	2017-04-14 11:01:13 +01:00
Cmdr McDonald	1e696ca4c2	Merge branch 'release/2.3.2'	2017-04-14 11:01:10 +01:00
Cmdr McDonald	4cba3b4c06	Bump package version	2017-04-14 11:01:02 +01:00
Cmdr McDonald	1f3fed31ce	Updates	2017-04-14 11:00:32 +01:00
Cmdr McDonald	9c2fe76cd7	Merge branch 'release/2.3.1' into develop	2017-04-13 23:12:10 +01:00
Cmdr McDonald	463b16789e	Merge branch 'release/2.3.1'	2017-04-13 23:12:04 +01:00
Cmdr McDonald	b1cd416619	Bump version	2017-04-13 23:11:57 +01:00
Cmdr McDonald	5451cfab9c	Merge branch 'feature/fixes' into develop	2017-04-13 23:11:38 +01:00
Cmdr McDonald	81ad6806d0	Add FD IDs	2017-04-13 23:11:13 +01:00
Cmdr McDonald	f6f9a03bef	Separate scan time and scan range	2017-04-13 23:10:35 +01:00
Cmdr McDonald	1930ea90cc	Merge branch 'release/2.3'	2017-04-09 09:10:25 +01:00
Cmdr McDonald	4864b11dea	Fix blueprint for specialised shield cell	2017-04-09 09:09:53 +01:00
Cmdr McDonald	8b41e96107	Merge branch 'feature/23' into develop	2017-03-31 16:49:24 +01:00
Cmdr McDonald	26ca6c8532	Revert changes not going in to 2.3	2017-03-31 16:34:02 +01:00
Cmdr McDonald	bc80662649	Revert changes not going in to 2.3	2017-03-31 16:31:20 +01:00
Cmdr McDonald	7516fb8783	Revert changes not going in to 2.3	2017-03-31 16:31:16 +01:00
Cmdr McDonald	3d28363e98	tidy-ups	2017-03-30 13:34:05 +01:00
Cmdr McDonald	1a6f9fc4da	fix	2017-03-28 13:01:41 +01:00
Cmdr McDonald	6567478d80	Add explosive/thermal split for overload munitions	2017-03-28 13:01:26 +01:00
Cmdr McDonald	501fc6932d	Remove power mods from DSS blueprints	2017-03-28 11:00:08 +01:00
Cmdr McDonald	812d84a130	Fix typo for scan angle	2017-03-27 12:12:14 +01:00
Cmdr McDonald	5594a5fc0d	Add engineer info	2017-03-27 09:53:34 +01:00
Cmdr McDonald	3bd6641c26	Update mine launch statS	2017-03-26 13:38:17 +01:00
Cmdr McDonald	2acb7cf433	Update shield cell bank metrics	2017-03-25 16:22:05 +00:00
Cmdr McDonald	4ec51cf25e	Update burstrof	2017-03-22 18:33:13 +00:00
Cmdr McDonald	670d2f0950	Update fragment cannons	2017-03-22 18:24:41 +00:00
Cmdr McDonald	b78f3b2af7	Update sensors	2017-03-22 13:26:16 +00:00
Cmdr McDonald	6d8ca95b12	Fix name for target lock breaker	2017-03-19 20:11:16 +00:00
Cmdr McDonald	ffb4b436a0	Update ships	2017-03-15 16:58:24 +00:00
Cmdr McDonald	c0eacc0ac5	Update MPR data	2017-03-08 15:33:47 +00:00
Cmdr McDonald	a71854309f	Fix jitter stat	2017-03-06 19:56:36 +00:00
Cmdr McDonald	bdb5dc40d5	Add missing components	2017-03-06 13:42:05 +00:00
Cmdr McDonald	1fff622ec6	Add integrity	2017-03-06 09:19:42 +00:00
Cmdr McDonald	b25278bf81	Fix bad value for kinetic shield booster grade 5	2017-03-04 08:42:16 +00:00
Cmdr McDonald	f0db785bf7	Add module name for blueprint	2017-03-04 08:40:35 +00:00
Cmdr McDonald	2a74be5b30	Fix cost of Yuri Grom weapon	2017-03-03 21:39:14 +00:00
Cmdr McDonald	4cac9de01c	Fix up odd numbers in blueprints	2017-03-02 14:54:01 +00:00
Cmdr McDonald	90a6e71720	Fix dolphin boost	2017-03-02 14:30:44 +00:00
Cmdr McDonald	841d70c560	Added Dolphin stats	2017-03-02 12:20:43 +00:00
Cmdr McDonald	e733fc23b4	Fix EDDB for fighter hangars	2017-03-02 08:19:33 +00:00
Cmdr McDonald	f62ed95cdf	Various 2.3 updates	2017-03-01 22:09:23 +00:00
Cmdr McDonald	3f4d2a83e0	Fix typos	2017-03-01 00:55:48 +00:00
Cmdr McDonald	c39722b6e3	Merge branch 'release/2.2.19' into develop	2017-02-26 21:09:53 +00:00
Cmdr McDonald	aec47c3c8c	Merge branch 'release/2.2.19'	2017-02-26 21:09:49 +00:00
Cmdr McDonald	05e9a8e071	Version bump	2017-02-26 21:09:43 +00:00
Cmdr McDonald	8e0a593a31	Fix incorrect value for 2c bi-weave	2017-02-23 22:03:49 +00:00
Cmdr McDonald	2baaea0db8	Remove shot speed	2017-02-23 18:52:01 +00:00
Cmdr McDonald	1fe19a9e53	Merge branch 'release/2.2.18' into develop	2017-02-22 08:05:22 +00:00
Cmdr McDonald	c04d09932f	Merge branch 'release/2.2.18'	2017-02-22 08:05:19 +00:00
Cmdr McDonald	411533aa9e	Version bump	2017-02-22 08:05:13 +00:00
Cmdr McDonald	5a049ee8e7	Fix eff higherbetter	2017-02-22 07:49:39 +00:00
Cmdr McDonald	7378f83ccd	Fix higherbetter for kinres	2017-02-20 14:29:09 +00:00
Cmdr McDonald	0b90af3b6c	Merge branch 'release/2.2.17' into develop	2017-02-18 09:51:58 +00:00
Cmdr McDonald	a4a4d315c2	Merge branch 'release/2.2.17'	2017-02-18 09:51:54 +00:00
Cmdr McDonald	daa6d74c2e	Package bupm	2017-02-18 09:51:46 +00:00
Cmdr McDonald	2c5e658181	Merge branch 'feature/multicrew' into develop	2017-02-18 09:49:44 +00:00
Cmdr McDonald	4e5ea494f5	Remove non-existent wake scanner blueprints	2017-02-18 08:28:37 +00:00
Cmdr McDonald	c21575f26d	Merge	2017-02-17 18:26:37 +00:00
Cmdr McDonald	9f6993b466	Change seats to crew	2017-02-17 18:26:02 +00:00
Cmdr McDonald	ed41236bba	Initial stab at seats	2017-02-17 18:25:48 +00:00
Cmdr McDonald	29f67ee228	Fix mining laser stats	2017-02-17 18:23:20 +00:00
Cmdr McDonald	4b8951d032	Change seats to crew	2017-02-16 22:37:05 +00:00
Cmdr McDonald	5096a3f740	Initial stab at seats	2017-02-16 22:32:26 +00:00
Cmdr McDonald	28a7d9446d	Add mass as potential SCB modification	2017-02-16 22:19:54 +00:00
Cmdr McDonald	dca6fe643d	Merge branch 'release/2.2.16' into develop	2017-02-15 20:37:04 +00:00
Cmdr McDonald	e791d73f2a	Merge branch 'release/2.2.16'	2017-02-15 20:36:58 +00:00
Cmdr McDonald	11d39dc0b5	Update package number	2017-02-15 20:36:51 +00:00
Cmdr McDonald	3d47dd2fb7	Set higherbetter for modifications	2017-02-15 19:12:56 +00:00
Cmdr McDonald	c90ebd0f3f	Merge branch 'release/2.2.15' into develop	2017-02-13 19:49:05 +00:00
Cmdr McDonald	19e111b6a4	Merge branch 'release/2.2.15'	2017-02-13 19:49:01 +00:00
Cmdr McDonald	a74b6cfb51	Bump package number	2017-02-13 19:48:57 +00:00
Cmdr McDonald	926e89cf1e	Merge branch 'feature/fixes' into develop	2017-02-13 19:48:24 +00:00
Cmdr McDonald	ba1ccdedb0	Tidy up module values	2017-02-13 19:48:13 +00:00
Cmdr McDonald	d1644df794	Fix location of initial cargo rack for Vulture	2017-02-08 09:41:13 +00:00
Cmdr McDonald	e99e86cfce	Merge branch 'release/2.2.14' into develop	2017-02-08 09:25:35 +00:00
Cmdr McDonald	fc649c6bbe	Merge branch 'release/2.2.14'	2017-02-08 09:25:31 +00:00
Cmdr McDonald	41bc89df58	Package bump	2017-02-08 09:25:27 +00:00
Cmdr McDonald	229e2742a7	Merge branch 'feature/x' into develop	2017-02-08 09:24:27 +00:00
Cmdr McDonald	6d4f79dda9	Correct EDID for class 6 passenger cabin	2017-02-08 07:58:44 +00:00
Cmdr McDonald	827ed4a6dd	Fix incorrect retail price for Keelback	2017-02-05 21:11:45 +00:00
Cmdr McDonald	c82b28448c	Separate hidden attribute of modifications	2017-02-05 19:04:41 +00:00
Cmdr McDonald	f3e4a19645	Tidy-ups for blueprint info	2017-02-05 15:34:00 +00:00
Cmdr McDonald	0d803c7c50	Additional data for blueprints	2017-02-05 12:42:18 +00:00
Cmdr McDonald	f02b9e0cac	Remove grade 5 life support modifications	2017-02-03 22:29:20 +00:00
Cmdr McDonald	ea9294fd88	Merge branch 'release/2.2.13' into develop	2017-02-02 23:00:04 +00:00
Cmdr McDonald	e020ee62c1	Merge branch 'release/2.2.13'	2017-02-02 23:00:00 +00:00
Cmdr McDonald	fa51463972	Bump package number	2017-02-02 22:59:55 +00:00
Cmdr McDonald	443ce708a5	Merge branch 'feature/fixes' into develop	2017-02-02 22:58:36 +00:00
Cmdr McDonald	1d2bb2d307	Tidy up blueprints	2017-02-01 18:49:53 +00:00
Cmdr McDonald	0026c1026e	Dist	2017-02-01 08:49:13 +00:00
Cmdr McDonald	2d6ef26ab2	Tweak hull costs	2017-02-01 08:27:05 +00:00
Cmdr McDonald	3a27604d01	Add plasma slug special for PAs. Fix for #64	2017-01-29 21:50:54 +00:00
Cmdr McDonald	a62adecffa	Merge branch 'release/2.2.12' into develop	2017-01-29 08:26:05 +00:00
Cmdr McDonald	67cb16da99	Merge branch 'release/2.2.12'	2017-01-29 08:26:02 +00:00
Cmdr McDonald	913406774c	Version number bump	2017-01-29 08:25:55 +00:00
Cmdr McDonald	4e297e01db	Merge branch 'feature/specials' into develop	2017-01-29 08:25:18 +00:00
Cmdr McDonald	9e330ea31a	Add IDs for most powerplay modules	2017-01-29 08:22:51 +00:00
Cmdr McDonald	ff9060e5f1	Tidy up thruster information	2017-01-27 18:15:51 +00:00
Cmdr McDonald	4ffbab8ef1	Add per-blueprint specials	2017-01-26 16:01:03 +00:00
Cmdr McDonald	3e2b13654d	Merge branch 'release/2.2.11' into develop	2017-01-25 19:33:43 +00:00
Cmdr McDonald	2d2f3548b5	Merge branch 'release/2.2.11'	2017-01-25 19:33:39 +00:00
Cmdr McDonald	91bbd53657	Bump version number	2017-01-25 19:33:31 +00:00
Cmdr McDonald	f34c839670	Merge branch 'feature/fixes' into develop	2017-01-25 19:31:51 +00:00
Cmdr McDonald	d6602dca06	Updates	2017-01-25 19:31:47 +00:00
Cmdr McDonald	7a63d71b0f	Fixed for frag cannons	2017-01-25 14:25:16 +00:00
Cmdr McDonald	73d1c15609	Remove non-existant AFMU blueprints	2017-01-25 07:43:53 +00:00
Cmdr McDonald	bb3b299c7b	dist	2017-01-24 11:50:04 +00:00
Cmdr McDonald	dfdc170639	Fix incorrect values for charge enhanced power distributor. Fixes #55	2017-01-24 11:41:32 +00:00
Cmdr McDonald	93166c2ea1	Changelog	2017-01-24 07:37:13 +00:00
Cmdr McDonald	700f730075	Remove erroneous chaff launcher capacity blueprint grades	2017-01-24 07:36:56 +00:00
Cmdr McDonald	3ad159fc4d	Merge branch 'release/2.2.10' into develop	2017-01-23 13:04:12 +00:00