Merge branch 'release/2.2.4'

Merge for #25

ChangeLog.md

@@ -0,0 +1,20 @@
+#2.2.4
+  * Fix incorrect ID for class 5 luxury passenger cabin
+  * Add damage type modifier
+  * Change modifications from simple strings to objects, to allow more data-driven behaviour
+  * Add special effects
+
+#2.2.3
+  * Fix mismatch between class 5 and class 7 fighter hangars
+  * Add details for concordant sequence special effect
+  * Fix details for thermal shock special effect
+  * Add engineer blueprints
+
+#2.2.2
+  * Add distributor draw modifier to shield generators
+  * Remove modifiers for sensors
+  * Add initial loadout passenger cabins for Beluga
+  * Add initial loadout passenger cabins for Orca
+  * Update costs and initial loadouts for Keelback and Type-7
+  * Add resistances for hull reinforcement packages
+  * Added modifier actions to create modifications from raw data

generate_distribution.js

@@ -2,8 +2,9 @@ var fs = require('fs');
 var UglifyJS = require('uglify-js');
 var Ships = require('./ships');
 var Modules = require('./modules');
-var exportString = JSON.stringify({ Ships: Ships, Modules: Modules }, null, '\t');
-var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules }), ';'].join(''));
+var Modifications = require('./modifications');
+var exportString = JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }, null, '\t');
+var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }), ';'].join(''));
 var code = ast.print_to_string({beautify: true, indent_level: 2});
 
 fs.open('./dist/index.json', 'w', function() {

modifications/blueprints.json

@@ -0,0 +1,93 @@
+{
+  "AFM_LightWeight": { "id": 1, "name": "Lightweight" },
+  "AFM_Reinforced": { "id": 2, "name": "Reinforced" },
+  "AFM_Shielded": { "id": 3, "name": "Shielded" },
+  "Armour_Advanced": { "id": 4, "name": "Kinetic resistant" },
+  "Armour_Explosive": { "id": 5, "name": "Blast Resistant" },
+  "Armour_LightWeight": { "id": 6, "name": "Lightweight" },
+  "Armour_HeavyDuty": { "id": 7, "name": "Heavy Duty" },
+  "Armour_Thermic": { "id": 8, "name": "Thermal Resistant" },
+  "CargoScanner_LightWeight": { "id": 9, "name": "Lightweight" },
+  "CargoScanner_Reinforced": { "id": 10, "name": "Reinforced" },
+  "CargoScanner_Shielded": { "id": 11, "name": "Shielded" },
+  "ChaffLauncher_ChaffCapacity": { "id": 12, "name": "Ammo capacity" },
+  "ChaffLauncher_LightWeight": { "id": 13, "name": "Lightweight" },
+  "ChaffLauncher_Reinforced": { "id": 14, "name": "Reinforced" },
+  "ChaffLauncher_Shielded": { "id": 15, "name": "Shielded" },
+  "CollectionLimpet_LightWeight": { "id": 16, "name": "Lightweight" },
+  "CollectionLimpet_Reinforced": { "id": 17, "name": "Reinforced" },
+  "CollectionLimpet_Shielded": { "id": 18, "name": "Shielded" },
+  "ECM_LightWeight": { "id": 19, "name": "Lightweight" },
+  "ECM_Reinforced": { "id": 20, "name": "Reinforced" },
+  "ECM_Shielded": { "id": 21, "name": "Shielded" },
+  "Engine_Dirty": { "id": 22, "name": "Dirty" },
+  "Engine_Reinforced": { "id": 23, "name": "Reinforced" },
+  "Engine_Tuned": { "id": 24, "name": "Clean" },
+  "FSD_FastBoot": { "id": 25, "name": "Faster boot sequence" },
+  "FSD_LongRange": { "id": 26, "name": "Increased range" },
+  "FSD_Shielded": { "id": 27, "name": "Shielded" },
+  "FSDinterdictor_Expanded": { "id": 28, "name": "Expanded capture arc" },
+  "FSDinterdictor_LongRange": { "id": 29, "name": "Longer range" },
+  "FuelScoop_Shielded": { "id": 30, "name": "Shielded" },
+  "FuelTransferLimpet_LightWeight": { "id": 31, "name": "Lightweight" },
+  "FuelTransferLimpet_Reinforced": { "id": 32, "name": "Reinforced" },
+  "FuelTransferLimpet_Shielded": { "id": 33, "name": "Shielded" },
+  "HatchBreakerLimpet_LightWeight": { "id": 34, "name": "Lightweight" },
+  "HatchBreakerLimpet_Reinforced": { "id": 35, "name": "Reinforced" },
+  "HatchBreakerLimpet_Shielded": { "id": 36, "name": "Shielded" },
+  "HeatSinkLauncher_HeatSinkCapacity": { "id": 37, "name": "Ammo capacity" },
+  "HeatSinkLauncher_LightWeight": { "id": 38, "name": "Lightweight" },
+  "HeatSinkLauncher_Reinforced": { "id": 39, "name": "Reinforced" },
+  "HeatSinkLauncher_Shielded": { "id": 40, "name": "Shielded" },
+  "HullReinforcement_Advanced": { "id": 41, "name": "Blast resistant" },
+  "HullReinforcement_HeavyDuty": { "id": 42, "name": "Heavy duty" },
+  "HullReinforcement_Lightweight": { "id": 43, "name": "Lightweight" },
+  "HullReinforcement_Kinetic": { "id": 44, "name": "Kinetic resistant" },
+  "HullReinforcement_Thermic": { "id": 45, "name": "Thermal resistant" },
+  "KillWarrantScanner_LightWeight": { "id": 46, "name": "Lightweight" },
+  "KillWarrantScanner_Reinforced": { "id": 47, "name": "Reinforced" },
+  "KillWarrantScanner_Shielded": { "id": 48, "name": "Shielded" },
+  "LifeSupport_LightWeight": { "id": 49, "name": "Lightweight" },
+  "LifeSupport_Reinforced": { "id": 50, "name": "Reinforced" },
+  "LifeSupport_Shielded": { "id": 51, "name": "Shielded" },
+  "PointDefence_LightWeight": { "id": 52, "name": "Lightweight" },
+  "PointDefence_Reinforced": { "id": 53, "name": "Reinforced" },
+  "PointDefence_Shielded": { "id": 54, "name": "Shielded" },
+  "PointDefence_PointDefenseCapacity": { "id": 55, "name": "Ammo capacity" },
+  "PowerDistributor_HighCapacity": { "id": 56, "name": "High charge capacity" },
+  "PowerDistributor_HighFrequency": { "id": 57, "name": "Charge enhanced" },
+  "PowerDistributor_PriorityEngines": { "id": 58, "name": "Engine focused" },
+  "PowerDistributor_PrioritySystems": { "id": 59, "name": "System focused" },
+  "PowerDistributor_PriorityWeapons": { "id": 60, "name": "Weapon focused" },
+  "PowerDistributor_Shielded": { "id": 61, "name": "Shielded" },
+  "PowerPlant_Armoured": { "id": 62, "name": "Armoured" },
+  "PowerPlant_Boosted": { "id": 63, "name": "Overcharged" },
+  "PowerPlant_Stealth": { "id": 64, "name": "Low emissions" },
+  "ProspectingLimpet_LightWeight": { "id": 63, "name": "Lightweight" },
+  "ProspectingLimpet_Reinforced": { "id": 66, "name": "Reinforced" },
+  "ProspectingLimpet_Shielded": { "id": 67, "name": "Shielded" },
+  "ShieldBooster_Explosive": { "id": 68, "name": "Blast resistant" },
+  "ShieldBooster_HeavyDuty": { "id": 69, "name": "Heavy duty" },
+  "ShieldBooster_Kinetic": { "id": 70, "name": "Kinetic resistant" },
+  "ShieldBooster_Resistive": { "id": 71, "name": "Resistance augmented" },
+  "ShieldBooster_Thermic": { "id": 72, "name": "Thermal resistant" },
+  "ShieldCellBank_Rapid": { "id": 73, "name": "Rapid charge" },
+  "ShieldCellBank_Specialised": { "id": 74, "name": "Specialised" },
+  "ShieldGenerator_Kinetic": { "id": 75, "name": "Kinetic resistant" },
+  "ShieldGenerator_Optimised": { "id": 76, "name": "Enhanced low power" },
+  "ShieldGenerator_Reinforced": { "id": 77, "name": "Reinforced" },
+  "ShieldGenerator_Thermic": { "id": 78, "name": "Thermal resistant" },
+  "WakeScanner_LightWeight": { "id": 79, "name": "Lightweight" },
+  "WakeScanner_Shielded": { "id": 80, "name": "Shielded" },
+  "WakeScanner_Reinforced": { "id": 81, "name": "Reinforced" },
+  "Weapon_DoubleShot": { "id": 82, "name": "Double shot" },
+  "Weapon_Efficient": { "id": 83, "name": "Efficient" },
+  "Weapon_Focused": { "id": 84, "name": "Focused" },
+  "Weapon_HighCapacity": { "id": 85, "name": "High capacity" },
+  "Weapon_LightWeight": { "id": 86, "name": "Lightweight" },
+  "Weapon_LongRange": { "id": 87, "name": "Long range" },
+  "Weapon_Overcharged": { "id": 88, "name": "Overcharged" },
+  "Weapon_RapidFire": { "id": 89, "name": "Rapid fire" },
+  "Weapon_ShortRange": { "id": 90, "name": "Short range" },
+  "Weapon_Sturdy": { "id": 91, "name": "Sturdy" }
+}

modifications/index.js

@@ -0,0 +1,7 @@
+module.exports = {
+  blueprints: require('./blueprints'),
+  modifications: require('./modifications'),
+  modifierActions: require('./modifierActions'),
+  specials: require('./specials'),
+  validity: require('./validity')
+};

modifications/modifications.json

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

modifications/modifierActions.json

@@ -0,0 +1,313 @@
+{
+  "mod_boot_time": {
+    "boot": 1
+  },
+  "mod_defencemodifier_explosive_mult": {
+    "explres": 1
+  },
+  "mod_defencemodifier_global_hull_mult": {
+    "explres": 1,
+    "kinres": 1,
+    "thermres": 1
+  },
+  "mod_defencemodifier_global_shield_mult": {
+    "explres": 1,
+    "kinres": 1,
+    "thermres": 1
+  },
+  "mod_defencemodifier_health_add": {
+    "hullreinforcement": 1
+  },
+  "mod_defencemodifier_health_mult": {
+    "hullboost": 1
+  },
+  "mod_defencemodifier_kinetic_mult": {
+    "kinres": 1
+  },
+  "mod_defencemodifier_shield_explosive_mult": {
+    "explres": 1
+  },
+  "mod_defencemodifier_shield_kinetic_mult": {
+    "kinres": 1
+  },
+  "mod_defencemodifier_shield_mult": {
+    "shieldboost": 1
+  },
+  "mod_defencemodifier_shield_thermic_mult": {
+    "thermres": 1
+  },
+  "mod_defencemodifier_thermic_mult": {
+    "thermres": 1
+  },
+  "mod_engine_heat": {
+    "thermload": 1
+  },
+  "mod_engine_mass_curve": {
+    "optmass": 1
+  },
+  "mod_engine_mass_curve_multiplier": {
+    "optmul": 1
+  },
+  "mod_fsd_heat_rate": {
+    "thermload": 1
+  },
+  "mod_fsd_max_fuel_per_jump": {
+    "maxfuel": 1
+  },
+  "mod_fsd_optimised_mass": {
+    "optmass": 1
+  },
+  "mod_fsdinterdictor_facing_limit": {
+    "facinglimit": 1
+  },
+  "mod_fsdinterdictor_range": {
+    "ranget": 1
+  },
+  "mod_health": {
+    "integrity": 1
+  },
+  "mod_mass": {
+    "mass": 1
+  },
+  "mod_passive_power": {
+    "power": 1
+  },
+  "mod_powerdistributor_engine_charge": {
+    "engcap": 1
+  },
+  "mod_powerdistributor_engine_rate": {
+    "engrate": 1
+  },
+  "mod_powerdistributor_global_charge": {
+    "engcap": 1,
+    "syscap": 1,
+    "wepcap": 1
+  },
+  "mod_powerdistributor_global_rate": {
+    "engrate": 1,
+    "sysrate": 1,
+    "weprate": 1
+  },
+  "mod_powerdistributor_system_charge": {
+    "syscap": 1
+  },
+  "mod_powerdistributor_system_rate": {
+    "sysrate": 1
+  },
+  "mod_powerdistributor_weapon_charge": {
+    "wepcap": 1
+  },
+  "mod_powerdistributor_weapon_rate": {
+    "weprate": 1
+  },
+  "mod_powerplant_heat": {
+    "eff": 1
+  },
+  "mod_powerplant_power": {
+    "pgen": 1
+  },
+  "mod_shield_broken_regen": {
+    "brokenregen": 1
+  },
+  "mod_shield_energy_per_regen": {
+    "distdraw": 1
+  },
+  "mod_shield_explosive_mult": {
+    "explres": 1
+  },
+  "mod_shield_global_mult": {
+    "explres": 1,
+    "kinres": 1,
+    "thermres": 1
+  },
+  "mod_shield_kinetic_mult": {
+    "kinres": 1
+  },
+  "mod_shield_mass_curve": {
+    "optmass": 1
+  },
+  "mod_shield_mass_curve_multiplier": {
+    "optmul": 1
+  },
+  "mod_shield_normal_regen": {
+    "regen": 1
+  },
+  "mod_shield_thermal_mult": {
+    "thermres": 1
+  },
+  "mod_shieldcell_charge_heat": {
+    "thermload": 1
+  },
+  "mod_shieldcell_duration": {
+    "duration": 1
+  },
+  "mod_shieldcell_shield_units": {
+    "shieldreinforcement": 1
+  },
+  "mod_shieldcell_spin_up": {
+    "spinup": 1
+  },
+  "mod_weapon_active_heat": {
+    "thermload": 1
+  },
+  "mod_weapon_active_power": {
+    "distdraw": 1
+  },
+  "mod_weapon_ammo_capacity": {
+    "ammo": 1
+  },
+  "mod_weapon_burst_interval": {
+    "rof": 1
+  },
+  "mod_weapon_burst_rof": {},
+  "mod_weapon_burst_size": {},
+  "mod_weapon_clip_size": {
+    "clip": 1
+  },
+  "mod_weapon_damage": {
+    "damage": 1
+  },
+  "mod_weapon_hardness_piercing": {
+    "piercing": 1
+  },
+  "mod_weapon_jitter_radius": {
+    "jitter": 1
+  },
+  "mod_weapon_range": {
+    "range": 1
+  },
+  "mod_weapon_reload_time": {
+    "reload": 1
+  },
+  "special_auto_loader": {},
+  "special_choke_canister": {},
+  "special_concordant_sequence": {
+    "thermload": 0.5
+  },
+  "special_corrosive_shell": {
+    "ammo": -0.2
+  },
+  "special_dispersal_field": {
+    "damage": -0.1
+  },
+  "special_distortion_field": {},
+  "special_drag_munitions": {},
+  "special_emissive_munitions": {
+    "thermload": 1
+  },
+  "special_feedback_cascade": {},
+  "special_high_yield_shell": {},
+  "special_incendiary_rounds": {
+    "rof": 0.05263157894736842,
+    "thermload": 2,
+    "type": "T"
+  },
+  "special_overload_munitions": {
+    "ammo": -0.2
+  },
+  "special_phasing_sequence": {},
+  "special_radiant_canister": {
+    "ammo": -0.25
+  },
+  "special_regeneration_sequence": {},
+  "special_scramble_spectrum": {
+    "rof": 0.1111111111111111
+  },
+  "special_shiftlock_canister": {
+    "damage": -0.2
+  },
+  "special_thermal_cascade": {},
+  "special_thermal_conduit": {},
+  "special_thermal_vent": {
+    "thermload": 0.25
+  },
+  "special_thermalshock": {
+    "damage": -0.2
+  },
+  "trade_cell_heat_cell_units": {},
+  "trade_defence_health_add_defence_global_mult": {},
+  "trade_distributor_engine_charge_system_charge": {
+    "engcap": 1,
+    "syscap": -1
+  },
+  "trade_distributor_global_charge_mass": {
+    "engcap": 0.75,
+    "mass": 1,
+    "syscap": 0.75,
+    "wepcap": 0.75
+  },
+  "trade_engine_curve_mult_engine_heat": {
+    "optmul": 0.4,
+    "thermload": 1
+  },
+  "trade_fsd_fuel_per_jump_fsd_heat": {
+    "maxfuel": 0.5,
+    "thermload": 1
+  },
+  "trade_interdictor_range_facing_limit": {},
+  "trade_mass_defence_health_add": {
+    "hullreinforcement": -0.75,
+    "mass": -1
+  },
+  "trade_mass_health": {
+    "integrity": 1,
+    "mass": 0.4
+  },
+  "trade_passive_power_booster_global_mult": {
+    "explres": 0.4,
+    "kinres": 0.4,
+    "power": -1,
+    "thermres": 0.4
+  },
+  "trade_passive_power_boot_time": {
+    "boot": 1,
+    "power": -0.5
+  },
+  "trade_passive_power_cell_spin_up": {},
+  "trade_passive_power_distributor_global_rate": {
+    "engrate": -1,
+    "power": -1,
+    "sysrate": -1,
+    "weprate": -1
+  },
+  "trade_passive_power_engine_curve": {
+    "optmass": -0.66,
+    "power": -1
+  },
+  "trade_passive_power_shield_global_mult": {
+    "explres": 0.5,
+    "kinres": 0.5,
+    "power": -1,
+    "thermres": 0.5
+  },
+  "trade_passive_power_weapon_active": {
+    "distdraw": -0.6,
+    "power": 1
+  },
+  "trade_shield_curve_shield_curve_mult": {
+    "optmass": -1,
+    "optmul": -0.8
+  },
+  "trade_shield_global_mult_shield_broken_regen": {
+    "brokenregen": -1,
+    "explres": -0.5,
+    "kinres": -0.5,
+    "thermres": -0.5
+  },
+  "trade_shield_kinetic_shield_thermic": {
+    "kinres": 1,
+    "thermres": -1
+  },
+  "trade_weapon_active_passive_power": {
+    "distdraw": -0.67,
+    "power": 1
+  },
+  "trade_weapon_damage_weapon_active_power": {
+    "damage": 0.5,
+    "distdraw": 1
+  },
+  "trade_weapon_hardness_weapon_heat": {
+    "piercing": 0.4,
+    "thermload": 1
+  }
+}

modifications/specials.json

@@ -0,0 +1,34 @@
+{
+    "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_dazzle_shell": {"id": 4, "name": "Dazzle shell"},
+    "special_dispersal_field": {"id": 5, "name": "Dispersal field"},
+    "special_distortion_field": {"id": 6, "name": "Distortion field"},
+    "special_drag_munitions": {"id": 7, "name": "Drag munitions"},
+    "special_emissive_munitions": {"id": 9, "name": "Emissive munitions"},
+    "special_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_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"}
+}

modifications/validity.json

@@ -0,0 +1,358 @@
+{
+  "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",
+    "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",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "piercing",
+    "power",
+    "range",
+    "rof",
+    "thermload"
+  ],
+  "ws": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
+  ]
+}

modules/hardpoints/beam_laser.json

@@ -1,233 +1,57 @@
 {
   "bl": [
     {
-      "armourpen": 60,
-      "breachdps": 33.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 2396160,
-      "dps": 41.4,
-      "edID": 128049431,
-      "eddbID": 1540,
-      "eps": 9.1,
-      "grp": "bl",
-      "hps": 9.9,
-      "id": "0w",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 2.9,
-      "range": 3000,
-      "rating": "A",
-      "type": "T"
-    },
-    {
-      "armourpen": 60,
-      "breachdps": 26.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 8746160,
-      "dps": 32.7,
-      "edID": 128681994,
-      "eddbID": 1544,
-      "eps": 8.99,
-      "grp": "bl",
-      "hps": 10.6,
-      "id": "0x",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 2.86,
-      "range": 3000,
-      "rating": "A",
-      "type": "T"
-    },
-    {
-      "armourpen": 50,
-      "breachdps": 20.6,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 1177600,
-      "dps": 25.8,
-      "edID": 128049430,
-      "eddbID": 843,
-      "eps": 5.67,
-      "grp": "bl",
-      "hps": 7.2,
-      "id": "0u",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 1.8,
-      "range": 3000,
-      "rating": "C",
-      "type": "T"
-    },
-    {
-      "armourpen": 50,
-      "breachdps": 16.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 2396160,
-      "dps": 20.3,
-      "edID": 128049434,
-      "eddbID": 846,
-      "eps": 5.58,
-      "grp": "bl",
-      "hps": 7.6,
-      "id": "0v",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 1.78,
-      "range": 3000,
-      "rating": "C",
-      "type": "T"
-    },
-    {
-      "armourpen": 50,
-      "breachdps": 11.5,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 19399600,
-      "dps": 14.4,
-      "edID": 128049437,
-      "eddbID": 849,
-      "eps": 3.51,
-      "grp": "bl",
-      "hps": 5.1,
-      "id": "0o",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "T",
-      "power": 1.68,
-      "range": 3000,
-      "rating": "D",
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 12.8,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 299520,
-      "dps": 16,
-      "edID": 128049429,
-      "eddbID": 842,
-      "eps": 3.51,
-      "grp": "bl",
-      "hps": 5.1,
-      "id": "0r",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "F",
-      "power": 1.12,
-      "range": 3000,
-      "rating": "D",
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 10,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 500600,
-      "dps": 12.5,
-      "edID": 128049433,
-      "eddbID": 845,
-      "eps": 3.44,
-      "grp": "bl",
-      "hps": 5.3,
-      "id": "0s",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "G",
-      "power": 1.1,
-      "range": 3000,
-      "rating": "D",
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 7.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 2099900,
-      "dps": 8.8,
-      "edID": 128049436,
-      "eddbID": 848,
-      "eps": 2.16,
-      "grp": "bl",
-      "hps": 3.5,
-      "id": "0t",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 1.03,
-      "range": 3000,
-      "rating": "E",
-      "type": "T"
-    },
-    {
-      "armourpen": 18,
-      "breachdps": 7.9,
+      "breachdmg": 7.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 37430,
-      "dps": 9.8,
+      "damage": 9.8,
+      "distdraw": 2.16,
       "edID": 128049428,
       "eddbID": 841,
-      "eps": 2.16,
       "grp": "bl",
-      "hps": 3.5,
       "id": "10",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 18,
       "power": 0.69,
       "range": 3000,
       "rating": "E",
+      "thermload": 3.5,
       "type": "T"
     },
     {
-      "armourpen": 18,
-      "breachdps": 6.1,
+      "breachdmg": 6.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 74650,
-      "dps": 7.7,
+      "damage": 7.66,
+      "distdraw": 2.11,
       "edID": 128049432,
       "eddbID": 844,
-      "eps": 2.11,
       "grp": "bl",
-      "hps": 3.7,
       "id": "0p",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 18,
       "power": 0.67,
       "range": 3000,
       "rating": "E",
+      "thermload": 3.6,
       "type": "T"
     },
     {
-      "armourpen": 18,
-      "breachdps": 4.3,
+      "breachdmg": 4.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 500000,
-      "dps": 5.4,
+      "damage": 5.4,
+      "distdraw": 1.32,
       "edID": 128049435,
       "eddbID": 847,
       "eps": 1.32,
@@ -237,33 +61,211 @@
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 18,
       "power": 0.63,
       "range": 3000,
       "rating": "F",
+      "thermload": 2.4,
       "type": "T"
     },
     {
-      "armourpen": 18,
-      "breachdps": 3.9,
+      "breachdmg": 3.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 56150,
-      "dps": 4.9,
+      "damage": 4.9,
+      "distdraw": 2.8,
       "edID": 128671346,
       "eddbID": 1476,
-      "eps": 2.8,
       "grp": "bl",
-      "hps": 2.7,
       "id": "b0",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Retributor",
+      "piercing": 18,
       "power": 0.69,
       "pp": "Edmund Mahon",
       "range": 3000,
       "rating": "E",
+      "thermload": 2.7,
+      "type": "T"
+    },
+    {
+      "breachdmg": 12.8,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 299520,
+      "damage": 15.96,
+      "distdraw": 3.51,
+      "edID": 128049429,
+      "eddbID": 842,
+      "grp": "bl",
+      "id": "0r",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 35,
+      "power": 1.12,
+      "range": 3000,
+      "rating": "D",
+      "thermload": 5.1,
+      "type": "T"
+    },
+    {
+      "breachdmg": 10,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 500600,
+      "damage": 12.52,
+      "distdraw": 3.44,
+      "edID": 128049433,
+      "eddbID": 845,
+      "grp": "bl",
+      "id": "0s",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 35,
+      "power": 1.1,
+      "range": 3000,
+      "rating": "D",
+      "thermload": 5.3,
+      "type": "T"
+    },
+    {
+      "breachdmg": 7.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 2099900,
+      "damage": 8.82,
+      "distdraw": 2.16,
+      "edID": 128049436,
+      "eddbID": 848,
+      "grp": "bl",
+      "id": "0t",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 35,
+      "power": 1.03,
+      "range": 3000,
+      "rating": "E",
+      "thermload": 3.5,
+      "type": "T"
+    },
+    {
+      "breachdmg": 20.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 1177600,
+      "damage": 25.78,
+      "distdraw": 5.67,
+      "edID": 128049430,
+      "eddbID": 843,
+      "grp": "bl",
+      "id": "0u",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 50,
+      "power": 1.8,
+      "range": 3000,
+      "rating": "C",
+      "thermload": 7.2,
+      "type": "T"
+    },
+    {
+      "breachdmg": 16.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 2396160,
+      "damage": 20.28,
+      "distdraw": 5.58,
+      "edID": 128049434,
+      "eddbID": 846,
+      "grp": "bl",
+      "id": "0v",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 50,
+      "power": 1.78,
+      "range": 3000,
+      "rating": "C",
+      "thermload": 7.6,
+      "type": "T"
+    },
+    {
+      "breachdmg": 11.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 19399600,
+      "damage": 14.34,
+      "distdraw": 3.51,
+      "edID": 128049437,
+      "eddbID": 849,
+      "grp": "bl",
+      "id": "0o",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 50,
+      "power": 1.68,
+      "range": 3000,
+      "rating": "D",
+      "thermload": 5.1,
+      "type": "T"
+    },
+    {
+      "breachdmg": 33.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 2396160,
+      "damage": 41.38,
+      "distdraw": 9.1,
+      "edID": 128049431,
+      "eddbID": 1540,
+      "grp": "bl",
+      "id": "0w",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 60,
+      "power": 2.9,
+      "range": 3000,
+      "rating": "A",
+      "thermload": 9.9,
+      "type": "T"
+    },
+    {
+      "breachdmg": 26.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 8746160,
+      "damage": 32.68,
+      "distdraw": 8.99,
+      "edID": 128681994,
+      "eddbID": 1544,
+      "grp": "bl",
+      "id": "0x",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 60,
+      "power": 2.86,
+      "range": 3000,
+      "rating": "A",
+      "thermload": 10.6,
       "type": "T"
     }
   ]

modules/hardpoints/burst_laser.json

@@ -1,305 +1,305 @@
 {
   "ul": [
     {
-      "armourpen": 65,
-      "breachdps": 28,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 3,
-      "class": 4,
-      "cost": 281600,
-      "dps": 32.3,
-      "edID": 128049403,
-      "eddbID": 1549,
-      "eps": 5.936,
-      "grp": "ul",
-      "hps": 7.2,
-      "id": "7s",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 2.58,
-      "range": 3000,
-      "rating": "E",
-      "rof": 1.6,
-      "type": "T"
-    },
-    {
-      "armourpen": 65,
-      "breachdps": 21.63,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 5,
-      "class": 4,
-      "cost": 1245600,
-      "dps": 25.9,
-      "edID": 128727920,
-      "eddbID": 1550,
-      "eps": 5.712,
-      "grp": "ul",
-      "hps": 6.93,
-      "id": "7t",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 2.59,
-      "range": 3000,
-      "rating": "E",
-      "rof": 2.1,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 10.53,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 7,
-      "class": 3,
-      "cost": 140400,
-      "dps": 20.8,
-      "edID": 128049402,
-      "eddbID": 834,
-      "eps": 3.753,
-      "grp": "ul",
-      "hps": 4.59,
-      "id": "14",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 1.66,
-      "range": 3000,
-      "rating": "D",
-      "rof": 2.7,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 14.08,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 9,
-      "class": 3,
-      "cost": 281600,
-      "dps": 16.6,
-      "edID": 128049406,
-      "eddbID": 837,
-      "eps": 3.712,
-      "grp": "ul",
-      "hps": 4.48,
-      "id": "15",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 1.65,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.2,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 5.58,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 11,
-      "class": 3,
-      "cost": 800400,
-      "dps": 11,
-      "edID": 128049409,
-      "eddbID": 840,
-      "eps": 1.913,
-      "grp": "ul",
-      "hps": 2.48,
-      "id": "16",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "T",
-      "power": 1.57,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.1,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 11.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 11,
-      "class": 2,
-      "cost": 23000,
-      "dps": 13,
-      "edID": 128049401,
-      "eddbID": 833,
-      "eps": 2.331,
-      "grp": "ul",
-      "hps": 2.96,
-      "id": "7h",
-      "integrity": 40,
-      "mass": 4,
-      "mount": "F",
-      "power": 1.05,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.7,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 8.82,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 13,
-      "class": 2,
-      "cost": 48500,
-      "dps": 10.3,
-      "edID": 128049405,
-      "eddbID": 836,
-      "eps": 2.31,
-      "grp": "ul",
-      "hps": 2.94,
-      "id": "7i",
-      "integrity": 40,
-      "mass": 4,
-      "mount": "G",
-      "power": 1.04,
-      "range": 3000,
-      "rating": "F",
-      "rof": 4.2,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 3.51,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "burst": 3,
-      "burstrof": 15,
-      "class": 2,
-      "cost": 162800,
-      "dps": 6.8,
-      "edID": 128049408,
-      "eddbID": 839,
-      "eps": 1.209,
-      "grp": "ul",
-      "hps": 1.56,
-      "id": "7j",
-      "integrity": 40,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.98,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3.9,
-      "type": "T"
-    },
-    {
-      "armourpen": 20,
-      "breachdps": 7.05,
+      "breachdmg": 7.05,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
       "burstrof": 15,
       "class": 1,
       "cost": 4400,
-      "dps": 8.1,
+      "damage": 1.72,
+      "distdraw": 0.31,
       "edID": 128049400,
       "eddbID": 832,
-      "eps": 1.457,
       "grp": "ul",
-      "hps": 1.88,
       "id": "11",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 20,
       "power": 0.65,
       "range": 3000,
       "rating": "F",
-      "rof": 4.7,
+      "rof": 4.735,
+      "thermload": 0.4,
       "type": "T"
     },
     {
-      "armourpen": 20,
-      "breachdps": 5.3,
+      "breachdmg": 5.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
       "burstrof": 17,
       "class": 1,
       "cost": 8600,
-      "dps": 6.4,
+      "damage": 1.22,
+      "distdraw": 0.27,
       "edID": 128049404,
       "eddbID": 835,
-      "eps": 1.4,
       "grp": "ul",
-      "hps": 1.6,
       "id": "12",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 20,
       "power": 0.64,
       "range": 3000,
       "rating": "G",
-      "rof": 5.3,
+      "rof": 5.28,
+      "thermload": 0.3,
       "type": "T"
     },
     {
-      "armourpen": 20,
-      "breachdps": 1.92,
+      "breachdmg": 1.92,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
       "burstrof": 19,
       "class": 1,
       "cost": 52800,
-      "dps": 4.2,
+      "damage": 0.87,
+      "distdraw": 0.16,
       "edID": 128049407,
       "eddbID": 838,
-      "eps": 0.768,
       "grp": "ul",
-      "hps": 0.96,
       "id": "13",
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 20,
       "power": 0.6,
       "range": 3000,
       "rating": "G",
-      "rof": 4.8,
+      "rof": 4.795,
+      "thermload": 0.2,
       "type": "T"
     },
     {
-      "armourpen": 1,
-      "breachdps": 15.25,
+      "breachdmg": 1.5,
       "breachmax": 0,
       "breachmin": 0,
-      "burst": 8,
-      "burstrof": 20,
+      "burst": 3,
+      "burstrof": 15,
       "class": 1,
       "cost": 8800,
-      "dps": 18.3,
+      "damage": 2.4,
+      "distdraw": 0.4,
       "edID": 128671449,
       "eddbID": 1477,
-      "eps": 3.05,
       "grp": "ul",
-      "hps": 2.29,
       "id": "cy",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Cytoscrambler",
+      "piercing": 1,
       "power": 0.8,
       "pp": "Archon Delaine",
       "range": 600,
       "rating": "F",
-      "rof": 7.6,
+      "rof": 7.615,
+      "thermload": 0.3,
+      "type": "T"
+    },
+    {
+      "breachdmg": 11.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 11,
+      "class": 2,
+      "cost": 23000,
+      "damage": 3.53,
+      "distdraw": 0.63,
+      "edID": 128049401,
+      "eddbID": 833,
+      "grp": "ul",
+      "id": "7h",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 35,
+      "power": 1.05,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.695,
+      "thermload": 0.8,
+      "type": "T"
+    },
+    {
+      "breachdmg": 8.82,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 13,
+      "class": 2,
+      "cost": 48500,
+      "damage": 2.45,
+      "distdraw": 0.55,
+      "edID": 128049405,
+      "eddbID": 836,
+      "grp": "ul",
+      "id": "7i",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 35,
+      "power": 1.04,
+      "range": 3000,
+      "rating": "F",
+      "rof": 4.2,
+      "thermload": 0.7,
+      "type": "T"
+    },
+    {
+      "breachdmg": 3.51,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 15,
+      "class": 2,
+      "cost": 162800,
+      "damage": 1.72,
+      "distdraw": 0.31,
+      "edID": 128049408,
+      "eddbID": 839,
+      "grp": "ul",
+      "id": "7j",
+      "integrity": 40,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 35,
+      "power": 0.98,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.93,
+      "thermload": 0.4,
+      "type": "T"
+    },
+    {
+      "breachdmg": 10.53,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 7,
+      "class": 3,
+      "cost": 140400,
+      "damage": 7.74,
+      "distdraw": 1.39,
+      "edID": 128049402,
+      "eddbID": 834,
+      "grp": "ul",
+      "id": "14",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 52,
+      "power": 1.66,
+      "range": 3000,
+      "rating": "D",
+      "rof": 2.685,
+      "thermload": 1.7,
+      "type": "T"
+    },
+    {
+      "breachdmg": 14.08,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 9,
+      "class": 3,
+      "cost": 281600,
+      "damage": 5.16,
+      "distdraw": 1.16,
+      "edID": 128049406,
+      "eddbID": 837,
+      "grp": "ul",
+      "id": "15",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 52,
+      "power": 1.65,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.215,
+      "thermload": 1.4,
+      "type": "T"
+    },
+    {
+      "breachdmg": 5.58,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 11,
+      "class": 3,
+      "cost": 800400,
+      "damage": 3.53,
+      "distdraw": 0.63,
+      "edID": 128049409,
+      "eddbID": 840,
+      "grp": "ul",
+      "id": "16",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 52,
+      "power": 1.57,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.115,
+      "thermload": 0.8,
+      "type": "T"
+    },
+    {
+      "breachdmg": 28,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 3,
+      "class": 4,
+      "cost": 281600,
+      "damage": 20.6,
+      "distdraw": 3.71,
+      "edID": 128049403,
+      "eddbID": 1549,
+      "grp": "ul",
+      "id": "7s",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 65,
+      "power": 2.58,
+      "range": 3000,
+      "rating": "E",
+      "rof": 1.565,
+      "thermload": 4.5,
+      "type": "T"
+    },
+    {
+      "breachdmg": 21.63,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 5,
+      "class": 4,
+      "cost": 1245600,
+      "damage": 12.1,
+      "distdraw": 2.72,
+      "edID": 128727920,
+      "eddbID": 1550,
+      "grp": "ul",
+      "id": "7t",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 65,
+      "power": 2.59,
+      "range": 3000,
+      "rating": "E",
+      "rof": 2.14,
+      "thermload": 3.3,
       "type": "T"
     }
   ]

modules/hardpoints/cannon.json

@@ -2,95 +2,203 @@
   "c": [
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 25.28,
+      "breachdmg": 17.1,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 4,
+      "class": 1,
       "clip": 5,
-      "cost": 2700800,
-      "dps": 25.3,
-      "edID": 128049441,
-      "eddbID": 853,
-      "eps": 0.644,
+      "cost": 21100,
+      "damage": 18,
+      "distdraw": 0.46,
+      "edID": 128049438,
+      "eddbID": 850,
       "grp": "c",
-      "hps": 1.92,
-      "id": "1q",
-      "integrity": 80,
-      "mass": 16,
+      "id": "1h",
+      "integrity": 40,
+      "mass": 2,
       "mount": "F",
-      "power": 0.92,
-      "range": 4500,
-      "rating": "B",
-      "reload": 5,
-      "rof": 0.4,
-      "speed": 900,
+      "piercing": 35,
+      "power": 0.34,
+      "range": 3000,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.5,
+      "speed": 1200,
+      "thermload": 1.4,
       "type": "K"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 16.92,
+      "breachdmg": 13.2,
+      "breachmax": 0.9,
+      "breachmin": 0.6,
+      "class": 1,
+      "clip": 5,
+      "cost": 42200,
+      "damage": 13.9,
+      "distdraw": 0.48,
+      "edID": 128049442,
+      "eddbID": 854,
+      "grp": "c",
+      "id": "1i",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "G",
+      "piercing": 35,
+      "power": 0.38,
+      "range": 3000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 0.52,
+      "speed": 1000,
+      "thermload": 1.3,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 10.6,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 4,
+      "class": 1,
       "clip": 5,
-      "cost": 5401600,
-      "dps": 19.7,
-      "edID": 128049444,
-      "eddbID": 856,
-      "eps": 0.688,
+      "cost": 506400,
+      "damage": 11.1,
+      "distdraw": 0.22,
+      "edID": 128049445,
+      "eddbID": 857,
       "grp": "c",
-      "hps": 1.76,
-      "id": "1r",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 1.03,
-      "range": 4500,
-      "rating": "B",
+      "id": "1j",
+      "integrity": 40,
+      "mass": 2,
+      "mount": "T",
+      "piercing": 90,
+      "power": 0.32,
+      "range": 3000,
+      "rating": "F",
       "reload": 4,
-      "rof": 0.4,
-      "speed": 750,
+      "rof": 0.435,
+      "speed": 1000,
+      "thermload": 0.7,
       "type": "K"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 16.92,
+      "breachdmg": 28,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 168430,
+      "damage": 29.2,
+      "distdraw": 0.7,
+      "edID": 128049439,
+      "eddbID": 851,
+      "grp": "c",
+      "id": "1k",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 90,
+      "power": 0.49,
+      "range": 3500,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.465,
+      "speed": 1051,
+      "thermload": 2.1,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 20.3,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 337600,
+      "damage": 21.3,
+      "distdraw": 0.75,
+      "edID": 128049443,
+      "eddbID": 855,
+      "grp": "c",
+      "id": "1l",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 90,
+      "power": 0.54,
+      "range": 3500,
+      "rating": "D",
+      "reload": 4,
+      "rof": 0.485,
+      "speed": 875,
+      "thermload": 1.9,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 16.3,
+      "breachmax": 0.8,
+      "breachmin": 0.6,
+      "class": 2,
+      "clip": 5,
+      "cost": 4051200,
+      "damage": 17.19,
+      "distdraw": 0.34,
+      "edID": 128049446,
+      "eddbID": 858,
+      "grp": "c",
+      "id": "1m",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 90,
+      "power": 0.45,
+      "range": 3500,
+      "rating": "E",
+      "reload": 4,
+      "rof": 0.405,
+      "speed": 875,
+      "thermload": 1,
+      "type": "K"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 42.3,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 3,
       "clip": 5,
       "cost": 675200,
-      "dps": 18.7,
+      "damage": 43.95,
+      "distdraw": 1.07,
       "edID": 128049440,
       "eddbID": 852,
-      "eps": 0.428,
       "grp": "c",
-      "hps": 1.28,
       "id": "1n",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 90,
       "power": 0.67,
       "range": 4000,
       "rating": "C",
       "reload": 4,
-      "rof": 0.4,
+      "rof": 0.425,
       "speed": 959,
+      "thermload": 3.2,
       "type": "K"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 30.9,
+      "breachdmg": 30.9,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 3,
       "clip": 5,
       "cost": 1350400,
-      "dps": 14.3,
+      "damage": 32.51,
+      "distdraw": 1.14,
       "edID": 128671120,
       "eddbID": 1383,
       "eps": 0.456,
@@ -100,201 +208,99 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
+      "piercing": 90,
       "power": 0.75,
       "range": 4000,
       "rating": "C",
       "reload": 4,
-      "rof": 0.4,
+      "rof": 0.445,
       "speed": 800,
+      "thermload": 2.9,
       "type": "K"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 10.04,
+      "breachdmg": 25.14,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 3,
       "clip": 5,
       "cost": 16204800,
-      "dps": 9.7,
+      "damage": 26.4,
+      "distdraw": 0.53,
       "edID": 128049447,
       "eddbID": 859,
-      "eps": 0.212,
       "grp": "c",
-      "hps": 0.64,
       "id": "1p",
       "integrity": 64,
       "mass": 8,
       "mount": "T",
+      "piercing": 90,
       "power": 0.64,
       "range": 4000,
       "rating": "D",
       "reload": 4,
-      "rof": 0.4,
+      "rof": 0.37,
       "speed": 800,
+      "thermload": 1.6,
       "type": "K"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 14,
+      "breachdmg": 63.2,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 2,
+      "class": 4,
       "clip": 5,
-      "cost": 168430,
-      "dps": 13.6,
-      "edID": 128049439,
-      "eddbID": 851,
-      "eps": 0.35,
+      "cost": 2700800,
+      "damage": 65.66,
+      "distdraw": 1.61,
+      "edID": 128049441,
+      "eddbID": 853,
+      "eps": 0.644,
       "grp": "c",
-      "hps": 1.05,
-      "id": "1k",
-      "integrity": 51,
-      "mass": 4,
+      "hps": 1.92,
+      "id": "1q",
+      "integrity": 80,
+      "mass": 16,
       "mount": "F",
-      "power": 0.49,
-      "range": 3500,
-      "rating": "D",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 1051,
+      "piercing": 90,
+      "power": 0.92,
+      "range": 4500,
+      "rating": "B",
+      "reload": 5,
+      "rof": 0.385,
+      "speed": 900,
+      "thermload": 4.8,
       "type": "K"
     },
     {
       "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 101.5,
+      "breachdmg": 46.7,
       "breachmax": 0.8,
       "breachmin": 0.6,
-      "class": 2,
+      "class": 4,
       "clip": 5,
-      "cost": 337600,
-      "dps": 10.3,
-      "edID": 128049443,
-      "eddbID": 855,
-      "eps": 0.375,
+      "cost": 5401600,
+      "damage": 49.2,
+      "distdraw": 1.72,
+      "edID": 128049444,
+      "eddbID": 856,
+      "eps": 0.688,
       "grp": "c",
-      "hps": 0.95,
-      "id": "1l",
-      "integrity": 51,
-      "mass": 4,
+      "hps": 1.76,
+      "id": "1r",
+      "integrity": 80,
+      "mass": 16,
       "mount": "G",
-      "power": 0.54,
-      "range": 3500,
-      "rating": "D",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 875,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 6.52,
-      "breachmax": 0.8,
-      "breachmin": 0.6,
-      "class": 2,
-      "clip": 5,
-      "cost": 4051200,
-      "dps": 6.9,
-      "edID": 128049446,
-      "eddbID": 858,
-      "eps": 0.136,
-      "grp": "c",
-      "hps": 0.4,
-      "id": "1m",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.45,
-      "range": 3500,
-      "rating": "E",
+      "piercing": 90,
+      "power": 1.03,
+      "range": 4500,
+      "rating": "B",
       "reload": 4,
       "rof": 0.4,
-      "speed": 875,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 8.55,
-      "breachmax": 0.8,
-      "breachmin": 0.6,
-      "class": 1,
-      "clip": 5,
-      "cost": 21100,
-      "dps": 9,
-      "edID": 128049438,
-      "eddbID": 850,
-      "eps": 0.23,
-      "grp": "c",
-      "hps": 0.7,
-      "id": "1h",
-      "integrity": 40,
-      "mass": 2,
-      "mount": "F",
-      "power": 0.34,
-      "range": 3000,
-      "rating": "D",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 1200,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 35,
-      "breachdps": 6.6,
-      "breachmax": 0.9,
-      "breachmin": 0.6,
-      "class": 1,
-      "clip": 5,
-      "cost": 42200,
-      "dps": 7.2,
-      "edID": 128049442,
-      "eddbID": 854,
-      "eps": 0.24,
-      "grp": "c",
-      "hps": 0.65,
-      "id": "1i",
-      "integrity": 40,
-      "mass": 2,
-      "mount": "G",
-      "power": 0.38,
-      "range": 3000,
-      "rating": "E",
-      "reload": 4,
-      "rof": 0.5,
-      "speed": 1000,
-      "type": "K"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 90,
-      "breachdps": 4.24,
-      "breachmax": 0.8,
-      "breachmin": 0.6,
-      "class": 1,
-      "clip": 5,
-      "cost": 506400,
-      "dps": 4.8,
-      "edID": 128049445,
-      "eddbID": 857,
-      "eps": 0.088,
-      "grp": "c",
-      "hps": 0.28,
-      "id": "1j",
-      "integrity": 40,
-      "mass": 2,
-      "mount": "T",
-      "power": 0.32,
-      "range": 3000,
-      "rating": "F",
-      "reload": 4,
-      "rof": 0.4,
-      "speed": 1000,
+      "speed": 750,
+      "thermload": 4.4,
       "type": "K"
     }
   ]

modules/hardpoints/chaff_launcher.json

@@ -0,0 +1,26 @@
+{
+  "ch": [
+    {
+      "ammo": 10,
+      "ammocost": 100,
+      "class": 0,
+      "clip": 1,
+      "cost": 8500,
+      "distdraw": 4,
+      "duration": 20,
+      "edID": 128049513,
+      "eddbID": 884,
+      "grp": "ch",
+      "id": "00",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Chaff Launcher",
+      "passive": 1,
+      "power": 0.2,
+      "rating": "I",
+      "reload": 10,
+      "rof": 1,
+      "thermload": 4
+    }
+  ]
+}

modules/hardpoints/countermeasures.json

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

modules/hardpoints/electronic_countermeasure.json

@@ -0,0 +1,23 @@
+{
+  "ec": [
+    {
+      "activepower": 4,
+      "chargeup": 3,
+      "class": 0,
+      "cooldown": 10,
+      "cost": 12500,
+      "edID": 128049516,
+      "eddbID": 885,
+      "grp": "ec",
+      "id": "01",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Electronic Countermeasure",
+      "power": 0.2,
+      "range": 3000,
+      "rating": "F",
+      "reload": 10,
+      "thermload": 4
+    }
+  ]
+}

modules/hardpoints/fragment_cannon.json

@@ -2,111 +2,110 @@
   "fc": [
     {
       "ammo": 90,
-      "armourpen": 52,
-      "breachdps": 189,
+      "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
-      "class": 3,
+      "class": 1,
       "clip": 3,
-      "cost": 1167360,
-      "dps": 113.8,
-      "edID": 128049450,
-      "eddbID": 862,
-      "eps": 30.78,
+      "cost": 36000,
+      "damage": 1.43,
+      "distdraw": 0.21,
+      "edID": 128049448,
+      "eddbID": 860,
       "grp": "fc",
-      "hps": 59.4,
-      "id": "1t",
-      "integrity": 80,
+      "id": "20",
+      "integrity": 40,
       "jitter": 0.5,
-      "mass": 8,
+      "mass": 2,
       "mount": "F",
-      "power": 1.02,
+      "piercing": 20,
+      "power": 0.45,
       "range": 2000,
-      "rating": "C",
+      "rating": "E",
       "reload": 5,
-      "rof": 4.5,
+      "rof": 5.555,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 0.4,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 52,
-      "breachdps": 167.04,
+      "breachdmg": 0.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
-      "class": 3,
+      "class": 1,
       "clip": 3,
-      "cost": 1751040,
-      "dps": 184.6,
-      "edID": 128671321,
-      "eddbID": 1454,
-      "eps": 46.66,
+      "cost": 54720,
+      "damage": 1.01,
+      "distdraw": 0.26,
+      "edID": 128049451,
+      "eddbID": 863,
       "grp": "fc",
-      "hps": 80.64,
-      "id": "1u",
-      "integrity": 80,
+      "id": "21",
+      "integrity": 40,
       "jitter": 0.5,
-      "mass": 8,
+      "mass": 2,
       "mount": "G",
-      "power": 1.55,
+      "piercing": 20,
+      "power": 0.59,
       "range": 2000,
-      "rating": "C",
+      "rating": "E",
       "reload": 5,
-      "rof": 4.8,
+      "rof": 5.88,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 0.4,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 52,
-      "breachdps": 110.4,
+      "breachdmg": 0.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
-      "class": 3,
+      "class": 1,
       "clip": 3,
-      "cost": 5836800,
-      "dps": 122.9,
-      "edID": 128671322,
-      "eddbID": 1455,
-      "eps": 17.76,
+      "cost": 182400,
+      "damage": 0.69,
+      "distdraw": 0.1,
+      "edID": 128049453,
+      "eddbID": 865,
       "grp": "fc",
-      "hps": 33.6,
-      "id": "1v",
-      "integrity": 80,
+      "id": "22",
+      "integrity": 40,
       "jitter": 0.5,
-      "mass": 8,
+      "mass": 2,
       "mount": "T",
-      "power": 1.29,
+      "piercing": 20,
+      "power": 0.42,
       "range": 2000,
-      "rating": "C",
+      "rating": "E",
       "reload": 5,
-      "rof": 4,
+      "rof": 4.76,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 0.2,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 35,
-      "breachdps": 138,
+      "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "clip": 3,
       "cost": 291840,
-      "dps": 122.9,
+      "damage": 2.56,
+      "distdraw": 0.37,
       "edID": 128049449,
       "eddbID": 861,
-      "eps": 22.2,
       "grp": "fc",
-      "hps": 42,
       "id": "1s",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 4,
       "mount": "F",
+      "piercing": 35,
       "power": 0.74,
       "range": 2000,
       "rating": "A",
@@ -114,173 +113,180 @@
       "rof": 5,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 0.7,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 35,
-      "breachdps": 114.48,
+      "breachdmg": 1.8,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "clip": 3,
       "cost": 437800,
-      "dps": 153.6,
+      "damage": 1.95,
+      "distdraw": 0.49,
       "edID": 128049452,
       "eddbID": 864,
-      "eps": 31.6,
       "grp": "fc",
-      "hps": 50.88,
       "id": "7e",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 4,
       "mount": "G",
+      "piercing": 35,
       "power": 1.03,
       "range": 2000,
       "rating": "D",
       "reload": 5,
-      "rof": 5.3,
+      "rof": 5.26,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 0.8,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 35,
-      "breachdps": 67.08,
+      "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "clip": 3,
       "cost": 1459200,
-      "dps": 123.2,
+      "damage": 1.43,
+      "distdraw": 0.21,
       "edID": 128049454,
       "eddbID": 866,
-      "eps": 10.84,
       "grp": "fc",
-      "hps": 20.64,
       "id": "7f",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 4,
       "mount": "T",
+      "piercing": 35,
       "power": 0.79,
       "range": 2000,
       "rating": "D",
       "reload": 5,
-      "rof": 3.7,
+      "rof": 4.345,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 0.4,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 20,
-      "breachdps": 87.36,
+      "breachdmg": 3.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
-      "class": 1,
+      "class": 3,
       "clip": 3,
-      "cost": 36000,
-      "dps": 95.3,
-      "edID": 128049448,
-      "eddbID": 860,
-      "eps": 14.112,
+      "cost": 1167360,
+      "damage": 3.92,
+      "distdraw": 0.57,
+      "edID": 128049450,
+      "eddbID": 862,
       "grp": "fc",
-      "hps": 26.88,
-      "id": "20",
-      "integrity": 40,
+      "id": "1t",
+      "integrity": 80,
       "jitter": 0.5,
-      "mass": 2,
+      "mass": 8,
       "mount": "F",
-      "power": 0.45,
+      "piercing": 52,
+      "power": 1.02,
       "range": 2000,
-      "rating": "E",
+      "rating": "C",
       "reload": 5,
-      "rof": 5.6,
+      "rof": 4.545,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 1.1,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 20,
-      "breachdps": 63.4,
+      "breachdmg": 2.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
-      "class": 1,
+      "class": 3,
       "clip": 3,
-      "cost": 54720,
-      "dps": 71.3,
-      "edID": 128049451,
-      "eddbID": 863,
-      "eps": 18.408,
+      "cost": 1751040,
+      "damage": 3.23,
+      "distdraw": 0.81,
+      "edID": 128671321,
+      "eddbID": 1454,
       "grp": "fc",
-      "hps": 28.32,
-      "id": "21",
-      "integrity": 40,
+      "id": "1u",
+      "integrity": 80,
       "jitter": 0.5,
-      "mass": 2,
+      "mass": 8,
       "mount": "G",
-      "power": 0.59,
+      "piercing": 52,
+      "power": 1.55,
       "range": 2000,
-      "rating": "E",
+      "rating": "C",
       "reload": 5,
-      "rof": 5.9,
+      "rof": 4.76,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 1.4,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": 20,
-      "breachdps": 34.56,
+      "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
-      "class": 1,
+      "class": 3,
       "clip": 3,
-      "cost": 182400,
-      "dps": 39.4,
-      "edID": 128049453,
-      "eddbID": 865,
-      "eps": 6.72,
+      "cost": 5836800,
+      "damage": 2.56,
+      "distdraw": 0.37,
+      "edID": 128671322,
+      "eddbID": 1455,
       "grp": "fc",
-      "hps": 13.44,
-      "id": "22",
-      "integrity": 40,
+      "id": "1v",
+      "integrity": 80,
       "jitter": 0.5,
-      "mass": 2,
+      "mass": 8,
       "mount": "T",
-      "power": 0.42,
+      "piercing": 52,
+      "power": 1.29,
       "range": 2000,
-      "rating": "E",
+      "rating": "C",
       "reload": 5,
-      "rof": 4.8,
+      "rof": 4,
       "roundspershot": 12,
       "speed": 667,
+      "thermload": 0.7,
       "type": "K"
     },
     {
       "ammo": 90,
-      "armourpen": "A",
+      "breachdmg": 3.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
       "class": 3,
       "clip": 3,
       "cost": 1400830,
-      "damage": 3,
-      "dps": 9,
+      "damage": 3.4,
+      "distdraw": 0.57,
       "edID": 128671343,
       "eddbID": 1478,
       "grp": "fc",
       "id": "pa",
+      "integrity": 64,
       "mass": 8,
       "mount": "F",
       "name": "Pacifier",
+      "piercing": 52,
       "power": 1.02,
       "pp": "Zachary Hudson",
       "rating": "C",
+      "reload": 5,
       "rof": 4.5,
-      "thermload": 1,
+      "speed": 1000,
+      "thermload": 1.1,
       "type": "K"
     }
   ]

modules/hardpoints/heat_sink_launcher.json

@@ -0,0 +1,27 @@
+{
+  "hs": [
+    {
+      "ammo": 2,
+      "ammocost": 25,
+      "class": 0,
+      "clip": 1,
+      "cost": 3500,
+      "distdraw": 2,
+      "drain": 100,
+      "duration": 10,
+      "edID": 128049519,
+      "eddbID": 886,
+      "eps": 0.4,
+      "grp": "hs",
+      "id": "02",
+      "integrity": 20,
+      "mass": 1.3,
+      "name": "Heat Sink Launcher",
+      "passive": 1,
+      "power": 0.2,
+      "rating": "I",
+      "reload": 10,
+      "rof": 0.2
+    }
+  ]
+}

modules/hardpoints/mine_launcher.json

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

modules/hardpoints/mining_laser.json

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

modules/hardpoints/missile_rack.json

@@ -1,38 +1,64 @@
 {
   "mr": [
     {
-      "ammo": 48,
-      "armourpen": 60,
-      "breachdps": 4.8,
-      "breachmax": 0,
-      "breachmin": 0,
-      "class": 2,
-      "clip": 12,
-      "cost": 190227,
-      "dps": 25,
-      "eddbID": 1559,
-      "eps": 0.12,
+      "ammo": 16,
+      "breachdmg": 20,
+      "breachmax": 1,
+      "breachmin": 1,
+      "class": 1,
+      "clip": 8,
+      "cost": 32180,
+      "damage": 50,
+      "distdraw": 0.24,
+      "edID": 128666724,
+      "eddbID": 1326,
       "grp": "mr",
-      "hps": 1.08,
-      "id": "1z",
-      "integrity": 51,
-      "mass": 4,
+      "id": "2d",
+      "integrity": 40,
+      "mass": 2,
       "missile": "D",
       "mount": "F",
-      "name": "Rocket Propelled FSD Disruptor",
-      "power": 1.2,
-      "pp": "Yuri Grom",
+      "piercing": 60,
+      "power": 0.4,
       "rating": "B",
+      "reload": 5,
       "rof": 0.5,
       "speed": 750,
+      "thermload": 3.6,
+      "type": "E"
+    },
+    {
+      "ammo": 6,
+      "breachdmg": 16,
+      "breachmax": 0,
+      "breachmin": 0,
+      "class": 1,
+      "clip": 6,
+      "cost": 72600,
+      "damage": 40,
+      "distdraw": 0.24,
+      "edID": 128049492,
+      "eddbID": 878,
+      "grp": "mr",
+      "id": "2e",
+      "integrity": 40,
+      "mass": 2,
+      "missile": "S",
+      "mount": "F",
+      "piercing": 60,
+      "power": 0.6,
+      "rating": "B",
+      "reload": 12,
+      "rof": 0.333,
+      "speed": 625,
+      "thermload": 3.6,
       "type": "E"
     },
     {
       "ammo": 48,
-      "armourpen": 60,
-      "breachdps": 0,
-      "breachmax": 0,
-      "breachmin": 0,
+      "breachdmg": 20,
+      "breachmax": 1,
+      "breachmin": 1,
       "class": 2,
       "clip": 12,
       "cost": 240400,
@@ -47,23 +73,24 @@
       "mass": 4,
       "missile": "D",
       "mount": "F",
+      "piercing": 60,
       "power": 1.2,
       "rating": "B",
       "reload": 5,
-      "roundspershot": 1,
+      "rof": 0.5,
       "speed": 750,
       "type": "E"
     },
     {
       "ammo": 18,
-      "armourpen": 60,
-      "breachdps": 0,
+      "breachdmg": 16,
       "breachmax": 0,
       "breachmin": 0,
       "class": 2,
       "clip": 6,
       "cost": 512400,
-      "dps": 13.3,
+      "damage": 40,
+      "distdraw": 0.24,
       "edID": 128049493,
       "eddbID": 879,
       "eps": 0.07,
@@ -74,90 +101,65 @@
       "mass": 4,
       "missile": "S",
       "mount": "F",
+      "piercing": 60,
       "power": 1.2,
       "rating": "B",
       "reload": 12,
-      "roundspershot": 1,
+      "rof": 0.333,
       "speed": 625,
+      "thermload": 3.6,
       "type": "E"
     },
     {
-      "ammo": 16,
-      "armourpen": 60,
-      "breachdps": 0,
+      "ammo": 48,
+      "breachdmg": 16,
       "breachmax": 0,
       "breachmin": 0,
-      "class": 1,
-      "clip": 8,
-      "cost": 32180,
-      "dps": 25,
-      "edID": 128666724,
-      "eddbID": 1326,
-      "eps": 0.12,
+      "class": 2,
+      "clip": 12,
+      "cost": 190227,
+      "damage": 40,
+      "distdraw": 0.24,
+      "eddbID": 1559,
       "grp": "mr",
-      "hps": 1.8,
-      "id": "2d",
-      "integrity": 40,
-      "mass": 2,
+      "id": "1z",
+      "integrity": 51,
+      "mass": 4,
       "missile": "D",
       "mount": "F",
-      "power": 0.4,
+      "name": "Rocket Propelled FSD Disruptor",
+      "piercing": 60,
+      "power": 1.2,
+      "pp": "Yuri Grom",
       "rating": "B",
       "reload": 5,
-      "rof": 0.5,
-      "roundspershot": 1,
+      "rof": 0.333,
       "speed": 750,
-      "type": "E"
-    },
-    {
-      "ammo": 6,
-      "armourpen": 60,
-      "breachdps": 0,
-      "breachmax": 0,
-      "breachmin": 0,
-      "class": 1,
-      "clip": 6,
-      "cost": 72600,
-      "dps": 13.3,
-      "edID": 128049492,
-      "eddbID": 878,
-      "eps": 0.07,
-      "grp": "mr",
-      "hps": 1.08,
-      "id": "2e",
-      "integrity": 40,
-      "mass": 2,
-      "missile": "S",
-      "mount": "F",
-      "power": 0.6,
-      "rating": "B",
-      "reload": 12,
-      "rof": 0.3,
-      "roundspershot": 1,
-      "speed": 625,
+      "thermload": 3.6,
       "type": "E"
     },
     {
       "ammo": 120,
-      "armourpen": 60,
-      "breachdps": 3.6,
+      "breachdmg": 6,
       "breachmax": 0,
       "breachmin": 0,
       "class": 2,
       "clip": 12,
       "cost": 768600,
-      "dps": 72,
+      "damage": 7.5,
+      "distdraw": 0.24,
       "edID": 128671344,
       "eddbID": 1480,
-      "eps": 0.48,
+      "eps": 1.92,
       "grp": "mr",
-      "hps": 7.2,
+      "hps": 28.8,
       "id": "Ph",
       "integrity": 51,
       "mass": 4,
       "missile": "S",
       "mount": "F",
       "name": "Pack-Hound",
+      "piercing": 60,
       "power": 1.2,
       "pp": "Li Yong-Rui",
       "rating": "B",
@@ -165,6 +167,7 @@
       "rof": 2,
       "roundspershot": 4,
       "speed": 600,
+      "thermload": 3.6,
       "type": "E"
     }
   ]

modules/hardpoints/multi_cannon.json

@@ -2,303 +2,302 @@
   "mc": [
     {
       "ammo": 2100,
-      "armourpen": 68,
-      "breachdps": 25.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "clip": 90,
-      "cost": 1177600,
-      "dps": 28,
-      "edID": 128049458,
-      "eddbID": 1542,
-      "eps": 1.44,
-      "grp": "mc",
-      "hps": 2.4,
-      "id": "7n",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 0.73,
-      "range": 4000,
-      "rating": "A",
-      "reload": 4,
-      "rof": 3,
-      "roundspershot": 2,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 68,
-      "breachdps": 21.08,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "clip": 90,
-      "cost": 6377600,
-      "dps": 23.3,
-      "edID": 128681996,
-      "eddbID": 1546,
-      "eps": 2.516,
-      "grp": "mc",
-      "hps": 3.4,
-      "id": "7o",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 1.22,
-      "range": 4000,
-      "rating": "A",
-      "reload": 4,
-      "rof": 3.4,
-      "roundspershot": 2,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 54,
-      "breachdps": 20.65,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "clip": 90,
-      "cost": 140400,
-      "dps": 23.1,
-      "edID": 128049457,
-      "eddbID": 1541,
-      "eps": 1.062,
-      "grp": "mc",
-      "hps": 1.77,
-      "id": "7k",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 0.64,
-      "range": 4000,
-      "rating": "C",
-      "reload": 4,
-      "rof": 5.9,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 54,
-      "breachdps": 17.42,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "clip": 90,
-      "cost": 578436,
-      "dps": 18.9,
-      "edID": 128049461,
-      "eddbID": 1543,
-      "eps": 1.675,
-      "grp": "mc",
-      "hps": 2.01,
-      "id": "7l",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 0.97,
-      "range": 4000,
-      "rating": "C",
-      "reload": 4,
-      "rof": 6.7,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 37,
-      "breachdps": 14.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 90,
-      "cost": 38000,
-      "dps": 15.6,
-      "edID": 128049456,
-      "eddbID": 868,
-      "eps": 0.781,
-      "grp": "mc",
-      "hps": 1.42,
-      "id": "26",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "F",
-      "power": 0.46,
-      "range": 4000,
-      "rating": "E",
-      "reload": 4,
-      "rof": 7.1,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 37,
-      "breachdps": 11.55,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 90,
-      "cost": 57000,
-      "dps": 12.6,
-      "edID": 128049460,
-      "eddbID": 870,
-      "eps": 1.078,
-      "grp": "mc",
-      "hps": 1.54,
-      "id": "27",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "G",
-      "power": 0.64,
-      "range": 4000,
-      "rating": "F",
-      "reload": 4,
-      "rof": 7.7,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 37,
-      "breachdps": 6.82,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "clip": 90,
-      "cost": 1292800,
-      "dps": 7.3,
-      "edID": 128049463,
-      "eddbID": 872,
-      "eps": 0.372,
-      "grp": "mc",
-      "hps": 0.62,
-      "id": "28",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.5,
-      "range": 4000,
-      "rating": "F",
-      "reload": 4,
-      "rof": 6.2,
-      "roundspershot": 1,
-      "speed": 1600,
-      "type": "K"
-    },
-    {
-      "ammo": 2100,
-      "armourpen": 22,
-      "breachdps": 7.7,
+      "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 90,
       "cost": 9500,
-      "dps": 8.6,
+      "damage": 1.12,
+      "distdraw": 0.06,
       "edID": 128049455,
       "eddbID": 867,
-      "eps": 0.462,
       "grp": "mc",
-      "hps": 0.77,
       "id": "23",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 22,
       "power": 0.28,
       "range": 4000,
       "rating": "F",
       "reload": 4,
-      "rof": 7.7,
-      "roundspershot": 1,
+      "rof": 7.69,
       "speed": 1600,
+      "thermload": 0.1,
       "type": "K"
     },
     {
       "ammo": 2100,
-      "armourpen": 22,
-      "breachdps": 5.8,
+      "breachdmg": 0.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 90,
       "cost": 14250,
-      "dps": 6.8,
+      "damage": 0.82,
+      "distdraw": 0.07,
       "edID": 128049459,
       "eddbID": 869,
-      "eps": 0.58,
       "grp": "mc",
-      "hps": 0.83,
       "id": "24",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 22,
       "power": 0.37,
       "range": 4000,
       "rating": "G",
       "reload": 4,
-      "rof": 8.3,
-      "roundspershot": 1,
+      "rof": 8.33,
       "speed": 1600,
+      "thermload": 0.1,
       "type": "K"
     },
     {
       "ammo": 2100,
-      "armourpen": 22,
-      "breachdps": 3.55,
+      "breachdmg": 0.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 90,
       "cost": 81600,
-      "dps": 4,
+      "damage": 0.56,
+      "distdraw": 0.03,
       "edID": 128049462,
       "eddbID": 871,
-      "eps": 0.213,
       "grp": "mc",
-      "hps": 0,
       "id": "25",
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 22,
       "power": 0.26,
       "range": 4000,
       "rating": "G",
       "reload": 4,
-      "rof": 7.1,
-      "roundspershot": 1,
+      "rof": 7.14,
       "speed": 1600,
+      "thermload": 0,
       "type": "K"
     },
     {
       "ammo": 1000,
-      "armourpen": "A",
+      "breachdmg": 2.7,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
       "class": 1,
       "clip": 60,
       "cost": 13980,
-      "damage": 4,
-      "dps": 4,
+      "damage": 3,
+      "distdraw": 0.12,
       "eddbID": 1481,
       "grp": "mc",
       "id": "e0",
+      "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Enforcer",
+      "piercing": "A",
       "power": 0.28,
       "pp": "Pranav Antal",
+      "range": 4500,
       "rating": "F",
+      "reload": 8,
       "rof": 4.3,
-      "thermload": 1,
+      "speed": 1800,
+      "thermload": 0.2,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 38000,
+      "damage": 2.19,
+      "distdraw": 0.11,
+      "edID": 128049456,
+      "eddbID": 868,
+      "grp": "mc",
+      "id": "26",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 37,
+      "power": 0.46,
+      "range": 4000,
+      "rating": "E",
+      "reload": 4,
+      "rof": 7.14,
+      "speed": 1600,
+      "thermload": 0.2,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 1.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 57000,
+      "damage": 1.64,
+      "distdraw": 0.14,
+      "edID": 128049460,
+      "eddbID": 870,
+      "grp": "mc",
+      "id": "27",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 37,
+      "power": 0.64,
+      "range": 4000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 7.69,
+      "speed": 1600,
+      "thermload": 0.2,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 1.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "clip": 90,
+      "cost": 1292800,
+      "damage": 1.17,
+      "distdraw": 0.06,
+      "edID": 128049463,
+      "eddbID": 872,
+      "grp": "mc",
+      "id": "28",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 37,
+      "power": 0.5,
+      "range": 4000,
+      "rating": "F",
+      "reload": 4,
+      "rof": 6.25,
+      "speed": 1600,
+      "thermload": 0.1,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 3.5,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 90,
+      "cost": 140400,
+      "damage": 3.93,
+      "distdraw": 0.18,
+      "edID": 128049457,
+      "eddbID": 1541,
+      "grp": "mc",
+      "id": "7k",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 54,
+      "power": 0.64,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 5.88,
+      "speed": 1600,
+      "thermload": 0.3,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 2.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 90,
+      "cost": 578436,
+      "damage": 2.84,
+      "distdraw": 0.25,
+      "edID": 128049461,
+      "eddbID": 1543,
+      "grp": "mc",
+      "id": "7l",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 54,
+      "power": 0.97,
+      "range": 4000,
+      "rating": "C",
+      "reload": 4,
+      "rof": 6.665,
+      "speed": 1600,
+      "thermload": 0.3,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 4.2,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 90,
+      "cost": 1177600,
+      "damage": 4.62,
+      "distdraw": 0.24,
+      "edID": 128049458,
+      "eddbID": 1542,
+      "grp": "mc",
+      "id": "7n",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 68,
+      "power": 0.73,
+      "range": 4000,
+      "rating": "A",
+      "reload": 4,
+      "rof": 3.03,
+      "roundspershot": 2,
+      "speed": 1600,
+      "thermload": 0.4,
+      "type": "K"
+    },
+    {
+      "ammo": 2100,
+      "breachdmg": 3.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 90,
+      "cost": 6377600,
+      "damage": 3.46,
+      "distdraw": 0.37,
+      "edID": 128681996,
+      "eddbID": 1546,
+      "grp": "mc",
+      "id": "7o",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 68,
+      "power": 1.22,
+      "range": 4000,
+      "rating": "A",
+      "reload": 4,
+      "rof": 3.365,
+      "roundspershot": 2,
+      "speed": 1600,
+      "thermload": 0.5,
       "type": "K"
     }
   ]

modules/hardpoints/plasma_accelerator.json

@@ -2,116 +2,112 @@
   "pa": [
     {
       "ammo": 100,
-      "armourpen": 85,
-      "breachdps": 30.62,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "clip": 5,
-      "cost": 13793600,
-      "dps": 30,
-      "edID": 128049467,
-      "eddbID": 875,
-      "eps": 6.312,
-      "grp": "pa",
-      "hps": 8.85,
-      "id": "2c",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 2.63,
-      "range": 3500,
-      "rating": "A",
-      "reload": 8,
-      "rof": 0.3,
-      "roundspershot": 1,
-      "speed": 875,
-      "type": "KT"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 70,
-      "breachdps": 20.4,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "clip": 5,
-      "cost": 3051200,
-      "dps": 23.2,
-      "edID": 128049466,
-      "eddbID": 874,
-      "eps": 4.08,
-      "grp": "pa",
-      "hps": 6.54,
-      "id": "2b",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 1.97,
-      "range": 3500,
-      "rating": "B",
-      "reload": 8,
-      "rof": 0.3,
-      "roundspershot": 1,
-      "speed": 875,
-      "type": "KT"
-    },
-    {
-      "ammo": 100,
-      "armourpen": 55,
-      "breachdps": 13.26,
+      "breachdmg": 44.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "clip": 5,
       "cost": 834200,
-      "dps": 17.2,
+      "damage": 52,
+      "distdraw": 8.65,
       "edID": 128049465,
       "eddbID": 873,
-      "eps": 2.595,
       "grp": "pa",
-      "hps": 4.68,
       "id": "1g",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 55,
       "power": 1.43,
       "range": 3500,
       "rating": "C",
       "reload": 8,
-      "rof": 0.3,
-      "roundspershot": 1,
+      "rof": 0.33,
       "speed": 875,
+      "thermload": 15.6,
+      "type": "KT"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 68,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "clip": 5,
+      "cost": 3051200,
+      "damage": 79.93,
+      "distdraw": 13.6,
+      "edID": 128049466,
+      "eddbID": 874,
+      "grp": "pa",
+      "id": "2b",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 70,
+      "power": 1.97,
+      "range": 3500,
+      "rating": "B",
+      "reload": 8,
+      "rof": 0.29,
+      "speed": 875,
+      "thermload": 21.8,
       "type": "KT"
     },
     {
       "ammo": 300,
-      "armourpen": 70,
-      "breachdps": 22.48,
+      "breachdmg": 28.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
       "clip": 20,
       "cost": 4119120,
-      "dps": 27.5,
+      "damage": 33,
+      "distdraw": 5.5,
       "edID": 128671339,
       "eddbID": 1482,
-      "eps": 4.4,
       "grp": "pa",
-      "hps": 8.8,
       "id": "Ap",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
       "name": "Advanced Plasma Accelerator",
+      "piercing": 70,
       "power": 1.97,
       "pp": "Denton Patreus",
       "range": 3500,
       "rating": "B",
       "reload": 8,
       "rof": 0.8,
-      "roundspershot": 1,
       "speed": 875,
+      "thermload": 11,
+      "type": "KT"
+    },
+    {
+      "ammo": 100,
+      "breachdmg": 102,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "clip": 5,
+      "cost": 13793600,
+      "damage": 120,
+      "distdraw": 21.04,
+      "edID": 128049467,
+      "eddbID": 875,
+      "grp": "pa",
+      "id": "2c",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 85,
+      "power": 2.63,
+      "range": 3500,
+      "rating": "A",
+      "reload": 8,
+      "rof": 0.25,
+      "speed": 875,
+      "thermload": 29.5,
       "type": "KT"
     }
   ]

modules/hardpoints/point_defence.json

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

modules/hardpoints/pulse_laser.json

@@ -1,276 +1,280 @@
 {
   "pl": [
     {
-      "armourpen": 65,
-      "breachdps": 22.62,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 177600,
-      "dps": 26.9,
-      "edID": 128049384,
-      "eddbID": 1539,
-      "eps": 4.264,
-      "grp": "pl",
-      "hps": 4.16,
-      "id": "7q",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "F",
-      "power": 1.33,
-      "range": 3000,
-      "rating": "A",
-      "rof": 2.6,
-      "type": "T"
-    },
-    {
-      "armourpen": 65,
-      "breachdps": 18.48,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 4,
-      "cost": 877600,
-      "dps": 21.7,
-      "edID": 128681995,
-      "eddbID": 1545,
-      "eps": 4.368,
-      "grp": "pl",
-      "hps": 4.48,
-      "id": "7r",
-      "integrity": 80,
-      "mass": 16,
-      "mount": "G",
-      "power": 1.37,
-      "range": 3000,
-      "rating": "A",
-      "rof": 2.8,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 15.3,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 70400,
-      "dps": 18.1,
-      "edID": 128049383,
-      "eddbID": 825,
-      "eps": 2.88,
-      "grp": "pl",
-      "hps": 3,
-      "id": "1d",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "F",
-      "power": 0.9,
-      "range": 3000,
-      "rating": "D",
-      "rof": 3,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 12.48,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 140600,
-      "dps": 14.8,
-      "edID": 128049387,
-      "eddbID": 828,
-      "eps": 2.944,
-      "grp": "pl",
-      "hps": 2.88,
-      "id": "1e",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "G",
-      "power": 0.92,
-      "range": 3000,
-      "rating": "E",
-      "rof": 3.2,
-      "type": "T"
-    },
-    {
-      "armourpen": 52,
-      "breachdps": 8.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 3,
-      "cost": 400400,
-      "dps": 9.5,
-      "edID": 128049390,
-      "eddbID": 831,
-      "eps": 1.512,
-      "grp": "pl",
-      "hps": 1.62,
-      "id": "1f",
-      "integrity": 64,
-      "mass": 8,
-      "mount": "T",
-      "power": 0.89,
-      "range": 3000,
-      "rating": "F",
-      "rof": 2.7,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 10.2,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 17600,
-      "dps": 12.1,
-      "edID": 128049382,
-      "eddbID": 824,
-      "eps": 1.904,
-      "grp": "pl",
-      "hps": 2.04,
-      "id": "1a",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "F",
-      "power": 0.6,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3.4,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 8.28,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 35400,
-      "dps": 9.6,
-      "edID": 128049386,
-      "eddbID": 827,
-      "eps": 1.944,
-      "grp": "pl",
-      "hps": 1.8,
-      "id": "1b",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "G",
-      "power": 0.6,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3.6,
-      "type": "T"
-    },
-    {
-      "armourpen": 35,
-      "breachdps": 5.1,
-      "breachmax": 0.8,
-      "breachmin": 0.4,
-      "class": 2,
-      "cost": 132800,
-      "dps": 6.2,
-      "edID": 128049389,
-      "eddbID": 830,
-      "eps": 1,
-      "grp": "pl",
-      "hps": 0.9,
-      "id": "1c",
-      "integrity": 51,
-      "mass": 4,
-      "mount": "T",
-      "power": 0.58,
-      "range": 3000,
-      "rating": "F",
-      "rof": 3,
-      "type": "T"
-    },
-    {
-      "armourpen": 20,
-      "breachdps": 6.46,
+      "breachdmg": 2.04,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 2200,
-      "dps": 7.9,
+      "damage": 2.04,
+      "distdraw": 0.33,
       "edID": 128049381,
       "eddbID": 823,
-      "eps": 1.254,
       "grp": "pl",
-      "hps": 1.14,
       "id": "17",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 20,
       "power": 0.39,
       "range": 3000,
       "rating": "F",
-      "rof": 3.8,
+      "rof": 3.847,
+      "thermload": 0.3,
       "type": "T"
     },
     {
-      "armourpen": 20,
-      "breachdps": 5.2,
+      "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 6600,
-      "dps": 6.2,
+      "damage": 1.56,
+      "distdraw": 0.31,
       "edID": 128049385,
       "eddbID": 826,
-      "eps": 1.24,
       "grp": "pl",
-      "hps": 1.2,
       "id": "18",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 20,
       "power": 0.39,
       "range": 3000,
       "rating": "G",
-      "rof": 4,
+      "rof": 3.987,
+      "thermload": 0.3,
       "type": "T"
     },
     {
-      "armourpen": 20,
-      "breachdps": 3.3,
+      "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 26000,
-      "dps": 4,
+      "damage": 1.18,
+      "distdraw": 0.19,
       "edID": 128049388,
       "eddbID": 829,
-      "eps": 0.627,
       "grp": "pl",
-      "hps": 6.6,
       "id": "19",
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 20,
       "power": 0.38,
       "range": 3000,
       "rating": "G",
-      "rof": 3.3,
+      "rof": 3.339,
+      "thermload": 0.2,
       "type": "T"
     },
     {
-      "armourpen": "A",
+      "breachdmg": 3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 17600,
+      "damage": 3.49,
+      "distdraw": 0.56,
+      "edID": 128049382,
+      "eddbID": 824,
+      "grp": "pl",
+      "id": "1a",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 35,
+      "power": 0.6,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.448,
+      "thermload": 0.6,
+      "type": "T"
+    },
+    {
+      "breachdmg": 2.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 35400,
+      "damage": 2.68,
+      "distdraw": 0.54,
+      "edID": 128049386,
+      "eddbID": 827,
+      "grp": "pl",
+      "id": "1b",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "piercing": 35,
+      "power": 0.6,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.567,
+      "thermload": 0.5,
+      "type": "T"
+    },
+    {
+      "breachdmg": 1.7,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 2,
+      "cost": 132800,
+      "damage": 2.04,
+      "distdraw": 0.33,
+      "edID": 128049389,
+      "eddbID": 830,
+      "grp": "pl",
+      "id": "1c",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 35,
+      "power": 0.58,
+      "range": 3000,
+      "rating": "F",
+      "rof": 3.037,
+      "thermload": 0.3,
+      "type": "T"
+    },
+    {
+      "breachdmg": 2.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
       "class": 2,
       "cost": 26400,
-      "damage": 2,
-      "dps": 2,
+      "damage": 2.8,
+      "distdraw": 1,
       "eddbID": 1483,
       "grp": "pl",
       "id": "PL",
+      "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Disruptor",
+      "piercing": "A",
       "power": 0.7,
       "pp": "Felicia Winters",
       "rating": "E",
-      "rof": 1.6,
+      "rof": 1.664,
       "thermload": 1,
       "type": "T"
+    },
+    {
+      "breachdmg": 5.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 70400,
+      "damage": 5.98,
+      "distdraw": 0.96,
+      "edID": 128049383,
+      "eddbID": 825,
+      "grp": "pl",
+      "id": "1d",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "F",
+      "piercing": 52,
+      "power": 0.9,
+      "range": 3000,
+      "rating": "D",
+      "rof": 3.3,
+      "thermload": 1,
+      "type": "T"
+    },
+    {
+      "breachdmg": 3.9,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 140600,
+      "damage": 4.58,
+      "distdraw": 0.92,
+      "edID": 128049387,
+      "eddbID": 828,
+      "grp": "pl",
+      "id": "1e",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "G",
+      "piercing": 52,
+      "power": 0.92,
+      "range": 3000,
+      "rating": "E",
+      "rof": 3.223,
+      "thermload": 0.9,
+      "type": "T"
+    },
+    {
+      "breachdmg": 3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 3,
+      "cost": 400400,
+      "damage": 3.49,
+      "distdraw": 0.56,
+      "edID": 128049390,
+      "eddbID": 831,
+      "grp": "pl",
+      "id": "1f",
+      "integrity": 64,
+      "mass": 8,
+      "mount": "T",
+      "piercing": 52,
+      "power": 0.89,
+      "range": 3000,
+      "rating": "F",
+      "rof": 2.705,
+      "thermload": 0.6,
+      "type": "T"
+    },
+    {
+      "breachdmg": 8.7,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 177600,
+      "damage": 10.23,
+      "distdraw": 1.64,
+      "edID": 128049384,
+      "eddbID": 1539,
+      "grp": "pl",
+      "id": "7q",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "F",
+      "piercing": 65,
+      "power": 1.33,
+      "range": 3000,
+      "rating": "A",
+      "rof": 2.633,
+      "thermload": 1.6,
+      "type": "T"
+    },
+    {
+      "breachdmg": 6.6,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "class": 4,
+      "cost": 877600,
+      "damage": 7.82,
+      "distdraw": 1.56,
+      "edID": 128681995,
+      "eddbID": 1545,
+      "grp": "pl",
+      "id": "7r",
+      "integrity": 80,
+      "mass": 16,
+      "mount": "G",
+      "piercing": 65,
+      "power": 1.37,
+      "range": 3000,
+      "rating": "A",
+      "rof": 2.777,
+      "thermload": 1.6,
+      "type": "T"
     }
   ]
 }

modules/hardpoints/rail_gun.json

@@ -2,76 +2,83 @@
   "rg": [
     {
       "ammo": 30,
-      "armourpen": 30,
-      "breachdps": 35.2,
+      "breachdmg": 22.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 1,
       "cost": 51600,
-      "dps": 37,
+      "damage": 23.3,
+      "distdraw": 2.69,
       "edID": 128049488,
       "eddbID": 876,
-      "eps": 4.3,
       "grp": "rg",
-      "hps": 28.48,
       "id": "29",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 30,
       "power": 1.15,
       "range": 3000,
       "rating": "D",
       "reload": 1,
       "rof": 1.6,
+      "thermload": 17.8,
       "type": "KT"
     },
     {
       "ammo": 30,
-      "armourpen": 48,
-      "breachdps": 47.4,
+      "breachdmg": 39.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "clip": 1,
       "cost": 412800,
-      "dps": 50,
+      "damage": 41.5,
+      "distdraw": 5.11,
       "edID": 128049489,
       "eddbID": 877,
-      "eps": 6.132,
       "grp": "rg",
-      "hps": 36,
       "id": "2a",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 48,
       "power": 1.63,
       "range": 3000,
       "rating": "B",
       "reload": 1,
       "rof": 1.2,
+      "thermload": 30,
       "type": "KT"
     },
     {
       "ammo": 90,
-      "armourpen": "A",
+      "breachdmg": 14.3,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "burst": 3,
+      "burstrof": 6,
       "class": 2,
       "clip": 3,
       "cost": 619200,
-      "damage": 5,
-      "dps": 5,
+      "damage": 15,
+      "distdraw": 2,
       "edID": 128671341,
       "eddbID": 1484,
       "grp": "rg",
       "id": "ih",
+      "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Imperial Hammer",
+      "piercing": "A",
       "power": 1.63,
       "pp": "Arissa Lavigny-Duval",
       "rating": "B",
-      "rof": 0.6,
-      "thermload": 3,
+      "reload": 1,
+      "rof": 4.1,
+      "thermload": 16,
       "type": "KT"
     }
   ]

modules/hardpoints/shield_booster.json

@@ -12,7 +12,7 @@
       "passive": 1,
       "power": 0.2,
       "rating": "E",
-      "shieldmul": 0.04
+      "shieldboost": 0.04
     },
     {
       "class": 0,
@@ -26,7 +26,7 @@
       "passive": 1,
       "power": 0.5,
       "rating": "D",
-      "shieldmul": 0.08
+      "shieldboost": 0.08
     },
     {
       "class": 0,
@@ -40,7 +40,7 @@
       "passive": 1,
       "power": 0.7,
       "rating": "C",
-      "shieldmul": 0.12
+      "shieldboost": 0.12
     },
     {
       "class": 0,
@@ -54,7 +54,7 @@
       "passive": 1,
       "power": 1,
       "rating": "B",
-      "shieldmul": 0.16
+      "shieldboost": 0.16
     },
     {
       "class": 0,
@@ -68,7 +68,7 @@
       "passive": 1,
       "power": 1.2,
       "rating": "A",
-      "shieldmul": 0.2
+      "shieldboost": 0.2
     }
   ]
 }

modules/hardpoints/torpedo_pylon.json

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

modules/index.js

@@ -23,10 +23,13 @@ module.exports = {
     nl: require('./hardpoints/mine_launcher').nl,
     ml: require('./hardpoints/mining_laser').ml,
     cs: require('./hardpoints/cargo_scanner').cs,
-    cm: require('./hardpoints/countermeasures').cm,
     ws: require('./hardpoints/frame_shift_wake_scanner').ws,
     kw: require('./hardpoints/kill_warrant_scanner').kw,
-    sb: require('./hardpoints/shield_booster').sb
+    sb: require('./hardpoints/shield_booster').sb,
+    ch: require('./hardpoints/chaff_launcher').ch,
+    ec: require('./hardpoints/electronic_countermeasure').ec,
+    hs: require('./hardpoints/heat_sink_launcher').hs,
+    po: require('./hardpoints/point_defence').po
   },
   internal: {
     am: require('./internal/auto_field_maintenance_unit').am,

modules/internal/bi_weave_shield_generator.json

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

modules/internal/business_passenger_cabin.json

@@ -2,7 +2,8 @@
   "pci": [
     {
       "class": 3,
-      "cost": -1,
+      "cost": 26720,
+      "edID": 128734692,
       "eddbID": 1568,
       "grp": "pci",
       "id": "mf",
@@ -12,7 +13,8 @@
     },
     {
       "class": 4,
-      "cost": -1,
+      "cost": 56870,
+      "edID": 128727923,
       "eddbID": 1569,
       "grp": "pci",
       "id": "mg",
@@ -22,7 +24,8 @@
     },
     {
       "class": 5,
-      "cost": -1,
+      "cost": 92370,
+      "edID": 128734694,
       "eddbID": 1570,
       "grp": "pci",
       "id": "mh",
@@ -32,7 +35,8 @@
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 184240,
+      "edID": 128727927,
       "eddbID": 1571,
       "grp": "pci",
       "id": "mi",

modules/internal/economy_passenger_cabin.json

@@ -2,7 +2,8 @@
   "pce": [
     {
       "class": 2,
-      "cost": -1,
+      "cost": 4320,
+      "edID": 128734690,
       "eddbID": 1563,
       "grp": "pce",
       "id": "ma",
@@ -12,7 +13,8 @@
     },
     {
       "class": 3,
-      "cost": -1,
+      "cost": 8670,
+      "edID": 128734691,
       "eddbID": 1564,
       "grp": "pce",
       "id": "mb",
@@ -22,7 +24,8 @@
     },
     {
       "class": 4,
-      "cost": -1,
+      "cost": 18960,
+      "edID": 128727922,
       "eddbID": 1565,
       "grp": "pce",
       "id": "mc",
@@ -32,7 +35,8 @@
     },
     {
       "class": 5,
-      "cost": -1,
+      "cost": 34960,
+      "edID": 128734693,
       "eddbID": 1566,
       "grp": "pce",
       "id": "md",
@@ -42,7 +46,8 @@
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 61420,
+      "edID": 12872926,
       "eddbID": 1567,
       "grp": "pce",
       "id": "me",

modules/internal/fighter_hangar.json

@@ -3,8 +3,10 @@
     {
       "bays": 2,
       "class": 7,
-      "cost": -1,
-      "eddbID": 1560,
+      "cost": 575660,
+      "edID": 128727932,
+      "eddbID": 1562,
+      "fightercost": 1030,
       "grp": "fh",
       "id": "fh",
       "mass": 60,
@@ -15,8 +17,10 @@
     {
       "bays": 2,
       "class": 6,
-      "cost": -1,
+      "cost": 1869350,
+      "edID": 128727931,
       "eddbID": 1561,
+      "fightercost": 1030,
       "grp": "fh",
       "id": "fm",
       "mass": 40,
@@ -27,8 +31,10 @@
     {
       "bays": 1,
       "class": 5,
-      "cost": -1,
-      "eddbID": 1562,
+      "cost": 2369330,
+      "edID": 128727930,
+      "eddbID": 1560,
+      "fightercost": 1030,
       "grp": "fh",
       "id": "fr",
       "mass": 20,

modules/internal/first_passenger_cabin.json

@@ -2,7 +2,8 @@
   "pcm": [
     {
       "class": 4,
-      "cost": -1,
+      "cost": 170600,
+      "edID": 128727924,
       "eddbID": 1572,
       "grp": "pcm",
       "id": "mj",
@@ -12,7 +13,8 @@
     },
     {
       "class": 5,
-      "cost": -1,
+      "cost": 340540,
+      "edID": 128734695,
       "eddbID": 1573,
       "grp": "pcm",
       "id": "mk",
@@ -22,7 +24,8 @@
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 552700,
+      "edID": 128727928,
       "eddbID": 1574,
       "grp": "pcm",
       "id": "ml",

modules/internal/frame_shift_drive_interdictor.json

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

modules/internal/hull_reinforcement_package.json

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

modules/internal/luxury_passenger_cabin.json

@@ -2,7 +2,8 @@
   "pcq": [
     {
       "class": 5,
-      "cost": -1,
+      "cost": 1658100,
+      "edID": 128727925,
       "eddbID": 1575,
       "grp": "pcq",
       "id": "mm",
@@ -12,7 +13,8 @@
     },
     {
       "class": 6,
-      "cost": -1,
+      "cost": 4974300,
+      "edID": 128727929,
       "eddbID": 1576,
       "grp": "pcq",
       "id": "mn",

modules/internal/pristmatic_shield_generator.json

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

modules/internal/shield_cell_bank.json

@@ -2,603 +2,803 @@
   "scb": [
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 6,
       "class": 8,
-      "cost": 697580,
+      "cost": 697584,
+      "duration": 17,
       "edID": 128064333,
       "eddbID": 1186,
       "grp": "scb",
       "id": "65",
+      "integrity": 120,
       "mass": 160,
       "power": 1.44,
       "rating": "E",
-      "recharge": 475,
-      "rechargeRating": "C"
+      "shieldreinforcement": 476,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 800
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 8,
-      "cost": 1743960,
+      "cost": 1743961,
+      "duration": 17,
       "edID": 128064334,
       "eddbID": 1187,
       "grp": "scb",
       "id": "64",
+      "integrity": 90,
       "mass": 64,
       "power": 1.92,
       "rating": "D",
-      "recharge": 630,
-      "rechargeRating": "C"
+      "shieldreinforcement": 629,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 800
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 8,
-      "cost": 4359900,
+      "cost": 4359903,
+      "duration": 17,
       "edID": 128064335,
       "eddbID": 1188,
       "grp": "scb",
       "id": "63",
+      "integrity": 150,
       "mass": 160,
       "power": 2.4,
       "rating": "C",
-      "recharge": 790,
-      "rechargeRating": "B"
+      "shieldreinforcement": 799,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 800
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 6,
       "class": 8,
-      "cost": 10899760,
+      "cost": 10899756,
+      "duration": 17,
       "edID": 128064336,
       "eddbID": 1189,
       "grp": "scb",
       "id": "62",
+      "integrity": 210,
       "mass": 256,
       "power": 2.88,
       "rating": "B",
-      "recharge": 950,
-      "rechargeRating": "A"
+      "shieldreinforcement": 952,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 800
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 8,
-      "cost": 27249390,
+      "cost": 27249391,
+      "duration": 17,
       "edID": 128064337,
       "eddbID": 1190,
       "grp": "scb",
       "id": "61",
+      "integrity": 180,
       "mass": 160,
       "power": 3.36,
       "rating": "A",
-      "recharge": 1105,
-      "rechargeRating": "A"
+      "shieldreinforcement": 1105,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 800
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 6,
       "class": 7,
-      "cost": 249140,
+      "cost": 249137,
+      "duration": 11,
       "edID": 128064328,
       "eddbID": 1181,
       "grp": "scb",
       "id": "60",
+      "integrity": 105,
       "mass": 80,
       "power": 1.24,
       "rating": "E",
-      "recharge": 280,
-      "rechargeRating": "D"
+      "shieldreinforcement": 264,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 720
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 7,
-      "cost": 622840,
+      "cost": 622843,
+      "duration": 11,
       "edID": 128064329,
       "eddbID": 1182,
       "grp": "scb",
       "id": "5v",
+      "integrity": 79,
       "mass": 32,
       "power": 1.66,
       "rating": "D",
-      "recharge": 370,
-      "rechargeRating": "C"
+      "shieldreinforcement": 352,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 720
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 7,
-      "cost": 1557110,
+      "cost": 1557108,
+      "duration": 11,
       "edID": 128064330,
       "eddbID": 1183,
       "grp": "scb",
       "id": "5u",
+      "integrity": 131,
       "mass": 80,
       "power": 2.07,
       "rating": "C",
-      "recharge": 465,
-      "rechargeRating": "B"
+      "shieldreinforcement": 451,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 720
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 6,
       "class": 7,
       "cost": 3892770,
+      "duration": 11,
       "edID": 128064331,
       "eddbID": 1184,
       "grp": "scb",
       "id": "5t",
+      "integrity": 183,
       "mass": 128,
       "power": 2.48,
       "rating": "B",
-      "recharge": 560,
-      "rechargeRating": "B"
+      "shieldreinforcement": 539,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 720
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 7,
-      "cost": 9731930,
+      "cost": 9731925,
+      "duration": 11,
       "edID": 128064332,
       "eddbID": 1185,
       "grp": "scb",
       "id": "5s",
+      "integrity": 157,
       "mass": 80,
       "power": 2.9,
       "rating": "A",
-      "recharge": 650,
-      "rechargeRating": "A"
+      "shieldreinforcement": 627,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 720
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 6,
       "class": 6,
-      "cost": 88980,
+      "cost": 88987,
+      "duration": 8,
       "edID": 128064323,
       "eddbID": 1176,
       "grp": "scb",
       "id": "5r",
+      "integrity": 90,
       "mass": 40,
       "power": 1.06,
       "rating": "E",
-      "recharge": 150,
-      "rechargeRating": "D"
+      "shieldreinforcement": 160,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 6,
-      "cost": 222440,
+      "cost": 222444,
+      "duration": 8,
       "edID": 128064324,
       "eddbID": 1177,
       "grp": "scb",
       "id": "5q",
+      "integrity": 68,
       "mass": 16,
       "power": 1.42,
       "rating": "D",
-      "recharge": 200,
-      "rechargeRating": "C"
+      "shieldreinforcement": 208,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 6,
       "cost": 556110,
+      "duration": 8,
       "edID": 128064325,
       "eddbID": 1178,
       "grp": "scb",
       "id": "5p",
+      "integrity": 113,
       "mass": 40,
       "power": 1.77,
       "rating": "C",
-      "recharge": 250,
-      "rechargeRating": "C"
+      "shieldreinforcement": 264,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 6,
       "class": 6,
-      "cost": 1390280,
+      "cost": 1390275,
+      "duration": 8,
       "edID": 128064326,
       "eddbID": 1179,
       "grp": "scb",
       "id": "5o",
+      "integrity": 158,
       "mass": 64,
       "power": 2.12,
       "rating": "B",
-      "recharge": 300,
-      "rechargeRating": "B"
+      "shieldreinforcement": 312,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 6,
-      "cost": 3475690,
+      "cost": 3475688,
+      "duration": 8,
       "edID": 128064327,
       "eddbID": 1180,
       "grp": "scb",
       "id": "5n",
+      "integrity": 136,
       "mass": 40,
       "power": 2.48,
       "rating": "A",
-      "recharge": 350,
-      "rechargeRating": "A"
+      "shieldreinforcement": 368,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 640
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 5,
-      "cost": 31780,
+      "cost": 31778,
+      "duration": 5,
       "edID": 128064318,
       "eddbID": 1171,
       "grp": "scb",
       "id": "5m",
+      "integrity": 77,
       "mass": 20,
       "power": 0.9,
       "rating": "E",
-      "recharge": 105,
-      "rechargeRating": "D"
+      "shieldreinforcement": 105,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 540
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 3,
       "class": 5,
-      "cost": 79440,
+      "cost": 79444,
+      "duration": 5,
       "edID": 128064319,
       "eddbID": 1172,
       "grp": "scb",
       "id": "5l",
+      "integrity": 58,
       "mass": 8,
       "power": 1.2,
       "rating": "D",
-      "recharge": 140,
-      "rechargeRating": "C"
+      "shieldreinforcement": 140,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 540
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 5,
-      "cost": 198610,
+      "cost": 194143,
+      "duration": 5,
       "edID": 128064320,
       "eddbID": 1173,
       "grp": "scb",
       "id": "5k",
+      "integrity": 96,
       "mass": 20,
       "power": 1.5,
       "rating": "C",
-      "recharge": 175,
-      "rechargeRating": "C"
+      "shieldreinforcement": 175,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 540
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 5,
-      "cost": 496530,
+      "cost": 496527,
+      "duration": 5,
       "edID": 128064321,
       "eddbID": 1174,
       "grp": "scb",
       "id": "5j",
+      "integrity": 134,
       "mass": 32,
       "power": 1.8,
       "rating": "B",
-      "recharge": 210,
-      "rechargeRating": "B"
+      "shieldreinforcement": 205,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 540
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 5,
-      "cost": 1241320,
+      "cost": 1210285,
+      "duration": 5,
       "edID": 128064322,
       "eddbID": 1175,
       "grp": "scb",
       "id": "5i",
+      "integrity": 115,
       "mass": 20,
       "power": 2.1,
       "rating": "A",
-      "recharge": 245,
-      "rechargeRating": "B"
+      "shieldreinforcement": 240,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 540
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 4,
-      "cost": 11350,
+      "cost": 11349,
+      "duration": 3,
       "edID": 128064313,
       "eddbID": 1166,
       "grp": "scb",
       "id": "5h",
+      "integrity": 64,
       "mass": 10,
       "power": 0.74,
       "rating": "E",
-      "recharge": 65,
-      "rechargeRating": "D"
+      "shieldreinforcement": 60,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 410
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 3,
       "class": 4,
-      "cost": 28370,
+      "cost": 28373,
+      "duration": 3,
       "edID": 128064314,
       "eddbID": 1167,
       "grp": "scb",
       "id": "5g",
+      "integrity": 48,
       "mass": 4,
       "power": 0.98,
       "rating": "D",
-      "recharge": 90,
-      "rechargeRating": "D"
+      "shieldreinforcement": 78,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 410
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 4,
-      "cost": 70930,
+      "cost": 70932,
+      "duration": 3,
       "edID": 128064315,
       "eddbID": 1168,
       "grp": "scb",
       "id": "5f",
+      "integrity": 80,
       "mass": 10,
       "power": 1.23,
       "rating": "C",
-      "recharge": 110,
-      "rechargeRating": "C"
+      "shieldreinforcement": 99,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 410
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 4,
-      "cost": 177330,
+      "cost": 177331,
+      "duration": 3,
       "edID": 128064316,
       "eddbID": 1169,
       "grp": "scb",
       "id": "5e",
+      "integrity": 112,
       "mass": 16,
       "power": 1.48,
       "rating": "B",
-      "recharge": 135,
-      "rechargeRating": "C"
+      "shieldreinforcement": 117,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 410
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 4,
-      "cost": 443330,
+      "cost": 443328,
+      "duration": 3,
       "edID": 128064317,
       "eddbID": 1170,
       "grp": "scb",
       "id": "5d",
+      "integrity": 96,
       "mass": 10,
       "power": 1.72,
       "rating": "A",
-      "recharge": 155,
-      "rechargeRating": "B"
+      "shieldreinforcement": 138,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 410
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 3,
-      "cost": 4050,
+      "cost": 4053,
+      "duration": 2,
       "edID": 128064308,
       "eddbID": 1161,
       "grp": "scb",
       "id": "5c",
+      "integrity": 51,
       "mass": 5,
       "power": 0.61,
       "rating": "E",
-      "recharge": 40,
-      "rechargeRating": "D"
+      "shieldreinforcement": 34,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 340
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 3,
       "class": 3,
-      "cost": 10130,
+      "cost": 10133,
+      "duration": 2,
       "edID": 128064309,
       "eddbID": 1162,
       "grp": "scb",
       "id": "5b",
+      "integrity": 38,
       "mass": 2,
       "power": 0.82,
       "rating": "D",
-      "recharge": 50,
-      "rechargeRating": "D"
+      "shieldreinforcement": 46,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 340
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 3,
-      "cost": 25330,
+      "cost": 25333,
+      "duration": 2,
       "edID": 128064310,
       "eddbID": 1163,
       "grp": "scb",
       "id": "5a",
+      "integrity": 64,
       "mass": 5,
       "power": 1.02,
       "rating": "C",
-      "recharge": 65,
-      "rechargeRating": "D"
+      "shieldreinforcement": 58,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 340
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 3,
-      "cost": 63330,
+      "cost": 61909,
+      "duration": 2,
       "edID": 128064311,
       "eddbID": 1164,
       "grp": "scb",
       "id": "59",
+      "integrity": 90,
       "mass": 8,
       "power": 1.22,
       "rating": "B",
-      "recharge": 80,
-      "rechargeRating": "C"
+      "shieldreinforcement": 70,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 340
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 3,
-      "cost": 158330,
+      "cost": 158331,
+      "duration": 2,
       "edID": 128064312,
       "eddbID": 1165,
       "grp": "scb",
       "id": "58",
+      "integrity": 77,
       "mass": 5,
       "power": 1.43,
       "rating": "A",
-      "recharge": 90,
-      "rechargeRating": "C"
+      "shieldreinforcement": 82,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 340
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 2,
-      "cost": 11,
+      "cost": 1448,
+      "duration": 2,
       "edID": 128064303,
       "eddbID": 1156,
       "grp": "scb",
       "id": "57",
+      "integrity": 41,
       "mass": 2.5,
       "power": 0.5,
       "rating": "E",
-      "recharge": 25,
-      "rechargeRating": "E"
+      "shieldreinforcement": 28,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 240
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 3,
       "class": 2,
-      "cost": 3620,
+      "cost": 3619,
+      "duration": 2,
       "edID": 128064304,
       "eddbID": 1157,
       "grp": "scb",
       "id": "56",
+      "integrity": 31,
       "mass": 1,
       "power": 0.67,
       "rating": "D",
-      "recharge": 30,
-      "rechargeRating": "D"
+      "shieldreinforcement": 36,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 240
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 2,
-      "cost": 9050,
+      "cost": 9048,
+      "duration": 2,
       "edID": 128064305,
       "eddbID": 1158,
       "grp": "scb",
       "id": "55",
+      "integrity": 51,
       "mass": 2.5,
       "power": 0.84,
       "rating": "C",
-      "recharge": 38,
-      "rechargeRating": "D"
+      "shieldreinforcement": 46,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 240
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 5,
       "class": 2,
-      "cost": 22620,
+      "cost": 22619,
+      "duration": 2,
       "edID": 128064306,
       "eddbID": 1159,
       "grp": "scb",
       "id": "54",
+      "integrity": 71,
       "mass": 4,
       "power": 1.01,
       "rating": "B",
-      "recharge": 45,
-      "rechargeRating": "D"
+      "shieldreinforcement": 56,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 240
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 2,
-      "cost": 56550,
+      "cost": 56547,
+      "duration": 2,
       "edID": 128064307,
       "eddbID": 1160,
       "grp": "scb",
       "id": "53",
+      "integrity": 61,
       "mass": 2.5,
       "power": 1.18,
       "rating": "A",
-      "recharge": 55,
-      "rechargeRating": "C"
+      "shieldreinforcement": 64,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 240
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 1,
-      "cost": 520,
+      "cost": 517,
+      "duration": 1,
       "edID": 128064298,
       "eddbID": 1151,
       "grp": "scb",
       "id": "52",
+      "integrity": 32,
       "mass": 1.3,
       "power": 0.41,
       "rating": "E",
-      "recharge": 10,
-      "rechargeRating": "E"
+      "shieldreinforcement": 12,
+      "rechargerating": "E",
+      "spinup": 5,
+      "thermload": 170
     },
     {
       "ammocost": 300,
-      "cells": 2,
+      "boot": 25,
+      "cells": 1,
       "class": 1,
-      "cost": 1290,
+      "cost": 1293,
+      "duration": 1,
       "edID": 128064299,
       "eddbID": 1152,
       "grp": "scb",
       "id": "51",
+      "integrity": 24,
       "mass": 0.5,
       "power": 0.55,
       "rating": "D",
-      "recharge": 12.5,
-      "rechargeRating": "E"
+      "shieldreinforcement": 12.5,
+      "rechargerating": "D",
+      "spinup": 5,
+      "thermload": 170
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 3,
       "class": 1,
-      "cost": 3230,
+      "cost": 3231,
+      "duration": 1,
       "edID": 128064300,
       "eddbID": 1153,
       "grp": "scb",
       "id": "50",
+      "integrity": 40,
       "mass": 1.3,
       "power": 0.69,
       "rating": "C",
-      "recharge": 15,
-      "rechargeRating": "D"
+      "shieldreinforcement": 20,
+      "rechargerating": "C",
+      "spinup": 5,
+      "thermload": 170
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 4,
       "class": 1,
-      "cost": 8080,
+      "cost": 8078,
+      "duration": 1,
       "edID": 128064301,
       "eddbID": 1154,
       "grp": "scb",
       "id": "4v",
+      "integrity": 56,
       "mass": 2,
       "power": 0.83,
       "rating": "B",
-      "recharge": 20,
-      "rechargeRating": "D"
+      "shieldreinforcement": 24,
+      "rechargerating": "B",
+      "spinup": 5,
+      "thermload": 170
     },
     {
       "ammocost": 300,
+      "boot": 25,
       "cells": 3,
       "class": 1,
-      "cost": 20200,
+      "cost": 20195,
+      "duration": 1,
       "edID": 128064302,
       "eddbID": 1155,
       "grp": "scb",
       "id": "4u",
+      "integrity": 48,
       "mass": 1.3,
       "power": 0.97,
       "rating": "A",
-      "recharge": 25,
-      "rechargeRating": "D"
+      "shieldreinforcement": 28,
+      "rechargerating": "A",
+      "spinup": 5,
+      "thermload": 170
     }
   ]
 }

modules/internal/shield_generator.json

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

modules/standard/frame_shift_drive.json

@@ -9,6 +9,7 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fy",
+      "integrity": 93,
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
@@ -24,6 +25,7 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fx",
+      "integrity": 37,
       "mass": 64,
       "maxfuel": 0,
       "optmass": 0,
@@ -39,6 +41,7 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fw",
+      "integrity": 46,
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
@@ -54,6 +57,7 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fv",
+      "integrity": 74,
       "mass": 256,
       "maxfuel": 0,
       "optmass": 0,
@@ -69,6 +73,7 @@
       "fuelpower": 2.9,
       "grp": "fsd",
       "id": "Fu",
+      "integrity": 46,
       "mass": 160,
       "maxfuel": 0,
       "optmass": 0,
@@ -84,6 +89,7 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Ft",
+      "integrity": 118,
       "mass": 80,
       "maxfuel": 8.5,
       "optmass": 1440,
@@ -99,6 +105,7 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fs",
+      "integrity": 105,
       "mass": 32,
       "maxfuel": 8.5,
       "optmass": 1620,
@@ -114,6 +121,7 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fr",
+      "integrity": 131,
       "mass": 80,
       "maxfuel": 8.5,
       "optmass": 1800,
@@ -129,6 +137,7 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fq",
+      "integrity": 157,
       "mass": 128,
       "maxfuel": 10.6,
       "optmass": 2250,
@@ -144,6 +153,7 @@
       "fuelpower": 2.75,
       "grp": "fsd",
       "id": "Fp",
+      "integrity": 144,
       "mass": 80,
       "maxfuel": 12.8,
       "optmass": 2700,
@@ -159,6 +169,7 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fo",
+      "integrity": 102,
       "mass": 40,
       "maxfuel": 5.3,
       "optmass": 960,
@@ -174,6 +185,7 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fn",
+      "integrity": 90,
       "mass": 16,
       "maxfuel": 5.3,
       "optmass": 1080,
@@ -189,6 +201,7 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fm",
+      "integrity": 113,
       "mass": 40,
       "maxfuel": 5.3,
       "optmass": 1200,
@@ -204,6 +217,7 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fl",
+      "integrity": 136,
       "mass": 64,
       "maxfuel": 6.6,
       "optmass": 1500,
@@ -219,6 +233,7 @@
       "fuelpower": 2.6,
       "grp": "fsd",
       "id": "Fk",
+      "integrity": 124,
       "mass": 40,
       "maxfuel": 8,
       "optmass": 1800,
@@ -234,6 +249,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fj",
+      "integrity": 86,
       "mass": 20,
       "maxfuel": 3.3,
       "optmass": 560,
@@ -249,6 +265,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fi",
+      "integrity": 77,
       "mass": 8,
       "maxfuel": 3.3,
       "optmass": 630,
@@ -264,6 +281,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fh",
+      "integrity": 96,
       "mass": 20,
       "maxfuel": 3.3,
       "optmass": 700,
@@ -279,6 +297,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Fg",
+      "integrity": 115,
       "mass": 32,
       "maxfuel": 4.1,
       "optmass": 875,
@@ -294,6 +313,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Ff",
+      "integrity": 106,
       "mass": 20,
       "maxfuel": 5,
       "optmass": 1050,
@@ -309,6 +329,7 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fe",
+      "integrity": 72,
       "mass": 10,
       "maxfuel": 2,
       "optmass": 280,
@@ -324,6 +345,7 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fd",
+      "integrity": 64,
       "mass": 4,
       "maxfuel": 2,
       "optmass": 315,
@@ -339,6 +361,7 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fc",
+      "integrity": 80,
       "mass": 10,
       "maxfuel": 2,
       "optmass": 350,
@@ -354,9 +377,10 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fb",
+      "integrity": 96,
       "mass": 16,
       "maxfuel": 2.5,
-      "optmass": 438,
+      "optmass": 437.5,
       "power": 0.38,
       "rating": "B"
     },
@@ -369,6 +393,7 @@
       "fuelpower": 2.3,
       "grp": "fsd",
       "id": "Fa",
+      "integrity": 88,
       "mass": 10,
       "maxfuel": 3,
       "optmass": 525,
@@ -384,6 +409,7 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F9",
+      "integrity": 58,
       "mass": 5,
       "maxfuel": 1.2,
       "optmass": 80,
@@ -399,6 +425,7 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F8",
+      "integrity": 51,
       "mass": 2,
       "maxfuel": 1.2,
       "optmass": 90,
@@ -414,6 +441,7 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F7",
+      "integrity": 64,
       "mass": 5,
       "maxfuel": 1.2,
       "optmass": 100,
@@ -429,6 +457,7 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F6",
+      "integrity": 77,
       "mass": 8,
       "maxfuel": 1.5,
       "optmass": 125,
@@ -444,6 +473,7 @@
       "fuelpower": 2.15,
       "grp": "fsd",
       "id": "F5",
+      "integrity": 70,
       "mass": 5,
       "maxfuel": 1.8,
       "optmass": 150,
@@ -459,6 +489,7 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F4",
+      "integrity": 46,
       "mass": 2.5,
       "maxfuel": 0.6,
       "optmass": 48,
@@ -474,6 +505,7 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F3",
+      "integrity": 41,
       "mass": 1,
       "maxfuel": 0.6,
       "optmass": 54,
@@ -489,6 +521,7 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F2",
+      "integrity": 51,
       "mass": 2.5,
       "maxfuel": 0.6,
       "optmass": 60,
@@ -504,6 +537,7 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F1",
+      "integrity": 61,
       "mass": 4,
       "maxfuel": 0.8,
       "optmass": 75,
@@ -519,6 +553,7 @@
       "fuelpower": 2,
       "grp": "fsd",
       "id": "F0",
+      "integrity": 56,
       "mass": 2.5,
       "maxfuel": 0.9,
       "optmass": 90,

modules/standard/life_support.json

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

modules/standard/power_distributor.json

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

modules/standard/power_plant.json

@@ -5,11 +5,12 @@
       "cost": 2007240,
       "edID": 128064063,
       "eddbID": 921,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "py",
+      "integrity": 135,
       "mass": 160,
-      "pGen": 24,
+      "pgen": 24,
       "rating": "E"
     },
     {
@@ -17,11 +18,12 @@
       "cost": 6021720,
       "edID": 128064064,
       "eddbID": 922,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "px",
+      "integrity": 120,
       "mass": 64,
-      "pGen": 27,
+      "pgen": 27,
       "rating": "D"
     },
     {
@@ -29,11 +31,12 @@
       "cost": 18065170,
       "edID": 128064065,
       "eddbID": 923,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pw",
+      "integrity": 150,
       "mass": 80,
-      "pGen": 30,
+      "pgen": 30,
       "rating": "C"
     },
     {
@@ -41,11 +44,12 @@
       "cost": 54195500,
       "edID": 128064066,
       "eddbID": 924,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pv",
+      "integrity": 180,
       "mass": 128,
-      "pGen": 33,
+      "pgen": 33,
       "rating": "B"
     },
     {
@@ -53,11 +57,12 @@
       "cost": 162586490,
       "edID": 128064067,
       "eddbID": 925,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pu",
+      "integrity": 165,
       "mass": 80,
-      "pGen": 36,
+      "pgen": 36,
       "rating": "A"
     },
     {
@@ -65,11 +70,12 @@
       "cost": 633200,
       "edID": 128064058,
       "eddbID": 916,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "pt",
+      "integrity": 118,
       "mass": 80,
-      "pGen": 20,
+      "pgen": 20,
       "rating": "E"
     },
     {
@@ -77,11 +83,12 @@
       "cost": 1899600,
       "edID": 128064059,
       "eddbID": 917,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "ps",
+      "integrity": 105,
       "mass": 32,
-      "pGen": 22.5,
+      "pgen": 22.5,
       "rating": "D"
     },
     {
@@ -89,11 +96,12 @@
       "cost": 5698790,
       "edID": 128064060,
       "eddbID": 918,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pr",
+      "integrity": 131,
       "mass": 40,
-      "pGen": 25,
+      "pgen": 25,
       "rating": "C"
     },
     {
@@ -101,11 +109,12 @@
       "cost": 17096370,
       "edID": 128064061,
       "eddbID": 919,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pq",
+      "integrity": 157,
       "mass": 64,
-      "pGen": 27.5,
+      "pgen": 27.5,
       "rating": "B"
     },
     {
@@ -113,11 +122,12 @@
       "cost": 51289110,
       "edID": 128064062,
       "eddbID": 920,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pp",
+      "integrity": 144,
       "mass": 40,
-      "pGen": 30,
+      "pgen": 30,
       "rating": "A"
     },
     {
@@ -125,11 +135,12 @@
       "cost": 199750,
       "edID": 128064053,
       "eddbID": 911,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "po",
+      "integrity": 90,
       "mass": 40,
-      "pGen": 16.8,
+      "pgen": 16.8,
       "rating": "E"
     },
     {
@@ -137,11 +148,12 @@
       "cost": 599240,
       "edID": 128064054,
       "eddbID": 912,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "pn",
+      "integrity": 113,
       "mass": 16,
-      "pGen": 18.9,
+      "pgen": 18.9,
       "rating": "D"
     },
     {
@@ -149,11 +161,12 @@
       "cost": 1797730,
       "edID": 128064055,
       "eddbID": 913,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pm",
+      "integrity": 136,
       "mass": 20,
-      "pGen": 21,
+      "pgen": 21,
       "rating": "C"
     },
     {
@@ -161,11 +174,12 @@
       "cost": 5393180,
       "edID": 128064056,
       "eddbID": 914,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pl",
+      "integrity": 124,
       "mass": 32,
-      "pGen": 23.1,
+      "pgen": 23.1,
       "rating": "B"
     },
     {
@@ -173,11 +187,12 @@
       "cost": 16179530,
       "edID": 128064057,
       "eddbID": 915,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pk",
+      "integrity": 118,
       "mass": 20,
-      "pGen": 25.2,
+      "pgen": 25.2,
       "rating": "A"
     },
     {
@@ -185,11 +200,12 @@
       "cost": 63010,
       "edID": 128064048,
       "eddbID": 906,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "pj",
+      "integrity": 86,
       "mass": 20,
-      "pGen": 13.6,
+      "pgen": 13.6,
       "rating": "E"
     },
     {
@@ -197,11 +213,12 @@
       "cost": 189040,
       "edID": 128064049,
       "eddbID": 907,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "pi",
+      "integrity": 77,
       "mass": 8,
-      "pGen": 15.3,
+      "pgen": 15.3,
       "rating": "D"
     },
     {
@@ -209,11 +226,12 @@
       "cost": 567110,
       "edID": 128064050,
       "eddbID": 908,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "ph",
+      "integrity": 96,
       "mass": 10,
-      "pGen": 17,
+      "pgen": 17,
       "rating": "C"
     },
     {
@@ -221,11 +239,12 @@
       "cost": 1701320,
       "edID": 128064051,
       "eddbID": 909,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pg",
+      "integrity": 114,
       "mass": 16,
-      "pGen": 18.7,
+      "pgen": 18.7,
       "rating": "B"
     },
     {
@@ -233,11 +252,12 @@
       "cost": 5103950,
       "edID": 128064052,
       "eddbID": 910,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pf",
+      "integrity": 106,
       "mass": 10,
-      "pGen": 20.4,
+      "pgen": 20.4,
       "rating": "A"
     },
     {
@@ -245,11 +265,12 @@
       "cost": 19880,
       "edID": 128064043,
       "eddbID": 901,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "pe",
+      "integrity": 72,
       "mass": 10,
-      "pGen": 10.4,
+      "pgen": 10.4,
       "rating": "E"
     },
     {
@@ -257,11 +278,12 @@
       "cost": 59630,
       "edID": 128064044,
       "eddbID": 902,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "pd",
+      "integrity": 64,
       "mass": 4,
-      "pGen": 11.7,
+      "pgen": 11.7,
       "rating": "D"
     },
     {
@@ -269,11 +291,12 @@
       "cost": 178900,
       "edID": 128064045,
       "eddbID": 903,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "pc",
+      "integrity": 80,
       "mass": 5,
-      "pGen": 13,
+      "pgen": 13,
       "rating": "C"
     },
     {
@@ -281,11 +304,12 @@
       "cost": 536690,
       "edID": 128064046,
       "eddbID": 904,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "pb",
+      "integrity": 96,
       "mass": 8,
-      "pGen": 14.3,
+      "pgen": 14.3,
       "rating": "B"
     },
     {
@@ -293,11 +317,12 @@
       "cost": 1610080,
       "edID": 128064047,
       "eddbID": 905,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "pa",
+      "integrity": 88,
       "mass": 5,
-      "pGen": 15.6,
+      "pgen": 15.6,
       "rating": "A"
     },
     {
@@ -305,11 +330,12 @@
       "cost": 6270,
       "edID": 128064038,
       "eddbID": 896,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "p9",
+      "integrity": 58,
       "mass": 5,
-      "pGen": 8,
+      "pgen": 8,
       "rating": "E"
     },
     {
@@ -317,11 +343,12 @@
       "cost": 18810,
       "edID": 128064039,
       "eddbID": 897,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "p8",
+      "integrity": 51,
       "mass": 2,
-      "pGen": 9,
+      "pgen": 9,
       "rating": "D"
     },
     {
@@ -329,11 +356,12 @@
       "cost": 56440,
       "edID": 128064040,
       "eddbID": 898,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "p7",
+      "integrity": 64,
       "mass": 2.5,
-      "pGen": 10,
+      "pgen": 10,
       "rating": "C"
     },
     {
@@ -341,11 +369,12 @@
       "cost": 169300,
       "edID": 128064041,
       "eddbID": 899,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "p6",
+      "integrity": 77,
       "mass": 4,
-      "pGen": 11,
+      "pgen": 11,
       "rating": "B"
     },
     {
@@ -353,11 +382,12 @@
       "cost": 507910,
       "edID": 128064042,
       "eddbID": 900,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "p5",
+      "integrity": 70,
       "mass": 2.5,
-      "pGen": 12,
+      "pgen": 12,
       "rating": "A"
     },
     {
@@ -365,11 +395,12 @@
       "cost": 1980,
       "edID": 128064033,
       "eddbID": 891,
-      "eff": "F",
+      "eff": 1,
       "grp": "pp",
       "id": "p4",
+      "integrity": 46,
       "mass": 2.5,
-      "pGen": 6.4,
+      "pgen": 6.4,
       "rating": "E"
     },
     {
@@ -377,11 +408,12 @@
       "cost": 5930,
       "edID": 128064034,
       "eddbID": 892,
-      "eff": "D",
+      "eff": 0.75,
       "grp": "pp",
       "id": "p3",
+      "integrity": 41,
       "mass": 1,
-      "pGen": 7.2,
+      "pgen": 7.2,
       "rating": "D"
     },
     {
@@ -389,11 +421,12 @@
       "cost": 17800,
       "edID": 128064035,
       "eddbID": 893,
-      "eff": "C",
+      "eff": 0.5,
       "grp": "pp",
       "id": "p2",
+      "integrity": 51,
       "mass": 1.3,
-      "pGen": 8,
+      "pgen": 8,
       "rating": "C"
     },
     {
@@ -401,11 +434,12 @@
       "cost": 53410,
       "edID": 128064036,
       "eddbID": 894,
-      "eff": "C",
+      "eff": 0.45,
       "grp": "pp",
       "id": "p1",
+      "integrity": 61,
       "mass": 2,
-      "pGen": 8.8,
+      "pgen": 8.8,
       "rating": "B"
     },
     {
@@ -413,11 +447,12 @@
       "cost": 160220,
       "edID": 128064037,
       "eddbID": 895,
-      "eff": "B",
+      "eff": 0.4,
       "grp": "pp",
       "id": "p0",
+      "integrity": 56,
       "mass": 1.3,
-      "pGen": 9.6,
+      "pgen": 9.6,
       "rating": "A"
     }
   ]

modules/standard/sensors.json

@@ -7,6 +7,7 @@
       "eddbID": 1111,
       "grp": "s",
       "id": "sy",
+      "integrity": 135,
       "mass": 160,
       "power": 0.55,
       "range": 5.12,
@@ -19,6 +20,7 @@
       "eddbID": 1112,
       "grp": "s",
       "id": "sx",
+      "integrity": 120,
       "mass": 64,
       "power": 0.62,
       "range": 5.76,
@@ -31,6 +33,7 @@
       "eddbID": 1113,
       "grp": "s",
       "id": "sw",
+      "integrity": 150,
       "mass": 160,
       "power": 0.69,
       "range": 6.4,
@@ -43,6 +46,7 @@
       "eddbID": 1114,
       "grp": "s",
       "id": "sv",
+      "integrity": 180,
       "mass": 256,
       "power": 1.14,
       "range": 7.04,
@@ -55,6 +59,7 @@
       "eddbID": 1115,
       "grp": "s",
       "id": "su",
+      "integrity": 165,
       "mass": 160,
       "power": 2.07,
       "range": 7.68,
@@ -67,6 +72,7 @@
       "eddbID": 1106,
       "grp": "s",
       "id": "sD",
+      "integrity": 118,
       "mass": 80,
       "power": 0.47,
       "range": 4.96,
@@ -79,6 +85,7 @@
       "eddbID": 1107,
       "grp": "s",
       "id": "sC",
+      "integrity": 105,
       "mass": 32,
       "power": 0.53,
       "range": 5.58,
@@ -91,6 +98,7 @@
       "eddbID": 1108,
       "grp": "s",
       "id": "sB",
+      "integrity": 131,
       "mass": 80,
       "power": 0.59,
       "range": 6.2,
@@ -103,6 +111,7 @@
       "eddbID": 1109,
       "grp": "s",
       "id": "sA",
+      "integrity": 157,
       "mass": 128,
       "power": 0.97,
       "range": 6.82,
@@ -115,6 +124,7 @@
       "eddbID": 1110,
       "grp": "s",
       "id": "sz",
+      "integrity": 144,
       "mass": 80,
       "power": 1.77,
       "range": 7.44,
@@ -127,6 +137,7 @@
       "eddbID": 1101,
       "grp": "s",
       "id": "st",
+      "integrity": 102,
       "mass": 40,
       "power": 0.4,
       "range": 4.8,
@@ -139,6 +150,7 @@
       "eddbID": 1102,
       "grp": "s",
       "id": "ss",
+      "integrity": 90,
       "mass": 16,
       "power": 0.45,
       "range": 5.4,
@@ -151,6 +163,7 @@
       "eddbID": 1103,
       "grp": "s",
       "id": "sr",
+      "integrity": 113,
       "mass": 40,
       "power": 0.5,
       "range": 6,
@@ -163,6 +176,7 @@
       "eddbID": 1104,
       "grp": "s",
       "id": "sq",
+      "integrity": 136,
       "mass": 64,
       "power": 0.83,
       "range": 6.6,
@@ -175,6 +189,7 @@
       "eddbID": 1105,
       "grp": "s",
       "id": "sp",
+      "integrity": 124,
       "mass": 40,
       "power": 1.5,
       "range": 7.2,
@@ -187,6 +202,7 @@
       "eddbID": 1096,
       "grp": "s",
       "id": "so",
+      "integrity": 86,
       "mass": 20,
       "power": 0.33,
       "range": 4.64,
@@ -199,6 +215,7 @@
       "eddbID": 1097,
       "grp": "s",
       "id": "sn",
+      "integrity": 77,
       "mass": 8,
       "power": 0.37,
       "range": 5.22,
@@ -211,6 +228,7 @@
       "eddbID": 1098,
       "grp": "s",
       "id": "sm",
+      "integrity": 96,
       "mass": 20,
       "power": 0.41,
       "range": 5.8,
@@ -223,6 +241,7 @@
       "eddbID": 1099,
       "grp": "s",
       "id": "sl",
+      "integrity": 115,
       "mass": 32,
       "power": 0.68,
       "range": 6.38,
@@ -235,6 +254,7 @@
       "eddbID": 1100,
       "grp": "s",
       "id": "sk",
+      "integrity": 106,
       "mass": 20,
       "power": 1.23,
       "range": 6.96,
@@ -247,6 +267,7 @@
       "eddbID": 1091,
       "grp": "s",
       "id": "sj",
+      "integrity": 72,
       "mass": 10,
       "power": 0.27,
       "range": 4.48,
@@ -259,6 +280,7 @@
       "eddbID": 1092,
       "grp": "s",
       "id": "si",
+      "integrity": 64,
       "mass": 4,
       "power": 0.31,
       "range": 5.04,
@@ -271,6 +293,7 @@
       "eddbID": 1093,
       "grp": "s",
       "id": "sh",
+      "integrity": 80,
       "mass": 10,
       "power": 0.34,
       "range": 5.6,
@@ -283,6 +306,7 @@
       "eddbID": 1094,
       "grp": "s",
       "id": "sg",
+      "integrity": 96,
       "mass": 16,
       "power": 0.56,
       "range": 6.16,
@@ -295,6 +319,7 @@
       "eddbID": 1095,
       "grp": "s",
       "id": "sf",
+      "integrity": 88,
       "mass": 10,
       "power": 1.02,
       "range": 6.72,
@@ -307,6 +332,7 @@
       "eddbID": 1086,
       "grp": "s",
       "id": "se",
+      "integrity": 58,
       "mass": 5,
       "power": 0.22,
       "range": 4.32,
@@ -319,6 +345,7 @@
       "eddbID": 1087,
       "grp": "s",
       "id": "sd",
+      "integrity": 51,
       "mass": 2,
       "power": 0.25,
       "range": 4.86,
@@ -331,6 +358,7 @@
       "eddbID": 1088,
       "grp": "s",
       "id": "sc",
+      "integrity": 64,
       "mass": 5,
       "power": 0.28,
       "range": 5.4,
@@ -343,6 +371,7 @@
       "eddbID": 1089,
       "grp": "s",
       "id": "sb",
+      "integrity": 77,
       "mass": 8,
       "power": 0.46,
       "range": 5.94,
@@ -355,6 +384,7 @@
       "eddbID": 1090,
       "grp": "s",
       "id": "sa",
+      "integrity": 70,
       "mass": 5,
       "power": 0.84,
       "range": 6.48,
@@ -367,6 +397,7 @@
       "eddbID": 1081,
       "grp": "s",
       "id": "s9",
+      "integrity": 46,
       "mass": 2.5,
       "power": 0.18,
       "range": 4.16,
@@ -379,6 +410,7 @@
       "eddbID": 1082,
       "grp": "s",
       "id": "s8",
+      "integrity": 41,
       "mass": 1,
       "power": 0.21,
       "range": 4.68,
@@ -391,6 +423,7 @@
       "eddbID": 1083,
       "grp": "s",
       "id": "s7",
+      "integrity": 51,
       "mass": 2.5,
       "power": 0.23,
       "range": 5.2,
@@ -403,6 +436,7 @@
       "eddbID": 1084,
       "grp": "s",
       "id": "s6",
+      "integrity": 61,
       "mass": 4,
       "power": 0.38,
       "range": 5.72,
@@ -415,6 +449,7 @@
       "eddbID": 1085,
       "grp": "s",
       "id": "s5",
+      "integrity": 56,
       "mass": 2.5,
       "power": 0.69,
       "range": 6.24,
@@ -427,6 +462,7 @@
       "eddbID": 1076,
       "grp": "s",
       "id": "s4",
+      "integrity": 46,
       "mass": 1.3,
       "power": 0.16,
       "range": 4,
@@ -439,6 +475,7 @@
       "eddbID": 1077,
       "grp": "s",
       "id": "s3",
+      "integrity": 41,
       "mass": 0.5,
       "power": 0.18,
       "range": 4.5,
@@ -451,6 +488,7 @@
       "eddbID": 1078,
       "grp": "s",
       "id": "s2",
+      "integrity": 51,
       "mass": 1.3,
       "power": 0.2,
       "range": 5,
@@ -463,6 +501,7 @@
       "eddbID": 1079,
       "grp": "s",
       "id": "s1",
+      "integrity": 61,
       "mass": 2,
       "power": 0.33,
       "range": 5.5,
@@ -475,6 +514,7 @@
       "eddbID": 1080,
       "grp": "s",
       "id": "s0",
+      "integrity": 56,
       "mass": 1.3,
       "power": 0.6,
       "range": 6,

modules/standard/thrusters.json

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

package.json

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

ships/adder.json

@@ -11,19 +11,19 @@
       "boost": 320,
       "boostEnergy": 9,
       "agility": 8,
-      "baseShieldStrength": 78,
-      "baseArmour": 162,
+      "baseShieldStrength": 60,
+      "baseArmour": 90,
       "hullMass": 35,
       "masslock": 7,
       "pipSpeed": 0.13625
     },
     "retailCost": 87810,
     "bulkheads": [
-      { "id": "BC", "edID": 128049268, "eddbID": 753, "cost": 0, "mass": 0 },
-      { "id": "BD", "edID": 128049269, "eddbID": 754, "cost": 35120, "mass": 3 },
-      { "id": "BE", "edID": 128049270, "eddbID": 755, "cost": 79030, "mass": 5 },
-      { "id": "BF", "edID": 128049271, "eddbID": 756, "cost": 186770, "mass": 5 },
-      { "id": "BG", "edID": 128049272, "eddbID": 757, "cost": 206960, "mass": 5 }
+      { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
+      { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5  }
     ],
     "slots": {
       "standard": [3, 3, 3, 1, 2, 3, 3],

ships/anaconda.json

@@ -7,12 +7,12 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 3,
       "hullCost": 141889930,
-      "speed": 183,
-      "boost": 244,
-      "boostEnergy": 29,
+      "speed": 180,
+      "boost": 240,
+      "boostEnergy": 27,
       "agility": 2,
-      "baseShieldStrength": 362,
-      "baseArmour": 945,
+      "baseShieldStrength": 350,
+      "baseArmour": 525,
       "hullMass": 400,
       "masslock": 23,
       "pipSpeed": 0.13875,
@@ -20,11 +20,11 @@
     },
     "retailCost": 146969450,
     "bulkheads": [
-      { "id": "bT", "edID": 128049364, "eddbID": 818, "cost": 0, "mass": 0 },
-      { "id": "bU", "edID": 128049365, "eddbID": 819, "cost": 58787780, "mass": 30 },
-      { "id": "bV", "edID": 128049366, "eddbID": 820, "cost": 132272510, "mass": 60 },
-      { "id": "bW", "edID": 128049367, "eddbID": 821, "cost": 312604020, "mass": 60 },
-      { "id": "bX", "edID": 128049368, "eddbID": 822, "cost": 346407000, "mass": 60 }
+      { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],

ships/asp.json

@@ -7,23 +7,23 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 6135660,
-      "speed": 254,
-      "boost": 345,
-      "boostEnergy": 14,
+      "speed": 250,
+      "boost": 340,
+      "boostEnergy": 13,
       "agility": 6,
-      "baseShieldStrength": 152,
-      "baseArmour": 378,
+      "baseShieldStrength": 140,
+      "baseArmour": 210,
       "hullMass": 280,
       "masslock": 11,
       "pipSpeed": 0.13
     },
     "retailCost": 6661150,
     "bulkheads": [
-      { "id": "BH", "edID": 128049304, "eddbID": 778, "cost": 0, "mass": 0 },
-      { "id": "BI", "edID": 128049305, "eddbID": 779, "cost": 2664460, "mass": 21 },
-      { "id": "BJ", "edID": 128049306, "eddbID": 780, "cost": 5995040, "mass": 42 },
-      { "id": "BK", "edID": 128049307, "eddbID": 781, "cost": 14168270, "mass": 42 },
-      { "id": "BL", "edID": 128049308, "eddbID": 782, "cost": 15700340, "mass": 42 }
+      { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [5, 5, 5, 4, 4, 5, 5],

ships/asp_scout.json

@@ -1,28 +1,29 @@
 {
   "asp_scout": {
-    "edID": 128672276, "eddbID": 24,
+    "edID": 128672276,
+    "eddbID": 24,
     "properties": {
       "name": "Asp Scout",
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 3818240,
-      "speed": 223,
-      "boost": 304,
+      "speed": 220,
+      "boost": 300,
       "boostEnergy": 13,
       "agility": 8,
-      "baseShieldStrength": 105,
-      "baseArmour": 324,
+      "baseShieldStrength": 120,
+      "baseArmour": 180,
       "hullMass": 150,
       "masslock": 8,
       "pipSpeed": 0.125
     },
     "retailCost": 3961150,
     "bulkheads": [
-      { "id": "c1", "edID": 128672278, "eddbID": 1503, "cost": 0, "mass": 0 },
-      { "id": "c2", "edID": 128672279, "eddbID": 1504, "cost": 1584460, "mass": 21 },
-      { "id": "c3", "edID": 128672280, "eddbID": 1505, "cost": 3565040, "mass": 42 },
-      { "id": "c4", "edID": 128672281, "eddbID": 1506, "cost": 8425380, "mass": 42 },
-      { "id": "c5", "edID": 128672282, "eddbID": 1507, "cost": 9336440, "mass": 42 }
+      { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 4, 4, 4],

ships/beluga.json

@@ -1,31 +1,31 @@
 {
   "beluga": {
-    "edID": -1,
+    "edID": 128049345,
     "eddbID": 30,
     "properties": {
       "name": "Beluga Liner",
       "manufacturer": "Saud Kruger",
       "class": 3,
-      "hullCost": -1,
-      "speed": 195,
-      "boost": 273,
-      "boostEnergy": 20,
+      "hullCost": 79654610,
+      "speed": 200,
+      "boost": 280,
+      "boostEnergy": 19,
       "agility": 2,
-      "baseShieldStrength": 92,
-      "baseArmour": 504,
+      "baseShieldStrength": 280,
+      "baseArmour": 280,
       "hullMass": 1100,
       "masslock": 18,
       "pipSpeed": -1,
       "luxuryCabins": true,
       "fighterHangars": true
     },
-    "retailCost": -1,
+    "retailCost": 84532770,
     "bulkheads": [
-      { "id": "cl", "eddbID": 1554,"cost": 0, "mass": 0 },
-      { "id": "cm", "eddbID": 1555,"cost": -1, "mass": 83 },
-      { "id": "cn", "eddbID": 1556,"cost": -1, "mass": 165 },
-      { "id": "co", "eddbID": 1557,"cost": -1, "mass": 165 },
-      { "id": "cp", "eddbID": 1558,"cost": -1, "mass": 165 }
+      { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 7, 7, 8, 6, 5, 7],
@@ -42,7 +42,7 @@
     "defaults": {
       "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"],
       "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h"]
+      "internal": ["4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, "2h"]
     }
   }
 }

ships/cobra_mk_iii.json

@@ -7,23 +7,23 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 205800,
-      "speed": 282,
-      "boost": 402,
-      "boostEnergy": 11,
+      "speed": 280,
+      "boost": 400,
+      "boostEnergy": 10,
       "agility": 6,
-      "baseShieldStrength": 92,
-      "baseArmour": 216,
+      "baseShieldStrength": 80,
+      "baseArmour": 120,
       "hullMass": 180,
       "masslock": 8,
       "pipSpeed": 0.125
     },
     "retailCost": 349720,
     "bulkheads": [
-      { "id": "bk", "edID": 128049280, "eddbID": 763, "cost": 0, "mass": 0 },
-      { "id": "bl", "edID": 128049281, "eddbID": 764, "cost": 151890, "mass": 14 },
-      { "id": "bm", "edID": 128049282, "eddbID": 765, "cost": 341750, "mass": 27 },
-      { "id": "bn", "edID": 128049283, "eddbID": 766, "cost": 797410, "mass": 27 },
-      { "id": "bo", "edID": 128049284, "eddbID": 767, "cost": 895000, "mass": 27 }
+      { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 3, 3, 4],

ships/cobra_mk_iv.json

@@ -8,22 +8,22 @@
       "class": 1,
       "hullCost": 603740,
       "speed": 200,
-      "boost": 299,
-      "boostEnergy": 11,
+      "boost": 300,
+      "boostEnergy": 10,
       "agility": 4,
-      "baseShieldStrength": 125,
-      "baseArmour": 216,
+      "baseShieldStrength": 120,
+      "baseArmour": 120,
       "hullMass": 210,
       "masslock": 8,
       "pipSpeed": 0.125
     },
     "retailCost": 747660,
     "bulkheads": [
-      { "id": "cg", "edID": 128672264, "eddbID": 1518, "cost": 0, "mass": 0 },
-      { "id": "ch", "edID": 128672265, "eddbID": 1519, "cost": 305890, "mass": 14 },
-      { "id": "ci", "edID": 128672266, "eddbID": 1520, "cost": 688250, "mass": 27 },
-      { "id": "cj", "edID": 128672267, "eddbID": 1521, "cost": 1605910, "mass": 27 },
-      { "id": "ck", "edID": 128672268, "eddbID": 1522, "cost": 1802440, "mass": 27 }
+      { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 3, 3, 3, 4],

ships/diamondback_explorer.json

@@ -6,23 +6,23 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 1635700,
-      "speed": 242,
-      "boost": 316,
-      "boostEnergy": 14,
+      "speed": 260,
+      "boost": 340,
+      "boostEnergy": 13,
       "agility": 5,
-      "baseShieldStrength": 115,
-      "baseArmour": 270,
+      "baseShieldStrength": 150,
+      "baseArmour": 150,
       "hullMass": 298,
       "masslock": 10,
       "pipSpeed": 0.09625
     },
     "retailCost": 1894760,
     "bulkheads": [
-      { "id": "ba", "edID": 128671832, "eddbID": 1456, "cost": 0, "mass": 0 },
-      { "id": "bb", "edID": 128671833, "eddbID": 1457, "cost": 800000, "mass": 23 },
-      { "id": "bc", "edID": 128671834, "eddbID": 1458, "cost": 1800000, "mass": 47 },
-      { "id": "bd", "edID": 128671835, "eddbID": 1459, "cost": 4200000, "mass": 26 },
-      { "id": "be", "edID": 128671836, "eddbID": 1460, "cost": 4714000, "mass": 47 }
+      { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 4, 5, 3, 4, 3, 5],

ships/diamondback_scout.json

@@ -7,23 +7,23 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 461340,
-      "speed": 283,
-      "boost": 384,
-      "boostEnergy": 11,
+      "speed": 280,
+      "boost": 380,
+      "boostEnergy": 10,
       "agility": 8,
-      "baseShieldStrength": 93,
-      "baseArmour": 216,
+      "baseShieldStrength": 120,
+      "baseArmour": 120,
       "hullMass": 170,
       "masslock": 8,
       "pipSpeed": 0.09875
     },
     "retailCost": 564330,
     "bulkheads": [
-      { "id": "b5", "edID": 128671218, "eddbID": 1384, "cost": 0, "mass": 0 },
-      { "id": "b6", "edID": 128671219, "eddbID": 1385, "cost": 225700, "mass": 13 },
-      { "id": "b7", "edID": 128671220, "eddbID": 1386, "cost": 507900, "mass": 26 },
-      { "id": "b8", "edID": 128671221, "eddbID": 1387, "cost": 1185100, "mass": 26 },
-      { "id": "b9", "edID": 128671222, "eddbID": 1388, "cost": 1330100, "mass": 26 }
+      { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 4, 4, 2, 3, 2, 4],

ships/eagle.json

@@ -7,23 +7,23 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 10440,
-      "speed": 239,
-      "boost": 349,
-      "boostEnergy": 9,
+      "speed": 240,
+      "boost": 350,
+      "boostEnergy": 8,
       "agility": 10,
-      "baseShieldStrength": 89,
-      "baseArmour": 72,
+      "baseShieldStrength": 60,
+      "baseArmour": 40,
       "hullMass": 50,
       "masslock": 6,
       "pipSpeed": 0.0625
     },
     "retailCost": 44800,
     "bulkheads": [
-      { "id": "bY", "edID": 128049256, "eddbID": 743, "cost": 0, "mass": 0 },
-      { "id": "bZ", "edID": 128049257, "eddbID": 744, "cost": 26880, "mass": 4 },
-      { "id": "B0", "edID": 128049258, "eddbID": 745, "cost": 90050, "mass": 8 },
-      { "id": "B1", "edID": 128049259, "eddbID": 746, "cost": 140090, "mass": 8 },
-      { "id": "B2", "edID": 128049260, "eddbID": 747, "cost": 150390, "mass": 8 }
+      { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 3, 3, 1, 2, 2, 2],

ships/federal_assault_ship.json

@@ -6,23 +6,23 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 19072000,
-      "speed": 214,
-      "boost": 357,
-      "boostEnergy": 21,
+      "speed": 210,
+      "boost": 350,
+      "boostEnergy": 19,
       "agility": 6,
-      "baseShieldStrength": 133,
-      "baseArmour": 540,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
       "hullMass": 480,
       "masslock": 14,
       "pipSpeed": 0.11125
     },
     "retailCost": 19814210,
     "bulkheads": [
-      { "id": "bz", "edID": 128672147, "eddbID": 1466, "cost": 0, "mass": 0 },
-      { "id": "bA", "edID": 128672148, "eddbID": 1467, "cost": 7925680, "mass": 44 },
-      { "id": "bB", "edID": 128672149, "eddbID": 1468, "cost": 17832780, "mass": 87 },
-      { "id": "bC", "edID": 128672150, "eddbID": 1469, "cost": 42144810, "mass": 87 },
-      { "id": "bD", "edID": 128672151, "eddbID": 1470, "cost": 46702080, "mass": 87 }
+      { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],

ships/federal_corvette.json

@@ -7,12 +7,12 @@
       "manufacturer": "Core Dynamics",
       "class": 3,
       "hullCost": 182589570,
-      "speed": 198,
-      "boost": 257,
+      "speed": 200,
+      "boost": 260,
       "boostEnergy": 27,
       "agility": 2,
-      "baseShieldStrength": 516,
-      "baseArmour": 666,
+      "baseShieldStrength": 555,
+      "baseArmour": 370,
       "hullMass": 900,
       "masslock": 24,
       "pipSpeed": 0.125,
@@ -20,11 +20,11 @@
     },
     "retailCost": 187969450,
     "bulkheads": [
-      { "id": "BW", "edID": 128049370, "eddbID": 1498, "cost": 0, "mass": 0 },
-      { "id": "BX", "edID": 128049371, "eddbID": 1499, "cost": 75187790, "mass": 30 },
-      { "id": "BY", "edID": 128049372, "eddbID": 1500, "cost": 169172510, "mass": 60 },
-      { "id": "BZ", "edID": 128049373, "eddbID": 1501, "cost": 399811020, "mass": 60 },
-      { "id": "c0", "edID": 128049374, "eddbID": 1502, "cost": 443044000, "mass": 60 }
+      { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],

ships/federal_dropship.json

@@ -7,23 +7,23 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 13469990,
-      "speed": 182,
-      "boost": 304,
-      "boostEnergy": 21,
+      "speed": 180,
+      "boost": 300,
+      "boostEnergy": 19,
       "agility": 2,
-      "baseShieldStrength": 104,
-      "baseArmour": 540,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
       "hullMass": 580,
       "masslock": 14,
       "pipSpeed": 0.0725
     },
     "retailCost": 14314210,
     "bulkheads": [
-      { "id": "bE", "edID": 128049322, "eddbID": 793, "cost": 0, "mass": 0 },
-      { "id": "bF", "edID": 128049323, "eddbID": 794, "cost": 5725680, "mass": 44 },
-      { "id": "bG", "edID": 128049324, "eddbID": 795, "cost": 12882780, "mass": 87 },
-      { "id": "bH", "edID": 128049325, "eddbID": 796, "cost": 30446310, "mass": 87 },
-      { "id": "bI", "edID": 128049326, "eddbID": 797, "cost": 33738580, "mass": 87 }
+      { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],

ships/federal_gunship.json

@@ -7,12 +7,12 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 34774790,
-      "speed": 171,
-      "boost": 282,
-      "boostEnergy": 21,
+      "speed": 170,
+      "boost": 280,
+      "boostEnergy": 23,
       "agility": 2,
-      "baseShieldStrength": 186,
-      "baseArmour": 630,
+      "baseShieldStrength": 250,
+      "baseArmour": 350,
       "hullMass": 580,
       "masslock": 14,
       "pipSpeed": 0.1025,
@@ -20,11 +20,11 @@
     },
     "retailCost": 35814210,
     "bulkheads": [
-      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "cost": 0, "mass": 0 },
-      { "id": "bK", "edID": 128672155, "eddbID": 1472, "cost": 14325690, "mass": 44 },
-      { "id": "bL", "edID": 128672156, "eddbID": 1473, "cost": 32232790, "mass": 87 },
-      { "id": "bM", "edID": 128672157, "eddbID": 1474, "cost": 76176810, "mass": 87 },
-      { "id": "bN", "edID": 128672158, "eddbID": 1475, "cost": 84414090, "mass": 87 }
+      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 7, 5, 4],

ships/fer_de_lance.json

@@ -7,23 +7,23 @@
       "manufacturer": "Zorgon Peterson",
       "class": 2,
       "hullCost": 51232230,
-      "speed": 265,
-      "boost": 357,
-      "boostEnergy": 21,
+      "speed": 260,
+      "boost": 350,
+      "boostEnergy": 19,
       "agility": 6,
-      "baseShieldStrength": 271,
-      "baseArmour": 405,
+      "baseShieldStrength": 300,
+      "baseArmour": 225,
       "hullMass": 250,
       "masslock": 12,
       "pipSpeed": 0.03875
     },
     "retailCost": 51567040,
     "bulkheads": [
-      { "id": "Bd", "edID": 128049352, "eddbID": 813, "cost": 0, "mass": 0 },
-      { "id": "Be", "edID": 128049353, "eddbID": 814, "cost": 20626820, "mass": 19 },
-      { "id": "Bf", "edID": 128049354, "eddbID": 815, "cost": 46410340, "mass": 38 },
-      { "id": "Bg", "edID": 128049355, "eddbID": 816, "cost": 109683090, "mass": 38 },
-      { "id": "Bh", "edID": 128049356, "eddbID": 817, "cost": 121543510, "mass": 38 }
+      { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 5, 4, 4, 6, 4, 3],

ships/hauler.json

@@ -7,23 +7,23 @@
       "manufacturer": "Zorgon Peterson",
       "class": 1,
       "hullCost": 29790,
-      "speed": 203,
-      "boost": 305,
+      "speed": 200,
+      "boost": 300,
       "agility": 6,
       "boostEnergy": 7,
-      "baseShieldStrength": 65,
-      "baseArmour": 90,
+      "baseShieldStrength": 50,
+      "baseArmour": 50,
       "hullMass": 14,
       "masslock": 6,
       "pipSpeed": 0.1625
     },
     "retailCost": 52720,
     "bulkheads": [
-      { "id": "Bi", "edID": 128049262, "eddbID": 748, "cost": 0, "mass": 0 },
-      { "id": "Bj", "edID": 128049263, "eddbID": 749, "cost": 42180, "mass": 1 },
-      { "id": "Bk", "edID": 128049264, "eddbID": 750, "cost": 185050, "mass": 2 },
-      { "id": "Bl", "edID": 128049265, "eddbID": 751, "cost": 270300, "mass": 2 },
-      { "id": "Bm", "edID": 128049266, "eddbID": 752, "cost": 282420, "mass": 2 }
+      { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 2, 2, 1, 1, 1, 2],

ships/imperial_clipper.json

@@ -7,23 +7,23 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 21077780,
-      "speed": 306,
-      "boost": 388,
-      "boostEnergy": 21,
+      "speed": 300,
+      "boost": 380,
+      "boostEnergy": 19,
       "agility": 2,
-      "baseShieldStrength": 186,
-      "baseArmour": 486,
+      "baseShieldStrength": 180,
+      "baseArmour": 270,
       "hullMass": 400,
       "masslock": 12,
       "pipSpeed": 0.1
     },
     "retailCost": 22296860,
       "bulkheads": [
-      { "id": "bp", "edID": 128049316, "eddbID": 788, "cost": 0, "mass": 0 },
-      { "id": "bq", "edID": 128049317, "eddbID": 789, "cost": 8918340, "mass": 30 },
-      { "id": "br", "edID": 128049318, "eddbID": 790, "cost": 20066270, "mass": 60 },
-      { "id": "bs", "edID": 128049319, "eddbID": 791, "cost": 47423290, "mass": 60 },
-      { "id": "bt", "edID": 128049320, "eddbID": 792, "cost": 52551340, "mass": 60 }
+      { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 5, 4],

ships/imperial_courier.json

@@ -8,21 +8,21 @@
       "hullCost": 2481550,
       "speed": 280,
       "boost": 380,
-      "boostEnergy": 11,
+      "boostEnergy": 10,
       "agility": 6,
-      "baseShieldStrength": 230,
-      "baseArmour": 144,
+      "baseShieldStrength": 200,
+      "baseArmour": 80,
       "hullMass": 35,
       "masslock": 7,
       "pipSpeed": 0.05375
     },
     "retailCost": 2542930,
     "bulkheads": [
-      { "id": "bf", "edID": 128671224, "eddbID": 1389, "cost": 0, "mass": 0 },
-      { "id": "bg", "edID": 128671225, "eddbID": 1390, "cost": 1017200, "mass": 4 },
-      { "id": "bh", "edID": 128671226, "eddbID": 1391, "cost": 2288600, "mass": 8 },
-      { "id": "bi", "edID": 128671227, "eddbID": 1392, "cost": 5408800, "mass": 8 },
-      { "id": "bj", "edID": 128671228, "eddbID": 1393, "cost": 5993700, "mass": 8 }
+      { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [ 4, 3, 3, 1, 3, 2, 3],

ships/imperial_cutter.json

@@ -6,12 +6,12 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 199926890,
-      "speed": 202,
-      "boost": 323,
-      "boostEnergy": 24,
+      "speed": 200,
+      "boost": 320,
+      "boostEnergy": 23,
       "agility": 2,
-      "baseShieldStrength": 703,
-      "baseArmour": 720,
+      "baseShieldStrength": 600,
+      "baseArmour": 400,
       "hullMass": 1100,
       "masslock": 27,
       "pipSpeed": 0.05,
@@ -19,11 +19,11 @@
     },
     "retailCost": 208969450,
     "bulkheads": [
-      { "id": "BR", "edID": 128049376, "eddbID": 1493, "cost": 0, "mass": 0 },
-      { "id": "BS", "edID": 128049377, "eddbID": 1494, "cost": 83587790, "mass": 30 },
-      { "id": "BT", "edID": 128049378, "eddbID": 1495, "cost": 188072510, "mass": 60 },
-      { "id": "BU", "edID": 128049379, "eddbID": 1496, "cost": 444478020, "mass": 60 },
-      { "id": "BV", "edID": 128049380, "eddbID": 1497, "cost": 492541000, "mass": 60 }
+      { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [8, 8, 7, 7, 7, 7, 6],

ships/imperial_eagle.json

@@ -7,23 +7,23 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 72180,
-      "speed": 298,
-      "boost": 397,
-      "boostEnergy": 9,
+      "speed": 300,
+      "boost": 400,
+      "boostEnergy": 8,
       "agility": 6,
-      "baseShieldStrength": 104,
-      "baseArmour": 108,
+      "baseShieldStrength": 80,
+      "baseArmour": 60,
       "hullMass": 50,
       "masslock": 6,
       "pipSpeed": 0.075
     },
     "retailCost": 110830,
     "bulkheads": [
-      { "id": "bu", "edID": 128672140, "eddbID": 1461, "cost": 0, "mass": 0 },
-      { "id": "bv", "edID": 128672141, "eddbID": 1462, "cost": 66500, "mass": 4 },
-      { "id": "bw", "edID": 128672142, "eddbID": 1463, "cost": 222760, "mass": 8 },
-      { "id": "bx", "edID": 128672143, "eddbID": 1464, "cost": 346550, "mass": 8 },
-      { "id": "by", "edID": 128672144, "eddbID": 1465, "cost": 372040, "mass": 8 }
+      { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [3, 3, 3, 1, 2, 2, 2],

ships/keelback.json

@@ -6,25 +6,25 @@
       "name": "Keelback",
       "manufacturer": "Lakon",
       "class": 2,
-      "hullCost": 2951180,
-      "speed": 202,
-      "boost": 303,
+      "hullCost": 2943880,
+      "speed": 200,
+      "boost": 300,
       "boostEnergy": 10,
       "agility": 2,
-      "baseShieldStrength": 99,
-      "baseArmour": 243,
+      "baseShieldStrength": 135,
+      "baseArmour": 135,
       "hullMass": 180,
       "masslock": 8,
       "pipSpeed": 0.1375,
       "fighterHangars": true
     },
-    "retailCost": 3126150,
+    "retailCost": 3126160,
     "bulkheads": [
-      { "id": "cb", "edID": 128672271, "eddbID": 1513, "cost": 0, "mass": 0 },
-      { "id": "cc", "edID": 128672272, "eddbID": 1514, "cost": 1250460, "mass": 12 },
-      { "id": "cd", "edID": 128672273, "eddbID": 1515, "cost": 2813540, "mass": 23 },
-      { "id": "ce", "edID": 128672274, "eddbID": 1516, "cost": 6649330, "mass": 23 },
-      { "id": "cf", "edID": 128672275, "eddbID": 1517, "cost": 7368340, "mass": 23 }
+      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 1, 3, 2, 4],

ships/orca.json

@@ -6,25 +6,25 @@
       "name": "Orca",
       "manufacturer": "Saud Kruger",
       "class": 3,
-      "hullCost": 47798080,
-      "speed": 303,
-      "boost": 384,
-      "boostEnergy": 17,
+      "hullCost": 47790590,
+      "speed": 300,
+      "boost": 380,
+      "boostEnergy": 16,
       "agility": 2,
-      "baseShieldStrength": 114,
-      "baseArmour": 396,
+      "baseShieldStrength": 220,
+      "baseArmour": 220,
       "hullMass": 580,
       "masslock": 13,
       "pipSpeed": 0.08375,
       "luxuryCabins": true
     },
-    "retailCost": 48539890,
+    "retailCost": 48539900,
     "bulkheads": [
-      { "id": "BM", "edID": 128049328, "eddbID": 798, "cost": 0, "mass": 0 },
-      { "id": "BN", "edID": 128049329, "eddbID": 799, "cost": 19415950, "mass": 21 },
-      { "id": "BO", "edID": 128049330, "eddbID": 800, "cost": 43685900, "mass": 87 },
-      { "id": "BP", "edID": 128049331, "eddbID": 801, "cost": 103244340, "mass": 87 },
-      { "id": "BQ", "edID": 128049332, "eddbID": 802, "cost": 114408510, "mass": 87 }
+      { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [5, 6, 5, 6, 5, 4, 5],
@@ -38,7 +38,7 @@
     "defaults": {
       "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["me", "mc", "03", "4e", "02", 0, 0, "2h"]
     }
   }
 }

ships/python.json

@@ -7,23 +7,23 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 2,
       "hullCost": 55171380,
-      "speed": 234,
-      "boost": 305,
-      "boostEnergy": 24,
+      "speed": 230,
+      "boost": 300,
+      "boostEnergy": 23,
       "agility": 6,
-      "baseShieldStrength": 294,
-      "baseArmour": 468,
+      "baseShieldStrength": 260,
+      "baseArmour": 260,
       "hullMass": 350,
       "masslock": 17,
       "pipSpeed": 0.0975
     },
     "retailCost": 56978180,
     "bulkheads": [
-      { "id": "bO", "edID": 128049340, "eddbID": 808, "cost": 0, "mass": 0 },
-      { "id": "bP", "edID": 128049341, "eddbID": 809, "cost": 22791270, "mass": 26 },
-      { "id": "bQ", "edID": 128049342, "eddbID": 810, "cost": 51280360, "mass": 53 },
-      { "id": "bR", "edID": 128049343, "eddbID": 811, "cost": 121192590, "mass": 53 },
-      { "id": "bS", "edID": 128049344, "eddbID": 812, "cost": 134297570, "mass": 53 }
+      { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bR", "edID": 128049343, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 53, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bS", "edID": 128049344, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 53, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [7, 6, 5, 4, 7, 6, 5],

ships/sidewinder.json

@@ -8,22 +8,22 @@
       "class": 1,
       "hullCost": 12870,
       "speed": 220,
-      "boost": 321,
+      "boost": 320,
       "boostEnergy": 7,
       "agility": 8,
-      "baseShieldStrength": 52,
-      "baseArmour": 108,
+      "baseShieldStrength": 40,
+      "baseArmour": 60,
       "hullMass": 25,
       "masslock": 6,
       "pipSpeed": 0.1375
     },
     "retailCost": 40800,
     "bulkheads": [
-      { "id": "b0", "edID": 128049250, "eddbID": 738, "cost": 0, "mass": 0 },
-      { "id": "b1", "edID": 128049251, "eddbID": 739, "cost": 25600, "mass": 2 },
-      { "id": "b2", "edID": 128049252, "eddbID": 740, "cost": 80320, "mass": 4 },
-      { "id": "b3", "edID": 128049253, "eddbID": 741, "cost": 132060, "mass": 4 },
-      { "id": "b4", "edID": 128049254, "eddbID": 742, "cost": 139420, "mass": 4 }
+      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "b3", "edID": 128049253, "eddbID": 741, "grp": "bh", "cost": 132060, "mass": 4, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "b4", "edID": 128049254, "eddbID": 742, "grp": "bh", "cost": 139420, "mass": 4, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [2, 2, 2, 1, 1, 1, 1],

ships/type_6_transporter.json

@@ -7,23 +7,23 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 865790,
-      "speed": 223,
-      "boost": 355,
-      "boostEnergy": 11,
+      "speed": 220,
+      "boost": 350,
+      "boostEnergy": 10,
       "agility": 3,
-      "baseShieldStrength": 77,
-      "baseArmour": 162,
+      "baseShieldStrength": 90,
+      "baseArmour": 90,
       "hullMass": 155,
       "masslock": 8,
       "pipSpeed": 0.1475
     },
     "retailCost": 1045950,
     "bulkheads": [
-      { "id": "Bn", "edID": 128049286, "eddbID": 768, "cost": 0, "mass": 0 },
-      { "id": "Bo", "edID": 128049287, "eddbID": 769, "cost": 418380, "mass": 12 },
-      { "id": "Bp", "edID": 128049288, "eddbID": 770, "cost": 941350, "mass": 23 },
-      { "id": "Bq", "edID": 128049289, "eddbID": 771, "cost": 2224730, "mass": 23 },
-      { "id": "Br", "edID": 128049290, "eddbID": 772, "cost": 2465290, "mass": 23 }
+      { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bq", "edID": 128049289, "eddbID": 771, "grp": "bh", "cost": 2224730, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Br", "edID": 128049290, "eddbID": 772, "grp": "bh", "cost": 2465290, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [3, 4, 4, 2, 3, 2, 4],

ships/type_7_transport.json

@@ -6,24 +6,24 @@
       "name": "Type-7 Transporter",
       "manufacturer": "Lakon",
       "class": 3,
-      "hullCost": 16881510,
-      "speed": 181,
-      "boost": 301,
-      "boostEnergy": 11,
+      "hullCost": 16780510,
+      "speed": 180,
+      "boost": 300,
+      "boostEnergy": 10,
       "agility": 2,
-      "baseShieldStrength": 78,
-      "baseArmour": 306,
+      "baseShieldStrength": 155,
+      "baseArmour": 170,
       "hullMass": 420,
       "masslock": 10,
       "pipSpeed": 0.16625
     },
-    "retailCost": 17472250,
+    "retailCost": 17472260,
     "bulkheads": [
-      { "id": "Bs", "edID": 128049298, "eddbID": 773, "cost": 0, "mass": 0 },
-      { "id": "Bt", "edID": 128049299, "eddbID": 774, "cost": 6988900, "mass": 32 },
-      { "id": "Bu", "edID": 128049300, "eddbID": 775, "cost": 15725030, "mass": 63 },
-      { "id": "Bv", "edID": 128049301, "eddbID": 776, "cost": 37163480, "mass": 63 },
-      { "id": "Bw", "edID": 128049302, "eddbID": 777, "cost": 41182100, "mass": 63 }
+      { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bv", "edID": 128049301, "eddbID": 776, "grp": "bh", "cost": 37163480, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 5, 5, 4, 3, 3, 5],

ships/type_9_heavy.json

@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 3,
       "hullCost": 73255150,
-      "speed": 131,
-      "boost": 201,
-      "boostEnergy": 21,
+      "speed": 130,
+      "boost": 200,
+      "boostEnergy": 19,
       "agility": 0,
-      "baseShieldStrength": 88,
-      "baseArmour": 432,
+      "baseShieldStrength": 240,
+      "baseArmour": 240,
       "hullMass": 1000,
       "masslock": 16,
       "pipSpeed": 0.17375,
@@ -20,11 +20,11 @@
     },
     "retailCost": 76555840,
     "bulkheads": [
-      { "id": "Bx", "edID": 128049334, "eddbID": 803, "cost": 0, "mass": 0 },
-      { "id": "By", "edID": 128049335, "eddbID": 804, "cost": 30622340, "mass": 75 },
-      { "id": "Bz", "edID": 128049336, "eddbID": 805, "cost": 68900260, "mass": 150 },
-      { "id": "BA", "edID": 128049337, "eddbID": 806, "cost": 162834280, "mass": 150 },
-      { "id": "BB", "edID": 128049338, "eddbID": 807, "cost": 180442120, "mass": 150 }
+      { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 7, 6, 5, 6, 4, 6],

ships/viper.json

@@ -7,23 +7,23 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 95900,
-      "speed": 310,
-      "boost": 388,
-      "boostEnergy": 11,
+      "speed": 320,
+      "boost": 400,
+      "boostEnergy": 10,
       "agility": 6,
-      "baseShieldStrength": 137,
-      "baseArmour": 126,
+      "baseShieldStrength": 105,
+      "baseArmour": 70,
       "hullMass": 60,
       "masslock": 7,
       "pipSpeed": 0.09375
     },
     "retailCost": 142930,
     "bulkheads": [
-      { "id": "B3", "edID": 128049274, "eddbID": 758, "cost": 0, "mass": 0 },
-      { "id": "B4", "edID": 128049275, "eddbID": 759, "cost": 57170, "mass": 5 },
-      { "id": "B5", "edID": 128049276, "eddbID": 760, "cost": 128640, "mass": 9 },
-      { "id": "B6", "edID": 128049277, "eddbID": 761, "cost": 304010, "mass": 9 },
-      { "id": "B7", "edID": 128049278, "eddbID": 762, "cost": 336890, "mass": 9 }
+      { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "B6", "edID": 128049277, "eddbID": 761, "grp": "bh", "cost": 304010, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "B7", "edID": 128049278, "eddbID": 762, "grp": "bh", "cost": 336890, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [3, 3, 3, 2, 3, 3, 2],

ships/viper_mk_iv.json

@@ -7,23 +7,23 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 310220,
-      "speed": 271,
-      "boost": 342,
+      "speed": 270,
+      "boost": 340,
       "boostEnergy": 10,
       "agility": 4,
-      "baseShieldStrength": 103,
-      "baseArmour": 270,
+      "baseShieldStrength": 150,
+      "baseArmour": 150,
       "hullMass": 190,
       "masslock": 7,
       "pipSpeed": 0.0875
     },
     "retailCost": 437930,
     "bulkheads": [
-      { "id": "c6", "edID": 128672257, "eddbID": 1508, "cost": 0, "mass": 0 },
-      { "id": "c7", "edID": 128672258, "eddbID": 1509, "cost": 175180, "mass": 5 },
-      { "id": "c8", "edID": 128672259, "eddbID": 1510, "cost": 394140, "mass": 9 },
-      { "id": "c9", "edID": 128672260, "eddbID": 1511, "cost": 931490, "mass": 9 },
-      { "id": "ca", "edID": 128672261, "eddbID": 1512, "cost": 1033210, "mass": 9 }
+      { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "c9", "edID": 128672260, "eddbID": 1511, "grp": "bh", "cost": 931490, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "ca", "edID": 128672261, "eddbID": 1512, "grp": "bh", "cost": 1033210, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 4, 4, 2, 3, 3, 4],

ships/vulture.json

@@ -7,23 +7,23 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 4689640,
-      "speed": 215,
-      "boost": 348,
-      "boostEnergy": 17,
+      "speed": 210,
+      "boost": 340,
+      "boostEnergy": 16,
       "agility": 9,
-      "baseShieldStrength": 293,
-      "baseArmour": 288,
+      "baseShieldStrength": 240,
+      "baseArmour": 160,
       "hullMass": 230,
       "masslock": 10,
       "pipSpeed": 0.02375
     },
     "retailCost": 4925620,
     "bulkheads": [
-      { "id": "B8", "edID": 128049310, "eddbID": 783, "cost": 0, "mass": 0 },
-      { "id": "B9", "edID": 128049311, "eddbID": 784, "cost": 1970250, "mass": 17 },
-      { "id": "Ba", "edID": 128049312, "eddbID": 785, "cost": 4433050, "mass": 35 },
-      { "id": "Bb", "edID": 128049313, "eddbID": 786, "cost": 10476780, "mass": 35 },
-      { "id": "Bc", "edID": 128049314, "eddbID": 787, "cost": 11609670, "mass": 35 }
+      { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bb", "edID": 128049313, "eddbID": 786, "grp": "bh", "cost": 10476780, "mass": 35, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "Bc", "edID": 128049314, "eddbID": 787, "grp": "bh", "cost": 11609670, "mass": 35, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 5, 4, 3, 5, 4, 3],

spec/data-spec.js

@@ -1,5 +1,6 @@
 var Modules = require('../modules');
 var Ships = require('../ships');
+var Modifications = require('../modifications');
 
 describe('JSON Data', function() {
 
@@ -36,7 +37,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');
+        expect(group[i].eddbID > 0 || group[i].pp).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}`);
@@ -53,10 +57,9 @@ describe('JSON Data', function() {
 
   it('has valid hardpoints', function() {
     var ids = {};
-    var groups = Modules.hardpoints;
 
-    for (var g in groups) {
-      var group = groups[g];
+    for (var g in Modules.hardpoints) {
+      var group = Modules.hardpoints[g];
       for (var i = 0; i < group.length; i++) {
         var id = group[i].id;
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
@@ -73,16 +76,16 @@ describe('JSON Data', function() {
         if (group[i].edID) {
           edIDs[group[i].edID] = true;
         }
-	if (group[i].dps) {
-            expect(group[i].dps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing dps`);
+	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].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`);
             expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`);
-            expect(group[i].breachdps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdps`);
-            expect(group[i].armourpen).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing armourpen`);
-            expect(group[i].eps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing eps`);
-            expect(group[i].hps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing hps`);
+            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) {
+	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`);
@@ -94,10 +97,9 @@ describe('JSON Data', function() {
 
   it('has valid internal modules', function() {
     var ids = {};
-    var groups = Modules.internal;
 
-    for (var g in groups) {
-      var group = groups[g];
+    for (var g in Modules.internal) {
+      var group = Modules.internal[g];
       for (var i = 0; i < group.length; i++) {
         var id = group[i].id;
         expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
@@ -159,4 +161,15 @@ describe('JSON Data', function() {
     }
   });
 
+  it('has valid blueprints', function() {
+    var ids = {};
+
+    for (var k in Modifications.blueprints) {
+      const blueprint = Modifications.blueprints[k];
+      expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
+      expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
+      ids[blueprint.idid] = true;
+    }
+  });
+
 });