Merge branch 'release/2.2.4'

Bump version
Merge branch 'feature/specials' into develop
2025-12-08 15:13:23 +00:00 · 2016-11-28 16:47:54 +00:00 · 2016-11-28 16:47:42 +00:00 · 2016-11-27 19:45:43 +00:00 · 2016-11-27 19:45:19 +00:00 · 2016-11-27 17:14:22 +00:00
54 changed files with 3883 additions and 763 deletions
--- a/ChangeLog.md
+++ b/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
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.json
+++ b/dist/index.json
--- a/modifications/blueprints.json
+++ b/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" }
+}
--- a/modifications/index.js
+++ b/modifications/index.js
@@ -1,4 +1,7 @@
 module.exports = {
-  modifiers: require('./modifiers'),
+  blueprints: require('./blueprints'),
+  modifications: require('./modifications'),
+  modifierActions: require('./modifierActions'),
+  specials: require('./specials'),
  validity: require('./validity')
 };
--- a/modifications/modifications.json
+++ b/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"}
+}
--- a/modifications/modifierActions.json
+++ b/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
+  }
+}
--- a/modifications/modifiers.json
+++ b/modifications/modifiers.json
@@ -1,41 +0,0 @@
-[
-    "ammo",
-    "boot",
-    "brokenregen",
-    "burst",
-    "clip",
-    "damage",
-    "distdraw",
-    "duration",
-    "eff",
-    "engcap",
-    "engrate",
-    "explres",
-    "facinglimit",
-    "hullboost",
-    "hullreinforcement",
-    "integrity",
-    "jitter",
-    "kinres",
-    "mass",
-    "maxfuel",
-    "optmass",
-    "optmul",
-    "pgen",
-    "piercing",
-    "power",
-    "range",
-    "ranget",
-    "regen",
-    "reload",
-    "rof",
-    "shield",
-    "shieldboost",
-    "spinup",
-    "syscap",
-    "sysrate",
-    "thermload",
-    "thermres",
-    "wepcap",
-    "weprate"
-]
--- a/modifications/specials.json
+++ b/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"}
+}
--- a/modifications/validity.json
+++ b/modifications/validity.json
@@ -23,6 +23,7 @@
  "bsg": [
    "boot",
    "brokenregen",
+    "distdraw",
    "explres",
    "integrity",
    "kinres",
@@ -86,7 +87,8 @@
    "range",
    "reload",
    "rof",
-    "thermload"
+    "thermload",
+    "type"
  ],
  "fi": [
    "boot",
@@ -159,7 +161,8 @@
    "range",
    "reload",
    "rof",
-    "thermload"
+    "thermload",
+    "type"
  ],
  "mr": [
    "ammo",
@@ -249,6 +252,7 @@
  "psg": [
    "boot",
    "brokenregen",
+    "distdraw",
    "explres",
    "integrity",
    "kinres",
@@ -279,12 +283,6 @@
    "rof",
    "thermload"
  ],
-  "s": [
-    "boot",
-    "integrity",
-    "mass",
-    "power"
-  ],
  "sb": [
    "explres",
    "integrity",
@@ -299,13 +297,14 @@
    "duration",
    "integrity",
    "power",
-    "shield",
+    "shieldreinforcement",
    "spinup",
    "thermload"
  ],
  "sg": [
    "boot",
    "brokenregen",
+    "distdraw",
    "explres",
    "integrity",
    "kinres",
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -76,14 +76,14 @@
      "type": "T"
    },
    {
-      "breachdmg": 15.25,
+      "breachdmg": 1.5,
      "breachmax": 0,
      "breachmin": 0,
-      "burst": 8,
-      "burstrof": 20,
+      "burst": 3,
+      "burstrof": 15,
      "class": 1,
      "cost": 8800,
-      "damage": 18,
+      "damage": 2.4,
      "distdraw": 0.4,
      "edID": 128671449,
      "eddbID": 1477,
--- a/modules/hardpoints/chaff_launcher.json
+++ b/modules/hardpoints/chaff_launcher.json
@@ -2,6 +2,7 @@
  "ch": [
    {
      "ammo": 10,
+      "ammocost": 100,
      "class": 0,
      "clip": 1,
      "cost": 8500,
--- a/modules/hardpoints/heat_sink_launcher.json
+++ b/modules/hardpoints/heat_sink_launcher.json
@@ -2,6 +2,7 @@
  "hs": [
    {
      "ammo": 2,
+      "ammocost": 25,
      "class": 0,
      "clip": 1,
      "cost": 3500,
--- a/modules/internal/bi_weave_shield_generator.json
+++ b/modules/internal/bi_weave_shield_generator.json
@@ -5,8 +5,10 @@
      "cost": 7710,
      "edID": 128671331,
      "eddbID": 1530,
+      "explres": 0.5,
      "grp": "bsg",
      "id": "B6",
+      "kinres": 0.4,
      "mass": 1.3,
      "maxmass": 63,
      "maxmul": 1.4,
@@ -16,15 +18,18 @@
      "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": 1.4,
@@ -34,15 +39,18 @@
      "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": 1.4,
@@ -52,15 +60,18 @@
      "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": 1.4,
@@ -70,15 +81,18 @@
      "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": 1.4,
@@ -88,15 +102,18 @@
      "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": 1.4,
@@ -106,15 +123,18 @@
      "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": 1.4,
@@ -124,15 +144,18 @@
      "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": 1.4,
@@ -142,7 +165,8 @@
      "optmul": 0.9,
      "power": 4,
      "rating": "C",
-      "recover": 7.2
+      "recover": 7.2,
+      "thermres": -0.2
    }
  ]
 }
--- a/modules/internal/fighter_hangar.json
+++ b/modules/internal/fighter_hangar.json
@@ -4,8 +4,9 @@
      "bays": 2,
      "class": 7,
      "cost": 575660,
-      "edID": 128727930,
-      "eddbID": 1560,
+      "edID": 128727932,
+      "eddbID": 1562,
+      "fightercost": 1030,
      "grp": "fh",
      "id": "fh",
      "mass": 60,
@@ -19,6 +20,7 @@
      "cost": 1869350,
      "edID": 128727931,
      "eddbID": 1561,
+      "fightercost": 1030,
      "grp": "fh",
      "id": "fm",
      "mass": 40,
@@ -30,8 +32,9 @@
      "bays": 1,
      "class": 5,
      "cost": 2369330,
-      "edID": 128727932,
-      "eddbID": 1562,
+      "edID": 128727930,
+      "eddbID": 1560,
+      "fightercost": 1030,
      "grp": "fh",
      "id": "fr",
      "mass": 20,
--- a/modules/internal/hull_reinforcement_package.json
+++ b/modules/internal/hull_reinforcement_package.json
@@ -6,10 +6,13 @@
      "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
    },
    {
      "hullreinforcement": 390,
@@ -17,10 +20,13 @@
      "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
    },
    {
      "hullreinforcement": 300,
@@ -28,10 +34,13 @@
      "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
    },
    {
      "hullreinforcement": 330,
@@ -39,10 +48,13 @@
      "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
    },
    {
      "hullreinforcement": 230,
@@ -50,10 +62,13 @@
      "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
    },
    {
      "hullreinforcement": 260,
@@ -61,10 +76,13 @@
      "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
    },
    {
      "hullreinforcement": 150,
@@ -72,10 +90,13 @@
      "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
    },
    {
      "hullreinforcement": 190,
@@ -83,10 +104,13 @@
      "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
    },
    {
      "hullreinforcement": 80,
@@ -94,10 +118,13 @@
      "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
    },
    {
      "hullreinforcement": 110,
@@ -105,10 +132,13 @@
      "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
    }
  ]
 }
--- a/modules/internal/luxury_passenger_cabin.json
+++ b/modules/internal/luxury_passenger_cabin.json
@@ -3,7 +3,7 @@
    {
      "class": 5,
      "cost": 1658100,
-      "edID": 128727095,
+      "edID": 128727925,
      "eddbID": 1575,
      "grp": "pcq",
      "id": "mm",
--- a/modules/internal/pristmatic_shield_generator.json
+++ b/modules/internal/pristmatic_shield_generator.json
@@ -5,8 +5,10 @@
      "cost": 132200,
      "edID": 128671323,
      "eddbID": 1485,
+      "explres": 0.5,
      "grp": "psg",
      "id": "p6",
+      "kinres": 0.4,
      "mass": 2.5,
      "maxmass": 63,
      "maxmul": 2,
@@ -17,15 +19,18 @@
      "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": 2,
@@ -36,15 +41,18 @@
      "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": 2,
@@ -55,15 +63,18 @@
      "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": 2,
@@ -74,15 +85,18 @@
      "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": 2,
@@ -93,15 +107,18 @@
      "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": 2,
@@ -112,15 +129,18 @@
      "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": 2,
@@ -131,15 +151,18 @@
      "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": 2,
@@ -150,7 +173,8 @@
      "power": 8.4,
      "pp": "Aisling Duval",
      "rating": "A",
-      "recover": 3.6
+      "recover": 3.6,
+      "thermres": -0.2
    }
  ]
 }
--- a/modules/internal/shield_cell_bank.json
+++ b/modules/internal/shield_cell_bank.json
@@ -15,7 +15,7 @@
      "mass": 160,
      "power": 1.44,
      "rating": "E",
-      "recharge": 476,
+      "shieldreinforcement": 476,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 800
@@ -35,7 +35,7 @@
      "mass": 64,
      "power": 1.92,
      "rating": "D",
-      "recharge": 629,
+      "shieldreinforcement": 629,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 800
@@ -55,7 +55,7 @@
      "mass": 160,
      "power": 2.4,
      "rating": "C",
-      "recharge": 799,
+      "shieldreinforcement": 799,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 800
@@ -75,7 +75,7 @@
      "mass": 256,
      "power": 2.88,
      "rating": "B",
-      "recharge": 952,
+      "shieldreinforcement": 952,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 800
@@ -95,7 +95,7 @@
      "mass": 160,
      "power": 3.36,
      "rating": "A",
-      "recharge": 1105,
+      "shieldreinforcement": 1105,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 800
@@ -115,7 +115,7 @@
      "mass": 80,
      "power": 1.24,
      "rating": "E",
-      "recharge": 264,
+      "shieldreinforcement": 264,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 720
@@ -135,7 +135,7 @@
      "mass": 32,
      "power": 1.66,
      "rating": "D",
-      "recharge": 352,
+      "shieldreinforcement": 352,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 720
@@ -155,7 +155,7 @@
      "mass": 80,
      "power": 2.07,
      "rating": "C",
-      "recharge": 451,
+      "shieldreinforcement": 451,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 720
@@ -175,7 +175,7 @@
      "mass": 128,
      "power": 2.48,
      "rating": "B",
-      "recharge": 539,
+      "shieldreinforcement": 539,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 720
@@ -195,7 +195,7 @@
      "mass": 80,
      "power": 2.9,
      "rating": "A",
-      "recharge": 627,
+      "shieldreinforcement": 627,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 720
@@ -215,7 +215,7 @@
      "mass": 40,
      "power": 1.06,
      "rating": "E",
-      "recharge": 160,
+      "shieldreinforcement": 160,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 640
@@ -235,7 +235,7 @@
      "mass": 16,
      "power": 1.42,
      "rating": "D",
-      "recharge": 208,
+      "shieldreinforcement": 208,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 640
@@ -255,7 +255,7 @@
      "mass": 40,
      "power": 1.77,
      "rating": "C",
-      "recharge": 264,
+      "shieldreinforcement": 264,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 640
@@ -275,7 +275,7 @@
      "mass": 64,
      "power": 2.12,
      "rating": "B",
-      "recharge": 312,
+      "shieldreinforcement": 312,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 640
@@ -295,7 +295,7 @@
      "mass": 40,
      "power": 2.48,
      "rating": "A",
-      "recharge": 368,
+      "shieldreinforcement": 368,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 640
@@ -315,7 +315,7 @@
      "mass": 20,
      "power": 0.9,
      "rating": "E",
-      "recharge": 105,
+      "shieldreinforcement": 105,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 540
@@ -335,7 +335,7 @@
      "mass": 8,
      "power": 1.2,
      "rating": "D",
-      "recharge": 140,
+      "shieldreinforcement": 140,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 540
@@ -355,7 +355,7 @@
      "mass": 20,
      "power": 1.5,
      "rating": "C",
-      "recharge": 175,
+      "shieldreinforcement": 175,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 540
@@ -375,7 +375,7 @@
      "mass": 32,
      "power": 1.8,
      "rating": "B",
-      "recharge": 205,
+      "shieldreinforcement": 205,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 540
@@ -395,7 +395,7 @@
      "mass": 20,
      "power": 2.1,
      "rating": "A",
-      "recharge": 240,
+      "shieldreinforcement": 240,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 540
@@ -415,7 +415,7 @@
      "mass": 10,
      "power": 0.74,
      "rating": "E",
-      "recharge": 60,
+      "shieldreinforcement": 60,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 410
@@ -435,7 +435,7 @@
      "mass": 4,
      "power": 0.98,
      "rating": "D",
-      "recharge": 78,
+      "shieldreinforcement": 78,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 410
@@ -455,7 +455,7 @@
      "mass": 10,
      "power": 1.23,
      "rating": "C",
-      "recharge": 99,
+      "shieldreinforcement": 99,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 410
@@ -475,7 +475,7 @@
      "mass": 16,
      "power": 1.48,
      "rating": "B",
-      "recharge": 117,
+      "shieldreinforcement": 117,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 410
@@ -495,7 +495,7 @@
      "mass": 10,
      "power": 1.72,
      "rating": "A",
-      "recharge": 138,
+      "shieldreinforcement": 138,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 410
@@ -515,7 +515,7 @@
      "mass": 5,
      "power": 0.61,
      "rating": "E",
-      "recharge": 34,
+      "shieldreinforcement": 34,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 340
@@ -535,7 +535,7 @@
      "mass": 2,
      "power": 0.82,
      "rating": "D",
-      "recharge": 46,
+      "shieldreinforcement": 46,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 340
@@ -555,7 +555,7 @@
      "mass": 5,
      "power": 1.02,
      "rating": "C",
-      "recharge": 58,
+      "shieldreinforcement": 58,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 340
@@ -575,7 +575,7 @@
      "mass": 8,
      "power": 1.22,
      "rating": "B",
-      "recharge": 70,
+      "shieldreinforcement": 70,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 340
@@ -595,7 +595,7 @@
      "mass": 5,
      "power": 1.43,
      "rating": "A",
-      "recharge": 82,
+      "shieldreinforcement": 82,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 340
@@ -615,7 +615,7 @@
      "mass": 2.5,
      "power": 0.5,
      "rating": "E",
-      "recharge": 28,
+      "shieldreinforcement": 28,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 240
@@ -635,7 +635,7 @@
      "mass": 1,
      "power": 0.67,
      "rating": "D",
-      "recharge": 36,
+      "shieldreinforcement": 36,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 240
@@ -655,7 +655,7 @@
      "mass": 2.5,
      "power": 0.84,
      "rating": "C",
-      "recharge": 46,
+      "shieldreinforcement": 46,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 240
@@ -675,7 +675,7 @@
      "mass": 4,
      "power": 1.01,
      "rating": "B",
-      "recharge": 56,
+      "shieldreinforcement": 56,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 240
@@ -695,7 +695,7 @@
      "mass": 2.5,
      "power": 1.18,
      "rating": "A",
-      "recharge": 64,
+      "shieldreinforcement": 64,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 240
@@ -715,7 +715,7 @@
      "mass": 1.3,
      "power": 0.41,
      "rating": "E",
-      "recharge": 12,
+      "shieldreinforcement": 12,
      "rechargerating": "E",
      "spinup": 5,
      "thermload": 170
@@ -735,7 +735,7 @@
      "mass": 0.5,
      "power": 0.55,
      "rating": "D",
-      "recharge": 12.5,
+      "shieldreinforcement": 12.5,
      "rechargerating": "D",
      "spinup": 5,
      "thermload": 170
@@ -755,7 +755,7 @@
      "mass": 1.3,
      "power": 0.69,
      "rating": "C",
-      "recharge": 20,
+      "shieldreinforcement": 20,
      "rechargerating": "C",
      "spinup": 5,
      "thermload": 170
@@ -775,7 +775,7 @@
      "mass": 2,
      "power": 0.83,
      "rating": "B",
-      "recharge": 24,
+      "shieldreinforcement": 24,
      "rechargerating": "B",
      "spinup": 5,
      "thermload": 170
@@ -795,7 +795,7 @@
      "mass": 1.3,
      "power": 0.97,
      "rating": "A",
-      "recharge": 28,
+      "shieldreinforcement": 28,
      "rechargerating": "A",
      "spinup": 5,
      "thermload": 170
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
@@ -5,8 +5,10 @@
      "cost": 2007240,
      "edID": 128064293,
      "eddbID": 1146,
+      "explres": 0.5,
      "grp": "sg",
      "id": "4t",
+      "kinres": 0.4,
      "mass": 160,
      "maxmass": 4500,
      "maxmul": 1.3,
@@ -16,15 +18,18 @@
      "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": 1.4,
@@ -34,15 +39,18 @@
      "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": 1.5,
@@ -52,15 +60,18 @@
      "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": 1.6,
@@ -70,15 +81,18 @@
      "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": 1.7,
@@ -88,15 +102,18 @@
      "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": 1.3,
@@ -106,15 +123,18 @@
      "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": 1.4,
@@ -124,15 +144,18 @@
      "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": 1.5,
@@ -142,15 +165,18 @@
      "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": 1.6,
@@ -160,15 +186,18 @@
      "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": 1.7,
@@ -178,15 +207,18 @@
      "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": 1.3,
@@ -196,15 +228,18 @@
      "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": 1.4,
@@ -214,15 +249,18 @@
      "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": 1.5,
@@ -232,15 +270,18 @@
      "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": 1.6,
@@ -250,15 +291,18 @@
      "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": 1.7,
@@ -268,15 +312,18 @@
      "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": 1.3,
@@ -286,15 +333,18 @@
      "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": 1.4,
@@ -304,15 +354,18 @@
      "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": 1.5,
@@ -322,15 +375,18 @@
      "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": 1.6,
@@ -340,15 +396,18 @@
      "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": 1.7,
@@ -358,15 +417,18 @@
      "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": 1.3,
@@ -376,15 +438,18 @@
      "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": 1.4,
@@ -394,15 +459,18 @@
      "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": 1.5,
@@ -412,15 +480,18 @@
      "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": 1.6,
@@ -430,15 +501,18 @@
      "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": 1.7,
@@ -448,15 +522,18 @@
      "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": 1.3,
@@ -466,15 +543,18 @@
      "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": 1.4,
@@ -484,15 +564,18 @@
      "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": 1.5,
@@ -502,15 +585,18 @@
      "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": 1.6,
@@ -520,15 +606,18 @@
      "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": 1.7,
@@ -538,15 +627,18 @@
      "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": 1.3,
@@ -556,15 +648,18 @@
      "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": 1.4,
@@ -574,15 +669,18 @@
      "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": 1.5,
@@ -592,15 +690,18 @@
      "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": 1.6,
@@ -610,15 +711,18 @@
      "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": 1.7,
@@ -628,15 +732,18 @@
      "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": 1.7,
@@ -646,7 +753,8 @@
      "optmul": 1.2,
      "power": 1.68,
      "rating": "A",
-      "recover": 1
+      "recover": 1,
+      "thermres": -0.2
    }
  ]
 }
--- a/modules/standard/life_support.json
+++ b/modules/standard/life_support.json
@@ -3,7 +3,7 @@
    {
      "boot": 1,
      "class": 8,
-      "cost": 0,
+      "cost": 697590,
      "edID": 128064173,
      "eddbID": 1031,
      "grp": "ls",
@@ -17,7 +17,7 @@
    {
      "boot": 1,
      "class": 8,
-      "cost": 0,
+      "cost": 1743970,
      "edID": 128064174,
      "eddbID": 1032,
      "grp": "ls",
@@ -31,7 +31,7 @@
    {
      "boot": 1,
      "class": 8,
-      "cost": 0,
+      "cost": 4359900,
      "edID": 128064175,
      "eddbID": 1033,
      "grp": "ls",
@@ -45,7 +45,7 @@
    {
      "boot": 1,
      "class": 8,
-      "cost": 0,
+      "cost": 10899770,
      "edID": 128064176,
      "eddbID": 1034,
      "grp": "ls",
@@ -59,7 +59,7 @@
    {
      "boot": 1,
      "class": 8,
-      "cost": 0,
+      "cost": 27249400,
      "edID": 128064177,
      "eddbID": 1035,
      "grp": "ls",
--- a/modules/standard/thrusters.json
+++ b/modules/standard/thrusters.json
@@ -118,7 +118,7 @@
      "integrity": 105,
      "mass": 32,
      "maxmass": 2430,
-      "maxmul": 1.86,
+      "maxmul": 1.06,
      "minmass": 810,
      "minmul": 0.86,
      "optmass": 1620,
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.2.1",
+  "version": "2.2.4",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 87810,
    "bulkheads": [
-      { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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  }
    ],
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -20,9 +20,9 @@
    },
    "retailCost": 146969450,
    "bulkheads": [
-      { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 6661150,
    "bulkheads": [
-      { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -1,6 +1,7 @@
 {
  "asp_scout": {
-    "edID": 128672276, "eddbID": 24,
+    "edID": 128672276,
+    "eddbID": 24,
    "properties": {
      "name": "Asp Scout",
      "manufacturer": "Lakon",
@@ -18,9 +19,9 @@
    },
    "retailCost": 3961150,
    "bulkheads": [
-      { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -21,9 +21,9 @@
    },
    "retailCost": 84532770,
    "bulkheads": [
-      { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
@@ -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"]
    }
  }
 }
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 349720,
    "bulkheads": [
-      { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 747660,
    "bulkheads": [
-      { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -18,9 +18,9 @@
    },
    "retailCost": 1894760,
    "bulkheads": [
-      { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 564330,
    "bulkheads": [
-      { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 44800,
    "bulkheads": [
-      { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -18,9 +18,9 @@
    },
    "retailCost": 19814210,
    "bulkheads": [
-      { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -12,7 +12,7 @@
      "boostEnergy": 27,
      "agility": 2,
      "baseShieldStrength": 555,
-      "baseArmour": 666,
+      "baseArmour": 370,
      "hullMass": 900,
      "masslock": 24,
      "pipSpeed": 0.125,
@@ -20,9 +20,9 @@
    },
    "retailCost": 187969450,
    "bulkheads": [
-      { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 14314210,
    "bulkheads": [
-      { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -20,9 +20,9 @@
    },
    "retailCost": 35814210,
    "bulkheads": [
-      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 51567040,
    "bulkheads": [
-      { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 52720,
    "bulkheads": [
-      { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 22296860,
      "bulkheads": [
-      { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -18,9 +18,9 @@
    },
    "retailCost": 2542930,
    "bulkheads": [
-      { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 208969450,
    "bulkheads": [
-      { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 110830,
    "bulkheads": [
-      { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -6,7 +6,7 @@
      "name": "Keelback",
      "manufacturer": "Lakon",
      "class": 2,
-      "hullCost": 2951180,
+      "hullCost": 2943880,
      "speed": 200,
      "boost": 300,
      "boostEnergy": 10,
@@ -18,11 +18,11 @@
      "pipSpeed": 0.1375,
      "fighterHangars": true
    },
-    "retailCost": 3126150,
+    "retailCost": 3126160,
    "bulkheads": [
-      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -6,7 +6,7 @@
      "name": "Orca",
      "manufacturer": "Saud Kruger",
      "class": 3,
-      "hullCost": 47798080,
+      "hullCost": 47790590,
      "speed": 300,
      "boost": 380,
      "boostEnergy": 16,
@@ -18,11 +18,11 @@
      "pipSpeed": 0.08375,
      "luxuryCabins": true
    },
-    "retailCost": 48539890,
+    "retailCost": 48539900,
    "bulkheads": [
-      { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
@@ -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"]
    }
  }
 }
--- a/ships/python.json
+++ b/ships/python.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 56978180,
    "bulkheads": [
-      { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 40800,
    "bulkheads": [
-      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 1045950,
    "bulkheads": [
-      { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -6,7 +6,7 @@
      "name": "Type-7 Transporter",
      "manufacturer": "Lakon",
      "class": 3,
-      "hullCost": 16881510,
+      "hullCost": 16780510,
      "speed": 180,
      "boost": 300,
      "boostEnergy": 10,
@@ -17,11 +17,11 @@
      "masslock": 10,
      "pipSpeed": 0.16625
    },
-    "retailCost": 17472250,
+    "retailCost": 17472260,
    "bulkheads": [
-      { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -20,9 +20,9 @@
    },
    "retailCost": 76555840,
    "bulkheads": [
-      { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 142930,
    "bulkheads": [
-      { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 437930,
    "bulkheads": [
-      { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -19,9 +19,9 @@
    },
    "retailCost": 4925620,
    "bulkheads": [
-      { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "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": "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 }
    ],
--- a/spec/data-spec.js
+++ b/spec/data-spec.js
@@ -1,5 +1,6 @@
 var Modules = require('../modules');
 var Ships = require('../ships');
+var Modifications = require('../modifications');

 describe('JSON Data', function() {

@@ -160,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;
+    }
+  });
+
 });
Author	SHA1	Message	Date
Cmdr McDonald	c08265b509	Merge branch 'release/2.2.4'	2016-11-28 16:47:54 +00:00
Cmdr McDonald	fb77f81f7d	Bump version	2016-11-28 16:47:42 +00:00
Cmdr McDonald	deb0606de1	Merge branch 'feature/specials' into develop Merge for #25	2016-11-27 19:45:43 +00:00
Cmdr McDonald	c088a8f99a	Fix incorrect modification	2016-11-27 19:45:19 +00:00
Cmdr McDonald	4d1eb00136	Update changelog	2016-11-27 17:14:22 +00:00
Cmdr McDonald	f521070a56	Added known special effects	2016-11-27 00:06:51 +00:00
Cmdr McDonald	7fc1173e15	Merge branch 'feature/incendiary' into develop	2016-11-26 23:24:15 +00:00
Cmdr McDonald	6ce244f7d0	Merge branch 'feature/incendiary' of https://github.com/edcd/coriolis-data into feature/incendiary	2016-11-26 13:19:27 +00:00
Cmdr McDonald	a81ba13615	Change modifications from simple strings to objects, to allow more data-driven behaviour	2016-11-26 13:19:04 +00:00
Cmdr McDonald	922b5727e6	Add damage type modifier for incendiary rounds	2016-11-26 13:18:24 +00:00
Cmdr McDonald	e0d7417ec2	Merge branch 'feature/issue10' into develop Merge for #10	2016-11-26 12:57:34 +00:00
Cmdr McDonald	b58f5c3bf5	Update dist	2016-11-26 12:57:26 +00:00
Cmdr McDonald	62a2bfe308	Merge of fix for #10	2016-11-26 12:56:39 +00:00
Cmdr McDonald	a2fcf8b2e7	Change modifications from simple strings to objects, to allow more data-driven behaviour	2016-11-26 12:49:39 +00:00
Cmdr McDonald	05e32fe1b1	Fix incorrect ID for luxury passenger cabins - #37	2016-11-24 19:17:07 +00:00
Cmdr McDonald	031e5b2a37	Merge branch 'release/2.2.3' into develop	2016-11-24 13:45:17 +00:00
Cmdr McDonald	e5cde00485	Merge branch 'release/2.2.3'	2016-11-24 13:45:12 +00:00
Cmdr McDonald	64c49b67c3	Bump revision	2016-11-24 13:45:03 +00:00
Cmdr McDonald	56cb1cbd00	Add damage type modifier for incendiary rounds	2016-11-24 13:44:12 +00:00
Cmdr McDonald	384af5dbd8	Merge branch 'feature/blueprints' into develop	2016-11-23 00:57:01 +00:00
Cmdr McDonald	258e1f9b34	Merge branch 'feature/issue29' into develop	2016-11-23 00:55:20 +00:00
Cmdr McDonald	d2404d9ad5	Update dist	2016-11-23 00:55:07 +00:00
Cmdr McDonald	361e921086	Fix details for thermal shock special effect	2016-11-23 00:31:55 +00:00
Cmdr McDonald	cd5d9af553	Add details for concordant sequence special effect	2016-11-23 00:24:10 +00:00
Cmdr McDonald	0ab34c984c	Fix mismatch between class 5 and class 7 fighter hangars	2016-11-23 00:23:25 +00:00
Cmdr McDonald	737ae38110	Add blueprint information	2016-11-22 14:47:06 +00:00
Cmdr McDonald	cd62eb46c8	Merge branch 'release/2.2.2' into develop	2016-11-21 16:43:39 +00:00
Cmdr McDonald	43983fc625	Merge branch 'release/2.2.2'	2016-11-21 16:43:34 +00:00
Cmdr McDonald	ebdc354b4d	Bumped release	2016-11-21 16:43:08 +00:00
Cmdr McDonald	2988e1a84d	Merge branch 'feature/res' into develop	2016-11-21 16:39:07 +00:00
Cmdr McDonald	1047378edc	Fix Federal Corvette base armour; add costs for individual items	2016-11-15 13:33:19 +00:00
Cmdr McDonald	a7549a4831	Added modifier actions to create modifications from raw data	2016-11-12 12:01:38 +00:00
Cmdr McDonald	5404e56c7e	Update distribution with fixed thrusters data	2016-11-11 07:56:12 +00:00
Cmdr McDonald	cd15379af9	Merge branch 'wbtuomela-patch-1' into feature/res	2016-11-11 07:54:40 +00:00
Cmdr McDonald	45701cbe98	Merge branch 'patch-1' of https://github.com/wbtuomela/coriolis-data into wbtuomela-patch-1	2016-11-11 07:54:19 +00:00
Brandon Tuomela	2b5feaa579	Fix 7D thrusters max multiplier We can only wish 7D gave a 1.86 multiplier, fixed to true value of 1.06	2016-11-10 17:15:00 -08:00
Cmdr McDonald	35b73f3d02	Added shield reinforcement for shield cell banks	2016-11-10 23:30:30 +00:00
Cmdr McDonald	403dfd0171	Update distribution files	2016-11-10 17:57:00 +00:00
Cmdr McDonald	74f6aa07cf	Enter more plausible values for cytoscrambler	2016-11-10 15:18:24 +00:00
Cmdr McDonald	cd443d9d57	Added resistance values	2016-11-10 00:09:10 +00:00
Cmdr McDonald	70cae4660b	Merge branch 'feature/fixes' into develop	2016-11-09 19:06:02 +00:00
Cmdr McDonald	70fd4595b4	Add resistances for hull reinforcement packages	2016-11-09 19:04:57 +00:00
Cmdr McDonald	24219231e6	Add initial loadout passenger cabins for Beluga Add initial loadout passenger cabins for Orca Update costs and initial loadouts for Keelback and Type-7	2016-11-09 16:33:21 +00:00
Cmdr McDonald	ea3b66e71d	Add distributor draw modifier to shield generators Remove modifiers for sensors	2016-11-07 10:13:48 +00:00
Cmdr McDonald	dad809a4bb	Merge branch 'release/2.2.1' into develop	2016-11-05 14:03:00 +00:00