Merge branch 'release/2.4.0'

Bump version and generate dist.

ChangeLog.md

@@ -1,3 +1,107 @@
+#2.4.0
+  * Added Repair Limpet Computers
+
+#2.3.7
+  * Fixed Orca mass-lock
+
+#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
+  * Add shotspeed modifier to cannon/multi-cannon/fragment cannon
+
+#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
+  * Remove power draw for detailed surface scanner - although shown in outfitting it is not part of active power
+  * Fix incorrect names for lightweight and kinetic armour
+  * Add engineering blueprints
+
+#2.2.9
+  * Add falloff metric for weapons
+  * Add falloff from range modification
+
 #2.2.8
   * Set military slot of Viper Mk IV to class 3; was incorrectly set as class 2
   * Update base regeneration rate of prismatic shield generators to values in 2.2.03

modifications/index.js

@@ -2,6 +2,6 @@ module.exports = {
   blueprints: require('./blueprints'),
   modifications: require('./modifications'),
   modifierActions: require('./modifierActions'),
-  specials: require('./specials'),
-  validity: require('./validity')
+  modules: require('./modules'),
+  specials: require('./specials')
 };

modifications/modifications.json

@@ -1,44 +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"},
-    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative"},
-    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
-    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
-    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative"},
-    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
-    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
-    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
-    "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
-    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
-    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative"},
-    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative"},
-    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive"},
-    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative"},
-    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative"},
-    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative"},
-    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative"},
-    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
-    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
-    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
-    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
-    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
-    "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},
-    "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative"},
-    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"},
-    "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"},
-    "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"},
-    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"},
-    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"},
-    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"},
-    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative"},
-    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive"},
-    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative"},
-    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative"},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"},
-    "type": {"id": 40, "name": "type", "type": "alphabetic", "method": "overwrite"}
+    "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}
 }

modifications/modifierActions.json

@@ -174,6 +174,8 @@
   "mod_weapon_damage": {
     "damage": 1
   },
+  "mod_weapon_falloffrange_from_range": {
+  },
   "mod_weapon_hardness_piercing": {
     "piercing": 1
   },
@@ -209,20 +211,33 @@
     "jitter": 1,
     "speed": -0.1667
   },
+  "special_fsd_interrupt": {
+    "damage": -0.3,
+    "rof": 0.5
+  },
   "special_high_yield_shell": {
     "rof": 0.1111111111111111
   },
   "special_incendiary_rounds": {
     "rof": 0.05263157894736842,
     "thermload": 2,
-    "type": "T"
+    "damagedist": { 
+      "T": 1
+    }
   },
   "special_inertial_impact": {
     "damage": 0.5,
-    "jitter": 1,
-    "type": "KT"
+    "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
@@ -259,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

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"}
 }

modifications/validity.json

@@ -1,360 +0,0 @@
-{
-  "am": [
-    "integrity",
-    "power"
-  ],
-  "bh": [
-    "explres",
-    "hullboost",
-    "kinres",
-    "mass",
-    "thermres"
-  ],
-  "bl": [
-    "damage",
-    "distdraw",
-    "integrity",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "thermload"
-  ],
-  "bsg": [
-    "boot",
-    "brokenregen",
-    "distdraw",
-    "explres",
-    "integrity",
-    "kinres",
-    "mass",
-    "optmass",
-    "optmul",
-    "power",
-    "regen",
-    "thermload",
-    "thermres"
-  ],
-  "c": [
-    "ammo",
-    "clip",
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "reload",
-    "rof",
-    "thermload"
-  ],
-  "cc": [
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "ch": [
-    "ammo",
-    "integrity",
-    "mass",
-    "power",
-    "reload"
-  ],
-  "cs": [
-    "boot",
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "ec": [
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "fc": [
-    "ammo",
-    "burst",
-    "burstrof",
-    "clip",
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "reload",
-    "rof",
-    "thermload",
-    "type"
-  ],
-  "fi": [
-    "boot",
-    "facinglimit",
-    "integrity",
-    "mass",
-    "power",
-    "ranget"
-  ],
-  "fs": [
-    "integrity",
-    "power"
-  ],
-  "fsd": [
-    "boot",
-    "integrity",
-    "mass",
-    "maxfuel",
-    "optmass",
-    "power",
-    "thermload"
-  ],
-  "fx": [
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "hb": [
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "hr": [
-    "hullreinforcement",
-    "explres",
-    "hullboost",
-    "kinres",
-    "mass",
-    "thermres"
-  ],
-  "hs": [
-    "ammo",
-    "integrity",
-    "mass",
-    "power",
-    "reload"
-  ],
-  "kw": [
-    "boot",
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "ls": [
-    "boot",
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "mc": [
-    "ammo",
-    "clip",
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "reload",
-    "rof",
-    "thermload",
-    "type"
-  ],
-  "mr": [
-    "ammo",
-    "clip",
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "reload",
-    "rof",
-    "thermload"
-  ],
-  "nl": [
-    "ammo",
-    "boot",
-    "clip",
-    "damage",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "reload",
-    "rof",
-    "thermload"
-  ],
-  "pa": [
-    "ammo",
-    "clip",
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "reload",
-    "rof",
-    "thermload"
-  ],
-  "pc": [
-    "integrity",
-    "mass",
-    "power"
-  ],
-  "pd": [
-    "boot",
-    "engcap",
-    "engrate",
-    "integrity",
-    "mass",
-    "power",
-    "syscap",
-    "sysrate",
-    "wepcap",
-    "weprate"
-  ],
-  "pl": [
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "rof",
-    "thermload"
-  ],
-  "po": [
-    "ammo",
-    "integrity",
-    "mass",
-    "power",
-    "reload"
-  ],
-  "pp": [
-    "eff",
-    "integrity",
-    "mass",
-    "pgen"
-  ],
-  "psg": [
-    "boot",
-    "brokenregen",
-    "distdraw",
-    "explres",
-    "integrity",
-    "kinres",
-    "mass",
-    "optmass",
-    "optmul",
-    "power",
-    "regen",
-    "thermload",
-    "thermres"
-  ],
-  "rf": [
-    "integrity",
-    "power"
-  ],
-  "rg": [
-    "ammo",
-    "clip",
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "reload",
-    "rof",
-    "thermload"
-  ],
-  "sb": [
-    "explres",
-    "integrity",
-    "kinres",
-    "mass",
-    "power",
-    "shieldboost",
-    "thermres"
-  ],
-  "scb": [
-    "boot",
-    "duration",
-    "integrity",
-    "power",
-    "shieldreinforcement",
-    "spinup",
-    "thermload"
-  ],
-  "sg": [
-    "boot",
-    "brokenregen",
-    "distdraw",
-    "explres",
-    "integrity",
-    "kinres",
-    "mass",
-    "optmass",
-    "optmul",
-    "power",
-    "regen",
-    "thermload",
-    "thermres"
-  ],
-  "t": [
-    "integrity",
-    "mass",
-    "optmass",
-    "optmul",
-    "power",
-    "thermload"
-  ],
-  "tp": [
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "rof",
-    "thermload"
-  ],
-  "ul": [
-    "burst",
-    "burstrof",
-    "damage",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "rof",
-    "thermload"
-  ],
-  "ws": [
-    "boot",
-    "integrity",
-    "mass",
-    "power"
-  ]
-}

modules/hardpoints/beam_laser.json

@@ -7,9 +7,13 @@
       "class": 1,
       "cost": 37430,
       "damage": 9.8,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.94,
       "edID": 128049428,
       "eddbID": 841,
+      "falloff": 600,
       "grp": "bl",
       "id": "10",
       "integrity": 40,
@@ -19,8 +23,7 @@
       "power": 0.62,
       "range": 3000,
       "rating": "E",
-      "thermload": 3.5,
-      "type": "T"
+      "thermload": 3.5
     },
     {
       "breachdmg": 6.1,
@@ -29,9 +32,13 @@
       "class": 1,
       "cost": 74650,
       "damage": 7.66,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 2.11,
       "edID": 128049432,
       "eddbID": 844,
+      "falloff": 600,
       "grp": "bl",
       "id": "0p",
       "integrity": 40,
@@ -41,8 +48,7 @@
       "power": 0.6,
       "range": 3000,
       "rating": "E",
-      "thermload": 3.6,
-      "type": "T"
+      "thermload": 3.6
     },
     {
       "breachdmg": 4.3,
@@ -51,9 +57,13 @@
       "class": 1,
       "cost": 500000,
       "damage": 5.4,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.32,
       "edID": 128049435,
       "eddbID": 847,
+      "falloff": 600,
       "eps": 1.32,
       "grp": "bl",
       "hps": 2.4,
@@ -65,8 +75,7 @@
       "power": 0.57,
       "range": 3000,
       "rating": "F",
-      "thermload": 2.4,
-      "type": "T"
+      "thermload": 2.4
     },
     {
       "breachdmg": 3.9,
@@ -75,9 +84,13 @@
       "class": 1,
       "cost": 56150,
       "damage": 4.9,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 2.52,
       "edID": 128671346,
       "eddbID": 1476,
+      "falloff": 600,
       "grp": "bl",
       "id": "b0",
       "integrity": 40,
@@ -89,8 +102,7 @@
       "pp": "Edmund Mahon",
       "range": 3000,
       "rating": "E",
-      "thermload": 2.7,
-      "type": "T"
+      "thermload": 2.7
     },
     {
       "breachdmg": 12.8,
@@ -99,9 +111,13 @@
       "class": 2,
       "cost": 299520,
       "damage": 15.96,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 3.16,
       "edID": 128049429,
       "eddbID": 842,
+      "falloff": 600,
       "grp": "bl",
       "id": "0r",
       "integrity": 51,
@@ -111,8 +127,7 @@
       "power": 1.01,
       "range": 3000,
       "rating": "D",
-      "thermload": 5.1,
-      "type": "T"
+      "thermload": 5.1
     },
     {
       "breachdmg": 10,
@@ -121,9 +136,13 @@
       "class": 2,
       "cost": 500600,
       "damage": 12.52,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 3.44,
       "edID": 128049433,
       "eddbID": 845,
+      "falloff": 600,
       "grp": "bl",
       "id": "0s",
       "integrity": 51,
@@ -133,8 +152,7 @@
       "power": 0.99,
       "range": 3000,
       "rating": "D",
-      "thermload": 5.3,
-      "type": "T"
+      "thermload": 5.3
     },
     {
       "breachdmg": 7.1,
@@ -143,9 +161,13 @@
       "class": 2,
       "cost": 2099900,
       "damage": 8.82,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 2.16,
       "edID": 128049436,
       "eddbID": 848,
+      "falloff": 600,
       "grp": "bl",
       "id": "0t",
       "integrity": 51,
@@ -155,8 +177,7 @@
       "power": 0.93,
       "range": 3000,
       "rating": "E",
-      "thermload": 3.5,
-      "type": "T"
+      "thermload": 3.5
     },
     {
       "breachdmg": 20.6,
@@ -165,9 +186,13 @@
       "class": 3,
       "cost": 1177600,
       "damage": 25.78,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 5.1,
       "edID": 128049430,
       "eddbID": 843,
+      "falloff": 600,
       "grp": "bl",
       "id": "0u",
       "integrity": 64,
@@ -177,8 +202,7 @@
       "power": 1.62,
       "range": 3000,
       "rating": "C",
-      "thermload": 7.2,
-      "type": "T"
+      "thermload": 7.2
     },
     {
       "breachdmg": 16.2,
@@ -187,9 +211,13 @@
       "class": 3,
       "cost": 2396160,
       "damage": 20.28,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 5.58,
       "edID": 128049434,
       "eddbID": 846,
+      "falloff": 600,
       "grp": "bl",
       "id": "0v",
       "integrity": 64,
@@ -199,8 +227,7 @@
       "power": 1.6,
       "range": 3000,
       "rating": "C",
-      "thermload": 7.6,
-      "type": "T"
+      "thermload": 7.6
     },
     {
       "breachdmg": 11.5,
@@ -209,9 +236,13 @@
       "class": 3,
       "cost": 19399600,
       "damage": 14.34,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 3.51,
       "edID": 128049437,
       "eddbID": 849,
+      "falloff": 600,
       "grp": "bl",
       "id": "0o",
       "integrity": 64,
@@ -221,8 +252,7 @@
       "power": 1.51,
       "range": 3000,
       "rating": "D",
-      "thermload": 5.1,
-      "type": "T"
+      "thermload": 5.1
     },
     {
       "breachdmg": 33.1,
@@ -231,9 +261,13 @@
       "class": 4,
       "cost": 2396160,
       "damage": 41.38,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 8.19,
       "edID": 128049431,
       "eddbID": 1540,
+      "falloff": 600,
       "grp": "bl",
       "id": "0w",
       "integrity": 80,
@@ -243,8 +277,7 @@
       "power": 2.61,
       "range": 3000,
       "rating": "A",
-      "thermload": 9.9,
-      "type": "T"
+      "thermload": 9.9
     },
     {
       "breachdmg": 26.1,
@@ -253,9 +286,13 @@
       "class": 4,
       "cost": 8746160,
       "damage": 32.68,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 8.99,
       "edID": 128681994,
       "eddbID": 1544,
+      "falloff": 600,
       "grp": "bl",
       "id": "0x",
       "integrity": 80,
@@ -265,8 +302,7 @@
       "power": 2.57,
       "range": 3000,
       "rating": "A",
-      "thermload": 10.6,
-      "type": "T"
+      "thermload": 10.6
     }
   ]
 }

modules/hardpoints/burst_laser.json

@@ -1,7 +1,7 @@
 {
   "ul": [
     {
-      "breachdmg": 7.05,
+      "breachdmg": 1.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -9,9 +9,13 @@
       "class": 1,
       "cost": 4400,
       "damage": 1.72,
-      "distdraw": 0.24,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.25,
       "edID": 128049400,
       "eddbID": 832,
+      "falloff": 500,
       "grp": "ul",
       "id": "11",
       "integrity": 40,
@@ -22,21 +26,24 @@
       "range": 3000,
       "rating": "F",
       "rof": 2,
-      "thermload": 0.4,
-      "type": "T"
+      "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,
-      "distdraw": 0.23,
+      "damage": 1.22,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.24,
       "edID": 128049404,
       "eddbID": 835,
+      "falloff": 500,
       "grp": "ul",
       "id": "12",
       "integrity": 40,
@@ -47,21 +54,24 @@
       "range": 3000,
       "rating": "G",
       "rof": 2.23,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.34
     },
     {
-      "breachdmg": 1.92,
+      "breachdmg": 0.4,
       "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
       "burst": 3,
       "burstrof": 19,
       "class": 1,
       "cost": 52800,
       "damage": 0.87,
-      "distdraw": 0.136,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.14,
       "edID": 128049407,
       "eddbID": 838,
+      "falloff": 500,
       "grp": "ul",
       "id": "13",
       "integrity": 40,
@@ -72,21 +82,24 @@
       "range": 3000,
       "rating": "G",
       "rof": 1.92,
-      "thermload": 0.2,
-      "type": "T"
+      "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": 600,
       "grp": "ul",
       "id": "cy",
       "integrity": 40,
@@ -97,24 +110,27 @@
       "piercing": 1,
       "power": 0.8,
       "pp": "Archon Delaine",
-      "range": 600,
+      "range": 3000,
       "rating": "F",
-      "rof": 6.6,
-      "thermload": 0.3,
-      "type": "T"
+      "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,
-      "distdraw": 0.482,
+      "damage": 3.53,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.5,
       "edID": 128049401,
       "eddbID": 833,
+      "falloff": 500,
       "grp": "ul",
       "id": "7h",
       "integrity": 40,
@@ -125,11 +141,10 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.6,
-      "thermload": 0.8,
-      "type": "T"
+      "thermload": 0.78
     },
     {
-      "breachdmg": 8.82,
+      "breachdmg": 2.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -137,9 +152,13 @@
       "class": 2,
       "cost": 48500,
       "damage": 2.45,
-      "distdraw": 0.468,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.49,
       "edID": 128049405,
       "eddbID": 836,
+      "falloff": 500,
       "grp": "ul",
       "id": "7i",
       "integrity": 40,
@@ -150,21 +169,24 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.78,
-      "thermload": 0.7,
-      "type": "T"
+      "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,
-      "distdraw": 0.26,
+      "damage": 1.72,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.28,
       "edID": 128049408,
       "eddbID": 839,
+      "falloff": 500,
       "grp": "ul",
       "id": "7j",
       "integrity": 40,
@@ -175,21 +197,24 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.57,
-      "thermload": 0.4,
-      "type": "T"
+      "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,
-      "distdraw": 1.06,
+      "damage": 7.73,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.11,
       "edID": 128049402,
       "eddbID": 834,
+      "falloff": 500,
       "grp": "ul",
       "id": "14",
       "integrity": 64,
@@ -200,21 +225,24 @@
       "range": 3000,
       "rating": "D",
       "rof": 1.2,
-      "thermload": 1.7,
-      "type": "T"
+      "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,
-      "distdraw": 0.986,
+      "damage": 5.16,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.03,
       "edID": 128049406,
       "eddbID": 837,
+      "falloff": 500,
       "grp": "ul",
       "id": "15",
       "integrity": 64,
@@ -225,21 +253,24 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.4,
-      "thermload": 1.4,
-      "type": "T"
+      "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,
-      "distdraw": 0.536,
+      "damage": 3.53,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.56,
       "edID": 128049409,
       "eddbID": 840,
+      "falloff": 500,
       "grp": "ul",
       "id": "16",
       "integrity": 64,
@@ -250,21 +281,24 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.272,
-      "thermload": 0.8,
-      "type": "T"
+      "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,
-      "distdraw": 2.84,
+      "damage": 20.61,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.98,
       "edID": 128049403,
       "eddbID": 1549,
+      "falloff": 500,
       "grp": "ul",
       "id": "7s",
       "integrity": 80,
@@ -275,21 +309,24 @@
       "range": 3000,
       "rating": "E",
       "rof": 0.8,
-      "thermload": 4.5,
-      "type": "T"
+      "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,
-      "distdraw": 2.31,
+      "damage": 12.09,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.41,
       "edID": 128727920,
       "eddbID": 1550,
+      "falloff": 500,
       "grp": "ul",
       "id": "7t",
       "integrity": 80,
@@ -300,8 +337,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1,
-      "thermload": 3.3,
-      "type": "T"
+      "thermload": 3.33
     }
   ]
 }

modules/hardpoints/cannon.json

@@ -9,9 +9,13 @@
       "clip": 6,
       "cost": 21100,
       "damage": 22.5,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.46,
       "edID": 128049438,
       "eddbID": 850,
+      "falloff": 3000,
       "grp": "c",
       "id": "1h",
       "integrity": 40,
@@ -23,9 +27,8 @@
       "rating": "D",
       "reload": 3,
       "rof": 0.5,
-      "speed": 1200,
-      "thermload": 1.4,
-      "type": "K"
+      "shotspeed": 1200,
+      "thermload": 1.4
     },
     {
       "ammo": 100,
@@ -36,9 +39,13 @@
       "clip": 5,
       "cost": 42200,
       "damage": 16,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.48,
       "edID": 128049442,
       "eddbID": 854,
+      "falloff": 3000,
       "grp": "c",
       "id": "1i",
       "integrity": 40,
@@ -50,9 +57,8 @@
       "rating": "E",
       "reload": 4,
       "rof": 0.52,
-      "speed": 1000,
-      "thermload": 1.3,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 1.3
     },
     {
       "ammo": 100,
@@ -63,9 +69,13 @@
       "clip": 5,
       "cost": 506400,
       "damage": 12.75,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.22,
       "edID": 128049445,
       "eddbID": 857,
+      "falloff": 3000,
       "grp": "c",
       "id": "1j",
       "integrity": 40,
@@ -77,9 +87,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 0.435,
-      "speed": 1000,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 0.7
     },
     {
       "ammo": 120,
@@ -90,9 +99,13 @@
       "clip": 6,
       "cost": 168430,
       "damage": 36.5,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.7,
       "edID": 128049439,
       "eddbID": 851,
+      "falloff": 3500,
       "grp": "c",
       "id": "1k",
       "integrity": 51,
@@ -104,9 +117,8 @@
       "rating": "D",
       "reload": 3,
       "rof": 0.465,
-      "speed": 1051,
-      "thermload": 2.1,
-      "type": "K"
+      "shotspeed": 1051,
+      "thermload": 2.1
     },
     {
       "ammo": 100,
@@ -117,9 +129,13 @@
       "clip": 5,
       "cost": 337600,
       "damage": 24.5,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.75,
       "edID": 128049443,
       "eddbID": 855,
+      "falloff": 3500,
       "grp": "c",
       "id": "1l",
       "integrity": 51,
@@ -131,9 +147,8 @@
       "rating": "D",
       "reload": 4,
       "rof": 0.485,
-      "speed": 875,
-      "thermload": 1.9,
-      "type": "K"
+      "shotspeed": 875,
+      "thermload": 1.9
     },
     {
       "ammo": 100,
@@ -144,9 +159,13 @@
       "clip": 5,
       "cost": 4051200,
       "damage": 19.77,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.34,
       "edID": 128049446,
       "eddbID": 858,
+      "falloff": 3500,
       "grp": "c",
       "id": "1m",
       "integrity": 51,
@@ -158,9 +177,8 @@
       "rating": "E",
       "reload": 4,
       "rof": 0.405,
-      "speed": 875,
-      "thermload": 1,
-      "type": "K"
+      "shotspeed": 875,
+      "thermload": 1
     },
     {
       "ammo": 120,
@@ -171,9 +189,13 @@
       "clip": 6,
       "cost": 675200,
       "damage": 54.94,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.07,
       "edID": 128049440,
       "eddbID": 852,
+      "falloff": 4000,
       "grp": "c",
       "id": "1n",
       "integrity": 64,
@@ -185,9 +207,8 @@
       "rating": "C",
       "reload": 3,
       "rof": 0.425,
-      "speed": 959,
-      "thermload": 3.2,
-      "type": "K"
+      "shotspeed": 959,
+      "thermload": 3.2
     },
     {
       "ammo": 100,
@@ -198,9 +219,13 @@
       "clip": 5,
       "cost": 1350400,
       "damage": 37.39,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.14,
       "edID": 128671120,
       "eddbID": 1383,
+      "falloff": 4000,
       "eps": 0.456,
       "grp": "c",
       "hps": 1.16,
@@ -214,9 +239,8 @@
       "rating": "C",
       "reload": 4,
       "rof": 0.445,
-      "speed": 800,
-      "thermload": 2.9,
-      "type": "K"
+      "shotspeed": 800,
+      "thermload": 2.9
     },
     {
       "ammo": 100,
@@ -227,9 +251,13 @@
       "clip": 5,
       "cost": 16204800,
       "damage": 30.4,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.53,
       "edID": 128049447,
       "eddbID": 859,
+      "falloff": 4000,
       "grp": "c",
       "id": "1p",
       "integrity": 64,
@@ -241,9 +269,8 @@
       "rating": "D",
       "reload": 4,
       "rof": 0.37,
-      "speed": 800,
-      "thermload": 1.6,
-      "type": "K"
+      "shotspeed": 800,
+      "thermload": 1.6
     },
     {
       "ammo": 120,
@@ -254,9 +281,13 @@
       "clip": 6,
       "cost": 2700800,
       "damage": 82.1,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.61,
       "edID": 128049441,
       "eddbID": 853,
+      "falloff": 4500,
       "eps": 0.644,
       "grp": "c",
       "hps": 1.92,
@@ -270,9 +301,8 @@
       "rating": "B",
       "reload": 3,
       "rof": 0.385,
-      "speed": 900,
-      "thermload": 4.8,
-      "type": "K"
+      "shotspeed": 900,
+      "thermload": 4.8
     },
     {
       "ammo": 100,
@@ -283,9 +313,13 @@
       "clip": 5,
       "cost": 5401600,
       "damage": 56.58,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.72,
       "edID": 128049444,
       "eddbID": 856,
+      "falloff": 4500,
       "eps": 0.688,
       "grp": "c",
       "hps": 1.76,
@@ -299,9 +333,8 @@
       "rating": "B",
       "reload": 4,
       "rof": 0.4,
-      "speed": 750,
-      "thermload": 4.4,
-      "type": "K"
+      "shotspeed": 750,
+      "thermload": 4.4
     }
   ]
 }

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
     }
   ]
 }

modules/hardpoints/fragment_cannon.json

@@ -9,25 +9,28 @@
       "clip": 3,
       "cost": 36000,
       "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.21,
       "edID": 128049448,
       "eddbID": 860,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
     },
     {
       "ammo": 180,
@@ -38,25 +41,28 @@
       "clip": 3,
       "cost": 54720,
       "damage": 1.01,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.26,
       "edID": 128049451,
       "eddbID": 863,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
     },
     {
       "ammo": 180,
@@ -67,25 +73,28 @@
       "clip": 3,
       "cost": 182400,
       "damage": 0.69,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.1,
       "edID": 128049453,
       "eddbID": 865,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.2
     },
     {
       "ammo": 180,
@@ -95,26 +104,29 @@
       "class": 2,
       "clip": 3,
       "cost": 291840,
-      "damage": 2.56,
+      "damage": 3,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128049449,
       "eddbID": 861,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
     },
     {
       "ammo": 180,
@@ -124,26 +136,29 @@
       "class": 2,
       "clip": 3,
       "cost": 437800,
-      "damage": 1.95,
+      "damage": 2.275,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.49,
       "edID": 128049452,
       "eddbID": 864,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 0.8,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.8
     },
     {
       "ammo": 180,
@@ -153,26 +168,29 @@
       "class": 2,
       "clip": 3,
       "cost": 1459200,
-      "damage": 1.43,
+      "damage": 1.7,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.21,
       "edID": 128049454,
       "eddbID": 866,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
     },
     {
       "ammo": 180,
@@ -182,26 +200,29 @@
       "class": 3,
       "clip": 3,
       "cost": 1167360,
-      "damage": 3.92,
+      "damage": 4.57,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.57,
       "edID": 128049450,
       "eddbID": 862,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 1.1,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.1
     },
     {
       "ammo": 180,
@@ -211,26 +232,29 @@
       "class": 3,
       "clip": 3,
       "cost": 1751040,
-      "damage": 3.23,
+      "damage": 3.77,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.81,
       "edID": 128671321,
       "eddbID": 1454,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 1.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.4
     },
     {
       "ammo": 180,
@@ -240,26 +264,29 @@
       "class": 3,
       "clip": 3,
       "cost": 5836800,
-      "damage": 2.56,
+      "damage": 2.98,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128671322,
       "eddbID": 1455,
+      "falloff": 1800,
       "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,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
     },
     {
       "ammo": 180,
@@ -270,9 +297,13 @@
       "clip": 3,
       "cost": 1400830,
       "damage": 3.4,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.57,
       "edID": 128671343,
       "eddbID": 1478,
+      "falloff": 1800,
       "grp": "fc",
       "id": "pa",
       "integrity": 64,
@@ -284,12 +315,11 @@
       "power": 1.02,
       "pp": "Zachary Hudson",
       "rating": "C",
-      "reload": 2.5,
+      "reload": 5,
       "rof": 4.5,
       "roundspershot": 12,
-      "speed": 1000,
-      "thermload": 1.1,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 1.1
     }
   ]
 }

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
     }
   ]
 }

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
     }
   ]
 }

modules/hardpoints/mine_launcher.json

@@ -6,9 +6,13 @@
       "breachmax": 0,
       "breachmin": 0,
       "class": 1,
-      "clip": 3,
+      "clip": 1,
       "cost": 24260,
       "damage": 44,
+      "damagedist": {
+        "E": 0.5,
+	"T": 0.5
+      },
       "distdraw": 0,
       "edID": 128049500,
       "eddbID": 880,
@@ -22,8 +26,7 @@
       "rating": "I",
       "reload": 2,
       "rof": 1,
-      "thermload": 5,
-      "type": "ET"
+      "thermload": 5
     },
     {
       "ammo": 36,
@@ -31,9 +34,13 @@
       "breachmax": 0,
       "breachmin": 0,
       "class": 1,
-      "clip": 3,
+      "clip": 1,
       "cost": 36400,
       "damage": 32,
+      "damagedist": {
+        "E": 0.5,
+	"T": 0.5
+      },
       "distdraw": 0,
       "edID": 128671448,
       "eddbID": 1523,
@@ -48,11 +55,10 @@
       "rating": "I",
       "reload": 2,
       "rof": 1,
-      "thermload": 5,
-      "type": "ET"
+      "thermload": 5
     },
     {
-      "ammo": 36,
+      "ammo": 72,
       "breachdmg": 0,
       "breachmax": 0,
       "breachmin": 0,
@@ -60,6 +66,10 @@
       "clip": 3,
       "cost": 294080,
       "damage": 44,
+      "damagedist": {
+        "E": 0.5,
+	"T": 0.5
+      },
       "distdraw": 0,
       "edID": 128049501,
       "eddbID": 881,
@@ -71,10 +81,9 @@
       "piercing": 60,
       "power": 0.4,
       "rating": "I",
-      "reload": 2,
+      "reload": 6.6,
       "rof": 1,
-      "thermload": 7.5,
-      "type": "ET"
+      "thermload": 7.5
     }
   ]
 }

modules/hardpoints/mining_laser.json

@@ -7,9 +7,13 @@
       "class": 1,
       "cost": 6800,
       "damage": 2,
-      "distdraw": 1.35,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.5,
       "edID": 128049525,
       "eddbID": 888,
+      "falloff": 300,
       "grp": "ml",
       "id": "2l",
       "integrity": 40,
@@ -21,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,
@@ -28,8 +57,13 @@
       "class": 1,
       "cost": 13600,
       "damage": 8,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.75,
+      "edID": 128671347,
       "eddbID": 1479,
+      "falloff": 400,
       "grp": "ml",
       "id": "ml",
       "integrity": 40,
@@ -41,19 +75,22 @@
       "pp": "Zemina Torval",
       "range": 2000,
       "rating": "D",
-      "thermload": 6,
-      "type": "T"
+      "thermload": 6
     },
     {
-      "breachdmg": 1.2,
+      "breachdmg": 0.6,
       "breachmax": 0.2,
       "breachmin": 0.1,
       "class": 2,
       "cost": 22580,
-      "damage": 8,
-      "distdraw": 1.75,
+      "damage": 4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3,
       "edID": 128049526,
       "eddbID": 889,
+      "falloff": 300,
       "grp": "ml",
       "id": "2m",
       "integrity": 51,
@@ -64,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
     }
   ]
 }

modules/hardpoints/missile_rack.json

@@ -9,6 +9,9 @@
       "clip": 8,
       "cost": 32180,
       "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128666724,
       "eddbID": 1326,
@@ -23,9 +26,8 @@
       "rating": "B",
       "reload": 5,
       "rof": 0.5,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
     },
     {
       "ammo": 6,
@@ -36,6 +38,9 @@
       "clip": 6,
       "cost": 72600,
       "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128049492,
       "eddbID": 878,
@@ -50,9 +55,8 @@
       "rating": "B",
       "reload": 12,
       "rof": 0.333,
-      "speed": 625,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 625,
+      "thermload": 3.6
     },
     {
       "ammo": 48,
@@ -63,6 +67,9 @@
       "clip": 12,
       "cost": 240400,
       "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128666725,
       "eddbID": 1327,
@@ -79,9 +86,8 @@
       "rating": "B",
       "reload": 5,
       "rof": 0.5,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
     },
     {
       "ammo": 18,
@@ -92,6 +98,9 @@
       "clip": 6,
       "cost": 512400,
       "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128049493,
       "eddbID": 879,
@@ -108,9 +117,8 @@
       "rating": "B",
       "reload": 12,
       "rof": 0.333,
-      "speed": 625,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 625,
+      "thermload": 3.6
     },
     {
       "ammo": 48,
@@ -119,11 +127,15 @@
       "breachmin": 0,
       "class": 2,
       "clip": 12,
-      "cost": 190227,
+      "cost": 1951040,
       "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "eddbID": 1559,
       "grp": "mr",
+      "edID": 128732552,
       "id": "1z",
       "integrity": 51,
       "mass": 4,
@@ -136,9 +148,8 @@
       "rating": "B",
       "reload": 5,
       "rof": 0.333,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
     },
     {
       "ammo": 120,
@@ -149,6 +160,9 @@
       "clip": 12,
       "cost": 768600,
       "damage": 7.5,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128671344,
       "eddbID": 1480,
@@ -168,9 +182,8 @@
       "reload": 5,
       "rof": 2,
       "roundspershot": 4,
-      "speed": 600,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 600,
+      "thermload": 3.6
     }
   ]
 }

modules/hardpoints/multi_cannon.json

@@ -9,9 +9,13 @@
       "clip": 100,
       "cost": 9500,
       "damage": 1.12,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.06,
       "edID": 128049455,
       "eddbID": 867,
+      "falloff": 1800,
       "grp": "mc",
       "id": "23",
       "integrity": 40,
@@ -23,9 +27,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.09
     },
     {
       "ammo": 2100,
@@ -36,9 +39,13 @@
       "clip": 90,
       "cost": 14250,
       "damage": 0.82,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.07,
       "edID": 128049459,
       "eddbID": 869,
+      "falloff": 1800,
       "grp": "mc",
       "id": "24",
       "integrity": 40,
@@ -50,9 +57,8 @@
       "rating": "G",
       "reload": 5,
       "rof": 8.33,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
     },
     {
       "ammo": 2100,
@@ -63,9 +69,13 @@
       "clip": 90,
       "cost": 81600,
       "damage": 0.56,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.03,
       "edID": 128049462,
       "eddbID": 871,
+      "falloff": 1800,
       "grp": "mc",
       "id": "25",
       "integrity": 40,
@@ -77,9 +87,8 @@
       "rating": "G",
       "reload": 4,
       "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.04
     },
     {
       "ammo": 1000,
@@ -90,8 +99,13 @@
       "clip": 60,
       "cost": 13980,
       "damage": 2.9,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.12,
+      "edID": 128671345,
       "eddbID": 1481,
+      "falloff": 1800,
       "grp": "mc",
       "id": "e0",
       "integrity": 40,
@@ -105,9 +119,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 4.3,
-      "speed": 1800,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1800,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -118,9 +131,13 @@
       "clip": 100,
       "cost": 38000,
       "damage": 2.19,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.11,
       "edID": 128049456,
       "eddbID": 868,
+      "falloff": 1800,
       "grp": "mc",
       "id": "26",
       "integrity": 51,
@@ -132,9 +149,8 @@
       "rating": "E",
       "reload": 4,
       "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.18
     },
     {
       "ammo": 2100,
@@ -145,9 +161,13 @@
       "clip": 90,
       "cost": 57000,
       "damage": 1.64,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.14,
       "edID": 128049460,
       "eddbID": 870,
+      "falloff": 1800,
       "grp": "mc",
       "id": "27",
       "integrity": 51,
@@ -159,9 +179,8 @@
       "rating": "F",
       "reload": 5,
       "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -172,9 +191,13 @@
       "clip": 90,
       "cost": 1292800,
       "damage": 1.17,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.06,
       "edID": 128049463,
       "eddbID": 872,
+      "falloff": 1800,
       "grp": "mc",
       "id": "28",
       "integrity": 51,
@@ -186,9 +209,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 6.25,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.09
     },
     {
       "ammo": 2100,
@@ -198,10 +220,14 @@
       "class": 3,
       "clip": 100,
       "cost": 140400,
-      "damage": 3.93,
+      "damage": 3.92,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.18,
       "edID": 128049457,
       "eddbID": 1541,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7k",
       "integrity": 64,
@@ -212,10 +238,9 @@
       "range": 4000,
       "rating": "C",
       "reload": 4,
-      "rof": 5.88,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "rof": 5.884,
+      "shotspeed": 1600,
+      "thermload": 0.28
     },
     {
       "ammo": 2100,
@@ -226,9 +251,13 @@
       "clip": 90,
       "cost": 578436,
       "damage": 2.84,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.25,
       "edID": 128049461,
       "eddbID": 1543,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7l",
       "integrity": 64,
@@ -240,9 +269,8 @@
       "rating": "C",
       "reload": 5,
       "rof": 6.665,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.34
     },
     {
       "ammo": 2100,
@@ -252,10 +280,14 @@
       "class": 4,
       "clip": 100,
       "cost": 1177600,
-      "damage": 4.62,
+      "damage": 4.625,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.24,
       "edID": 128049458,
       "eddbID": 1542,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7n",
       "integrity": 80,
@@ -268,9 +300,8 @@
       "reload": 4,
       "rof": 3.03,
       "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.39
     },
     {
       "ammo": 2100,
@@ -281,9 +312,13 @@
       "clip": 90,
       "cost": 6377600,
       "damage": 3.46,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128681996,
       "eddbID": 1546,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7o",
       "integrity": 80,
@@ -296,9 +331,8 @@
       "reload": 5,
       "rof": 3.365,
       "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.5,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.51
     }
   ]
 }

modules/hardpoints/plasma_accelerator.json

@@ -9,9 +9,15 @@
       "clip": 5,
       "cost": 834200,
       "damage": 54.3,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 8.65,
       "edID": 128049465,
       "eddbID": 873,
+      "falloff": 2000,
       "grp": "pa",
       "id": "1g",
       "integrity": 51,
@@ -23,9 +29,8 @@
       "rating": "C",
       "reload": 6,
       "rof": 0.33,
-      "speed": 875,
-      "thermload": 15.6,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 15.6
     },
     {
       "ammo": 100,
@@ -36,9 +41,15 @@
       "clip": 5,
       "cost": 3051200,
       "damage": 83.4,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 13.6,
       "edID": 128049466,
       "eddbID": 874,
+      "falloff": 2000,
       "grp": "pa",
       "id": "2b",
       "integrity": 64,
@@ -50,9 +61,8 @@
       "rating": "B",
       "reload": 6,
       "rof": 0.29,
-      "speed": 875,
-      "thermload": 21.8,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 21.8
     },
     {
       "ammo": 300,
@@ -63,9 +73,15 @@
       "clip": 20,
       "cost": 4119120,
       "damage": 34.5,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 5.5,
       "edID": 128671339,
       "eddbID": 1482,
+      "falloff": 2000,
       "grp": "pa",
       "id": "Ap",
       "integrity": 64,
@@ -79,9 +95,8 @@
       "rating": "B",
       "reload": 6,
       "rof": 0.8,
-      "speed": 875,
-      "thermload": 11,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 11
     },
     {
       "ammo": 100,
@@ -92,9 +107,15 @@
       "clip": 5,
       "cost": 13793600,
       "damage": 125.2,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 21.04,
       "edID": 128049467,
       "eddbID": 875,
+      "falloff": 2000,
       "grp": "pa",
       "id": "2c",
       "integrity": 80,
@@ -106,9 +127,8 @@
       "rating": "A",
       "reload": 6,
       "rof": 0.25,
-      "speed": 875,
-      "thermload": 29.5,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 29.5
     }
   ]
 }

modules/hardpoints/point_defence.json

@@ -5,25 +5,28 @@
       "burst": 4,
       "burstrof": 15,
       "class": 0,
-      "clip": 50,
+      "clip": 12,
       "cost": 18550,
+      "damage": 0.2,
+      "damagedist": {
+        "K": 1
+      },
       "edID": 128049522,
       "eddbID": 887,
       "grp": "po",
       "id": "03",
       "integrity": 30,
-      "jitter": 1.5,
+      "jitter": 0.75,
       "mass": 0.5,
       "name": "Point Defence",
       "passive": 1,
       "power": 0.2,
       "range": 2500,
       "rating": "I",
-      "reload": 0,
+      "reload": 0.4,
       "rof": 10,
-      "speed": 1000,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 0.1
     }
   ]
 }

modules/hardpoints/pulse_laser.json

@@ -1,15 +1,19 @@
 {
   "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
+      },
       "distdraw": 0.30,
       "edID": 128049381,
       "eddbID": 823,
+      "falloff": 500,
       "grp": "pl",
       "id": "17",
       "integrity": 40,
@@ -19,9 +23,8 @@
       "power": 0.39,
       "range": 3000,
       "rating": "F",
-      "rof": 3.847,
-      "thermload": 0.3,
-      "type": "T"
+      "rof": 3.85,
+      "thermload": 0.33
     },
     {
       "breachdmg": 1.3,
@@ -30,9 +33,13 @@
       "class": 1,
       "cost": 6600,
       "damage": 1.56,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.31,
       "edID": 128049385,
       "eddbID": 826,
+      "falloff": 500,
       "grp": "pl",
       "id": "18",
       "integrity": 40,
@@ -42,9 +49,8 @@
       "power": 0.39,
       "range": 3000,
       "rating": "G",
-      "rof": 3.987,
-      "thermload": 0.3,
-      "type": "T"
+      "rof": 4,
+      "thermload": 0.31
     },
     {
       "breachdmg": 1,
@@ -52,10 +58,14 @@
       "breachmin": 0.4,
       "class": 1,
       "cost": 26000,
-      "damage": 1.18,
+      "damage": 1.19,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.19,
       "edID": 128049388,
       "eddbID": 829,
+      "falloff": 500,
       "grp": "pl",
       "id": "19",
       "integrity": 40,
@@ -65,9 +75,8 @@
       "power": 0.38,
       "range": 3000,
       "rating": "G",
-      "rof": 3.339,
-      "thermload": 0.2,
-      "type": "T"
+      "rof": 3.33,
+      "thermload": 0.19
     },
     {
       "breachdmg": 3,
@@ -75,10 +84,14 @@
       "breachmin": 0.4,
       "class": 2,
       "cost": 17600,
-      "damage": 3.49,
+      "damage": 3.5,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.5,
       "edID": 128049382,
       "eddbID": 824,
+      "falloff": 500,
       "grp": "pl",
       "id": "1a",
       "integrity": 51,
@@ -87,10 +100,9 @@
       "piercing": 35,
       "power": 0.6,
       "range": 3000,
-      "rating": "F",
-      "rof": 3.448,
-      "thermload": 0.6,
-      "type": "T"
+      "rating": "E",
+      "rof": 3.45,
+      "thermload": 0.56
     },
     {
       "breachdmg": 2.3,
@@ -99,9 +111,13 @@
       "class": 2,
       "cost": 35400,
       "damage": 2.68,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.54,
       "edID": 128049386,
       "eddbID": 827,
+      "falloff": 500,
       "grp": "pl",
       "id": "1b",
       "integrity": 51,
@@ -111,9 +127,8 @@
       "power": 0.6,
       "range": 3000,
       "rating": "F",
-      "rof": 3.567,
-      "thermload": 0.5,
-      "type": "T"
+      "rof": 3.57,
+      "thermload": 0.54
     },
     {
       "breachdmg": 1.7,
@@ -121,10 +136,14 @@
       "breachmin": 0.4,
       "class": 2,
       "cost": 132800,
-      "damage": 2.04,
+      "damage": 2.05,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.33,
       "edID": 128049389,
       "eddbID": 830,
+      "falloff": 500,
       "grp": "pl",
       "id": "1c",
       "integrity": 51,
@@ -134,9 +153,8 @@
       "power": 0.58,
       "range": 3000,
       "rating": "F",
-      "rof": 3.037,
-      "thermload": 0.3,
-      "type": "T"
+      "rof": 3.03,
+      "thermload": 0.33
     },
     {
       "breachdmg": 2.4,
@@ -145,8 +163,13 @@
       "class": 2,
       "cost": 26400,
       "damage": 2.8,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.9,
+      "edID": 128671342,
       "eddbID": 1483,
+      "falloff": 500,
       "grp": "pl",
       "id": "PL",
       "integrity": 51,
@@ -158,8 +181,7 @@
       "pp": "Felicia Winters",
       "rating": "E",
       "rof": 1.664,
-      "thermload": 1,
-      "type": "T"
+      "thermload": 1
     },
     {
       "breachdmg": 5.1,
@@ -168,9 +190,13 @@
       "class": 3,
       "cost": 70400,
       "damage": 5.98,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.86,
       "edID": 128049383,
       "eddbID": 825,
+      "falloff": 500,
       "grp": "pl",
       "id": "1d",
       "integrity": 64,
@@ -180,9 +206,8 @@
       "power": 0.9,
       "range": 3000,
       "rating": "D",
-      "rof": 3.3,
-      "thermload": 1,
-      "type": "T"
+      "rof": 3.03,
+      "thermload": 0.96
     },
     {
       "breachdmg": 3.9,
@@ -191,9 +216,13 @@
       "class": 3,
       "cost": 140600,
       "damage": 4.58,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.92,
       "edID": 128049387,
       "eddbID": 828,
+      "falloff": 500,
       "grp": "pl",
       "id": "1e",
       "integrity": 64,
@@ -203,9 +232,8 @@
       "power": 0.92,
       "range": 3000,
       "rating": "E",
-      "rof": 3.223,
-      "thermload": 0.9,
-      "type": "T"
+      "rof": 3.23,
+      "thermload": 0.92
     },
     {
       "breachdmg": 3,
@@ -213,10 +241,14 @@
       "breachmin": 0.4,
       "class": 3,
       "cost": 400400,
-      "damage": 3.49,
+      "damage": 3.5,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.56,
       "edID": 128049390,
       "eddbID": 831,
+      "falloff": 500,
       "grp": "pl",
       "id": "1f",
       "integrity": 64,
@@ -226,9 +258,8 @@
       "power": 0.89,
       "range": 3000,
       "rating": "F",
-      "rof": 2.705,
-      "thermload": 0.6,
-      "type": "T"
+      "rof": 2.7,
+      "thermload": 0.56
     },
     {
       "breachdmg": 8.7,
@@ -236,10 +267,14 @@
       "breachmin": 0.4,
       "class": 4,
       "cost": 177600,
-      "damage": 10.23,
+      "damage": 10.24,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.48,
       "edID": 128049384,
       "eddbID": 1539,
+      "falloff": 500,
       "grp": "pl",
       "id": "7q",
       "integrity": 80,
@@ -249,9 +284,8 @@
       "power": 1.33,
       "range": 3000,
       "rating": "A",
-      "rof": 2.633,
-      "thermload": 1.6,
-      "type": "T"
+      "rof": 2.63,
+      "thermload": 1.64
     },
     {
       "breachdmg": 6.6,
@@ -260,9 +294,13 @@
       "class": 4,
       "cost": 877600,
       "damage": 7.82,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.56,
       "edID": 128681995,
       "eddbID": 1545,
+      "falloff": 500,
       "grp": "pl",
       "id": "7r",
       "integrity": 80,
@@ -272,9 +310,8 @@
       "power": 1.37,
       "range": 3000,
       "rating": "A",
-      "rof": 2.777,
-      "thermload": 1.6,
-      "type": "T"
+      "rof": 2.78,
+      "thermload": 1.56
     }
   ]
 }

modules/hardpoints/rail_gun.json

@@ -8,23 +8,27 @@
       "class": 1,
       "clip": 1,
       "cost": 51600,
-      "damage": 23.3,
+      "damage": 23.25,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 2.69,
       "edID": 128049488,
       "eddbID": 876,
+      "falloff": 1000,
       "grp": "rg",
       "id": "29",
       "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,
-      "type": "KT"
+      "thermload": 12
     },
     {
       "ammo": 80,
@@ -35,25 +39,29 @@
       "clip": 1,
       "cost": 412800,
       "damage": 41.5,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 5.11,
       "edID": 128049489,
       "eddbID": 877,
+      "falloff": 1000,
       "grp": "rg",
       "id": "2a",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
-      "piercing": 48,
+      "piercing": 100,
       "power": 1.63,
       "range": 3000,
       "rating": "B",
       "reload": 1,
       "rof": 1.2,
-      "thermload": 30,
-      "type": "KT"
+      "thermload": 20
     },
     {
-      "ammo": 90,
+      "ammo": 240,
       "breachdmg": 14.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -63,24 +71,28 @@
       "clip": 3,
       "cost": 619200,
       "damage": 15,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 2,
       "edID": 128671341,
       "eddbID": 1484,
+      "falloff": 1000,
       "grp": "rg",
       "id": "ih",
       "integrity": 51,
       "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,
-      "type": "KT"
+      "thermload": 11
     }
   ]
 }

modules/hardpoints/torpedo_pylon.json

@@ -9,6 +9,9 @@
       "clip": 1,
       "cost": 11200,
       "damage": 120,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0,
       "edID": 128049509,
       "eddbID": 882,
@@ -23,9 +26,8 @@
       "rating": "I",
       "reload": 5,
       "rof": 1,
-      "speed": 250,
-      "thermload": 45,
-      "type": "E"
+      "shotspeed": 250,
+      "thermload": 45
     },
     {
       "ammo": 2,
@@ -36,6 +38,9 @@
       "clip": 1,
       "cost": 44800,
       "damage": 120,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0,
       "edID": 128049510,
       "eddbID": 883,
@@ -50,9 +55,8 @@
       "rating": "I",
       "reload": 5,
       "rof": 1,
-      "speed": 250,
-      "thermload": 50,
-      "type": "E"
+      "shotspeed": 250,
+      "thermload": 50
     }
   ]
 }

modules/index.js

@@ -55,6 +55,8 @@ 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,
+    rpl: require('./internal/repair_limpet_controller').rpl
   }
 };

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,

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"

modules/internal/economy_passenger_cabin.json

@@ -47,7 +47,7 @@
     {
       "class": 6,
       "cost": 61420,
-      "edID": 12872926,
+      "edID": 128727926,
       "eddbID": 1567,
       "grp": "pce",
       "id": "me",

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",

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, 

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"

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"

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,
@@ -189,7 +197,7 @@
       "power": 8.4,
       "pp": "Aisling Duval",
       "rating": "A",
-      "regen": 1.2,
+      "regen": 1.4,
       "thermres": -0.2
     }
   ]

modules/internal/repair_limpet_controller.json

@@ -0,0 +1,265 @@
+{
+    "rpl": [
+      {
+        "class": 1,
+        "cost": 600,
+        "edID": 128777327,
+        "eddbID": 1594,
+        "grp": "rpl",
+        "id": "rple1",
+        "mass": 1.3,
+        "maximum": 1,
+        "power": 0.18,
+        "range": 0.6,
+        "rating": "E"
+      },
+      {
+        "class": 1,
+        "cost": 1200,
+        "edID": 128777328,
+        "eddbID": 1595,
+        "grp": "rpl",
+        "id": "rpld1",
+        "mass": 0.5,
+        "maximum": 1,
+        "power": 0.14,
+        "range": 0.8,
+        "rating": "D"
+      },
+      {
+        "class": 1,
+        "cost": 2400,
+        "edID": 128777329,
+        "eddbID": 1596,
+        "grp": "rpl",
+        "id": "rplc1",
+        "mass": 1.3,
+        "maximum": 1,
+        "power": 0.23,
+        "range": 1,
+        "rating": "C"
+      },
+      {
+        "class": 1,
+        "cost": 4800,
+        "edID": 128777330,
+        "eddbID": 1597,
+        "grp": "rpl",
+        "id": "rplb1",
+        "mass": 2,
+        "maximum": 1,
+        "power": 0.32,
+        "range": 1.2,
+        "rating": "B"
+      },
+      {
+        "class": 1,
+        "cost": 9600,
+        "edID": 128777331,
+        "eddbID": 1598,
+        "grp": "rpl",
+        "id": "rpla1",
+        "mass": 1.3,
+        "maximum": 1,
+        "power": 0.28,
+        "range": 1.4,
+        "rating": "A"
+      },
+      {
+        "class": 3,
+        "cost": 5400,
+        "edID": 128777332,
+        "eddbID": 1599,
+        "grp": "rpl",
+        "id": "rple3",
+        "mass": 5,
+        "maximum": 2,
+        "power": 0.27,
+        "range": 0.66,
+        "rating": "E"
+      },
+      {
+        "class": 3,
+        "cost": 10800,
+        "edID": 128777333,
+        "eddbID": 1600,
+        "grp": "rpl",
+        "id": "rpld3",
+        "mass": 2,
+        "maximum": 2,
+        "power": 0.2,
+        "range": 0.88,
+        "rating": "D"
+      },
+      {
+        "class": 3,
+        "cost": 21600,
+        "edID": 128777334,
+        "eddbID": 1601,
+        "grp": "rpl",
+        "id": "rplc3",
+        "mass": 5,
+        "maximum": 2,
+        "power": 0.34,
+        "range": 1.1,
+        "rating": "C"
+      },
+      {
+        "class": 3,
+        "cost": 43200,
+        "edID": 128777335,
+        "eddbID": 1602,
+        "grp": "rpl",
+        "id": "rplb3",
+        "mass": 8,
+        "maximum": 2,
+        "power": 0.48,
+        "range": 1.32,
+        "rating": "B"
+      },
+      {
+        "class": 3,
+        "cost": 86400,
+        "edID": 128777336,
+        "eddbID": 1603,
+        "grp": "rpl",
+        "id": "rpba3",
+        "mass": 5,
+        "maximum": 2,
+        "power": 0.41,
+        "range": 1.54,
+        "rating": "A"
+      },
+      {
+        "class": 5,
+        "cost": 48600,
+        "edID": 128777337,
+        "eddbID": 1604,
+        "grp": "rpl",
+        "id": "rple5",
+        "mass": 20,
+        "maximum": 3,
+        "power": 0.4,
+        "range": 0.78,
+        "rating": "E"
+      },
+      {
+        "class": 5,
+        "cost": 97200,
+        "edID": 128777338,
+        "eddbID": 1605,
+        "grp": "rpl",
+        "id": "rpld5",
+        "mass": 8,
+        "maximum": 3,
+        "power": 0.3,
+        "range": 1.04,
+        "rating": "D"
+      },
+      {
+        "class": 5,
+        "cost": 194400,
+        "edID": 128777339,
+        "eddbID": 1606,
+        "grp": "rpl",
+        "id": "rplc5",
+        "mass": 20,
+        "maximum": 3,
+        "power": 0.5,
+        "range": 1.3,
+        "rating": "C"
+      },
+      {
+        "class": 5,
+        "cost": 388800,
+        "edID": 128777340,
+        "eddbID": 1607,
+        "grp": "rpl",
+        "id": "rplb5",
+        "mass": 32,
+        "maximum": 3,
+        "power": 0.97,
+        "range": 1.56,
+        "rating": "B"
+      },
+      {
+        "class": 5,
+        "cost": 777600,
+        "edID": 128777341,
+        "eddbID": 1608,
+        "grp": "rpl",
+        "id": "rpla5",
+        "mass": 20,
+        "maximum": 3,
+        "power": 0.6,
+        "range": 1.82,
+        "rating": "A"
+      },
+      {
+        "class": 7,
+        "cost": 437400,
+        "edID": 128777342,
+        "eddbID": 1609,
+        "grp": "rpl",
+        "id": "rple7",
+        "mass": 80,
+        "maximum": 4,
+        "power": 0.55,
+        "range": 1.02,
+        "rating": "E"
+      },
+      {
+        "class": 7,
+        "cost": 874800,
+        "edID": 128777343,
+        "eddbID": 1610,
+        "grp": "rpl",
+        "id": "rpld7",
+        "mass": 32,
+        "maximum": 4,
+        "power": 0.41,
+        "range": 1.36,
+        "rating": "D"
+      },
+      {
+        "class": 7,
+        "cost": 1749600,
+        "edID": 128777344,
+        "eddbID": 1611,
+        "grp": "rpl",
+        "id": "rplc7",
+        "mass": 80,
+        "maximum": 4,
+        "power": 0.69,
+        "range": 1.7,
+        "rating": "C"
+      },
+      {
+        "class": 7,
+        "cost": 3499200,
+        "edID": 128777345,
+        "eddbID": 1612,
+        "grp": "rpl",
+        "id": "rplb7",
+        "mass": 128,
+        "maximum": 4,
+        "power": 0.97,
+        "range": 2.04,
+        "rating": "B"
+      },
+      {
+        "class": 7,
+        "cost": 6998400,
+        "edID": 128777346,
+        "eddbID": 1613,
+        "grp": "rpl",
+        "id": "rpla7",
+        "mass": 80,
+        "maximum": 4,
+        "power": 0.83,
+        "range": 2.38,
+        "rating": "A"
+      }
+    ]
+  }
+  

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.6,
-      "rating": "C"
     }
   ]
 }

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

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,

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"
+    }
+  ]
+}

modules/standard/frame_shift_drive.json

@@ -313,7 +313,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Ff",
-      "integrity": 106,
+      "integrity": 120,
       "mass": 20,
       "maxfuel": 5,
       "optmass": 1050,

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"

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,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.2.8",
+  "version": "2.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"
@@ -9,7 +9,7 @@
   "homepage": "https://coriolis.edcd.io",
   "bugs": "https://github.com/EDCD/coriolis/issues",
   "private": true,
-  "engine": "node >= 0.12.2",
+  "engine": "node >= 4.0.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint --plugin json --ext .json modules ships dist",
@@ -19,9 +19,9 @@
     "start": "node generate_distribution.js"
   },
   "devDependencies": {
-    "eslint": "^1.10.3",
+    "eslint": "^2.2.0",
     "eslint-plugin-json": "^1.1.0",
     "jasmine-node": "^1.14.5",
-    "uglify-js": "^2.6.1"
+    "uglify-js": "^2.7.5"
   }
 }

ships/adder.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.13625,
       "pitch": 38,
       "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
     },
     "retailCost": 87810,
     "bulkheads": [

ships/anaconda.json

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 25,
       "roll": 60,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 3
     },
     "retailCost": 146969450,
     "bulkheads": [

ships/asp.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.13,
       "pitch": 38,
       "roll": 100,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
     },
     "retailCost": 6661150,
     "bulkheads": [

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]
     }
   }
 }

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": [

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": [

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": [

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]
     }
   }
 }

ships/diamondback_scout.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.09875,
       "pitch": 42,
       "roll": 100,
-      "yaw": 15 
+      "yaw": 15,
+      "crew": 1
     } ,
     "retailCost": 564330,
     "bulkheads": [

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"]
+    }
+  }
+}

ships/eagle.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.0625,
       "pitch": 50,
       "roll": 120,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 1
     },
     "retailCost": 44800,
     "bulkheads": [

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": [

ships/federal_corvette.json

@@ -10,7 +10,7 @@
       "speed": 200,
       "boost": 260,
       "boostEnergy": 27,
-      "baseShieldStrength": 610.5,
+      "baseShieldStrength": 555,
       "baseArmour": 370,
       "hardness": 70,
       "hullMass": 900,
@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 28,
       "roll": 75,
-      "yaw": 8 
+      "yaw": 8,
+      "crew": 3 
     },
     "retailCost": 187969450,
     "bulkheads": [

ships/federal_dropship.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.0725,
       "pitch": 30,
       "roll": 80,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
     },
     "retailCost": 14314210,
     "bulkheads": [

ships/federal_gunship.json

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 25,
       "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 35814210,
     "bulkheads": [

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": [

ships/hauler.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.1625,
       "pitch": 36,
       "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 1
     },
     "retailCost": 52720,
     "bulkheads": [

ships/imperial_clipper.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.1,
       "pitch": 40,
       "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 22296860,
       "bulkheads": [

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": [

ships/imperial_cutter.json

@@ -1,6 +1,7 @@
 {
   "imperial_cutter": {
-    "edID": 128049375, "eddbID": 26,
+    "edID": 128049375,
+    "eddbID": 26,
     "properties": {
       "name": "Imperial Cutter",
       "manufacturer": "Gutamaya",
@@ -9,7 +10,7 @@
       "speed": 200,
       "boost": 320,
       "boostEnergy": 23,
-      "baseShieldStrength": 690,
+      "baseShieldStrength": 600,
       "baseArmour": 400,
       "hardness": 70,
       "hullMass": 1100,
@@ -18,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 18,
       "roll": 45,
-      "yaw":8 
+      "yaw": 8,
+      "crew": 3 
     },
     "retailCost": 208969450,
     "bulkheads": [

ships/imperial_eagle.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.075,
       "pitch": 40,
       "roll": 100,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
     },
     "retailCost": 110830,
     "bulkheads": [

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,

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 },

ships/orca.json

@@ -13,13 +13,14 @@
       "baseShieldStrength": 220,
       "baseArmour": 220,
       "hardness": 55,
-      "hullMass": 580,
-      "masslock": 13,
+      "hullMass": 290,
+      "masslock": 16,
       "pipSpeed": 0.08375,
       "luxuryCabins": true,
       "pitch": 25,
       "roll": 55,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 48539900,
     "bulkheads": [

ships/python.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.0975,
       "pitch": 29,
       "roll": 90,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
     },
     "retailCost": 56978180,
     "bulkheads": [

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 },

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": [

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": [

ships/type_9_heavy.json

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 20,
       "roll": 20,
-      "yaw": 8
+      "yaw": 8,
+      "crew": 3
     },
     "retailCost": 76555840,
     "bulkheads": [

ships/viper.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.09375,
       "pitch": 35,
       "roll": 90,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
     },
     "retailCost": 142930,
     "bulkheads": [

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": [

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"]
     }
   }
 }

spec/data-spec.js

@@ -20,7 +20,8 @@ describe('JSON Data', function() {
     'pipSpeed',
     'pitch',
     'roll',
-    'yaw'
+    'yaw',
+    'crew'
   ];
 
   var edIDs = {};
@@ -40,10 +41,10 @@ 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');
-	if (s != 'ft' && s != 'pas' ) {
+        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+        if (s != 'ft' && s != 'pas' ) {
           expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
-	}
+        }
         expect(group[i].grp).toBeDefined(`No group defined, Type: ${s}, ID: ${id}, Index: ${i}`);
         expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists for ID: ${id}, Index: ${i}`);
         expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists for ID: ${id}, Index: ${i}`);
@@ -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) {
@@ -79,19 +80,22 @@ describe('JSON Data', function() {
         if (group[i].edID) {
           edIDs[group[i].edID] = true;
         }
-	if (group[i].damage) {
-            expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+        if (group[i].damage) {
+          expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+          expect(group[i].damagedist).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage distribution`);
+          if (group[i].grp != 'po') {
+            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
             expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`);
             expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`);
             expect(group[i].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`);
             expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`);
-            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
             expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`);
+          }
         }
-	if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
-            expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
-            expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
-            expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
+        if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
+          expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
+          expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
+          expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
         }
         ids[id] = true;
       }
@@ -107,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}`);
@@ -166,12 +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);
       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);
+      }
     }
   });
 
@@ -188,6 +206,18 @@ describe('JSON Data', function() {
     }
   });
 
+  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() {
     var ids = {};