Merge branch 'release/2.2.12'

ChangeLog.md

@@ -1,3 +1,46 @@
+#2.2.12
+  * Add special effects for each blueprint
+  * Add IDs for most Powerplay modules
+
+#2.2.11
+  * Remove non-existant chaff launcher capacity blueprint grades
+  * Fix incorrect values for charge enhanced power distributor
+  * Remove incorrect AFMU blueprints
+  * Correct fragment cannon Double Shot blueprint information
+  * Correct Focused weapon blueprint information
+
+#2.2.10
+  * Fix incorrect base shield values for Cutter and Corvette
+  * Update weapons to have %-based damage distributions
+  * Remove power draw for detailed surface scanner - although shown in outfitting it is not part of active power
+  * Fix incorrect names for lightweight and kinetic armour
+  * Add engineering blueprints
+
+#2.2.9
+  * Add falloff metric for weapons
+  * Add falloff from range modification
+
+#2.2.8
+  * Set military slot of Viper Mk IV to class 3; was incorrectly set as class 2
+  * Update base regeneration rate of prismatic shield generators to values in 2.2.03
+  * Update specials with information in 2.2.03
+
+#2.2.6
+  * Update weapons with changed values for 2.2.03
+  * Add individual pitch/roll/yaw statistics for each ship
+  * Remove old and meaningless agility stat
+  * Use sane order for multi-module JSON - coriolis can re-order as it sees fit when displaying modules
+  * Fix cost of fighter hangars
+  * Update Powerplay weapons with current statistics
+  * Add separate min/opt/max multipliers for enhanced thrusters for speed, acceleration and rotation
+  * Add module reinforcement packages
+  * Add military compartments
+  * Fix missing damage value for 2B dumbfires
+  * Update shield recharge rates
+  * Reduce hull mass of Viper to 50T
+  * Fix incorrect optimal mass value for 8A thrusters
+  * Add power draw for detailed surface scanner
+
 #2.2.5
   * Fix incorrect ID for emissive munitions special
   * Fix rate of fire for burst lasers

modifications/index.js

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

modifications/modifications.json

@@ -2,10 +2,11 @@
     "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative"},
     "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative"},
     "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative"},
-    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "multiplicative"},
-    "burstrof": {"id": 41, "name": "burstrof", "type": "percentage", "method": "multiplicative"},
+    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite"},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite"},
     "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative"},
     "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
+    "damagedist": {"id": 40, "name": "damage", "type": "hidden", "method": "overwrite"},
     "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative"},
     "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
     "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
@@ -13,6 +14,8 @@
     "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
     "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
     "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
+    "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative"},
+    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "hidden", "method": "overwrite"},
     "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
     "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
     "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative"},
@@ -25,6 +28,7 @@
     "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
     "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
     "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
+    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative"},
     "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
     "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
     "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},
@@ -32,6 +36,7 @@
     "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"},
     "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"},
     "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"},
+    "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative"},
     "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"},
     "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"},
     "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"},
@@ -39,6 +44,5 @@
     "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive"},
     "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative"},
     "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative"},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"},
-    "type": {"id": 40, "name": "type", "type": "alphabetic", "method": "overwrite"}
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"}
 }

modifications/modifierActions.json

@@ -174,6 +174,8 @@
   "mod_weapon_damage": {
     "damage": 1
   },
+  "mod_weapon_falloffrange_from_range": {
+  },
   "mod_weapon_hardness_piercing": {
     "piercing": 1
   },
@@ -195,28 +197,53 @@
     "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_feedback_cascade": {
+    "breachdmg": -0.2,
+    "damage": -0.2
+  },
+  "special_force_shell": {
+    "jitter": 1,
+    "speed": -0.1667
+  },
+  "special_high_yield_shell": {
+    "rof": 0.1111111111111111
+  },
   "special_incendiary_rounds": {
     "rof": 0.05263157894736842,
     "thermload": 2,
-    "type": "T"
+    "damagedist": { 
+      "T": 1
+    }
+  },
+  "special_inertial_impact": {
+    "damage": 0.5,
+    "jitter": 1,
+    "damagedist": { 
+      "K": 0.5,
+      "T": 0.5
+    }
   },
   "special_overload_munitions": {
-    "ammo": -0.2
   },
-  "special_phasing_sequence": {},
+  "special_phasing_sequence": {
+    "damage": -0.1
+  },
+  "special_plasma_slug": {
+    "damage": -0.2
+  },
   "special_radiant_canister": {
     "ammo": -0.25
   },
-  "special_regeneration_sequence": {},
+  "special_regeneration_sequence": {
+    "damage": -0.1
+  },
+  "special_reverberating_cascade": {},
   "special_scramble_spectrum": {
     "rof": 0.1111111111111111
   },
@@ -226,8 +253,13 @@
   "special_shiftlock_canister": {
     "damage": -0.2
   },
+  "special_super_penetrator": {
+    "reload": 0.5
+  },
   "special_thermal_cascade": {},
-  "special_thermal_conduit": {},
+  "special_thermal_conduit": {
+    "damage": -0.2
+  },
   "special_thermal_vent": {
     "thermload": 0.25
   },

modifications/modules.json

@@ -0,0 +1,854 @@
+{
+  "am": {
+    "blueprints": {
+      "AFM_Shielded": [1, 2, 3, 4]
+    },
+    "modifications": [
+      "integrity",
+      "power"
+    ]
+  },
+  "bh": {
+    "blueprints": {
+      "Armour_Advanced": [1, 2, 3, 4, 5],
+      "Armour_Explosive": [1, 2, 3, 4, 5],
+      "Armour_HeavyDuty": [1, 2, 3, 4, 5],
+      "Armour_Kinetic": [1, 2, 3, 4, 5],
+      "Armour_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "explres",
+      "hullboost",
+      "kinres",
+      "mass",
+      "thermres"
+    ]
+  },
+  "bl": {
+    "blueprints": {
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "damage",
+      "damagedist",
+      "distdraw",
+      "fallofffromrange",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_regeneration_sequence",
+      "special_thermal_conduit",
+      "special_thermalshock",
+      "special_thermal_vent"
+    ]
+  },
+  "bsg": {
+    "blueprints": {
+      "ShieldGenerator_Kinetic": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Optimised": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Reinforced": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "brokenregen",
+      "distdraw",
+      "explres",
+      "integrity",
+      "kinres",
+      "mass",
+      "optmass",
+      "optmul",
+      "power",
+      "regen",
+      "thermload",
+      "thermres"
+    ]
+  },
+  "c": {
+    "blueprints": {
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_HighCapacity": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "clip",
+      "damage",
+      "damagedist",
+      "distdraw",
+      "fallofffromrange",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "reload",
+      "rof",
+      "shotspeed",
+      "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_dispersal_field",
+      "special_smart_rounds",
+      "special_force_shell",
+      "special_high_yield_shell",
+      "special_thermal_cascade"
+    ]
+  },
+  "cc": {
+    "blueprints": {
+      "CollectionLimpet_LightWeight": [1, 2, 3, 4, 5],
+      "CollectionLimpet_Reinforced": [1, 2, 3, 4, 5],
+      "CollectionLimpet_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "ch": {
+    "blueprints": {
+      "ChaffLauncher_ChaffCapacity": [3],
+      "ChaffLauncher_LightWeight": [1, 2, 3, 4, 5],
+      "ChaffLauncher_Reinforced": [1, 2, 3, 4, 5],
+      "ChaffLauncher_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "integrity",
+      "mass",
+      "power",
+      "reload"
+    ]
+  },
+  "cr": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "cs": {
+    "blueprints": {
+      "CargoScanner_LightWeight": [1, 2, 3, 4, 5],
+      "CargoScanner_Reinforced": [1, 2, 3, 4, 5],
+      "CargoScanner_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "dc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "ec": {
+    "blueprints": {
+      "ECM_LightWeight": [1, 2, 3, 4, 5],
+      "ECM_Reinforced": [1, 2, 3, 4, 5],
+      "ECM_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "fc": {
+    "blueprints": {
+      "Weapon_DoubleShot": [1, 2, 3, 4, 5],
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_HighCapacity": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "burst",
+      "burstrof",
+      "clip",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "reload",
+      "rof",
+      "shotspeed",
+      "thermload"
+    ],
+    "specials": [
+      "special_corrosive_shell",
+      "special_blinding_shell",
+      "special_incendiary_rounds",
+      "special_drag_munitions",
+      "special_screening_shell"
+    ]
+  },
+  "fh": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "fi": {
+    "blueprints": {
+      "FSDinterdictor_Expanded": [1, 2, 3, 4],
+      "FSDinterdictor_LongRange": [1, 2, 3]
+    },
+    "modifications": [
+      "boot",
+      "facinglimit",
+      "integrity",
+      "mass",
+      "power",
+      "ranget"
+    ]
+  },
+  "fs": {
+    "blueprints": {
+      "FuelScoop_Shielded": [1, 2, 3, 4]
+    },
+    "modifications": [
+      "integrity",
+      "power"
+    ]
+  },
+  "fsd": {
+    "blueprints": {
+      "FSD_FastBoot": [1, 2, 3, 4, 5],
+      "FSD_LongRange": [1, 2, 3, 4, 5],
+      "FSD_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "maxfuel",
+      "optmass",
+      "power",
+      "thermload"
+    ]
+  },
+  "ft": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "fx": {
+    "blueprints": {
+      "FuelTransferLimpet_LightWeight": [1, 2, 3, 4, 5],
+      "FuelTransferLimpet_Reinforced": [1, 2, 3, 4, 5],
+      "FuelTransferLimpet_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "hb": {
+    "blueprints": {
+      "HatchBreakerLimpet_LightWeight": [1, 2, 3, 4, 5],
+      "HatchBreakerLimpet_Reinforced": [1, 2, 3, 4, 5],
+      "HatchBreakerLimpet_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "hr": {
+    "blueprints": {
+      "HullReinforcement_Advanced": [1, 2, 3, 4, 5],
+      "HullReinforcement_Explosive": [1, 2, 3, 4, 5],
+      "HullReinforcement_HeavyDuty": [1, 2, 3, 4, 5],
+      "HullReinforcement_Kinetic": [1, 2, 3, 4, 5],
+      "HullReinforcement_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "hullreinforcement",
+      "explres",
+      "hullboost",
+      "kinres",
+      "mass",
+      "thermres"
+    ]
+  },
+  "hs": {
+    "blueprints": {
+      "HeatSinkLauncher_HeatSinkCapacity": [3],
+      "HeatSinkLauncher_LightWeight": [1, 2, 3, 4, 5],
+      "HeatSinkLauncher_Reinforced": [1, 2, 3, 4, 5],
+      "HeatSinkLauncher_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "integrity",
+      "mass",
+      "power",
+      "reload"
+    ]
+  },
+  "kw": {
+    "blueprints": {
+      "KillWarrantScanner_LightWeight": [1, 2, 3, 4, 5],
+      "KillWarrantScanner_Reinforced": [1, 2, 3, 4, 5],
+      "KillWarrantScanner_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "ls": {
+    "blueprints": {
+      "LifeSupport_LightWeight": [1, 2, 3, 4, 5],
+      "LifeSupport_Reinforced": [1, 2, 3, 4, 5],
+      "LifeSupport_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "mc": {
+    "blueprints": {
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_HighCapacity": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "clip",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "reload",
+      "rof",
+      "shotspeed",
+      "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_corrosive_shell",
+      "special_emissive_munitions",
+      "special_incendiary_rounds",
+      "special_smart_rounds",
+      "special_thermalshock"
+    ]
+  },
+  "ml": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "mr": {
+    "blueprints": {
+      "Weapon_HighCapacity": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "clip",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "reload",
+      "rof",
+      "thermload"
+    ],
+    "specials": [
+      "special_drag_munitions",
+      "special_emissive_munitions",
+      "special_overload_munitions",
+      "special_penetrator_payload",
+      "special_thermal_cascade"
+    ]
+  },
+  "mrp": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "nl": {
+    "blueprints": {
+      "Weapon_HighCapacity": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "boot",
+      "clip",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "reload",
+      "rof",
+      "thermload"
+    ],
+    "specials": [
+      "special_ion_disruptor",
+      "special_overload_munitions",
+      "special_radiant_canister",
+      "special_reverberating_cascade",
+      "special_shiftlock_canister",
+      "special_emissive_munitions"
+    ]
+  },
+  "pa": {
+    "blueprints": {
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_Focused": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "clip",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "reload",
+      "rof",
+      "shotspeed",
+      "thermload"
+    ],
+    "specials": [
+      "special_blinding_shell",
+      "special_dispersal_field",
+      "special_phasing_sequence",
+      "special_target_lock_breaker",
+      "special_thermal_conduit"
+    ]
+  },
+  "pas": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "pc": {
+    "blueprints": {
+      "ProspectingLimpet_LightWeight": [1, 2, 3, 4, 5],
+      "ProspectingLimpet_Reinforced": [1, 2, 3, 4, 5],
+      "ProspectingLimpet_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "pce": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "pci": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "pcm": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "pcq": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "pd": {
+    "blueprints": {
+      "PowerDistributor_HighFrequency": [1, 2, 3, 4, 5],
+      "PowerDistributor_PriorityEngines": [1, 2, 3],
+      "PowerDistributor_HighCapacity": [1, 2, 3, 4, 5],
+      "PowerDistributor_Shielded": [1, 2, 3, 4, 5],
+      "PowerDistributor_PrioritySystems": [1, 2, 3],
+      "PowerDistributor_PriorityWeapons": [1, 2, 3]
+    },
+    "modifications": [
+      "boot",
+      "engcap",
+      "engrate",
+      "integrity",
+      "mass",
+      "power",
+      "syscap",
+      "sysrate",
+      "wepcap",
+      "weprate"
+    ]
+  },
+  "pl": {
+    "blueprints": {
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_Focused": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "rof",
+      "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_emissive_munitions",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
+    ]
+  },
+  "po": {
+    "blueprints": {
+      "PointDefence_PointDefenseCapacity": [3],
+      "PointDefence_LightWeight": [1, 2, 3, 4, 5],
+      "PointDefence_Reinforced": [1, 2, 3, 4, 5],
+      "PointDefence_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "integrity",
+      "mass",
+      "power",
+      "reload"
+    ]
+  },
+  "pp": {
+    "blueprints": {
+      "PowerPlant_Armoured": [1, 2, 3, 4, 5],
+      "PowerPlant_Stealth": [1, 2, 3],
+      "PowerPlant_Boosted": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "eff",
+      "integrity",
+      "mass",
+      "pgen"
+    ]
+  },
+  "psg": {
+    "blueprints": {
+      "ShieldGenerator_Kinetic": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Optimised": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Reinforced": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "brokenregen",
+      "distdraw",
+      "explres",
+      "integrity",
+      "kinres",
+      "mass",
+      "optmass",
+      "optmul",
+      "power",
+      "regen",
+      "thermload",
+      "thermres"
+    ]
+  },
+  "pv": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "rf": {
+    "blueprints": {
+      "Refineries_Shielded": [1, 2, 3, 4]
+    },
+    "modifications": [
+      "integrity",
+      "power"
+    ]
+  },
+  "rg": {
+    "blueprints": {
+      "Weapon_HighCapacity": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "clip",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "reload",
+      "rof",
+      "thermload"
+    ],
+    "specials": [
+      "special_feedback_cascade",
+      "special_plasma_slug",
+      "special_super_penetrator"
+    ]
+  },
+  "s": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "sb": {
+    "blueprints": {
+      "ShieldBooster_Explosive": [1, 2, 3, 4, 5],
+      "ShieldBooster_HeavyDuty": [1, 2, 3, 4, 5],
+      "ShieldBooster_Kinetic": [1, 2, 3, 4, 5],
+      "ShieldBooster_Resistive": [1, 2, 3, 4, 5],
+      "ShieldBooster_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "explres",
+      "integrity",
+      "kinres",
+      "mass",
+      "power",
+      "shieldboost",
+      "thermres"
+    ]
+  },
+  "sc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "scb": {
+    "blueprints": {
+      "ShieldCellBank_Rapid": [1, 2, 3, 4],
+      "ShieldCellBank_Specialised": [1, 2, 3, 4]
+    },
+    "modifications": [
+      "boot",
+      "duration",
+      "integrity",
+      "power",
+      "shieldreinforcement",
+      "spinup",
+      "thermload"
+    ]
+  },
+  "sg": {
+    "blueprints": {
+      "ShieldGenerator_Kinetic": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Optimised": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Reinforced": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "brokenregen",
+      "distdraw",
+      "explres",
+      "integrity",
+      "kinres",
+      "mass",
+      "optmass",
+      "optmul",
+      "power",
+      "regen",
+      "thermload",
+      "thermres"
+    ]
+  },
+  "t": {
+    "blueprints": {
+      "Engine_Dirty": [1, 2, 3, 4, 5],
+      "Engine_Reinforced": [1, 2, 3, 4, 5],
+      "Engine_Tuned": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "optmass",
+      "optmul",
+      "power",
+      "thermload"
+    ]
+  },
+  "tp": {
+    "blueprints": {
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "rof",
+      "thermload"
+    ],
+    "specials": [
+      "special_mass_lock_munition",
+      "special_penetrator_payload",
+      "special_reverberating_cascade"
+    ]
+  },
+  "ul": {
+    "blueprints": {
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_Focused": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "burst",
+      "burstrof",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "rof",
+      "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_inertial_impact",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
+    ]
+  },
+  "ws": {
+    "blueprints": {
+      "WakeScanner_LightWeight": [1, 2, 3, 4, 5],
+      "WakeScanner_Reinforced": [1, 2, 3, 4, 5],
+      "WakeScanner_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  }
+}

modifications/specials.json

@@ -1,34 +1,35 @@
 {
-    "special_auto_loader": {"id": 0, "name": "Auto loader"},
-    "special_choke_canister": {"id": 1, "name": "Choke canister"},
-    "special_concordant_sequence": {"id": 2, "name": "Concordant sequence"},
-    "special_corrosive_shell": {"id": 3, "name": "Corrosive shell"},
-    "special_blinding_shell": {"id": 4, "name": "Dazzle shell"},
-    "special_dispersal_field": {"id": 5, "name": "Dispersal field"},
-    "special_distortion_field": {"id": 6, "name": "Distortion field"},
-    "special_drag_munitions": {"id": 7, "name": "Drag munitions"},
-    "special_emissive_munitions": {"id": 8, "name": "Emissive munitions"},
-    "special_feedback_cascade": {"id": 9, "name": "Feedback cascade"},
-    "special_force_shell": {"id": 10, "name": "Force shell"},
-    "special_high_yield_shell": {"id": 11, "name": "High yield shell"},
-    "special_incendiary_rounds": {"id": 12, "name": "Incendiary rounds"},
-    "special_ion_disruptor": {"id": 13, "name": "Ion disruptor"},
-    "special_mass_lock_munition": {"id": 14, "name": "Mass lock munition"},
-    "special_overload_munitions": {"id": 15, "name": "Overload munitions"},
-    "special_penetrator_payload": {"id": 16, "name": "Penetrator payload"},
-    "special_phasing_sequence": {"id": 17, "name": "Phasing sequence"},
-    "special_plasma_slug": {"id": 18, "name": "Plasma slug"},
-    "special_radiant_canister": {"id": 19, "name": "Radiant Canister"},
-    "special_regeneration_sequence": {"id": 20, "name": "Regeneration sequence"},
-    "special_reverberating_cascade": {"id": 21, "name": "Reverberating cascade"},
-    "special_scramble_spectrum": {"id": 22, "name": "Scramble spectrum"},
-    "special_screening_shell": {"id": 23, "name": "Screening shell"},
-    "special_shiftlock_canister": {"id": 24, "name": "Shift-lock canister"},
-    "special_smart_rounds": {"id": 25, "name": "Smart rounds"},
-    "special_super_penetrator": {"id": 26, "name": "Super penetrator"},
-    "special_target_lock_breaker": {"id": 27, "name": "Target lock breaker"},
-    "special_thermal_cascade": {"id": 28, "name": "Thermal cascade"},
-    "special_thermal_conduit": {"id": 29, "name": "Thermal conduit"},
-    "special_thermal_vent": {"id": 30, "name": "Thermal vent"},
-    "special_thermalshock": {"id": 31, "name": "Thermal shock"}
+    "special_auto_loader": {"id": 0, "edname": "special_auto_loader", "name": "Auto loader"},
+    "special_choke_canister": {"id": 1, "edname": "special_choke_canister", "name": "Choke canister"},
+    "special_concordant_sequence": {"id": 2, "edname": "special_concordant_sequence", "name": "Concordant sequence"},
+    "special_corrosive_shell": {"id": 3, "edname": "special_corrosive_shell", "name": "Corrosive shell"},
+    "special_blinding_shell": {"id": 4, "edname": "special_blinding_shell", "name": "Dazzle shell"},
+    "special_dispersal_field": {"id": 5, "edname": "special_dispersal_field", "name": "Dispersal field"},
+    "special_distortion_field": {"id": 6, "edname": "special_distortion_field", "name": "Distortion field"},
+    "special_drag_munitions": {"id": 7, "edname": "special_drag_munitions", "name": "Drag munitions"},
+    "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
+    "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
+    "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
+    "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
+    "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
+    "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},
+    "special_ion_disruptor": {"id": 13, "edname": "special_ion_disruptor", "name": "Ion disruptor"},
+    "special_mass_lock_munition": {"id": 14, "edname": "special_mass_lock_munition", "name": "Mass lock munition"},
+    "special_overload_munitions": {"id": 15, "edname": "special_overload_munitions", "name": "Overload munitions"},
+    "special_penetrator_payload": {"id": 16, "edname": "special_penetrator_payload", "name": "Penetrator payload"},
+    "special_phasing_sequence": {"id": 17, "edname": "special_phasing_sequence", "name": "Phasing sequence"},
+    "special_plasma_slug": {"id": 18, "edname": "special_plasma_slug", "name": "Plasma slug"},
+    "special_radiant_canister": {"id": 19, "edname": "special_radiant_canister", "name": "Radiant Canister"},
+    "special_regeneration_sequence": {"id": 20, "edname": "special_regeneration_sequence", "name": "Regeneration sequence"},
+    "special_reverberating_cascade": {"id": 21, "edname": "special_reverberating_cascade", "name": "Reverberating cascade"},
+    "special_scramble_spectrum": {"id": 22, "edname": "special_scramble_spectrum", "name": "Scramble spectrum"},
+    "special_screening_shell": {"id": 23, "edname": "special_screening_shell", "name": "Screening shell"},
+    "special_shiftlock_canister": {"id": 24, "edname": "special_shiftlock_canister", "name": "Shift-lock canister"},
+    "special_smart_rounds": {"id": 25, "edname": "special_smart_rounds", "name": "Smart rounds"},
+    "special_super_penetrator": {"id": 26, "edname": "special_super_penetrator", "name": "Super penetrator"},
+    "special_target_lock_breaker": {"id": 27, "edname": "special_target_lock_breaker", "name": "Target lock breaker"},
+    "special_thermal_cascade": {"id": 28, "edname": "special_thermal_cascade", "name": "Thermal cascade"},
+    "special_thermal_conduit": {"id": 29, "edname": "special_thermal_conduit", "name": "Thermal conduit"},
+    "special_thermal_vent": {"id": 30, "edname": "special_thermal_vent", "name": "Thermal vent"},
+    "special_thermalshock": {"id": 31, "edname": "special_thermalshock", "name": "Thermal shock"}
 }

modifications/validity.json

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

modules/hardpoints/beam_laser.json

@@ -7,20 +7,23 @@
       "class": 1,
       "cost": 37430,
       "damage": 9.8,
-      "distdraw": 2.16,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.94,
       "edID": 128049428,
       "eddbID": 841,
+      "falloff": 600,
       "grp": "bl",
       "id": "10",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
       "piercing": 18,
-      "power": 0.69,
+      "power": 0.62,
       "range": 3000,
       "rating": "E",
-      "thermload": 3.5,
-      "type": "T"
+      "thermload": 3.5
     },
     {
       "breachdmg": 6.1,
@@ -29,20 +32,23 @@
       "class": 1,
       "cost": 74650,
       "damage": 7.66,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 2.11,
       "edID": 128049432,
       "eddbID": 844,
+      "falloff": 600,
       "grp": "bl",
       "id": "0p",
       "integrity": 40,
       "mass": 2,
       "mount": "G",
       "piercing": 18,
-      "power": 0.67,
+      "power": 0.6,
       "range": 3000,
       "rating": "E",
-      "thermload": 3.6,
-      "type": "T"
+      "thermload": 3.6
     },
     {
       "breachdmg": 4.3,
@@ -51,9 +57,13 @@
       "class": 1,
       "cost": 500000,
       "damage": 5.4,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.32,
       "edID": 128049435,
       "eddbID": 847,
+      "falloff": 600,
       "eps": 1.32,
       "grp": "bl",
       "hps": 2.4,
@@ -62,11 +72,10 @@
       "mass": 2,
       "mount": "T",
       "piercing": 18,
-      "power": 0.63,
+      "power": 0.57,
       "range": 3000,
       "rating": "F",
-      "thermload": 2.4,
-      "type": "T"
+      "thermload": 2.4
     },
     {
       "breachdmg": 3.9,
@@ -75,9 +84,13 @@
       "class": 1,
       "cost": 56150,
       "damage": 4.9,
-      "distdraw": 2.8,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.52,
       "edID": 128671346,
       "eddbID": 1476,
+      "falloff": 600,
       "grp": "bl",
       "id": "b0",
       "integrity": 40,
@@ -85,12 +98,11 @@
       "mount": "F",
       "name": "Retributor",
       "piercing": 18,
-      "power": 0.69,
+      "power": 0.62,
       "pp": "Edmund Mahon",
       "range": 3000,
       "rating": "E",
-      "thermload": 2.7,
-      "type": "T"
+      "thermload": 2.7
     },
     {
       "breachdmg": 12.8,
@@ -99,20 +111,23 @@
       "class": 2,
       "cost": 299520,
       "damage": 15.96,
-      "distdraw": 3.51,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3.16,
       "edID": 128049429,
       "eddbID": 842,
+      "falloff": 600,
       "grp": "bl",
       "id": "0r",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
       "piercing": 35,
-      "power": 1.12,
+      "power": 1.01,
       "range": 3000,
       "rating": "D",
-      "thermload": 5.1,
-      "type": "T"
+      "thermload": 5.1
     },
     {
       "breachdmg": 10,
@@ -121,20 +136,23 @@
       "class": 2,
       "cost": 500600,
       "damage": 12.52,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 3.44,
       "edID": 128049433,
       "eddbID": 845,
+      "falloff": 600,
       "grp": "bl",
       "id": "0s",
       "integrity": 51,
       "mass": 4,
       "mount": "G",
       "piercing": 35,
-      "power": 1.1,
+      "power": 0.99,
       "range": 3000,
       "rating": "D",
-      "thermload": 5.3,
-      "type": "T"
+      "thermload": 5.3
     },
     {
       "breachdmg": 7.1,
@@ -143,20 +161,23 @@
       "class": 2,
       "cost": 2099900,
       "damage": 8.82,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 2.16,
       "edID": 128049436,
       "eddbID": 848,
+      "falloff": 600,
       "grp": "bl",
       "id": "0t",
       "integrity": 51,
       "mass": 4,
       "mount": "T",
       "piercing": 35,
-      "power": 1.03,
+      "power": 0.93,
       "range": 3000,
       "rating": "E",
-      "thermload": 3.5,
-      "type": "T"
+      "thermload": 3.5
     },
     {
       "breachdmg": 20.6,
@@ -165,20 +186,23 @@
       "class": 3,
       "cost": 1177600,
       "damage": 25.78,
-      "distdraw": 5.67,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 5.1,
       "edID": 128049430,
       "eddbID": 843,
+      "falloff": 600,
       "grp": "bl",
       "id": "0u",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
       "piercing": 50,
-      "power": 1.8,
+      "power": 1.62,
       "range": 3000,
       "rating": "C",
-      "thermload": 7.2,
-      "type": "T"
+      "thermload": 7.2
     },
     {
       "breachdmg": 16.2,
@@ -187,20 +211,23 @@
       "class": 3,
       "cost": 2396160,
       "damage": 20.28,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 5.58,
       "edID": 128049434,
       "eddbID": 846,
+      "falloff": 600,
       "grp": "bl",
       "id": "0v",
       "integrity": 64,
       "mass": 8,
       "mount": "G",
       "piercing": 50,
-      "power": 1.78,
+      "power": 1.6,
       "range": 3000,
       "rating": "C",
-      "thermload": 7.6,
-      "type": "T"
+      "thermload": 7.6
     },
     {
       "breachdmg": 11.5,
@@ -209,20 +236,23 @@
       "class": 3,
       "cost": 19399600,
       "damage": 14.34,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 3.51,
       "edID": 128049437,
       "eddbID": 849,
+      "falloff": 600,
       "grp": "bl",
       "id": "0o",
       "integrity": 64,
       "mass": 8,
       "mount": "T",
       "piercing": 50,
-      "power": 1.68,
+      "power": 1.51,
       "range": 3000,
       "rating": "D",
-      "thermload": 5.1,
-      "type": "T"
+      "thermload": 5.1
     },
     {
       "breachdmg": 33.1,
@@ -231,20 +261,23 @@
       "class": 4,
       "cost": 2396160,
       "damage": 41.38,
-      "distdraw": 9.1,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 8.19,
       "edID": 128049431,
       "eddbID": 1540,
+      "falloff": 600,
       "grp": "bl",
       "id": "0w",
       "integrity": 80,
       "mass": 16,
       "mount": "F",
       "piercing": 60,
-      "power": 2.9,
+      "power": 2.61,
       "range": 3000,
       "rating": "A",
-      "thermload": 9.9,
-      "type": "T"
+      "thermload": 9.9
     },
     {
       "breachdmg": 26.1,
@@ -253,20 +286,23 @@
       "class": 4,
       "cost": 8746160,
       "damage": 32.68,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 8.99,
       "edID": 128681994,
       "eddbID": 1544,
+      "falloff": 600,
       "grp": "bl",
       "id": "0x",
       "integrity": 80,
       "mass": 16,
       "mount": "G",
       "piercing": 60,
-      "power": 2.86,
+      "power": 2.57,
       "range": 3000,
       "rating": "A",
-      "thermload": 10.6,
-      "type": "T"
+      "thermload": 10.6
     }
   ]
 }

modules/hardpoints/burst_laser.json

@@ -9,9 +9,13 @@
       "class": 1,
       "cost": 4400,
       "damage": 1.72,
-      "distdraw": 0.31,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.24,
       "edID": 128049400,
       "eddbID": 832,
+      "falloff": 500,
       "grp": "ul",
       "id": "11",
       "integrity": 40,
@@ -22,8 +26,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 2,
-      "thermload": 0.4,
-      "type": "T"
+      "thermload": 0.4
     },
     {
       "breachdmg": 5.3,
@@ -34,9 +37,13 @@
       "class": 1,
       "cost": 8600,
       "damage": 1.2,
-      "distdraw": 0.27,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.23,
       "edID": 128049404,
       "eddbID": 835,
+      "falloff": 500,
       "grp": "ul",
       "id": "12",
       "integrity": 40,
@@ -47,8 +54,7 @@
       "range": 3000,
       "rating": "G",
       "rof": 2.23,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
     },
     {
       "breachdmg": 1.92,
@@ -59,9 +65,13 @@
       "class": 1,
       "cost": 52800,
       "damage": 0.87,
-      "distdraw": 0.16,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.136,
       "edID": 128049407,
       "eddbID": 838,
+      "falloff": 500,
       "grp": "ul",
       "id": "13",
       "integrity": 40,
@@ -72,24 +82,28 @@
       "range": 3000,
       "rating": "G",
       "rof": 1.92,
-      "thermload": 0.2,
-      "type": "T"
+      "thermload": 0.2
     },
     {
-      "breachdmg": 1.5,
+      "breachdmg": 2,
       "breachmax": 0,
       "breachmin": 0,
-      "burst": 3,
-      "burstrof": 15,
+      "burst": 8,
+      "burstrof": 20,
       "class": 1,
       "cost": 8800,
       "damage": 2.4,
-      "distdraw": 0.4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.31,
       "edID": 128671449,
       "eddbID": 1477,
+      "falloff": 500,
       "grp": "ul",
       "id": "cy",
       "integrity": 40,
+      "jitter": 3.5,
       "mass": 2,
       "mount": "F",
       "name": "Cytoscrambler",
@@ -98,9 +112,8 @@
       "pp": "Archon Delaine",
       "range": 600,
       "rating": "F",
-      "rof": 1.98,
-      "thermload": 0.3,
-      "type": "T"
+      "rof": 6.6,
+      "thermload": 0.3
     },
     {
       "breachdmg": 11.1,
@@ -111,9 +124,13 @@
       "class": 2,
       "cost": 23000,
       "damage": 3.5,
-      "distdraw": 0.63,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.482,
       "edID": 128049401,
       "eddbID": 833,
+      "falloff": 500,
       "grp": "ul",
       "id": "7h",
       "integrity": 40,
@@ -124,8 +141,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.6,
-      "thermload": 0.8,
-      "type": "T"
+      "thermload": 0.8
     },
     {
       "breachdmg": 8.82,
@@ -136,9 +152,13 @@
       "class": 2,
       "cost": 48500,
       "damage": 2.45,
-      "distdraw": 0.55,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.468,
       "edID": 128049405,
       "eddbID": 836,
+      "falloff": 500,
       "grp": "ul",
       "id": "7i",
       "integrity": 40,
@@ -149,8 +169,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.78,
-      "thermload": 0.7,
-      "type": "T"
+      "thermload": 0.7
     },
     {
       "breachdmg": 3.51,
@@ -161,9 +180,13 @@
       "class": 2,
       "cost": 162800,
       "damage": 1.74,
-      "distdraw": 0.31,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.26,
       "edID": 128049408,
       "eddbID": 839,
+      "falloff": 500,
       "grp": "ul",
       "id": "7j",
       "integrity": 40,
@@ -174,8 +197,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.57,
-      "thermload": 0.4,
-      "type": "T"
+      "thermload": 0.4
     },
     {
       "breachdmg": 10.53,
@@ -186,9 +208,13 @@
       "class": 3,
       "cost": 140400,
       "damage": 7.75,
-      "distdraw": 1.39,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.06,
       "edID": 128049402,
       "eddbID": 834,
+      "falloff": 500,
       "grp": "ul",
       "id": "14",
       "integrity": 64,
@@ -199,8 +225,7 @@
       "range": 3000,
       "rating": "D",
       "rof": 1.2,
-      "thermload": 1.7,
-      "type": "T"
+      "thermload": 1.7
     },
     {
       "breachdmg": 14.08,
@@ -211,9 +236,13 @@
       "class": 3,
       "cost": 281600,
       "damage": 5.18,
-      "distdraw": 1.16,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.986,
       "edID": 128049406,
       "eddbID": 837,
+      "falloff": 500,
       "grp": "ul",
       "id": "15",
       "integrity": 64,
@@ -224,8 +253,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.4,
-      "thermload": 1.4,
-      "type": "T"
+      "thermload": 1.4
     },
     {
       "breachdmg": 5.58,
@@ -236,9 +264,13 @@
       "class": 3,
       "cost": 800400,
       "damage": 3.54,
-      "distdraw": 0.63,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.536,
       "edID": 128049409,
       "eddbID": 840,
+      "falloff": 500,
       "grp": "ul",
       "id": "16",
       "integrity": 64,
@@ -249,8 +281,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.272,
-      "thermload": 0.8,
-      "type": "T"
+      "thermload": 0.8
     },
     {
       "breachdmg": 28,
@@ -261,9 +292,13 @@
       "class": 4,
       "cost": 281600,
       "damage": 20.6,
-      "distdraw": 3.71,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.84,
       "edID": 128049403,
       "eddbID": 1549,
+      "falloff": 500,
       "grp": "ul",
       "id": "7s",
       "integrity": 80,
@@ -274,8 +309,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 0.8,
-      "thermload": 4.5,
-      "type": "T"
+      "thermload": 4.5
     },
     {
       "breachdmg": 21.63,
@@ -286,9 +320,13 @@
       "class": 4,
       "cost": 1245600,
       "damage": 12.1,
-      "distdraw": 2.72,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 2.31,
       "edID": 128727920,
       "eddbID": 1550,
+      "falloff": 500,
       "grp": "ul",
       "id": "7t",
       "integrity": 80,
@@ -299,8 +337,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1,
-      "thermload": 3.3,
-      "type": "T"
+      "thermload": 3.3
     }
   ]
 }

modules/hardpoints/cannon.json

@@ -1,17 +1,21 @@
 {
   "c": [
     {
-      "ammo": 100,
+      "ammo": 120,
       "breachdmg": 17.1,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 1,
-      "clip": 5,
+      "clip": 6,
       "cost": 21100,
-      "damage": 18,
+      "damage": 22.5,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.46,
       "edID": 128049438,
       "eddbID": 850,
+      "falloff": 3000,
       "grp": "c",
       "id": "1h",
       "integrity": 40,
@@ -21,11 +25,10 @@
       "power": 0.34,
       "range": 3000,
       "rating": "D",
-      "reload": 4,
+      "reload": 3,
       "rof": 0.5,
-      "speed": 1200,
-      "thermload": 1.4,
-      "type": "K"
+      "shotspeed": 1200,
+      "thermload": 1.4
     },
     {
       "ammo": 100,
@@ -35,10 +38,14 @@
       "class": 1,
       "clip": 5,
       "cost": 42200,
-      "damage": 13.9,
+      "damage": 16,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.48,
       "edID": 128049442,
       "eddbID": 854,
+      "falloff": 3000,
       "grp": "c",
       "id": "1i",
       "integrity": 40,
@@ -50,9 +57,8 @@
       "rating": "E",
       "reload": 4,
       "rof": 0.52,
-      "speed": 1000,
-      "thermload": 1.3,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 1.3
     },
     {
       "ammo": 100,
@@ -62,51 +68,57 @@
       "class": 1,
       "clip": 5,
       "cost": 506400,
-      "damage": 11.1,
+      "damage": 12.75,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.22,
       "edID": 128049445,
       "eddbID": 857,
+      "falloff": 3000,
       "grp": "c",
       "id": "1j",
       "integrity": 40,
       "mass": 2,
       "mount": "T",
-      "piercing": 90,
+      "piercing": 35,
       "power": 0.32,
       "range": 3000,
       "rating": "F",
       "reload": 4,
       "rof": 0.435,
-      "speed": 1000,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 0.7
     },
     {
-      "ammo": 100,
+      "ammo": 120,
       "breachdmg": 28,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 2,
-      "clip": 5,
+      "clip": 6,
       "cost": 168430,
-      "damage": 29.2,
+      "damage": 36.5,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.7,
       "edID": 128049439,
       "eddbID": 851,
+      "falloff": 3500,
       "grp": "c",
       "id": "1k",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
-      "piercing": 90,
+      "piercing": 50,
       "power": 0.49,
       "range": 3500,
       "rating": "D",
-      "reload": 4,
+      "reload": 3,
       "rof": 0.465,
-      "speed": 1051,
-      "thermload": 2.1,
-      "type": "K"
+      "shotspeed": 1051,
+      "thermload": 2.1
     },
     {
       "ammo": 100,
@@ -116,24 +128,27 @@
       "class": 2,
       "clip": 5,
       "cost": 337600,
-      "damage": 21.3,
+      "damage": 24.5,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.75,
       "edID": 128049443,
       "eddbID": 855,
+      "falloff": 3500,
       "grp": "c",
       "id": "1l",
       "integrity": 51,
       "mass": 4,
       "mount": "G",
-      "piercing": 90,
+      "piercing": 50,
       "power": 0.54,
       "range": 3500,
       "rating": "D",
       "reload": 4,
       "rof": 0.485,
-      "speed": 875,
-      "thermload": 1.9,
-      "type": "K"
+      "shotspeed": 875,
+      "thermload": 1.9
     },
     {
       "ammo": 100,
@@ -143,51 +158,57 @@
       "class": 2,
       "clip": 5,
       "cost": 4051200,
-      "damage": 17.19,
+      "damage": 19.77,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.34,
       "edID": 128049446,
       "eddbID": 858,
+      "falloff": 3500,
       "grp": "c",
       "id": "1m",
       "integrity": 51,
       "mass": 4,
       "mount": "T",
-      "piercing": 90,
+      "piercing": 50,
       "power": 0.45,
       "range": 3500,
       "rating": "E",
       "reload": 4,
       "rof": 0.405,
-      "speed": 875,
-      "thermload": 1,
-      "type": "K"
+      "shotspeed": 875,
+      "thermload": 1
     },
     {
-      "ammo": 100,
+      "ammo": 120,
       "breachdmg": 42.3,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 3,
-      "clip": 5,
+      "clip": 6,
       "cost": 675200,
-      "damage": 43.95,
+      "damage": 54.94,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.07,
       "edID": 128049440,
       "eddbID": 852,
+      "falloff": 4000,
       "grp": "c",
       "id": "1n",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
-      "piercing": 90,
+      "piercing": 70,
       "power": 0.67,
       "range": 4000,
       "rating": "C",
-      "reload": 4,
+      "reload": 3,
       "rof": 0.425,
-      "speed": 959,
-      "thermload": 3.2,
-      "type": "K"
+      "shotspeed": 959,
+      "thermload": 3.2
     },
     {
       "ammo": 100,
@@ -197,10 +218,14 @@
       "class": 3,
       "clip": 5,
       "cost": 1350400,
-      "damage": 32.51,
+      "damage": 37.39,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.14,
       "edID": 128671120,
       "eddbID": 1383,
+      "falloff": 4000,
       "eps": 0.456,
       "grp": "c",
       "hps": 1.16,
@@ -208,15 +233,14 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
-      "piercing": 90,
+      "piercing": 70,
       "power": 0.75,
       "range": 4000,
       "rating": "C",
       "reload": 4,
       "rof": 0.445,
-      "speed": 800,
-      "thermload": 2.9,
-      "type": "K"
+      "shotspeed": 800,
+      "thermload": 2.9
     },
     {
       "ammo": 100,
@@ -226,37 +250,44 @@
       "class": 3,
       "clip": 5,
       "cost": 16204800,
-      "damage": 26.4,
+      "damage": 30.4,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.53,
       "edID": 128049447,
       "eddbID": 859,
+      "falloff": 4000,
       "grp": "c",
       "id": "1p",
       "integrity": 64,
       "mass": 8,
       "mount": "T",
-      "piercing": 90,
+      "piercing": 70,
       "power": 0.64,
       "range": 4000,
       "rating": "D",
       "reload": 4,
       "rof": 0.37,
-      "speed": 800,
-      "thermload": 1.6,
-      "type": "K"
+      "shotspeed": 800,
+      "thermload": 1.6
     },
     {
-      "ammo": 100,
+      "ammo": 120,
       "breachdmg": 63.2,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 4,
-      "clip": 5,
+      "clip": 6,
       "cost": 2700800,
-      "damage": 65.66,
+      "damage": 82.1,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.61,
       "edID": 128049441,
       "eddbID": 853,
+      "falloff": 4500,
       "eps": 0.644,
       "grp": "c",
       "hps": 1.92,
@@ -268,11 +299,10 @@
       "power": 0.92,
       "range": 4500,
       "rating": "B",
-      "reload": 5,
+      "reload": 3,
       "rof": 0.385,
-      "speed": 900,
-      "thermload": 4.8,
-      "type": "K"
+      "shotspeed": 900,
+      "thermload": 4.8
     },
     {
       "ammo": 100,
@@ -282,10 +312,14 @@
       "class": 4,
       "clip": 5,
       "cost": 5401600,
-      "damage": 49.2,
+      "damage": 56.58,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 1.72,
       "edID": 128049444,
       "eddbID": 856,
+      "falloff": 4500,
       "eps": 0.688,
       "grp": "c",
       "hps": 1.76,
@@ -299,9 +333,8 @@
       "rating": "B",
       "reload": 4,
       "rof": 0.4,
-      "speed": 750,
-      "thermload": 4.4,
-      "type": "K"
+      "shotspeed": 750,
+      "thermload": 4.4
     }
   ]
 }

modules/hardpoints/fragment_cannon.json

@@ -1,7 +1,7 @@
 {
   "fc": [
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -9,9 +9,13 @@
       "clip": 3,
       "cost": 36000,
       "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.21,
       "edID": 128049448,
       "eddbID": 860,
+      "falloff": 1800,
       "grp": "fc",
       "id": "20",
       "integrity": 40,
@@ -22,15 +26,14 @@
       "power": 0.45,
       "range": 2000,
       "rating": "E",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 5.555,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 0.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -38,9 +41,13 @@
       "clip": 3,
       "cost": 54720,
       "damage": 1.01,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.26,
       "edID": 128049451,
       "eddbID": 863,
+      "falloff": 1800,
       "grp": "fc",
       "id": "21",
       "integrity": 40,
@@ -51,15 +58,14 @@
       "power": 0.59,
       "range": 2000,
       "rating": "E",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 5.88,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 0.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -67,9 +73,13 @@
       "clip": 3,
       "cost": 182400,
       "damage": 0.69,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.1,
       "edID": 128049453,
       "eddbID": 865,
+      "falloff": 1800,
       "grp": "fc",
       "id": "22",
       "integrity": 40,
@@ -80,15 +90,14 @@
       "power": 0.42,
       "range": 2000,
       "rating": "E",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 4.76,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.2
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -96,28 +105,31 @@
       "clip": 3,
       "cost": 291840,
       "damage": 2.56,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128049449,
       "eddbID": 861,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1s",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 4,
       "mount": "F",
-      "piercing": 35,
+      "piercing": 30,
       "power": 0.74,
       "range": 2000,
       "rating": "A",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 5,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 1.8,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -125,28 +137,31 @@
       "clip": 3,
       "cost": 437800,
       "damage": 1.95,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.49,
       "edID": 128049452,
       "eddbID": 864,
+      "falloff": 1800,
       "grp": "fc",
       "id": "7e",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 4,
       "mount": "G",
-      "piercing": 35,
+      "piercing": 30,
       "power": 1.03,
       "range": 2000,
       "rating": "D",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 5.26,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.8,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.8
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -154,28 +169,31 @@
       "clip": 3,
       "cost": 1459200,
       "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.21,
       "edID": 128049454,
       "eddbID": 866,
+      "falloff": 1800,
       "grp": "fc",
       "id": "7f",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 4,
       "mount": "T",
-      "piercing": 35,
+      "piercing": 30,
       "power": 0.79,
       "range": 2000,
       "rating": "D",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 4.345,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 3.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -183,28 +201,31 @@
       "clip": 3,
       "cost": 1167360,
       "damage": 3.92,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.57,
       "edID": 128049450,
       "eddbID": 862,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1t",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 8,
       "mount": "F",
-      "piercing": 52,
+      "piercing": 45,
       "power": 1.02,
       "range": 2000,
       "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 4.545,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 1.1,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.1
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 2.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -212,28 +233,31 @@
       "clip": 3,
       "cost": 1751040,
       "damage": 3.23,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.81,
       "edID": 128671321,
       "eddbID": 1454,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1u",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 8,
       "mount": "G",
-      "piercing": 52,
+      "piercing": 45,
       "power": 1.55,
       "range": 2000,
       "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 4.76,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 1.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.4
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -241,28 +265,31 @@
       "clip": 3,
       "cost": 5836800,
       "damage": 2.56,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128671322,
       "eddbID": 1455,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1v",
       "integrity": 80,
       "jitter": 0.5,
       "mass": 8,
       "mount": "T",
-      "piercing": 52,
+      "piercing": 45,
       "power": 1.29,
       "range": 2000,
       "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 4,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
     },
     {
-      "ammo": 90,
+      "ammo": 180,
       "breachdmg": 3.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -270,24 +297,29 @@
       "clip": 3,
       "cost": 1400830,
       "damage": 3.4,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.57,
       "edID": 128671343,
       "eddbID": 1478,
+      "falloff": 1800,
       "grp": "fc",
       "id": "pa",
       "integrity": 64,
+      "jitter": 1.7,
       "mass": 8,
       "mount": "F",
       "name": "Pacifier",
-      "piercing": 52,
+      "piercing": 45,
       "power": 1.02,
       "pp": "Zachary Hudson",
       "rating": "C",
-      "reload": 5,
+      "reload": 2.5,
       "rof": 4.5,
-      "speed": 1000,
-      "thermload": 1.1,
-      "type": "K"
+      "roundspershot": 12,
+      "shotspeed": 1000,
+      "thermload": 1.1
     }
   ]
 }

modules/hardpoints/mine_launcher.json

@@ -9,6 +9,10 @@
       "clip": 3,
       "cost": 24260,
       "damage": 44,
+      "damagedist": {
+        "E": 0.5,
+	"T": 0.5
+      },
       "distdraw": 0,
       "edID": 128049500,
       "eddbID": 880,
@@ -22,8 +26,7 @@
       "rating": "I",
       "reload": 2,
       "rof": 1,
-      "thermload": 5,
-      "type": "ET"
+      "thermload": 5
     },
     {
       "ammo": 36,
@@ -34,6 +37,10 @@
       "clip": 3,
       "cost": 36400,
       "damage": 32,
+      "damagedist": {
+        "E": 0.5,
+	"T": 0.5
+      },
       "distdraw": 0,
       "edID": 128671448,
       "eddbID": 1523,
@@ -48,8 +55,7 @@
       "rating": "I",
       "reload": 2,
       "rof": 1,
-      "thermload": 5,
-      "type": "ET"
+      "thermload": 5
     },
     {
       "ammo": 36,
@@ -60,6 +66,10 @@
       "clip": 3,
       "cost": 294080,
       "damage": 44,
+      "damagedist": {
+        "E": 0.5,
+	"T": 0.5
+      },
       "distdraw": 0,
       "edID": 128049501,
       "eddbID": 881,
@@ -73,8 +83,7 @@
       "rating": "I",
       "reload": 2,
       "rof": 1,
-      "thermload": 7.5,
-      "type": "ET"
+      "thermload": 7.5
     }
   ]
 }

modules/hardpoints/mining_laser.json

@@ -7,9 +7,11 @@
       "class": 1,
       "cost": 6800,
       "damage": 2,
-      "distdraw": 1.5,
+      "damagedist": {},
+      "distdraw": 1.35,
       "edID": 128049525,
       "eddbID": 888,
+      "falloff": 300,
       "grp": "ml",
       "id": "2l",
       "integrity": 40,
@@ -17,30 +19,36 @@
       "mount": "F",
       "piercing": 18,
       "power": 0.5,
+      "range": 500,
       "rating": "D",
       "thermload": 2
     },
     {
-      "breachdmg": 0.6,
+      "breachdmg": 1.2,
       "breachmax": 0.2,
       "breachmin": 0.1,
       "class": 1,
       "cost": 13600,
       "damage": 8,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.75,
+      "edID": 128671347,
       "eddbID": 1479,
+      "falloff": 400,
       "grp": "ml",
       "id": "ml",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Mining Lance",
-      "piercing": "D",
+      "piercing": 18,
       "power": 0.7,
       "pp": "Zemina Torval",
+      "range": 2000,
       "rating": "D",
-      "thermload": 6,
-      "type": "T"
+      "thermload": 6
     },
     {
       "breachdmg": 1.2,
@@ -49,9 +57,11 @@
       "class": 2,
       "cost": 22580,
       "damage": 8,
+      "damagedist": {},
       "distdraw": 1.75,
       "edID": 128049526,
       "eddbID": 889,
+      "falloff": 300,
       "grp": "ml",
       "id": "2m",
       "integrity": 51,
@@ -59,6 +69,7 @@
       "mount": "F",
       "piercing": 18,
       "power": 0.75,
+      "range": 500,
       "rating": "D",
       "thermload": 4
     }

modules/hardpoints/missile_rack.json

@@ -3,12 +3,15 @@
     {
       "ammo": 16,
       "breachdmg": 20,
-      "breachmax": 1,
-      "breachmin": 1,
+      "breachmax": 0,
+      "breachmin": 0,
       "class": 1,
       "clip": 8,
       "cost": 32180,
       "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128666724,
       "eddbID": 1326,
@@ -23,9 +26,8 @@
       "rating": "B",
       "reload": 5,
       "rof": 0.5,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
     },
     {
       "ammo": 6,
@@ -36,6 +38,9 @@
       "clip": 6,
       "cost": 72600,
       "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128049492,
       "eddbID": 878,
@@ -50,19 +55,22 @@
       "rating": "B",
       "reload": 12,
       "rof": 0.333,
-      "speed": 625,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 625,
+      "thermload": 3.6
     },
     {
       "ammo": 48,
       "breachdmg": 20,
-      "breachmax": 1,
-      "breachmin": 1,
+      "breachmax": 0,
+      "breachmin": 0,
       "class": 2,
       "clip": 12,
       "cost": 240400,
-      "dps": 25,
+      "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
+      "distdraw": 0.24,
       "edID": 128666725,
       "eddbID": 1327,
       "eps": 0.12,
@@ -78,8 +86,8 @@
       "rating": "B",
       "reload": 5,
       "rof": 0.5,
-      "speed": 750,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
     },
     {
       "ammo": 18,
@@ -90,6 +98,9 @@
       "clip": 6,
       "cost": 512400,
       "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128049493,
       "eddbID": 879,
@@ -106,9 +117,8 @@
       "rating": "B",
       "reload": 12,
       "rof": 0.333,
-      "speed": 625,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 625,
+      "thermload": 3.6
     },
     {
       "ammo": 48,
@@ -119,6 +129,9 @@
       "clip": 12,
       "cost": 190227,
       "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "eddbID": 1559,
       "grp": "mr",
@@ -134,19 +147,21 @@
       "rating": "B",
       "reload": 5,
       "rof": 0.333,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
     },
     {
       "ammo": 120,
-      "breachdmg": 6,
+      "breachdmg": 3,
       "breachmax": 0,
       "breachmin": 0,
       "class": 2,
       "clip": 12,
       "cost": 768600,
       "damage": 7.5,
+      "damagedist": {
+        "E": 1
+      },
       "distdraw": 0.24,
       "edID": 128671344,
       "eddbID": 1480,
@@ -166,9 +181,8 @@
       "reload": 5,
       "rof": 2,
       "roundspershot": 4,
-      "speed": 600,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 600,
+      "thermload": 3.6
     }
   ]
 }

modules/hardpoints/multi_cannon.json

@@ -6,12 +6,16 @@
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
-      "clip": 90,
+      "clip": 100,
       "cost": 9500,
       "damage": 1.12,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.06,
       "edID": 128049455,
       "eddbID": 867,
+      "falloff": 1800,
       "grp": "mc",
       "id": "23",
       "integrity": 40,
@@ -23,9 +27,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
     },
     {
       "ammo": 2100,
@@ -36,9 +39,13 @@
       "clip": 90,
       "cost": 14250,
       "damage": 0.82,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.07,
       "edID": 128049459,
       "eddbID": 869,
+      "falloff": 1800,
       "grp": "mc",
       "id": "24",
       "integrity": 40,
@@ -48,11 +55,10 @@
       "power": 0.37,
       "range": 4000,
       "rating": "G",
-      "reload": 4,
+      "reload": 5,
       "rof": 8.33,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
     },
     {
       "ammo": 2100,
@@ -63,9 +69,13 @@
       "clip": 90,
       "cost": 81600,
       "damage": 0.56,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.03,
       "edID": 128049462,
       "eddbID": 871,
+      "falloff": 1800,
       "grp": "mc",
       "id": "25",
       "integrity": 40,
@@ -77,37 +87,40 @@
       "rating": "G",
       "reload": 4,
       "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0
     },
     {
       "ammo": 1000,
-      "breachdmg": 2.7,
+      "breachdmg": 2.6,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "clip": 60,
       "cost": 13980,
-      "damage": 3,
+      "damage": 2.9,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.12,
+      "edID": 128671345,
       "eddbID": 1481,
+      "falloff": 1800,
       "grp": "mc",
       "id": "e0",
       "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Enforcer",
-      "piercing": "A",
+      "piercing": 30,
       "power": 0.28,
       "pp": "Pranav Antal",
       "range": 4500,
       "rating": "F",
-      "reload": 8,
+      "reload": 4,
       "rof": 4.3,
-      "speed": 1800,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1800,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -115,12 +128,16 @@
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
-      "clip": 90,
+      "clip": 100,
       "cost": 38000,
       "damage": 2.19,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.11,
       "edID": 128049456,
       "eddbID": 868,
+      "falloff": 1800,
       "grp": "mc",
       "id": "26",
       "integrity": 51,
@@ -132,9 +149,8 @@
       "rating": "E",
       "reload": 4,
       "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -145,9 +161,13 @@
       "clip": 90,
       "cost": 57000,
       "damage": 1.64,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.14,
       "edID": 128049460,
       "eddbID": 870,
+      "falloff": 1800,
       "grp": "mc",
       "id": "27",
       "integrity": 51,
@@ -157,11 +177,10 @@
       "power": 0.64,
       "range": 4000,
       "rating": "F",
-      "reload": 4,
+      "reload": 5,
       "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -172,9 +191,13 @@
       "clip": 90,
       "cost": 1292800,
       "damage": 1.17,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.06,
       "edID": 128049463,
       "eddbID": 872,
+      "falloff": 1800,
       "grp": "mc",
       "id": "28",
       "integrity": 51,
@@ -186,9 +209,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 6.25,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
     },
     {
       "ammo": 2100,
@@ -196,12 +218,16 @@
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
-      "clip": 90,
+      "clip": 100,
       "cost": 140400,
       "damage": 3.93,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.18,
       "edID": 128049457,
       "eddbID": 1541,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7k",
       "integrity": 64,
@@ -213,9 +239,8 @@
       "rating": "C",
       "reload": 4,
       "rof": 5.88,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.3
     },
     {
       "ammo": 2100,
@@ -226,9 +251,13 @@
       "clip": 90,
       "cost": 578436,
       "damage": 2.84,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.25,
       "edID": 128049461,
       "eddbID": 1543,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7l",
       "integrity": 64,
@@ -238,11 +267,10 @@
       "power": 0.97,
       "range": 4000,
       "rating": "C",
-      "reload": 4,
+      "reload": 5,
       "rof": 6.665,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.3
     },
     {
       "ammo": 2100,
@@ -250,12 +278,16 @@
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 4,
-      "clip": 90,
+      "clip": 100,
       "cost": 1177600,
       "damage": 4.62,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.24,
       "edID": 128049458,
       "eddbID": 1542,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7n",
       "integrity": 80,
@@ -268,9 +300,8 @@
       "reload": 4,
       "rof": 3.03,
       "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.4
     },
     {
       "ammo": 2100,
@@ -281,9 +312,13 @@
       "clip": 90,
       "cost": 6377600,
       "damage": 3.46,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128681996,
       "eddbID": 1546,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7o",
       "integrity": 80,
@@ -293,12 +328,11 @@
       "power": 1.22,
       "range": 4000,
       "rating": "A",
-      "reload": 4,
+      "reload": 5,
       "rof": 3.365,
       "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.5,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.5
     }
   ]
 }

modules/hardpoints/plasma_accelerator.json

@@ -8,24 +8,29 @@
       "class": 2,
       "clip": 5,
       "cost": 834200,
-      "damage": 52,
+      "damage": 54.3,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 8.65,
       "edID": 128049465,
       "eddbID": 873,
+      "falloff": 2000,
       "grp": "pa",
       "id": "1g",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
-      "piercing": 55,
+      "piercing": 100,
       "power": 1.43,
       "range": 3500,
       "rating": "C",
-      "reload": 8,
+      "reload": 6,
       "rof": 0.33,
-      "speed": 875,
-      "thermload": 15.6,
-      "type": "KT"
+      "shotspeed": 875,
+      "thermload": 15.6
     },
     {
       "ammo": 100,
@@ -35,53 +40,63 @@
       "class": 3,
       "clip": 5,
       "cost": 3051200,
-      "damage": 79.93,
+      "damage": 83.4,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 13.6,
       "edID": 128049466,
       "eddbID": 874,
+      "falloff": 2000,
       "grp": "pa",
       "id": "2b",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
-      "piercing": 70,
+      "piercing": 100,
       "power": 1.97,
       "range": 3500,
       "rating": "B",
-      "reload": 8,
+      "reload": 6,
       "rof": 0.29,
-      "speed": 875,
-      "thermload": 21.8,
-      "type": "KT"
+      "shotspeed": 875,
+      "thermload": 21.8
     },
     {
       "ammo": 300,
-      "breachdmg": 28.1,
+      "breachdmg": 30.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
       "clip": 20,
       "cost": 4119120,
-      "damage": 33,
+      "damage": 34.5,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 5.5,
       "edID": 128671339,
       "eddbID": 1482,
+      "falloff": 2000,
       "grp": "pa",
       "id": "Ap",
       "integrity": 64,
       "mass": 8,
       "mount": "F",
       "name": "Advanced Plasma Accelerator",
-      "piercing": 70,
+      "piercing": 100,
       "power": 1.97,
       "pp": "Denton Patreus",
       "range": 3500,
       "rating": "B",
-      "reload": 8,
+      "reload": 6,
       "rof": 0.8,
-      "speed": 875,
-      "thermload": 11,
-      "type": "KT"
+      "shotspeed": 875,
+      "thermload": 11
     },
     {
       "ammo": 100,
@@ -91,24 +106,29 @@
       "class": 4,
       "clip": 5,
       "cost": 13793600,
-      "damage": 120,
+      "damage": 125.2,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
       "distdraw": 21.04,
       "edID": 128049467,
       "eddbID": 875,
+      "falloff": 2000,
       "grp": "pa",
       "id": "2c",
       "integrity": 80,
       "mass": 16,
       "mount": "F",
-      "piercing": 85,
+      "piercing": 100,
       "power": 2.63,
       "range": 3500,
       "rating": "A",
-      "reload": 8,
+      "reload": 6,
       "rof": 0.25,
-      "speed": 875,
-      "thermload": 29.5,
-      "type": "KT"
+      "shotspeed": 875,
+      "thermload": 29.5
     }
   ]
 }

modules/hardpoints/point_defence.json

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

modules/hardpoints/pulse_laser.json

@@ -7,9 +7,13 @@
       "class": 1,
       "cost": 2200,
       "damage": 2.04,
-      "distdraw": 0.33,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.30,
       "edID": 128049381,
       "eddbID": 823,
+      "falloff": 500,
       "grp": "pl",
       "id": "17",
       "integrity": 40,
@@ -20,8 +24,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 3.847,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
     },
     {
       "breachdmg": 1.3,
@@ -30,9 +33,13 @@
       "class": 1,
       "cost": 6600,
       "damage": 1.56,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.31,
       "edID": 128049385,
       "eddbID": 826,
+      "falloff": 500,
       "grp": "pl",
       "id": "18",
       "integrity": 40,
@@ -43,8 +50,7 @@
       "range": 3000,
       "rating": "G",
       "rof": 3.987,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
     },
     {
       "breachdmg": 1,
@@ -53,9 +59,13 @@
       "class": 1,
       "cost": 26000,
       "damage": 1.18,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.19,
       "edID": 128049388,
       "eddbID": 829,
+      "falloff": 500,
       "grp": "pl",
       "id": "19",
       "integrity": 40,
@@ -66,8 +76,7 @@
       "range": 3000,
       "rating": "G",
       "rof": 3.339,
-      "thermload": 0.2,
-      "type": "T"
+      "thermload": 0.2
     },
     {
       "breachdmg": 3,
@@ -76,9 +85,13 @@
       "class": 2,
       "cost": 17600,
       "damage": 3.49,
-      "distdraw": 0.56,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.5,
       "edID": 128049382,
       "eddbID": 824,
+      "falloff": 500,
       "grp": "pl",
       "id": "1a",
       "integrity": 51,
@@ -87,10 +100,9 @@
       "piercing": 35,
       "power": 0.6,
       "range": 3000,
-      "rating": "F",
+      "rating": "E",
       "rof": 3.448,
-      "thermload": 0.6,
-      "type": "T"
+      "thermload": 0.6
     },
     {
       "breachdmg": 2.3,
@@ -99,9 +111,13 @@
       "class": 2,
       "cost": 35400,
       "damage": 2.68,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.54,
       "edID": 128049386,
       "eddbID": 827,
+      "falloff": 500,
       "grp": "pl",
       "id": "1b",
       "integrity": 51,
@@ -112,8 +128,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 3.567,
-      "thermload": 0.5,
-      "type": "T"
+      "thermload": 0.5
     },
     {
       "breachdmg": 1.7,
@@ -122,9 +137,13 @@
       "class": 2,
       "cost": 132800,
       "damage": 2.04,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.33,
       "edID": 128049389,
       "eddbID": 830,
+      "falloff": 500,
       "grp": "pl",
       "id": "1c",
       "integrity": 51,
@@ -135,8 +154,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 3.037,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
     },
     {
       "breachdmg": 2.4,
@@ -145,21 +163,25 @@
       "class": 2,
       "cost": 26400,
       "damage": 2.8,
-      "distdraw": 1,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.9,
+      "edID": 128671342,
       "eddbID": 1483,
+      "falloff": 500,
       "grp": "pl",
       "id": "PL",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Disruptor",
-      "piercing": "A",
+      "piercing": 35,
       "power": 0.7,
       "pp": "Felicia Winters",
       "rating": "E",
       "rof": 1.664,
-      "thermload": 1,
-      "type": "T"
+      "thermload": 1
     },
     {
       "breachdmg": 5.1,
@@ -168,9 +190,13 @@
       "class": 3,
       "cost": 70400,
       "damage": 5.98,
-      "distdraw": 0.96,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 0.86,
       "edID": 128049383,
       "eddbID": 825,
+      "falloff": 500,
       "grp": "pl",
       "id": "1d",
       "integrity": 64,
@@ -181,8 +207,7 @@
       "range": 3000,
       "rating": "D",
       "rof": 3.3,
-      "thermload": 1,
-      "type": "T"
+      "thermload": 1
     },
     {
       "breachdmg": 3.9,
@@ -191,9 +216,13 @@
       "class": 3,
       "cost": 140600,
       "damage": 4.58,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.92,
       "edID": 128049387,
       "eddbID": 828,
+      "falloff": 500,
       "grp": "pl",
       "id": "1e",
       "integrity": 64,
@@ -204,8 +233,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 3.223,
-      "thermload": 0.9,
-      "type": "T"
+      "thermload": 0.9
     },
     {
       "breachdmg": 3,
@@ -214,9 +242,13 @@
       "class": 3,
       "cost": 400400,
       "damage": 3.49,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.56,
       "edID": 128049390,
       "eddbID": 831,
+      "falloff": 500,
       "grp": "pl",
       "id": "1f",
       "integrity": 64,
@@ -227,8 +259,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 2.705,
-      "thermload": 0.6,
-      "type": "T"
+      "thermload": 0.6
     },
     {
       "breachdmg": 8.7,
@@ -237,9 +268,13 @@
       "class": 4,
       "cost": 177600,
       "damage": 10.23,
-      "distdraw": 1.64,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.48,
       "edID": 128049384,
       "eddbID": 1539,
+      "falloff": 500,
       "grp": "pl",
       "id": "7q",
       "integrity": 80,
@@ -250,8 +285,7 @@
       "range": 3000,
       "rating": "A",
       "rof": 2.633,
-      "thermload": 1.6,
-      "type": "T"
+      "thermload": 1.6
     },
     {
       "breachdmg": 6.6,
@@ -260,9 +294,13 @@
       "class": 4,
       "cost": 877600,
       "damage": 7.82,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.56,
       "edID": 128681995,
       "eddbID": 1545,
+      "falloff": 500,
       "grp": "pl",
       "id": "7r",
       "integrity": 80,
@@ -273,8 +311,7 @@
       "range": 3000,
       "rating": "A",
       "rof": 2.777,
-      "thermload": 1.6,
-      "type": "T"
+      "thermload": 1.6
     }
   ]
 }

modules/hardpoints/rail_gun.json

@@ -1,7 +1,7 @@
 {
   "rg": [
     {
-      "ammo": 30,
+      "ammo": 80,
       "breachdmg": 22.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -9,9 +9,14 @@
       "clip": 1,
       "cost": 51600,
       "damage": 23.3,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 2.69,
       "edID": 128049488,
       "eddbID": 876,
+      "falloff": 1000,
       "grp": "rg",
       "id": "29",
       "integrity": 40,
@@ -23,11 +28,10 @@
       "rating": "D",
       "reload": 1,
       "rof": 1.6,
-      "thermload": 17.8,
-      "type": "KT"
+      "thermload": 17.8
     },
     {
-      "ammo": 30,
+      "ammo": 80,
       "breachdmg": 39.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -35,9 +39,14 @@
       "clip": 1,
       "cost": 412800,
       "damage": 41.5,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 5.11,
       "edID": 128049489,
       "eddbID": 877,
+      "falloff": 1000,
       "grp": "rg",
       "id": "2a",
       "integrity": 51,
@@ -49,8 +58,7 @@
       "rating": "B",
       "reload": 1,
       "rof": 1.2,
-      "thermload": 30,
-      "type": "KT"
+      "thermload": 30
     },
     {
       "ammo": 90,
@@ -63,23 +71,28 @@
       "clip": 3,
       "cost": 619200,
       "damage": 15,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 2,
       "edID": 128671341,
       "eddbID": 1484,
+      "falloff": 1000,
       "grp": "rg",
       "id": "ih",
       "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Imperial Hammer",
-      "piercing": "A",
+      "piercing": 150,
       "power": 1.63,
       "pp": "Arissa Lavigny-Duval",
+      "range": 3000,
       "rating": "B",
       "reload": 1,
       "rof": 4.1,
-      "thermload": 16,
-      "type": "KT"
+      "thermload": 16
     }
   ]
 }

modules/hardpoints/torpedo_pylon.json

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

modules/index.js

@@ -44,6 +44,7 @@ module.exports = {
     fx: require('./internal/fuel_transfer_limpet_controllers').fx,
     hb: require('./internal/hatch_breaker_limpet_controller').hb,
     hr: require('./internal/hull_reinforcement_package').hr,
+    mrp: require('./internal/module_reinforcement_package').mrp,
     pv: require('./internal/planetary_vehicle_hanger').pv,
     psg: require('./internal/pristmatic_shield_generator').psg,
     pc: require('./internal/prospector_limpet_controllers').pc,

modules/internal/auto_field_maintenance_unit.json

@@ -1,394 +1,69 @@
 {
   "am": [
     {
-      "ammo": 10000,
+      "ammo": 1000,
       "ammocost": 1,
-      "class": 8,
-      "cost": 612220,
-      "edID": 128667605,
-      "eddbID": 1335,
+      "class": 1,
+      "cost": 10000,
+      "edID": 128667598,
+      "eddbID": 1328,
       "grp": "am",
-      "id": "1f",
-      "power": 1.8,
+      "id": "0c",
+      "power": 0.54,
       "rating": "E",
-      "repair": 120
+      "repair": 12
     },
     {
-      "ammo": 9000,
+      "ammo": 900,
       "ammocost": 1,
-      "class": 8,
-      "cost": 1836660,
-      "edID": 128667613,
-      "eddbID": 1343,
+      "class": 1,
+      "cost": 30000,
+      "edID": 128667606,
+      "eddbID": 1336,
       "grp": "am",
-      "id": "1e",
-      "power": 2.4,
+      "id": "0b",
+      "power": 0.72,
       "rating": "D",
-      "repair": 144
+      "repair": 14.4
     },
     {
-      "ammo": 10000,
+      "ammo": 1000,
       "ammocost": 1,
-      "class": 8,
-      "cost": 5509980,
-      "edID": 128667621,
-      "eddbID": 1351,
+      "class": 1,
+      "cost": 90000,
+      "edID": 128667614,
+      "eddbID": 1344,
       "grp": "am",
-      "id": "1d",
-      "power": 3,
+      "id": "0a",
+      "power": 0.9,
       "rating": "C",
-      "repair": 200
+      "repair": 20
     },
     {
-      "ammo": 12000,
+      "ammo": 1200,
       "ammocost": 1,
-      "class": 8,
-      "cost": 16529940,
-      "edID": 128667629,
-      "eddbID": 1359,
+      "class": 1,
+      "cost": 270000,
+      "edID": 128667622,
+      "eddbID": 1352,
       "grp": "am",
-      "id": "1c",
-      "power": 3.45,
+      "id": "09",
+      "power": 1.04,
       "rating": "B",
-      "repair": 276
+      "repair": 27.6
     },
     {
-      "ammo": 11000,
+      "ammo": 1100,
       "ammocost": 1,
-      "class": 8,
-      "cost": 49589820,
-      "edID": 128667637,
-      "eddbID": 1367,
+      "class": 1,
+      "cost": 810000,
+      "edID": 128667630,
+      "eddbID": 1360,
       "grp": "am",
-      "id": "1b",
-      "power": 4.2,
+      "id": "08",
+      "power": 1.26,
       "rating": "A",
-      "repair": 308
-    },
-    {
-      "ammo": 8700,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 340120,
-      "edID": 128667604,
-      "eddbID": 1334,
-      "grp": "am",
-      "id": "1a",
-      "power": 1.58,
-      "rating": "E",
-      "repair": 104.4
-    },
-    {
-      "ammo": 7800,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 1020370,
-      "edID": 128667612,
-      "eddbID": 1342,
-      "grp": "am",
-      "id": "19",
-      "power": 2.1,
-      "rating": "D",
-      "repair": 124.8
-    },
-    {
-      "ammo": 8700,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 3061100,
-      "edID": 128667620,
-      "eddbID": 1350,
-      "grp": "am",
-      "id": "18",
-      "power": 2.63,
-      "rating": "C",
-      "repair": 174
-    },
-    {
-      "ammo": 10400,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 9183300,
-      "edID": 128667628,
-      "eddbID": 1358,
-      "grp": "am",
-      "id": "17",
-      "power": 3.02,
-      "rating": "B",
-      "repair": 239.2
-    },
-    {
-      "ammo": 9600,
-      "ammocost": 1,
-      "class": 7,
-      "cost": 27549900,
-      "edID": 128667636,
-      "eddbID": 1366,
-      "grp": "am",
-      "id": "16",
-      "power": 3.68,
-      "rating": "A",
-      "repair": 268.8
-    },
-    {
-      "ammo": 7400,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 188960,
-      "edID": 128667603,
-      "eddbID": 1333,
-      "grp": "am",
-      "id": "15",
-      "power": 1.4,
-      "rating": "E",
-      "repair": 88.8
-    },
-    {
-      "ammo": 6700,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 566870,
-      "edID": 128667611,
-      "eddbID": 1341,
-      "grp": "am",
-      "id": "14",
-      "power": 1.86,
-      "rating": "D",
-      "repair": 107.2
-    },
-    {
-      "ammo": 7400,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 1700610,
-      "edID": 128667619,
-      "eddbID": 1349,
-      "grp": "am",
-      "id": "13",
-      "power": 2.33,
-      "rating": "C",
-      "repair": 148
-    },
-    {
-      "ammo": 8900,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 5101830,
-      "edID": 128667627,
-      "eddbID": 1357,
-      "grp": "am",
-      "id": "12",
-      "power": 2.67,
-      "rating": "B",
-      "repair": 204.7
-    },
-    {
-      "ammo": 8100,
-      "ammocost": 1,
-      "class": 6,
-      "cost": 15305500,
-      "edID": 128667635,
-      "eddbID": 1365,
-      "grp": "am",
-      "id": "11",
-      "power": 3.26,
-      "rating": "A",
-      "repair": 226.8
-    },
-    {
-      "ammo": 6100,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 104980,
-      "edID": 128667602,
-      "eddbID": 1332,
-      "grp": "am",
-      "id": "10",
-      "power": 1.17,
-      "rating": "E",
-      "repair": 73.2
-    },
-    {
-      "ammo": 5500,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 314930,
-      "edID": 128667610,
-      "eddbID": 1340,
-      "grp": "am",
-      "id": "0v",
-      "power": 1.56,
-      "rating": "D",
-      "repair": 88
-    },
-    {
-      "ammo": 6100,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 944780,
-      "edID": 128667618,
-      "eddbID": 1348,
-      "grp": "am",
-      "id": "0u",
-      "power": 1.95,
-      "rating": "C",
-      "repair": 122
-    },
-    {
-      "ammo": 7300,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 2834350,
-      "edID": 128667626,
-      "eddbID": 1356,
-      "grp": "am",
-      "id": "0t",
-      "power": 2.24,
-      "rating": "B",
-      "repair": 167.9
-    },
-    {
-      "ammo": 6700,
-      "ammocost": 1,
-      "class": 5,
-      "cost": 8503060,
-      "edID": 128667634,
-      "eddbID": 1364,
-      "grp": "am",
-      "id": "0s",
-      "power": 2.73,
-      "rating": "A",
-      "repair": 187.6
-    },
-    {
-      "ammo": 4900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 58320,
-      "edID": 128667601,
-      "eddbID": 1331,
-      "grp": "am",
-      "id": "0r",
-      "power": 0.99,
-      "rating": "E",
-      "repair": 58.8
-    },
-    {
-      "ammo": 4400,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 174960,
-      "edID": 128667609,
-      "eddbID": 1339,
-      "grp": "am",
-      "id": "0q",
-      "power": 1.32,
-      "rating": "D",
-      "repair": 70.4
-    },
-    {
-      "ammo": 4900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 524880,
-      "edID": 128667617,
-      "eddbID": 1347,
-      "grp": "am",
-      "id": "0p",
-      "power": 1.65,
-      "rating": "C",
-      "repair": 98
-    },
-    {
-      "ammo": 5900,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 1574640,
-      "edID": 128667625,
-      "eddbID": 1355,
-      "grp": "am",
-      "id": "0o",
-      "power": 1.9,
-      "rating": "B",
-      "repair": 135.7
-    },
-    {
-      "ammo": 5400,
-      "ammocost": 1,
-      "class": 4,
-      "cost": 4723920,
-      "edID": 128667633,
-      "eddbID": 1363,
-      "grp": "am",
-      "id": "0n",
-      "power": 2.31,
-      "rating": "A",
-      "repair": 151.2
-    },
-    {
-      "ammo": 3600,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 32400,
-      "edID": 128667600,
-      "eddbID": 1330,
-      "grp": "am",
-      "id": "0m",
-      "power": 0.81,
-      "rating": "E",
-      "repair": 43.2
-    },
-    {
-      "ammo": 3200,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 97200,
-      "edID": 128667608,
-      "eddbID": 1338,
-      "grp": "am",
-      "id": "0l",
-      "power": 1.08,
-      "rating": "D",
-      "repair": 51.2
-    },
-    {
-      "ammo": 3600,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 291600,
-      "edID": 128667616,
-      "eddbID": 1346,
-      "grp": "am",
-      "id": "0k",
-      "power": 1.35,
-      "rating": "C",
-      "repair": 72
-    },
-    {
-      "ammo": 4300,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 874800,
-      "edID": 128667624,
-      "eddbID": 1354,
-      "grp": "am",
-      "id": "0j",
-      "power": 1.55,
-      "rating": "B",
-      "repair": 98.9
-    },
-    {
-      "ammo": 4000,
-      "ammocost": 1,
-      "class": 3,
-      "cost": 2624400,
-      "edID": 128667632,
-      "eddbID": 1362,
-      "grp": "am",
-      "id": "0i",
-      "power": 1.89,
-      "rating": "A",
-      "repair": 112
+      "repair": 30.8
     },
     {
       "ammo": 2300,
@@ -456,69 +131,394 @@
       "repair": 70
     },
     {
-      "ammo": 1000,
+      "ammo": 3600,
       "ammocost": 1,
-      "class": 1,
-      "cost": 10000,
-      "edID": 128667598,
-      "eddbID": 1328,
+      "class": 3,
+      "cost": 32400,
+      "edID": 128667600,
+      "eddbID": 1330,
       "grp": "am",
-      "id": "0c",
-      "power": 0.54,
+      "id": "0m",
+      "power": 0.81,
       "rating": "E",
-      "repair": 12
+      "repair": 43.2
     },
     {
-      "ammo": 900,
+      "ammo": 3200,
       "ammocost": 1,
-      "class": 1,
-      "cost": 30000,
-      "edID": 128667606,
-      "eddbID": 1336,
+      "class": 3,
+      "cost": 97200,
+      "edID": 128667608,
+      "eddbID": 1338,
       "grp": "am",
-      "id": "0b",
-      "power": 0.72,
+      "id": "0l",
+      "power": 1.08,
       "rating": "D",
-      "repair": 14.4
+      "repair": 51.2
     },
     {
-      "ammo": 1000,
+      "ammo": 3600,
       "ammocost": 1,
-      "class": 1,
-      "cost": 90000,
-      "edID": 128667614,
-      "eddbID": 1344,
+      "class": 3,
+      "cost": 291600,
+      "edID": 128667616,
+      "eddbID": 1346,
       "grp": "am",
-      "id": "0a",
-      "power": 0.9,
+      "id": "0k",
+      "power": 1.35,
       "rating": "C",
-      "repair": 20
+      "repair": 72
     },
     {
-      "ammo": 1200,
+      "ammo": 4300,
       "ammocost": 1,
-      "class": 1,
-      "cost": 270000,
-      "edID": 128667622,
-      "eddbID": 1352,
+      "class": 3,
+      "cost": 874800,
+      "edID": 128667624,
+      "eddbID": 1354,
       "grp": "am",
-      "id": "09",
-      "power": 1.04,
+      "id": "0j",
+      "power": 1.55,
       "rating": "B",
-      "repair": 27.6
+      "repair": 98.9
     },
     {
-      "ammo": 1100,
+      "ammo": 4000,
       "ammocost": 1,
-      "class": 1,
-      "cost": 810000,
-      "edID": 128667630,
-      "eddbID": 1360,
+      "class": 3,
+      "cost": 2624400,
+      "edID": 128667632,
+      "eddbID": 1362,
       "grp": "am",
-      "id": "08",
-      "power": 1.26,
+      "id": "0i",
+      "power": 1.89,
       "rating": "A",
-      "repair": 30.8
+      "repair": 112
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 58320,
+      "edID": 128667601,
+      "eddbID": 1331,
+      "grp": "am",
+      "id": "0r",
+      "power": 0.99,
+      "rating": "E",
+      "repair": 58.8
+    },
+    {
+      "ammo": 4400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 174960,
+      "edID": 128667609,
+      "eddbID": 1339,
+      "grp": "am",
+      "id": "0q",
+      "power": 1.32,
+      "rating": "D",
+      "repair": 70.4
+    },
+    {
+      "ammo": 4900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 524880,
+      "edID": 128667617,
+      "eddbID": 1347,
+      "grp": "am",
+      "id": "0p",
+      "power": 1.65,
+      "rating": "C",
+      "repair": 98
+    },
+    {
+      "ammo": 5900,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 1574640,
+      "edID": 128667625,
+      "eddbID": 1355,
+      "grp": "am",
+      "id": "0o",
+      "power": 1.9,
+      "rating": "B",
+      "repair": 135.7
+    },
+    {
+      "ammo": 5400,
+      "ammocost": 1,
+      "class": 4,
+      "cost": 4723920,
+      "edID": 128667633,
+      "eddbID": 1363,
+      "grp": "am",
+      "id": "0n",
+      "power": 2.31,
+      "rating": "A",
+      "repair": 151.2
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 104980,
+      "edID": 128667602,
+      "eddbID": 1332,
+      "grp": "am",
+      "id": "10",
+      "power": 1.17,
+      "rating": "E",
+      "repair": 73.2
+    },
+    {
+      "ammo": 5500,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 314930,
+      "edID": 128667610,
+      "eddbID": 1340,
+      "grp": "am",
+      "id": "0v",
+      "power": 1.56,
+      "rating": "D",
+      "repair": 88
+    },
+    {
+      "ammo": 6100,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 944780,
+      "edID": 128667618,
+      "eddbID": 1348,
+      "grp": "am",
+      "id": "0u",
+      "power": 1.95,
+      "rating": "C",
+      "repair": 122
+    },
+    {
+      "ammo": 7300,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 2834350,
+      "edID": 128667626,
+      "eddbID": 1356,
+      "grp": "am",
+      "id": "0t",
+      "power": 2.24,
+      "rating": "B",
+      "repair": 167.9
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 5,
+      "cost": 8503060,
+      "edID": 128667634,
+      "eddbID": 1364,
+      "grp": "am",
+      "id": "0s",
+      "power": 2.73,
+      "rating": "A",
+      "repair": 187.6
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 188960,
+      "edID": 128667603,
+      "eddbID": 1333,
+      "grp": "am",
+      "id": "15",
+      "power": 1.4,
+      "rating": "E",
+      "repair": 88.8
+    },
+    {
+      "ammo": 6700,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 566870,
+      "edID": 128667611,
+      "eddbID": 1341,
+      "grp": "am",
+      "id": "14",
+      "power": 1.86,
+      "rating": "D",
+      "repair": 107.2
+    },
+    {
+      "ammo": 7400,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 1700610,
+      "edID": 128667619,
+      "eddbID": 1349,
+      "grp": "am",
+      "id": "13",
+      "power": 2.33,
+      "rating": "C",
+      "repair": 148
+    },
+    {
+      "ammo": 8900,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 5101830,
+      "edID": 128667627,
+      "eddbID": 1357,
+      "grp": "am",
+      "id": "12",
+      "power": 2.67,
+      "rating": "B",
+      "repair": 204.7
+    },
+    {
+      "ammo": 8100,
+      "ammocost": 1,
+      "class": 6,
+      "cost": 15305500,
+      "edID": 128667635,
+      "eddbID": 1365,
+      "grp": "am",
+      "id": "11",
+      "power": 3.26,
+      "rating": "A",
+      "repair": 226.8
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 340120,
+      "edID": 128667604,
+      "eddbID": 1334,
+      "grp": "am",
+      "id": "1a",
+      "power": 1.58,
+      "rating": "E",
+      "repair": 104.4
+    },
+    {
+      "ammo": 7800,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 1020370,
+      "edID": 128667612,
+      "eddbID": 1342,
+      "grp": "am",
+      "id": "19",
+      "power": 2.1,
+      "rating": "D",
+      "repair": 124.8
+    },
+    {
+      "ammo": 8700,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 3061100,
+      "edID": 128667620,
+      "eddbID": 1350,
+      "grp": "am",
+      "id": "18",
+      "power": 2.63,
+      "rating": "C",
+      "repair": 174
+    },
+    {
+      "ammo": 10400,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 9183300,
+      "edID": 128667628,
+      "eddbID": 1358,
+      "grp": "am",
+      "id": "17",
+      "power": 3.02,
+      "rating": "B",
+      "repair": 239.2
+    },
+    {
+      "ammo": 9600,
+      "ammocost": 1,
+      "class": 7,
+      "cost": 27549900,
+      "edID": 128667636,
+      "eddbID": 1366,
+      "grp": "am",
+      "id": "16",
+      "power": 3.68,
+      "rating": "A",
+      "repair": 268.8
+    },
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 612220,
+      "edID": 128667605,
+      "eddbID": 1335,
+      "grp": "am",
+      "id": "1f",
+      "power": 1.8,
+      "rating": "E",
+      "repair": 120
+    },
+    {
+      "ammo": 9000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 1836660,
+      "edID": 128667613,
+      "eddbID": 1343,
+      "grp": "am",
+      "id": "1e",
+      "power": 2.4,
+      "rating": "D",
+      "repair": 144
+    },
+    {
+      "ammo": 10000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 5509980,
+      "edID": 128667621,
+      "eddbID": 1351,
+      "grp": "am",
+      "id": "1d",
+      "power": 3,
+      "rating": "C",
+      "repair": 200
+    },
+    {
+      "ammo": 12000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 16529940,
+      "edID": 128667629,
+      "eddbID": 1359,
+      "grp": "am",
+      "id": "1c",
+      "power": 3.45,
+      "rating": "B",
+      "repair": 276
+    },
+    {
+      "ammo": 11000,
+      "ammocost": 1,
+      "class": 8,
+      "cost": 49589820,
+      "edID": 128667637,
+      "eddbID": 1367,
+      "grp": "am",
+      "id": "1b",
+      "power": 4.2,
+      "rating": "A",
+      "repair": 308
     }
   ]
 }

modules/internal/bi_weave_shield_generator.json

@@ -1,8 +1,10 @@
 {
   "bsg": [
     {
+      "brokenregen": 2.4,
       "class": 1,
       "cost": 7710,
+      "distdraw": 0.6,
       "edID": 128671331,
       "eddbID": 1530,
       "explres": 0.5,
@@ -18,12 +20,14 @@
       "optmul": 0.9,
       "power": 1.2,
       "rating": "C",
-      "recover": 2.4,
+      "regen": 1.8,
       "thermres": -0.2
     },
     {
+      "brokenregen": 2.4,
       "class": 2,
       "cost": 26710,
+      "distdraw": 0.6,
       "edID": 128671332,
       "eddbID": 1531,
       "explres": 0.5,
@@ -39,12 +43,14 @@
       "optmul": 0.9,
       "power": 1.5,
       "rating": "C",
-      "recover": 2.4,
+      "regen": 1.8,
       "thermres": -0.2
     },
     {
+      "brokenregen": 2.8,
       "class": 3,
       "cost": 84650,
+      "distdraw": 0.6,
       "edID": 128671333,
       "eddbID": 1532,
       "explres": 0.5,
@@ -60,12 +66,14 @@
       "optmul": 0.9,
       "power": 1.8,
       "rating": "C",
-      "recover": 2.4,
+      "regen": 2.2,
       "thermres": -0.2
     },
     {
+      "brokenregen": 3.8,
       "class": 4,
       "cost": 268350,
+      "distdraw": 0.6,
       "edID": 128671334,
       "eddbID": 1533,
       "explres": 0.5,
@@ -81,12 +89,14 @@
       "optmul": 0.9,
       "power": 2.2,
       "rating": "C",
-      "recover": 2.85,
+      "regen": 1.8,
       "thermres": -0.2
     },
     {
+      "brokenregen": 5.6,
       "class": 5,
       "cost": 850660,
+      "distdraw": 0.6,
       "edID": 128671335,
       "eddbID": 1534,
       "explres": 0.5,
@@ -102,12 +112,14 @@
       "optmul": 0.9,
       "power": 2.6,
       "rating": "C",
-      "recover": 3.75,
+      "regen": 2.2,
       "thermres": -0.2
     },
     {
+      "brokenregen": 8,
       "class": 6,
       "cost": 2696600,
+      "distdraw": 0.6,
       "edID": 128671336,
       "eddbID": 1535,
       "explres": 0.5,
@@ -123,12 +135,14 @@
       "optmul": 0.9,
       "power": 3.1,
       "rating": "C",
-      "recover": 4.8,
+      "regen": 3.2,
       "thermres": -0.2
     },
     {
+      "brokenregen": 11,
       "class": 7,
       "cost": 8548200,
+      "distdraw": 0.6,
       "edID": 128671337,
       "eddbID": 1536,
       "explres": 0.5,
@@ -144,12 +158,14 @@
       "optmul": 0.9,
       "power": 3.5,
       "rating": "C",
-      "recover": 6,
+      "regen": 4.4,
       "thermres": -0.2
     },
     {
+      "brokenregen": 14.4,
       "class": 8,
       "cost": 27097750,
+      "distdraw": 0.6,
       "edID": 128671338,
       "eddbID": 1537,
       "explres": 0.5,
@@ -165,7 +181,7 @@
       "optmul": 0.9,
       "power": 4,
       "rating": "C",
-      "recover": 7.2,
+      "regen": 5.8,
       "thermres": -0.2
     }
   ]

modules/internal/collector_limpet_controllers.json

@@ -1,142 +1,72 @@
 {
   "cc": [
     {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671244,
-      "eddbID": 1409,
+      "class": 1,
+      "cost": 600,
+      "edID": 128671229,
+      "eddbID": 1394,
       "grp": "cc",
-      "id": "Cf",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.41,
-      "range": 1.36,
+      "id": "C1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 0.8,
       "rating": "E",
       "time": 300
     },
     {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671245,
-      "eddbID": 1410,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671230,
+      "eddbID": 1395,
       "grp": "cc",
-      "id": "Cg",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.55,
-      "range": 1.02,
+      "id": "C2",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
       "rating": "D",
       "time": 600
     },
     {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671246,
-      "eddbID": 1411,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671231,
+      "eddbID": 1396,
       "grp": "cc",
-      "id": "Ch",
-      "mass": 80,
-      "maximum": 4,
-      "power": 0.69,
-      "range": 1.7,
+      "id": "C3",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
       "rating": "C",
       "time": 510
     },
     {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671247,
-      "eddbID": 1412,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671232,
+      "eddbID": 1397,
       "grp": "cc",
-      "id": "Ci",
-      "mass": 128,
-      "maximum": 4,
-      "power": 0.83,
-      "range": 2.38,
+      "id": "C4",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 1.4,
       "rating": "B",
       "time": 420
     },
     {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671248,
-      "eddbID": 1413,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671233,
+      "eddbID": 1398,
       "grp": "cc",
-      "id": "Cj",
-      "mass": 128,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 2.04,
-      "rating": "A",
-      "time": 720
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671239,
-      "eddbID": 1404,
-      "grp": "cc",
-      "id": "Ca",
-      "mass": 8,
-      "maximum": 3,
-      "power": 0.3,
-      "range": 1.04,
-      "rating": "E",
-      "time": 300
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671240,
-      "eddbID": 1405,
-      "grp": "cc",
-      "id": "Cb",
-      "mass": 8,
-      "maximum": 3,
-      "power": 0.4,
-      "range": 0.78,
-      "rating": "D",
-      "time": 600
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671241,
-      "eddbID": 1406,
-      "grp": "cc",
-      "id": "Cc",
-      "mass": 20,
-      "maximum": 3,
-      "power": 0.5,
-      "range": 1.3,
-      "rating": "C",
-      "time": 510
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671242,
-      "eddbID": 1407,
-      "grp": "cc",
-      "id": "Cd",
-      "mass": 32,
-      "maximum": 3,
-      "power": 0.6,
-      "range": 1.82,
-      "rating": "B",
-      "time": 420
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671243,
-      "eddbID": 1408,
-      "grp": "cc",
-      "id": "Ce",
-      "mass": 32,
-      "maximum": 3,
-      "power": 0.7,
-      "range": 1.56,
+      "id": "C5",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
       "rating": "A",
       "time": 720
     },
@@ -211,72 +141,142 @@
       "time": 720
     },
     {
-      "class": 1,
-      "cost": 600,
-      "edID": 128671229,
-      "eddbID": 1394,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671239,
+      "eddbID": 1404,
       "grp": "cc",
-      "id": "C1",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.14,
-      "range": 0.8,
+      "id": "Ca",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 1.04,
       "rating": "E",
       "time": 300
     },
     {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128671230,
-      "eddbID": 1395,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671240,
+      "eddbID": 1405,
       "grp": "cc",
-      "id": "C2",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.18,
-      "range": 0.6,
+      "id": "Cb",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.4,
+      "range": 0.78,
       "rating": "D",
       "time": 600
     },
     {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128671231,
-      "eddbID": 1396,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671241,
+      "eddbID": 1406,
       "grp": "cc",
-      "id": "C3",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.23,
-      "range": 1,
+      "id": "Cc",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.5,
+      "range": 1.3,
       "rating": "C",
       "time": 510
     },
     {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128671232,
-      "eddbID": 1397,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671242,
+      "eddbID": 1407,
       "grp": "cc",
-      "id": "C4",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 1.4,
+      "id": "Cd",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.6,
+      "range": 1.82,
       "rating": "B",
       "time": 420
     },
     {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128671233,
-      "eddbID": 1398,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671243,
+      "eddbID": 1408,
       "grp": "cc",
-      "id": "C5",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.32,
-      "range": 1.2,
+      "id": "Ce",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.7,
+      "range": 1.56,
+      "rating": "A",
+      "time": 720
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671244,
+      "eddbID": 1409,
+      "grp": "cc",
+      "id": "Cf",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "E",
+      "time": 300
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671245,
+      "eddbID": 1410,
+      "grp": "cc",
+      "id": "Cg",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "D",
+      "time": 600
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671246,
+      "eddbID": 1411,
+      "grp": "cc",
+      "id": "Ch",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C",
+      "time": 510
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671247,
+      "eddbID": 1412,
+      "grp": "cc",
+      "id": "Ci",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "B",
+      "time": 420
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671248,
+      "eddbID": 1413,
+      "grp": "cc",
+      "id": "Cj",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 2.04,
       "rating": "A",
       "time": 720
     }

modules/internal/fighter_hangar.json

@@ -1,18 +1,18 @@
 {
   "fh": [
     {
-      "bays": 2,
-      "class": 7,
+      "bays": 1,
+      "class": 5,
       "cost": 575660,
-      "edID": 128727932,
-      "eddbID": 1562,
+      "edID": 128727930,
+      "eddbID": 1560,
       "fightercost": 1030,
       "grp": "fh",
-      "id": "fh",
-      "mass": 60,
-      "power": 0.35,
+      "id": "fr",
+      "mass": 20,
+      "power": 0.25,
       "rating": "D",
-      "rebuildsperbay": 15
+      "rebuildsperbay": 6
     },
     {
       "bays": 2,
@@ -29,18 +29,18 @@
       "rebuildsperbay": 8
     },
     {
-      "bays": 1,
-      "class": 5,
+      "bays": 2,
+      "class": 7,
+      "edID": 128727932,
       "cost": 2369330,
-      "edID": 128727930,
-      "eddbID": 1560,
+      "eddbID": 1562,
       "fightercost": 1030,
       "grp": "fh",
-      "id": "fr",
-      "mass": 20,
-      "power": 0.25,
+      "id": "fh",
+      "mass": 60,
+      "power": 0.35,
       "rating": "D",
-      "rebuildsperbay": 6
+      "rebuildsperbay": 15
     }
   ]
 }

modules/internal/fuel_scoop.json

@@ -1,333 +1,58 @@
 {
   "fs": [
     {
-      "class": 8,
-      "cost": 1083910,
-      "edID": 128666651,
-      "eddbID": 1253,
+      "class": 1,
+      "cost": 310,
+      "edID": 128666644,
+      "eddbID": 1246,
       "grp": "fs",
-      "id": "3q",
-      "power": 0.48,
-      "rate": 720,
+      "id": "2n",
+      "power": 0.14,
+      "rate": 18,
       "rating": "E"
     },
     {
-      "class": 8,
-      "cost": 4516290,
-      "edID": 128666659,
-      "eddbID": 1261,
+      "class": 1,
+      "cost": 1290,
+      "edID": 128666652,
+      "eddbID": 1254,
       "grp": "fs",
-      "id": "3p",
-      "power": 0.64,
-      "rate": 960,
+      "id": "2m",
+      "power": 0.18,
+      "rate": 24,
       "rating": "D"
     },
     {
-      "class": 8,
-      "cost": 18065160,
-      "edID": 128666667,
-      "eddbID": 1269,
+      "class": 1,
+      "cost": 5140,
+      "edID": 128666660,
+      "eddbID": 1262,
       "grp": "fs",
-      "id": "3o",
-      "power": 0.8,
-      "rate": 1200,
+      "id": "2l",
+      "power": 0.23,
+      "rate": 30,
       "rating": "C"
     },
     {
-      "class": 8,
-      "cost": 72260660,
-      "edID": 128666675,
-      "eddbID": 1277,
+      "class": 1,
+      "cost": 20570,
+      "edID": 128666668,
+      "eddbID": 1270,
       "grp": "fs",
-      "id": "3n",
-      "power": 0.96,
-      "rate": 1440,
+      "id": "2k",
+      "power": 0.28,
+      "rate": 36,
       "rating": "B"
     },
     {
-      "class": 8,
-      "cost": 289042540,
-      "edID": 128666683,
-      "eddbID": 1285,
+      "class": 1,
+      "cost": 82270,
+      "edID": 128666676,
+      "eddbID": 1278,
       "grp": "fs",
-      "id": "3m",
-      "power": 1.12,
-      "rate": 1680,
-      "rating": "A"
-    },
-    {
-      "class": 7,
-      "cost": 341930,
-      "edID": 128666650,
-      "eddbID": 1252,
-      "grp": "fs",
-      "id": "3l",
-      "power": 0.41,
-      "rate": 534,
-      "rating": "E"
-    },
-    {
-      "class": 7,
-      "cost": 1424700,
-      "edID": 128666658,
-      "eddbID": 1260,
-      "grp": "fs",
-      "id": "3k",
-      "power": 0.55,
-      "rate": 712,
-      "rating": "D"
-    },
-    {
-      "class": 7,
-      "cost": 5698790,
-      "edID": 128666666,
-      "eddbID": 1268,
-      "grp": "fs",
-      "id": "3j",
-      "power": 0.69,
-      "rate": 890,
-      "rating": "C"
-    },
-    {
-      "class": 7,
-      "cost": 22795160,
-      "edID": 128666674,
-      "eddbID": 1276,
-      "grp": "fs",
-      "id": "3i",
-      "power": 0.83,
-      "rate": 1068,
-      "rating": "B"
-    },
-    {
-      "class": 7,
-      "cost": 91180640,
-      "edID": 128666682,
-      "eddbID": 1284,
-      "grp": "fs",
-      "id": "3h",
-      "power": 0.97,
-      "rate": 1245,
-      "rating": "A"
-    },
-    {
-      "class": 6,
-      "cost": 107860,
-      "edID": 128666649,
-      "eddbID": 1251,
-      "grp": "fs",
-      "id": "3g",
-      "power": 0.35,
-      "rate": 376,
-      "rating": "E"
-    },
-    {
-      "class": 6,
-      "cost": 449430,
-      "edID": 128666657,
-      "eddbID": 1259,
-      "grp": "fs",
-      "id": "3f",
-      "power": 0.47,
-      "rate": 502,
-      "rating": "D"
-    },
-    {
-      "class": 6,
-      "cost": 1797730,
-      "edID": 128666665,
-      "eddbID": 1267,
-      "grp": "fs",
-      "id": "3e",
-      "power": 0.59,
-      "rate": 627,
-      "rating": "C"
-    },
-    {
-      "class": 6,
-      "cost": 7190900,
-      "edID": 128666673,
-      "eddbID": 1275,
-      "grp": "fs",
-      "id": "3d",
-      "power": 0.71,
-      "rate": 752,
-      "rating": "B"
-    },
-    {
-      "class": 6,
-      "cost": 28763610,
-      "edID": 128666681,
-      "eddbID": 1283,
-      "grp": "fs",
-      "id": "3c",
-      "power": 0.83,
-      "rate": 878,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 34030,
-      "edID": 128666648,
-      "eddbID": 1250,
-      "grp": "fs",
-      "id": "3b",
-      "power": 0.3,
-      "rate": 247,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 141780,
-      "edID": 128666656,
-      "eddbID": 1258,
-      "grp": "fs",
-      "id": "3a",
-      "power": 0.4,
-      "rate": 330,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 567110,
-      "edID": 128666664,
-      "eddbID": 1266,
-      "grp": "fs",
-      "id": "39",
-      "power": 0.5,
-      "rate": 412,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 2268420,
-      "edID": 128666672,
-      "eddbID": 1274,
-      "grp": "fs",
-      "id": "38",
-      "power": 0.6,
-      "rate": 494,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 9073690,
-      "edID": 128666680,
-      "eddbID": 1282,
-      "grp": "fs",
-      "id": "37",
-      "power": 0.7,
-      "rate": 577,
-      "rating": "A"
-    },
-    {
-      "class": 4,
-      "cost": 10730,
-      "edID": 128666647,
-      "eddbID": 1249,
-      "grp": "fs",
-      "id": "36",
-      "power": 0.25,
-      "rate": 147,
-      "rating": "E"
-    },
-    {
-      "class": 4,
-      "cost": 44720,
-      "edID": 128666655,
-      "eddbID": 1257,
-      "grp": "fs",
-      "id": "35",
-      "power": 0.33,
-      "rate": 196,
-      "rating": "D"
-    },
-    {
-      "class": 4,
-      "cost": 178900,
-      "edID": 128666663,
-      "eddbID": 1265,
-      "grp": "fs",
-      "id": "34",
-      "power": 0.41,
-      "rate": 245,
-      "rating": "C"
-    },
-    {
-      "class": 4,
-      "cost": 715590,
-      "edID": 128666671,
-      "eddbID": 1273,
-      "grp": "fs",
-      "id": "33",
-      "power": 0.49,
-      "rate": 294,
-      "rating": "B"
-    },
-    {
-      "class": 4,
-      "cost": 2862360,
-      "edID": 128666679,
-      "eddbID": 1281,
-      "grp": "fs",
-      "id": "32",
-      "power": 0.57,
-      "rate": 342,
-      "rating": "A"
-    },
-    {
-      "class": 3,
-      "cost": 3390,
-      "edID": 128666646,
-      "eddbID": 1248,
-      "grp": "fs",
-      "id": "31",
-      "power": 0.2,
-      "rate": 75,
-      "rating": "E"
-    },
-    {
-      "class": 3,
-      "cost": 14110,
-      "edID": 128666654,
-      "eddbID": 1256,
-      "grp": "fs",
-      "id": "30",
-      "power": 0.27,
-      "rate": 100,
-      "rating": "D"
-    },
-    {
-      "class": 3,
-      "cost": 56440,
-      "edID": 128666662,
-      "eddbID": 1264,
-      "grp": "fs",
-      "id": "2v",
-      "power": 0.34,
-      "rate": 126,
-      "rating": "C"
-    },
-    {
-      "class": 3,
-      "cost": 225740,
-      "edID": 128666670,
-      "eddbID": 1272,
-      "grp": "fs",
-      "id": "2u",
-      "power": 0.41,
-      "rate": 151,
-      "rating": "B"
-    },
-    {
-      "class": 3,
-      "cost": 902950,
-      "edID": 128666678,
-      "eddbID": 1280,
-      "grp": "fs",
-      "id": "2t",
-      "power": 0.48,
-      "rate": 176,
+      "id": "2j",
+      "power": 0.32,
+      "rate": 42,
       "rating": "A"
     },
     {
@@ -386,58 +111,333 @@
       "rating": "A"
     },
     {
-      "class": 1,
-      "cost": 310,
-      "edID": 128666644,
-      "eddbID": 1246,
+      "class": 3,
+      "cost": 3390,
+      "edID": 128666646,
+      "eddbID": 1248,
       "grp": "fs",
-      "id": "2n",
-      "power": 0.14,
-      "rate": 18,
+      "id": "31",
+      "power": 0.2,
+      "rate": 75,
       "rating": "E"
     },
     {
-      "class": 1,
-      "cost": 1290,
-      "edID": 128666652,
-      "eddbID": 1254,
+      "class": 3,
+      "cost": 14110,
+      "edID": 128666654,
+      "eddbID": 1256,
       "grp": "fs",
-      "id": "2m",
-      "power": 0.18,
-      "rate": 24,
+      "id": "30",
+      "power": 0.27,
+      "rate": 100,
       "rating": "D"
     },
     {
-      "class": 1,
-      "cost": 5140,
-      "edID": 128666660,
-      "eddbID": 1262,
+      "class": 3,
+      "cost": 56440,
+      "edID": 128666662,
+      "eddbID": 1264,
       "grp": "fs",
-      "id": "2l",
-      "power": 0.23,
-      "rate": 30,
+      "id": "2v",
+      "power": 0.34,
+      "rate": 126,
       "rating": "C"
     },
     {
-      "class": 1,
-      "cost": 20570,
-      "edID": 128666668,
-      "eddbID": 1270,
+      "class": 3,
+      "cost": 225740,
+      "edID": 128666670,
+      "eddbID": 1272,
       "grp": "fs",
-      "id": "2k",
-      "power": 0.28,
-      "rate": 36,
+      "id": "2u",
+      "power": 0.41,
+      "rate": 151,
       "rating": "B"
     },
     {
-      "class": 1,
-      "cost": 82270,
-      "edID": 128666676,
-      "eddbID": 1278,
+      "class": 3,
+      "cost": 902950,
+      "edID": 128666678,
+      "eddbID": 1280,
       "grp": "fs",
-      "id": "2j",
-      "power": 0.32,
-      "rate": 42,
+      "id": "2t",
+      "power": 0.48,
+      "rate": 176,
+      "rating": "A"
+    },
+    {
+      "class": 4,
+      "cost": 10730,
+      "edID": 128666647,
+      "eddbID": 1249,
+      "grp": "fs",
+      "id": "36",
+      "power": 0.25,
+      "rate": 147,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 44720,
+      "edID": 128666655,
+      "eddbID": 1257,
+      "grp": "fs",
+      "id": "35",
+      "power": 0.33,
+      "rate": 196,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 178900,
+      "edID": 128666663,
+      "eddbID": 1265,
+      "grp": "fs",
+      "id": "34",
+      "power": 0.41,
+      "rate": 245,
+      "rating": "C"
+    },
+    {
+      "class": 4,
+      "cost": 715590,
+      "edID": 128666671,
+      "eddbID": 1273,
+      "grp": "fs",
+      "id": "33",
+      "power": 0.49,
+      "rate": 294,
+      "rating": "B"
+    },
+    {
+      "class": 4,
+      "cost": 2862360,
+      "edID": 128666679,
+      "eddbID": 1281,
+      "grp": "fs",
+      "id": "32",
+      "power": 0.57,
+      "rate": 342,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 34030,
+      "edID": 128666648,
+      "eddbID": 1250,
+      "grp": "fs",
+      "id": "3b",
+      "power": 0.3,
+      "rate": 247,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 141780,
+      "edID": 128666656,
+      "eddbID": 1258,
+      "grp": "fs",
+      "id": "3a",
+      "power": 0.4,
+      "rate": 330,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 567110,
+      "edID": 128666664,
+      "eddbID": 1266,
+      "grp": "fs",
+      "id": "39",
+      "power": 0.5,
+      "rate": 412,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 2268420,
+      "edID": 128666672,
+      "eddbID": 1274,
+      "grp": "fs",
+      "id": "38",
+      "power": 0.6,
+      "rate": 494,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 9073690,
+      "edID": 128666680,
+      "eddbID": 1282,
+      "grp": "fs",
+      "id": "37",
+      "power": 0.7,
+      "rate": 577,
+      "rating": "A"
+    },
+    {
+      "class": 6,
+      "cost": 107860,
+      "edID": 128666649,
+      "eddbID": 1251,
+      "grp": "fs",
+      "id": "3g",
+      "power": 0.35,
+      "rate": 376,
+      "rating": "E"
+    },
+    {
+      "class": 6,
+      "cost": 449430,
+      "edID": 128666657,
+      "eddbID": 1259,
+      "grp": "fs",
+      "id": "3f",
+      "power": 0.47,
+      "rate": 502,
+      "rating": "D"
+    },
+    {
+      "class": 6,
+      "cost": 1797730,
+      "edID": 128666665,
+      "eddbID": 1267,
+      "grp": "fs",
+      "id": "3e",
+      "power": 0.59,
+      "rate": 627,
+      "rating": "C"
+    },
+    {
+      "class": 6,
+      "cost": 7190900,
+      "edID": 128666673,
+      "eddbID": 1275,
+      "grp": "fs",
+      "id": "3d",
+      "power": 0.71,
+      "rate": 752,
+      "rating": "B"
+    },
+    {
+      "class": 6,
+      "cost": 28763610,
+      "edID": 128666681,
+      "eddbID": 1283,
+      "grp": "fs",
+      "id": "3c",
+      "power": 0.83,
+      "rate": 878,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 341930,
+      "edID": 128666650,
+      "eddbID": 1252,
+      "grp": "fs",
+      "id": "3l",
+      "power": 0.41,
+      "rate": 534,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 1424700,
+      "edID": 128666658,
+      "eddbID": 1260,
+      "grp": "fs",
+      "id": "3k",
+      "power": 0.55,
+      "rate": 712,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 5698790,
+      "edID": 128666666,
+      "eddbID": 1268,
+      "grp": "fs",
+      "id": "3j",
+      "power": 0.69,
+      "rate": 890,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 22795160,
+      "edID": 128666674,
+      "eddbID": 1276,
+      "grp": "fs",
+      "id": "3i",
+      "power": 0.83,
+      "rate": 1068,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 91180640,
+      "edID": 128666682,
+      "eddbID": 1284,
+      "grp": "fs",
+      "id": "3h",
+      "power": 0.97,
+      "rate": 1245,
+      "rating": "A"
+    },
+    {
+      "class": 8,
+      "cost": 1083910,
+      "edID": 128666651,
+      "eddbID": 1253,
+      "grp": "fs",
+      "id": "3q",
+      "power": 0.48,
+      "rate": 720,
+      "rating": "E"
+    },
+    {
+      "class": 8,
+      "cost": 4516290,
+      "edID": 128666659,
+      "eddbID": 1261,
+      "grp": "fs",
+      "id": "3p",
+      "power": 0.64,
+      "rate": 960,
+      "rating": "D"
+    },
+    {
+      "class": 8,
+      "cost": 18065160,
+      "edID": 128666667,
+      "eddbID": 1269,
+      "grp": "fs",
+      "id": "3o",
+      "power": 0.8,
+      "rate": 1200,
+      "rating": "C"
+    },
+    {
+      "class": 8,
+      "cost": 72260660,
+      "edID": 128666675,
+      "eddbID": 1277,
+      "grp": "fs",
+      "id": "3n",
+      "power": 0.96,
+      "rate": 1440,
+      "rating": "B"
+    },
+    {
+      "class": 8,
+      "cost": 289042540,
+      "edID": 128666683,
+      "eddbID": 1285,
+      "grp": "fs",
+      "id": "3m",
+      "power": 1.12,
+      "rate": 1680,
       "rating": "A"
     }
   ]

modules/internal/fuel_transfer_limpet_controllers.json

@@ -1,133 +1,68 @@
 {
   "fx": [
     {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671264,
-      "eddbID": 1429,
+      "class": 1,
+      "cost": 600,
+      "edID": 128671249,
+      "eddbID": 1414,
       "grp": "fx",
-      "id": "Ff",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.55,
-      "range": 1.02,
+      "id": "F0",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
       "rating": "E"
     },
     {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671265,
-      "eddbID": 1430,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671250,
+      "eddbID": 1415,
       "grp": "fx",
-      "id": "Fg",
-      "mass": 32,
-      "maximum": 8,
-      "power": 0.41,
-      "range": 1.36,
+      "id": "F1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 0.8,
       "rating": "D"
     },
     {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671266,
-      "eddbID": 1431,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671251,
+      "eddbID": 1416,
       "grp": "fx",
-      "id": "Fh",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.69,
-      "range": 1.7,
+      "id": "F2",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
       "rating": "C"
     },
     {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671267,
-      "eddbID": 1432,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671252,
+      "eddbID": 1417,
       "grp": "fx",
-      "id": "Fi",
-      "mass": 128,
-      "maximum": 8,
-      "power": 0.97,
-      "range": 2.04,
+      "id": "F3",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
       "rating": "B"
     },
     {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671268,
-      "eddbID": 1433,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671253,
+      "eddbID": 1418,
       "grp": "fx",
-      "id": "Fj",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.83,
-      "range": 2.38,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671259,
-      "eddbID": 1424,
-      "grp": "fx",
-      "id": "Fa",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.4,
-      "range": 0.78,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671260,
-      "eddbID": 1425,
-      "grp": "fx",
-      "id": "Fb",
-      "mass": 8,
-      "maximum": 4,
-      "power": 0.3,
-      "range": 1.04,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671261,
-      "eddbID": 1426,
-      "grp": "fx",
-      "id": "Fc",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.5,
-      "range": 1.3,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671262,
-      "eddbID": 1427,
-      "grp": "fx",
-      "id": "Fd",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 1.56,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671263,
-      "eddbID": 1428,
-      "grp": "fx",
-      "id": "Fe",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.6,
-      "range": 1.82,
+      "id": "F4",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 1.4,
       "rating": "A"
     },
     {
@@ -196,68 +131,133 @@
       "rating": "A"
     },
     {
-      "class": 1,
-      "cost": 600,
-      "edID": 128671249,
-      "eddbID": 1414,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671259,
+      "eddbID": 1424,
       "grp": "fx",
-      "id": "F0",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.18,
-      "range": 0.6,
+      "id": "Fa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 0.78,
       "rating": "E"
     },
     {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128671250,
-      "eddbID": 1415,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671260,
+      "eddbID": 1425,
       "grp": "fx",
-      "id": "F1",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.14,
-      "range": 0.8,
+      "id": "Fb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 1.04,
       "rating": "D"
     },
     {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128671251,
-      "eddbID": 1416,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671261,
+      "eddbID": 1426,
       "grp": "fx",
-      "id": "F2",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.23,
-      "range": 1,
+      "id": "Fc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 1.3,
       "rating": "C"
     },
     {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128671252,
-      "eddbID": 1417,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671262,
+      "eddbID": 1427,
       "grp": "fx",
-      "id": "F3",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.32,
-      "range": 1.2,
+      "id": "Fd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 1.56,
       "rating": "B"
     },
     {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128671253,
-      "eddbID": 1418,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671263,
+      "eddbID": 1428,
       "grp": "fx",
-      "id": "F4",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 1.4,
+      "id": "Fe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671264,
+      "eddbID": 1429,
+      "grp": "fx",
+      "id": "Ff",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671265,
+      "eddbID": 1430,
+      "grp": "fx",
+      "id": "Fg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671266,
+      "eddbID": 1431,
+      "grp": "fx",
+      "id": "Fh",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671267,
+      "eddbID": 1432,
+      "grp": "fx",
+      "id": "Fi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671268,
+      "eddbID": 1433,
+      "grp": "fx",
+      "id": "Fj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 2.38,
       "rating": "A"
     }
   ]

modules/internal/hatch_breaker_limpet_controller.json

@@ -1,145 +1,75 @@
 {
   "hb": [
     {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128066547,
-      "eddbID": 1222,
+      "class": 1,
+      "cost": 600,
+      "edID": 128066532,
+      "eddbID": 1207,
       "grp": "hb",
-      "id": "7d",
-      "mass": 80,
-      "maximum": 18,
-      "power": 0.42,
-      "range": 2.58,
+      "id": "6u",
+      "mass": 1.3,
+      "maximum": 2,
+      "power": 0.12,
+      "range": 1.5,
       "rating": "E",
-      "time": 25
+      "time": 42
     },
     {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128066548,
-      "eddbID": 1223,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128066533,
+      "eddbID": 1208,
       "grp": "hb",
-      "id": "7c",
-      "mass": 32,
-      "maximum": 12,
-      "power": 0.56,
-      "range": 3.44,
+      "id": "6t",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.16,
+      "range": 2,
       "rating": "D",
-      "time": 22
+      "time": 36
     },
     {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128066549,
-      "eddbID": 1224,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128066534,
+      "eddbID": 1209,
       "grp": "hb",
-      "id": "7b",
-      "mass": 80,
-      "maximum": 15,
-      "power": 0.7,
-      "range": 4.3,
+      "id": "6s",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.2,
+      "range": 2.5,
       "rating": "C",
-      "time": 18
+      "time": 30
     },
     {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128066550,
-      "eddbID": 1225,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128066535,
+      "eddbID": 1210,
       "grp": "hb",
-      "id": "7a",
-      "mass": 128,
-      "maximum": 18,
-      "power": 0.84,
-      "range": 5.16,
+      "id": "6r",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.24,
+      "range": 3,
       "rating": "B",
-      "time": 14
+      "time": 24
     },
     {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128066551,
-      "eddbID": 1226,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128066536,
+      "eddbID": 1211,
       "grp": "hb",
-      "id": "79",
-      "mass": 90,
-      "maximum": 12,
-      "power": 0.98,
-      "range": 6.02,
+      "id": "6q",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 3.5,
       "rating": "A",
-      "time": 11
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128066542,
-      "eddbID": 1217,
-      "grp": "hb",
-      "id": "78",
-      "mass": 20,
-      "maximum": 9,
-      "power": 0.3,
-      "range": 1.98,
-      "rating": "E",
-      "time": 31
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128066543,
-      "eddbID": 1218,
-      "grp": "hb",
-      "id": "77",
-      "mass": 8,
-      "maximum": 6,
-      "power": 0.4,
-      "range": 2.64,
-      "rating": "D",
-      "time": 26
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128066544,
-      "eddbID": 1219,
-      "grp": "hb",
-      "id": "76",
-      "mass": 20,
-      "maximum": 7,
-      "power": 0.5,
-      "range": 3.3,
-      "rating": "C",
-      "time": 22
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128066545,
-      "eddbID": 1220,
-      "grp": "hb",
-      "id": "75",
-      "mass": 32,
-      "maximum": 9,
-      "power": 0.6,
-      "range": 3.96,
-      "rating": "B",
       "time": 18
     },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128066546,
-      "eddbID": 1221,
-      "grp": "hb",
-      "id": "74",
-      "mass": 20,
-      "maximum": 6,
-      "power": 0.7,
-      "range": 4.62,
-      "rating": "A",
-      "time": 13
-    },
     {
       "class": 3,
       "cost": 5400,
@@ -211,74 +141,144 @@
       "time": 16
     },
     {
-      "class": 1,
-      "cost": 600,
-      "edID": 128066532,
-      "eddbID": 1207,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128066542,
+      "eddbID": 1217,
       "grp": "hb",
-      "id": "6u",
-      "mass": 1.3,
-      "maximum": 2,
-      "power": 0.12,
-      "range": 1.5,
+      "id": "78",
+      "mass": 20,
+      "maximum": 9,
+      "power": 0.3,
+      "range": 1.98,
       "rating": "E",
-      "time": 42
+      "time": 31
     },
     {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128066533,
-      "eddbID": 1208,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128066543,
+      "eddbID": 1218,
       "grp": "hb",
-      "id": "6t",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.16,
-      "range": 2,
+      "id": "77",
+      "mass": 8,
+      "maximum": 6,
+      "power": 0.4,
+      "range": 2.64,
       "rating": "D",
-      "time": 36
+      "time": 26
     },
     {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128066534,
-      "eddbID": 1209,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128066544,
+      "eddbID": 1219,
       "grp": "hb",
-      "id": "6s",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.2,
-      "range": 2.5,
+      "id": "76",
+      "mass": 20,
+      "maximum": 7,
+      "power": 0.5,
+      "range": 3.3,
       "rating": "C",
-      "time": 30
+      "time": 22
     },
     {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128066535,
-      "eddbID": 1210,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128066545,
+      "eddbID": 1220,
       "grp": "hb",
-      "id": "6r",
-      "mass": 2,
-      "maximum": 2,
-      "power": 0.24,
-      "range": 3,
+      "id": "75",
+      "mass": 32,
+      "maximum": 9,
+      "power": 0.6,
+      "range": 3.96,
       "rating": "B",
-      "time": 24
+      "time": 18
     },
     {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128066536,
-      "eddbID": 1211,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128066546,
+      "eddbID": 1221,
       "grp": "hb",
-      "id": "6q",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 3.5,
+      "id": "74",
+      "mass": 20,
+      "maximum": 6,
+      "power": 0.7,
+      "range": 4.62,
       "rating": "A",
+      "time": 13
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128066547,
+      "eddbID": 1222,
+      "grp": "hb",
+      "id": "7d",
+      "mass": 80,
+      "maximum": 18,
+      "power": 0.42,
+      "range": 2.58,
+      "rating": "E",
+      "time": 25
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128066548,
+      "eddbID": 1223,
+      "grp": "hb",
+      "id": "7c",
+      "mass": 32,
+      "maximum": 12,
+      "power": 0.56,
+      "range": 3.44,
+      "rating": "D",
+      "time": 22
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128066549,
+      "eddbID": 1224,
+      "grp": "hb",
+      "id": "7b",
+      "mass": 80,
+      "maximum": 15,
+      "power": 0.7,
+      "range": 4.3,
+      "rating": "C",
       "time": 18
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128066550,
+      "eddbID": 1225,
+      "grp": "hb",
+      "id": "7a",
+      "mass": 128,
+      "maximum": 18,
+      "power": 0.84,
+      "range": 5.16,
+      "rating": "B",
+      "time": 14
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128066551,
+      "eddbID": 1226,
+      "grp": "hb",
+      "id": "79",
+      "mass": 90,
+      "maximum": 12,
+      "power": 0.98,
+      "range": 6.02,
+      "rating": "A",
+      "time": 11
     }
   ]
 }

modules/internal/hull_reinforcement_package.json

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

modules/internal/module_reinforcement_package.json

@@ -0,0 +1,124 @@
+{
+  "mrp": [
+    {
+      "class": 1,
+      "cost": 5000,
+      "eddbID": 1577,
+      "edID": 128737270,
+      "grp": "mrp",
+      "id": "m0",
+      "integrity": 70,
+      "mass": 2,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 15000,
+      "eddbID": 1578,
+      "edID": 128737271,
+      "grp": "mrp",
+      "id": "m1",
+      "integrity": 30,
+      "mass": 1,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 2,
+      "cost": 12000,
+      "eddbID": 1579,
+      "edID": 128737272,
+      "grp": "mrp",
+      "id": "m2",
+      "integrity": 105,
+      "mass": 4,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 2,
+      "cost": 36000,
+      "eddbID": 1580,
+      "edID": 128737273,
+      "grp": "mrp",
+      "id": "m3",
+      "integrity": 45,
+      "mass": 2,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 28000,
+      "eddbID": 1581,
+      "edID": 128737274,
+      "grp": "mrp",
+      "id": "m4",
+      "integrity": 155,
+      "mass": 8,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 84000,
+      "eddbID": 1582,
+      "edID": 128737275,
+      "grp": "mrp",
+      "id": "m5",
+      "integrity": 65,
+      "mass": 4,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 4,
+      "cost": 65000,
+      "eddbID": 1583,
+      "edID": 128737276,
+      "grp": "mrp",
+      "id": "m6",
+      "integrity": 235,
+      "mass": 16,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 4,
+      "cost": 195000,
+      "eddbID": 1584,
+      "edID": 128737277,
+      "grp": "mrp",
+      "id": "m7",
+      "integrity": 95,
+      "mass": 8,
+      "protection": 0.6,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 150000,
+      "eddbID": 1585,
+      "edID": 128737278,
+      "grp": "mrp",
+      "id": "m8",
+      "integrity": 350,
+      "mass": 32,
+      "protection": 0.3,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 450000,
+      "eddbID": 1586,
+      "edID": 128737279,
+      "grp": "mrp",
+      "id": "m9",
+      "integrity": 145,
+      "mass": 16,
+      "protection": 0.6,
+      "rating": "D"
+    }
+  ]
+}

modules/internal/planetary_vehicle_hanger.json

@@ -1,27 +1,27 @@
 {
   "pv": [
     {
-      "bays": 4,
-      "class": 6,
-      "cost": 576000,
-      "edID": 128672292,
-      "eddbID": 1524,
+      "bays": 1,
+      "class": 2,
+      "cost": 18000,
+      "edID": 128672288,
+      "eddbID": 1528,
       "grp": "pv",
-      "id": "v1",
-      "mass": 34,
-      "power": 0.6,
+      "id": "v5",
+      "mass": 12,
+      "power": 0.25,
       "rating": "H"
     },
     {
-      "bays": 4,
-      "class": 6,
-      "cost": 691200,
-      "edID": 128672293,
-      "eddbID": 1525,
+      "bays": 1,
+      "class": 2,
+      "cost": 21600,
+      "edID": 128672289,
+      "eddbID": 1529,
       "grp": "pv",
-      "id": "v2",
-      "mass": 17,
-      "power": 1.8,
+      "id": "v6",
+      "mass": 6,
+      "power": 0.75,
       "rating": "G"
     },
     {
@@ -49,27 +49,27 @@
       "rating": "G"
     },
     {
-      "bays": 1,
-      "class": 2,
-      "cost": 18000,
-      "edID": 128672288,
-      "eddbID": 1528,
+      "bays": 4,
+      "class": 6,
+      "cost": 576000,
+      "edID": 128672292,
+      "eddbID": 1524,
       "grp": "pv",
-      "id": "v5",
-      "mass": 12,
-      "power": 0.25,
+      "id": "v1",
+      "mass": 34,
+      "power": 0.6,
       "rating": "H"
     },
     {
-      "bays": 1,
-      "class": 2,
-      "cost": 21600,
-      "edID": 128672289,
-      "eddbID": 1529,
+      "bays": 4,
+      "class": 6,
+      "cost": 691200,
+      "edID": 128672293,
+      "eddbID": 1525,
       "grp": "pv",
-      "id": "v6",
-      "mass": 6,
-      "power": 0.75,
+      "id": "v2",
+      "mass": 17,
+      "power": 1.8,
       "rating": "G"
     }
   ]

modules/internal/pristmatic_shield_generator.json

@@ -1,8 +1,10 @@
 {
   "psg": [
     {
+      "brokenregen": 1.2,
       "class": 1,
       "cost": 132200,
+      "distdraw": 0.6,
       "edID": 128671323,
       "eddbID": 1485,
       "explres": 0.5,
@@ -19,12 +21,14 @@
       "power": 2.52,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2,
+      "regen": 1,
       "thermres": -0.2
     },
     {
+      "brokenregen": 1.2,
       "class": 2,
       "cost": 240340,
+      "distdraw": 0.6,
       "edID": 128671324,
       "eddbID": 1486,
       "explres": 0.5,
@@ -41,12 +45,14 @@
       "power": 3.15,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2,
+      "regen": 1,
       "thermres": -0.2
     },
     {
+      "brokenregen": 1.3,
       "class": 3,
       "cost": 761870,
+      "distdraw": 0.6,
       "edID": 128671325,
       "eddbID": 1487,
       "explres": 0.5,
@@ -63,12 +69,14 @@
       "power": 3.78,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2,
+      "regen": 1,
       "thermres": -0.2
     },
     {
+      "brokenregen": 1.7,
       "class": 4,
       "cost": 2415120,
+      "distdraw": 0.6,
       "edID": 128671326,
       "eddbID": 1488,
       "explres": 0.5,
@@ -85,12 +93,14 @@
       "power": 4.62,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.425,
+      "regen": 1,
       "thermres": -0.2
     },
     {
+      "brokenregen": 2.3,
       "class": 5,
       "cost": 7655930,
+      "distdraw": 0.6,
       "edID": 128671327,
       "eddbID": 1489,
       "explres": 0.5,
@@ -107,12 +117,14 @@
       "power": 5.46,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.875,
+      "regen": 1,
       "thermres": -0.2
     },
     {
+      "brokenregen": 3.2,
       "class": 6,
       "cost": 24269300,
+      "distdraw": 0.6,
       "edID": 128671328,
       "eddbID": 1490,
       "explres": 0.5,
@@ -129,12 +141,14 @@
       "power": 6.51,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 2.4,
+      "regen": 1,
       "thermres": -0.2
     },
     {
+      "brokenregen": 4.2,
       "class": 7,
       "cost": 76933670,
+      "distdraw": 0.6,
       "edID": 128671329,
       "eddbID": 1491,
       "explres": 0.5,
@@ -151,12 +165,14 @@
       "power": 7.35,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 3,
+      "regen": 1.1,
       "thermres": -0.2
     },
     {
+      "brokenregen": 5.4,
       "class": 8,
       "cost": 243879730,
+      "distdraw": 0.6,
       "edID": 128671330,
       "eddbID": 1492,
       "explres": 0.5,
@@ -173,7 +189,7 @@
       "power": 8.4,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 3.6,
+      "regen": 1.4,
       "thermres": -0.2
     }
   ]

modules/internal/prospector_limpet_controllers.json

@@ -1,133 +1,68 @@
 {
   "pc": [
     {
-      "class": 7,
-      "cost": 437400,
-      "edID": 128671284,
-      "eddbID": 1449,
+      "class": 1,
+      "cost": 600,
+      "edID": 128671269,
+      "eddbID": 1434,
       "grp": "pc",
-      "id": "Pf",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.55,
-      "range": 5.1,
+      "id": "P0",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 3,
       "rating": "E"
     },
     {
-      "class": 7,
-      "cost": 874800,
-      "edID": 128671285,
-      "eddbID": 1450,
+      "class": 1,
+      "cost": 1200,
+      "edID": 128671270,
+      "eddbID": 1435,
       "grp": "pc",
-      "id": "Pg",
-      "mass": 32,
-      "maximum": 8,
-      "power": 0.41,
-      "range": 6.8,
+      "id": "P1",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 4,
       "rating": "D"
     },
     {
-      "class": 7,
-      "cost": 1749600,
-      "edID": 128671286,
-      "eddbID": 1451,
+      "class": 1,
+      "cost": 2400,
+      "edID": 128671271,
+      "eddbID": 1436,
       "grp": "pc",
-      "id": "Ph",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.69,
-      "range": 8.5,
+      "id": "P2",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 5,
       "rating": "C"
     },
     {
-      "class": 7,
-      "cost": 3499200,
-      "edID": 128671287,
-      "eddbID": 1452,
+      "class": 1,
+      "cost": 4800,
+      "edID": 128671272,
+      "eddbID": 1437,
       "grp": "pc",
-      "id": "Pi",
-      "mass": 128,
-      "maximum": 8,
-      "power": 0.97,
-      "range": 10.2,
+      "id": "P3",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 6,
       "rating": "B"
     },
     {
-      "class": 7,
-      "cost": 6998400,
-      "edID": 128671288,
-      "eddbID": 1453,
+      "class": 1,
+      "cost": 9600,
+      "edID": 128671273,
+      "eddbID": 1438,
       "grp": "pc",
-      "id": "Pj",
-      "mass": 80,
-      "maximum": 8,
-      "power": 0.83,
-      "range": 11.9,
-      "rating": "A"
-    },
-    {
-      "class": 5,
-      "cost": 48600,
-      "edID": 128671279,
-      "eddbID": 1444,
-      "grp": "pc",
-      "id": "Pa",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.4,
-      "range": 3.9,
-      "rating": "E"
-    },
-    {
-      "class": 5,
-      "cost": 97200,
-      "edID": 128671280,
-      "eddbID": 1445,
-      "grp": "pc",
-      "id": "Pb",
-      "mass": 8,
-      "maximum": 4,
-      "power": 0.3,
-      "range": 5.2,
-      "rating": "D"
-    },
-    {
-      "class": 5,
-      "cost": 194400,
-      "edID": 128671281,
-      "eddbID": 1446,
-      "grp": "pc",
-      "id": "Pc",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.5,
-      "range": 6.5,
-      "rating": "C"
-    },
-    {
-      "class": 5,
-      "cost": 388800,
-      "edID": 128671282,
-      "eddbID": 1447,
-      "grp": "pc",
-      "id": "Pd",
-      "mass": 32,
-      "maximum": 4,
-      "power": 0.97,
-      "range": 7.8,
-      "rating": "B"
-    },
-    {
-      "class": 5,
-      "cost": 777600,
-      "edID": 128671283,
-      "eddbID": 1448,
-      "grp": "pc",
-      "id": "Pe",
-      "mass": 20,
-      "maximum": 4,
-      "power": 0.6,
-      "range": 9.1,
+      "id": "P4",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 7,
       "rating": "A"
     },
     {
@@ -196,68 +131,133 @@
       "rating": "A"
     },
     {
-      "class": 1,
-      "cost": 600,
-      "edID": 128671269,
-      "eddbID": 1434,
+      "class": 5,
+      "cost": 48600,
+      "edID": 128671279,
+      "eddbID": 1444,
       "grp": "pc",
-      "id": "P0",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.18,
-      "range": 3,
+      "id": "Pa",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.4,
+      "range": 3.9,
       "rating": "E"
     },
     {
-      "class": 1,
-      "cost": 1200,
-      "edID": 128671270,
-      "eddbID": 1435,
+      "class": 5,
+      "cost": 97200,
+      "edID": 128671280,
+      "eddbID": 1445,
       "grp": "pc",
-      "id": "P1",
-      "mass": 0.5,
-      "maximum": 1,
-      "power": 0.14,
-      "range": 4,
+      "id": "Pb",
+      "mass": 8,
+      "maximum": 4,
+      "power": 0.3,
+      "range": 5.2,
       "rating": "D"
     },
     {
-      "class": 1,
-      "cost": 2400,
-      "edID": 128671271,
-      "eddbID": 1436,
+      "class": 5,
+      "cost": 194400,
+      "edID": 128671281,
+      "eddbID": 1446,
       "grp": "pc",
-      "id": "P2",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.23,
-      "range": 5,
+      "id": "Pc",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.5,
+      "range": 6.5,
       "rating": "C"
     },
     {
-      "class": 1,
-      "cost": 4800,
-      "edID": 128671272,
-      "eddbID": 1437,
+      "class": 5,
+      "cost": 388800,
+      "edID": 128671282,
+      "eddbID": 1447,
       "grp": "pc",
-      "id": "P3",
-      "mass": 2,
-      "maximum": 1,
-      "power": 0.32,
-      "range": 6,
+      "id": "Pd",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 7.8,
       "rating": "B"
     },
     {
-      "class": 1,
-      "cost": 9600,
-      "edID": 128671273,
-      "eddbID": 1438,
+      "class": 5,
+      "cost": 777600,
+      "edID": 128671283,
+      "eddbID": 1448,
       "grp": "pc",
-      "id": "P4",
-      "mass": 1.3,
-      "maximum": 1,
-      "power": 0.28,
-      "range": 7,
+      "id": "Pe",
+      "mass": 20,
+      "maximum": 4,
+      "power": 0.6,
+      "range": 9.1,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128671284,
+      "eddbID": 1449,
+      "grp": "pc",
+      "id": "Pf",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.55,
+      "range": 5.1,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128671285,
+      "eddbID": 1450,
+      "grp": "pc",
+      "id": "Pg",
+      "mass": 32,
+      "maximum": 8,
+      "power": 0.41,
+      "range": 6.8,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128671286,
+      "eddbID": 1451,
+      "grp": "pc",
+      "id": "Ph",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.69,
+      "range": 8.5,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128671287,
+      "eddbID": 1452,
+      "grp": "pc",
+      "id": "Pi",
+      "mass": 128,
+      "maximum": 8,
+      "power": 0.97,
+      "range": 10.2,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128671288,
+      "eddbID": 1453,
+      "grp": "pc",
+      "id": "Pj",
+      "mass": 80,
+      "maximum": 8,
+      "power": 0.83,
+      "range": 11.9,
       "rating": "A"
     }
   ]

modules/internal/refinery.json

@@ -1,113 +1,58 @@
 {
   "rf": [
     {
-      "bins": 4,
-      "class": 4,
-      "cost": 55570,
-      "edID": 128666687,
-      "eddbID": 1289,
+      "bins": 1,
+      "class": 1,
+      "cost": 6000,
+      "edID": 128666684,
+      "eddbID": 1286,
       "grp": "rf",
-      "id": "23",
-      "power": 0.25,
+      "id": "1k",
+      "power": 0.14,
       "rating": "E"
     },
     {
-      "bins": 5,
-      "class": 4,
-      "cost": 166700,
-      "edID": 128666691,
-      "eddbID": 1293,
+      "bins": 1,
+      "class": 1,
+      "cost": 18000,
+      "edID": 128666688,
+      "eddbID": 1290,
       "grp": "rf",
-      "id": "22",
-      "power": 0.33,
+      "id": "1j",
+      "power": 0.18,
       "rating": "D"
     },
     {
-      "bins": 7,
-      "class": 4,
-      "cost": 500090,
-      "edID": 128666695,
-      "eddbID": 1297,
+      "bins": 2,
+      "class": 1,
+      "cost": 54000,
+      "edID": 128666692,
+      "eddbID": 1294,
       "grp": "rf",
-      "id": "21",
-      "power": 0.41,
+      "id": "1i",
+      "power": 0.23,
       "rating": "C"
     },
-    {
-      "bins": 9,
-      "class": 4,
-      "cost": 1500280,
-      "edID": 128666699,
-      "eddbID": 1301,
-      "grp": "rf",
-      "id": "20",
-      "power": 0.49,
-      "rating": "B"
-    },
-    {
-      "bins": 10,
-      "class": 4,
-      "cost": 4500850,
-      "edID": 128666703,
-      "eddbID": 1305,
-      "grp": "rf",
-      "id": "1v",
-      "power": 0.57,
-      "rating": "A"
-    },
     {
       "bins": 3,
-      "class": 3,
-      "cost": 26460,
-      "edID": 128666686,
-      "eddbID": 1288,
+      "class": 1,
+      "cost": 162000,
+      "edID": 128666696,
+      "eddbID": 1298,
       "grp": "rf",
-      "id": "1u",
-      "power": 0.2,
-      "rating": "E"
-    },
-    {
-      "bins": 4,
-      "class": 3,
-      "cost": 79380,
-      "edID": 128666690,
-      "eddbID": 1292,
-      "grp": "rf",
-      "id": "1t",
-      "power": 0.27,
-      "rating": "D"
-    },
-    {
-      "bins": 6,
-      "class": 3,
-      "cost": 238140,
-      "edID": 128666694,
-      "eddbID": 1296,
-      "grp": "rf",
-      "id": "1s",
-      "power": 0.34,
-      "rating": "C"
-    },
-    {
-      "bins": 7,
-      "class": 3,
-      "cost": 714420,
-      "edID": 128666698,
-      "eddbID": 1300,
-      "grp": "rf",
-      "id": "1r",
-      "power": 0.41,
+      "id": "1h",
+      "power": 0.28,
       "rating": "B"
     },
     {
-      "bins": 8,
-      "class": 3,
-      "cost": 2143260,
-      "edID": 128666702,
-      "eddbID": 1304,
+      "bins": 4,
+      "class": 1,
+      "cost": 486000,
+      "edID": 128666700,
+      "eddbID": 1302,
       "grp": "rf",
-      "id": "1q",
-      "power": 0.48,
+      "id": "1g",
+      "power": 0.32,
       "rating": "A"
     },
     {
@@ -166,58 +111,113 @@
       "rating": "A"
     },
     {
-      "bins": 1,
-      "class": 1,
-      "cost": 6000,
-      "edID": 128666684,
-      "eddbID": 1286,
+      "bins": 3,
+      "class": 3,
+      "cost": 26460,
+      "edID": 128666686,
+      "eddbID": 1288,
       "grp": "rf",
-      "id": "1k",
-      "power": 0.14,
+      "id": "1u",
+      "power": 0.2,
       "rating": "E"
     },
     {
-      "bins": 1,
-      "class": 1,
-      "cost": 18000,
-      "edID": 128666688,
-      "eddbID": 1290,
+      "bins": 4,
+      "class": 3,
+      "cost": 79380,
+      "edID": 128666690,
+      "eddbID": 1292,
       "grp": "rf",
-      "id": "1j",
-      "power": 0.18,
+      "id": "1t",
+      "power": 0.27,
       "rating": "D"
     },
     {
-      "bins": 2,
-      "class": 1,
-      "cost": 54000,
-      "edID": 128666692,
-      "eddbID": 1294,
+      "bins": 6,
+      "class": 3,
+      "cost": 238140,
+      "edID": 128666694,
+      "eddbID": 1296,
       "grp": "rf",
-      "id": "1i",
-      "power": 0.23,
+      "id": "1s",
+      "power": 0.34,
       "rating": "C"
     },
     {
-      "bins": 3,
-      "class": 1,
-      "cost": 162000,
-      "edID": 128666696,
-      "eddbID": 1298,
+      "bins": 7,
+      "class": 3,
+      "cost": 714420,
+      "edID": 128666698,
+      "eddbID": 1300,
       "grp": "rf",
-      "id": "1h",
-      "power": 0.28,
+      "id": "1r",
+      "power": 0.41,
       "rating": "B"
     },
     {
-      "bins": 4,
-      "class": 1,
-      "cost": 486000,
-      "edID": 128666700,
-      "eddbID": 1302,
+      "bins": 8,
+      "class": 3,
+      "cost": 2143260,
+      "edID": 128666702,
+      "eddbID": 1304,
       "grp": "rf",
-      "id": "1g",
-      "power": 0.32,
+      "id": "1q",
+      "power": 0.48,
+      "rating": "A"
+    },
+    {
+      "bins": 4,
+      "class": 4,
+      "cost": 55570,
+      "edID": 128666687,
+      "eddbID": 1289,
+      "grp": "rf",
+      "id": "23",
+      "power": 0.25,
+      "rating": "E"
+    },
+    {
+      "bins": 5,
+      "class": 4,
+      "cost": 166700,
+      "edID": 128666691,
+      "eddbID": 1293,
+      "grp": "rf",
+      "id": "22",
+      "power": 0.33,
+      "rating": "D"
+    },
+    {
+      "bins": 7,
+      "class": 4,
+      "cost": 500090,
+      "edID": 128666695,
+      "eddbID": 1297,
+      "grp": "rf",
+      "id": "21",
+      "power": 0.41,
+      "rating": "C"
+    },
+    {
+      "bins": 9,
+      "class": 4,
+      "cost": 1500280,
+      "edID": 128666699,
+      "eddbID": 1301,
+      "grp": "rf",
+      "id": "20",
+      "power": 0.49,
+      "rating": "B"
+    },
+    {
+      "bins": 10,
+      "class": 4,
+      "cost": 4500850,
+      "edID": 128666703,
+      "eddbID": 1305,
+      "grp": "rf",
+      "id": "1v",
+      "power": 0.57,
       "rating": "A"
     }
   ]

modules/standard/thrusters.json

@@ -85,7 +85,7 @@
       "maxmul": 1.16,
       "minmass": 1680,
       "minmul": 0.96,
-      "optmass": 5040,
+      "optmass": 3360,
       "optmul": 1,
       "power": 10.8,
       "rating": "A"
@@ -622,9 +622,9 @@
       "integrity": 56,
       "mass": 2.5,
       "maxmass": 108,
-      "maxmul": 0.96,
+      "maxmul": 1.16,
       "minmass": 36,
-      "minmul": 1.16,
+      "minmul": 0.96,
       "optmass": 72,
       "optmul": 1,
       "power": 3,
@@ -640,12 +640,21 @@
       "integrity": 55,
       "mass": 5,
       "maxmass": 200,
-      "maxmul": 1.6,
+      "maxmul": 1.367,
+      "maxmulacceleration": 1.20,
+      "maxmulrotation": 1.30,
+      "maxmulspeed": 1.60,
       "minmass": 70,
       "minmul": 0.9,
+      "minmulacceleration": 0.9,
+      "minmulrotation": 0.9,
+      "minmulspeed": 0.9,
       "name": "Enhanced Performance",
       "optmass": 90,
-      "optmul": 1.25,
+      "optmul": 1.15,
+      "optmulacceleration": 1.10,
+      "optmulrotation": 1.10,
+      "optmulspeed": 1.25,
       "power": 5,
       "rating": "A"
     },
@@ -659,12 +668,21 @@
       "integrity": 40,
       "mass": 2.5,
       "maxmass": 120,
-      "maxmul": 1.6,
+      "maxmul": 1.367,
+      "maxmulacceleration": 1.20,
+      "maxmulrotation": 1.30,
+      "maxmulspeed": 1.60,
       "minmass": 50,
       "minmul": 0.9,
+      "minmulacceleration": 0.9,
+      "minmulrotation": 0.9,
+      "minmulspeed": 0.9,
       "name": "Enhanced Performance",
       "optmass": 60,
-      "optmul": 1.25,
+      "optmul": 1.15,
+      "optmulacceleration": 1.10,
+      "optmulrotation": 1.10,
+      "optmulspeed": 1.25,
       "power": 4,
       "rating": "A"
     }

package.json

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

ships/adder.json

@@ -10,12 +10,15 @@
       "speed": 220,
       "boost": 320,
       "boostEnergy": 9,
-      "agility": 8,
       "baseShieldStrength": 60,
       "baseArmour": 90,
+      "hardness": 35,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.13625
+      "pipSpeed": 0.13625,
+      "pitch": 38,
+      "roll": 100,
+      "yaw": 14
     },
     "retailCost": 87810,
     "bulkheads": [

ships/anaconda.json

@@ -10,13 +10,16 @@
       "speed": 180,
       "boost": 240,
       "boostEnergy": 27,
-      "agility": 2,
       "baseShieldStrength": 350,
       "baseArmour": 525,
+      "hardness": 65,
       "hullMass": 400,
       "masslock": 23,
       "pipSpeed": 0.13875,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 60,
+      "yaw": 10
     },
     "retailCost": 146969450,
     "bulkheads": [
@@ -29,12 +32,16 @@
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],
       "hardpoints": [4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [7, 6, 6, 6, 5, 5, 5, 4, 4, 4, 2]
+      "internal": [
+        7, 6, 6, 6, 5, 5, 5,
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 4, 4, 2
+      ]
     },
     "defaults": {
       "standard": ["8E", "7E", "6E", "5E", "8E", "8E", "5C"],
       "hardpoints": [0, 0, 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, "2h", "00"]
+      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, "2h", "00"]
     }
   }
 }

ships/asp.json

@@ -10,12 +10,15 @@
       "speed": 250,
       "boost": 340,
       "boostEnergy": 13,
-      "agility": 6,
       "baseShieldStrength": 140,
       "baseArmour": 210,
+      "hardness": 52,
       "hullMass": 280,
       "masslock": 11,
-      "pipSpeed": 0.13
+      "pipSpeed": 0.13,
+      "pitch": 38,
+      "roll": 100,
+      "yaw": 10
     },
     "retailCost": 6661150,
     "bulkheads": [

ships/asp_scout.json

@@ -10,12 +10,15 @@
       "speed": 220,
       "boost": 300,
       "boostEnergy": 13,
-      "agility": 8,
       "baseShieldStrength": 120,
       "baseArmour": 180,
+      "hardness": 52,
       "hullMass": 150,
       "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 40,
+      "roll": 110,
+      "yaw": 15
     },
     "retailCost": 3961150,
     "bulkheads": [

ships/beluga.json

@@ -10,14 +10,17 @@
       "speed": 200,
       "boost": 280,
       "boostEnergy": 19,
-      "agility": 2,
       "baseShieldStrength": 280,
       "baseArmour": 280,
+      "hardness": 60,
       "hullMass": 1100,
       "masslock": 18,
-      "pipSpeed": -1,
+      "pipSpeed": 0.1125,
       "luxuryCabins": true,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 60,
+      "yaw": 17 
     },
     "retailCost": 84532770,
     "bulkheads": [
@@ -32,10 +35,10 @@
       "hardpoints": [2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0],
       "internal": [
         6, 6,
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
         4, 3, 3, 3, 3
       ]
     },

ships/cobra_mk_iii.json

@@ -10,12 +10,15 @@
       "speed": 280,
       "boost": 400,
       "boostEnergy": 10,
-      "agility": 6,
       "baseShieldStrength": 80,
       "baseArmour": 120,
+      "hardness": 35,
       "hullMass": 180,
       "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 40,
+      "roll": 100,
+      "yaw": 10
     },
     "retailCost": 349720,
     "bulkheads": [

ships/cobra_mk_iv.json

@@ -10,12 +10,15 @@
       "speed": 200,
       "boost": 300,
       "boostEnergy": 10,
-      "agility": 4,
       "baseShieldStrength": 120,
       "baseArmour": 120,
+      "hardness": 35,
       "hullMass": 210,
       "masslock": 8,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "pitch": 30,
+      "roll": 90,
+      "yaw": 10 
     },
     "retailCost": 747660,
     "bulkheads": [

ships/diamondback_explorer.json

@@ -9,12 +9,15 @@
       "speed": 260,
       "boost": 340,
       "boostEnergy": 13,
-      "agility": 5,
       "baseShieldStrength": 150,
       "baseArmour": 150,
+      "hardness": 42,
       "hullMass": 298,
       "masslock": 10,
-      "pipSpeed": 0.09625
+      "pipSpeed": 0.09625,
+      "pitch": 35,
+      "roll": 90,
+      "yaw": 13
     },
     "retailCost": 1894760,
     "bulkheads": [

ships/diamondback_scout.json

@@ -10,13 +10,16 @@
       "speed": 280,
       "boost": 380,
       "boostEnergy": 10,
-      "agility": 8,
       "baseShieldStrength": 120,
       "baseArmour": 120,
+      "hardness": 40,
       "hullMass": 170,
       "masslock": 8,
-      "pipSpeed": 0.09875
-    },
+      "pipSpeed": 0.09875,
+      "pitch": 42,
+      "roll": 100,
+      "yaw": 15 
+    } ,
     "retailCost": 564330,
     "bulkheads": [
       { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },

ships/eagle.json

@@ -10,12 +10,15 @@
       "speed": 240,
       "boost": 350,
       "boostEnergy": 8,
-      "agility": 10,
       "baseShieldStrength": 60,
       "baseArmour": 40,
+      "hardness": 28,
       "hullMass": 50,
       "masslock": 6,
-      "pipSpeed": 0.0625
+      "pipSpeed": 0.0625,
+      "pitch": 50,
+      "roll": 120,
+      "yaw": 18
     },
     "retailCost": 44800,
     "bulkheads": [
@@ -28,12 +31,16 @@
     "slots": {
       "standard": [2, 3, 3, 1, 2, 2, 2],
       "hardpoints": [1, 1, 1, 0],
-      "internal": [3, 2, 1, 1]
+      "internal": [
+        3, 2, 
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        1, 1
+      ]
     },
     "defaults": {
       "standard": ["2E", "3E", "3E", "1E", "2E", "2E", "2C"],
       "hardpoints": [17, 17, 0, 0],
-      "internal": ["44", "00", "2h", 0]
+      "internal": ["44", "00", 0, "2h", 0]
     }
   }
 }

ships/federal_assault_ship.json

@@ -9,12 +9,15 @@
       "speed": 210,
       "boost": 350,
       "boostEnergy": 19,
-      "agility": 6,
       "baseShieldStrength": 200,
       "baseArmour": 300,
+      "hardness": 60,
       "hullMass": 480,
       "masslock": 14,
-      "pipSpeed": 0.11125
+      "pipSpeed": 0.11125,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 19
     },
     "retailCost": 19814210,
     "bulkheads": [
@@ -27,12 +30,17 @@
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
       "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
-      "internal": [5, 5, 4, 3, 2, 2]
+      "internal": [
+        5, 5, 4, 
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        3, 2, 2
+      ]
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
       "hardpoints": [0, 0, 17, 17, 0, 0, 0, 0],
-      "internal": ["4e", "03", "02", "02", 0, 0]
+      "internal": ["4e", "03", "02", 0, 0, "02", 0, 0]
     }
   }
 }

ships/federal_corvette.json

@@ -10,13 +10,16 @@
       "speed": 200,
       "boost": 260,
       "boostEnergy": 27,
-      "agility": 2,
       "baseShieldStrength": 555,
       "baseArmour": 370,
+      "hardness": 70,
       "hullMass": 900,
       "masslock": 24,
       "pipSpeed": 0.125,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 28,
+      "roll": 75,
+      "yaw": 8 
     },
     "retailCost": 187969450,
     "bulkheads": [
@@ -29,12 +32,17 @@
     "slots": {
       "standard": [8, 7, 6, 5, 8, 8, 5],
       "hardpoints": [4, 4, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [7, 7, 7, 6, 6, 5, 5, 4, 4, 3]
+      "internal": [
+        7, 7, 7, 6, 6, 5, 5,
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 4, 3
+      ]
     },
     "defaults": {
       "standard": ["8E", "7E" ,"6E", "5E", "8E", "8E", "5C"],
       "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4o", "05", 0, 0, 0, 0, 0, "02", "01", "2h"]
+      "internal": ["4o", "05", 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h"]
     }
   }
 }

ships/federal_dropship.json

@@ -10,12 +10,15 @@
       "speed": 180,
       "boost": 300,
       "boostEnergy": 19,
-      "agility": 2,
       "baseShieldStrength": 200,
       "baseArmour": 300,
+      "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.0725
+      "pipSpeed": 0.0725,
+      "pitch": 30,
+      "roll": 80,
+      "yaw": 14
     },
     "retailCost": 14314210,
     "bulkheads": [
@@ -28,12 +31,17 @@
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
       "hardpoints": [3, 2, 2, 2, 2, 0, 0, 0, 0],
-      "internal": [6, 5, 5, 4, 3, 3, 2]
+      "internal": [
+        6, 5, 5, 4,
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        3, 3, 2
+      ]
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["04", "03", "4e", "02", 0, 0, 0, 0, "2h"]
     }
   }
 }

ships/federal_gunship.json

@@ -10,13 +10,16 @@
       "speed": 170,
       "boost": 280,
       "boostEnergy": 23,
-      "agility": 2,
       "baseShieldStrength": 250,
       "baseArmour": 350,
+      "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
       "pipSpeed": 0.1025,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 25,
+      "roll": 80,
+      "yaw": 18
     },
     "retailCost": 35814210,
     "bulkheads": [
@@ -29,12 +32,18 @@
     "slots": {
       "standard": [6, 6, 5, 5, 7, 5, 4],
       "hardpoints": [3, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0],
-      "internal": [6, 6, 5, 2, 2]
+      "internal": [
+        6, 6, 5,
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        2, 2
+      ]
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "7E", "5E", "4C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [0, "4j", "03", 0, "2h"]
+      "internal": [0, "4j", "03", 0, 0, 0, 0, "2h"]
     }
   }
 }

ships/fer_de_lance.json

@@ -10,12 +10,15 @@
       "speed": 260,
       "boost": 350,
       "boostEnergy": 19,
-      "agility": 6,
       "baseShieldStrength": 300,
       "baseArmour": 225,
+      "hardness": 70,
       "hullMass": 250,
       "masslock": 12,
-      "pipSpeed": 0.03875
+      "pipSpeed": 0.03875,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 12
     },
     "retailCost": 51567040,
     "bulkheads": [

ships/hauler.json

@@ -9,13 +9,16 @@
       "hullCost": 29790,
       "speed": 200,
       "boost": 300,
-      "agility": 6,
       "boostEnergy": 7,
       "baseShieldStrength": 50,
-      "baseArmour": 50,
+      "baseArmour": 100,
+      "hardness": 20,
       "hullMass": 14,
       "masslock": 6,
-      "pipSpeed": 0.1625
+      "pipSpeed": 0.1625,
+      "pitch": 36,
+      "roll": 100,
+      "yaw": 14
     },
     "retailCost": 52720,
     "bulkheads": [

ships/imperial_clipper.json

@@ -10,12 +10,15 @@
       "speed": 300,
       "boost": 380,
       "boostEnergy": 19,
-      "agility": 2,
       "baseShieldStrength": 180,
       "baseArmour": 270,
+      "hardness": 60,
       "hullMass": 400,
       "masslock": 12,
-      "pipSpeed": 0.1
+      "pipSpeed": 0.1,
+      "pitch": 40,
+      "roll": 80,
+      "yaw": 18
     },
     "retailCost": 22296860,
       "bulkheads": [

ships/imperial_courier.json

@@ -9,12 +9,15 @@
       "speed": 280,
       "boost": 380,
       "boostEnergy": 10,
-      "agility": 6,
       "baseShieldStrength": 200,
       "baseArmour": 80,
+      "hardness": 30,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.05375
+      "pipSpeed": 0.05375,
+      "pitch": 38,
+      "roll": 90,
+      "yaw": 16
     },
     "retailCost": 2542930,
     "bulkheads": [

ships/imperial_cutter.json

@@ -9,13 +9,16 @@
       "speed": 200,
       "boost": 320,
       "boostEnergy": 23,
-      "agility": 2,
       "baseShieldStrength": 600,
       "baseArmour": 400,
+      "hardness": 70,
       "hullMass": 1100,
       "masslock": 27,
       "pipSpeed": 0.05,
-       "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 18,
+      "roll": 45,
+      "yaw":8 
     },
     "retailCost": 208969450,
     "bulkheads": [
@@ -28,12 +31,17 @@
     "slots": {
       "standard": [8, 8, 7, 7, 7, 7, 6],
       "hardpoints": [4, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [8, 8, 6, 6, 6, 5, 5, 4, 3]
+      "internal": [
+        8, 8, 6, 6, 6, 5, 5,
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 3
+      ]
     },
     "defaults": {
       "standard": ["8E", "8E", "7E", "7E", "7E", "7E", "6C"],
       "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4t", "06", "04", 0, 0, 0, 0, "01", "2h"]
+      "internal": ["4t", "06", "04", 0, 0, 0, 0, 0, 0, "01", "2h"]
     }
   }
 }

ships/imperial_eagle.json

@@ -10,12 +10,15 @@
       "speed": 300,
       "boost": 400,
       "boostEnergy": 8,
-      "agility": 6,
       "baseShieldStrength": 80,
       "baseArmour": 60,
+      "hardness": 28,
       "hullMass": 50,
       "masslock": 6,
-      "pipSpeed": 0.075
+      "pipSpeed": 0.075,
+      "pitch": 40,
+      "roll": 100,
+      "yaw": 15
     },
     "retailCost": 110830,
     "bulkheads": [
@@ -28,12 +31,16 @@
     "slots": {
       "standard": [3, 3, 3, 1, 2, 2, 2],
       "hardpoints": [2, 1, 1, 0],
-      "internal": [3, 2, 1, 1]
+      "internal": [
+        3, 2, 
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        1, 1
+      ]
     },
     "defaults": {
       "standard": ["3E", "3E", "3E", "1E", "2E", "2E", "2C"],
       "hardpoints": [0, 17, 17, 0],
-      "internal": ["44", "00", "2h", 0]
+      "internal": ["44", "00", 0, "2h", 0]
     }
   }
 }

ships/keelback.json

@@ -10,13 +10,16 @@
       "speed": 200,
       "boost": 300,
       "boostEnergy": 10,
-      "agility": 2,
       "baseShieldStrength": 135,
-      "baseArmour": 135,
+      "baseArmour": 270,
+      "hardness": 45,
       "hullMass": 180,
       "masslock": 8,
       "pipSpeed": 0.1375,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 27,
+      "roll": 100,
+      "yaw": 15
     },
     "retailCost": 3126160,
     "bulkheads": [

ships/orca.json

@@ -10,13 +10,16 @@
       "speed": 300,
       "boost": 380,
       "boostEnergy": 16,
-      "agility": 2,
       "baseShieldStrength": 220,
       "baseArmour": 220,
+      "hardness": 55,
       "hullMass": 580,
       "masslock": 13,
       "pipSpeed": 0.08375,
-      "luxuryCabins": true
+      "luxuryCabins": true,
+      "pitch": 25,
+      "roll": 55,
+      "yaw": 18
     },
     "retailCost": 48539900,
     "bulkheads": [
@@ -30,8 +33,8 @@
       "standard": [5, 6, 5, 6, 5, 4, 5],
       "hardpoints": [3, 2, 2, 0, 0, 0, 0],
       "internal": [
-        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
         5, 5, 4, 3, 2, 2
       ]
     },

ships/python.json

@@ -10,12 +10,15 @@
       "speed": 230,
       "boost": 300,
       "boostEnergy": 23,
-      "agility": 6,
       "baseShieldStrength": 260,
       "baseArmour": 260,
+      "hardness": 65,
       "hullMass": 350,
       "masslock": 17,
-      "pipSpeed": 0.0975
+      "pipSpeed": 0.0975,
+      "pitch": 29,
+      "roll": 90,
+      "yaw": 10
     },
     "retailCost": 56978180,
     "bulkheads": [

ships/sidewinder.json

@@ -10,12 +10,15 @@
       "speed": 220,
       "boost": 320,
       "boostEnergy": 7,
-      "agility": 8,
       "baseShieldStrength": 40,
       "baseArmour": 60,
+      "hardness": 20,
       "hullMass": 25,
       "masslock": 6,
-      "pipSpeed": 0.1375
+      "pipSpeed": 0.1375,
+      "pitch": 42,
+      "roll": 110,
+      "yaw": 16
     },
     "retailCost": 40800,
     "bulkheads": [

ships/type_6_transporter.json

@@ -10,12 +10,15 @@
       "speed": 220,
       "boost": 350,
       "boostEnergy": 10,
-      "agility": 3,
       "baseShieldStrength": 90,
-      "baseArmour": 90,
+      "baseArmour": 180,
+      "hardness": 35,
       "hullMass": 155,
       "masslock": 8,
-      "pipSpeed": 0.1475
+      "pipSpeed": 0.1475,
+      "pitch": 30,
+      "roll": 100,
+      "yaw": 17
     },
     "retailCost": 1045950,
     "bulkheads": [

ships/type_7_transport.json

@@ -10,12 +10,15 @@
       "speed": 180,
       "boost": 300,
       "boostEnergy": 10,
-      "agility": 2,
       "baseShieldStrength": 155,
-      "baseArmour": 170,
+      "baseArmour": 340,
+      "hardness": 54,
       "hullMass": 420,
       "masslock": 10,
-      "pipSpeed": 0.16625
+      "pipSpeed": 0.16625,
+      "pitch": 22,
+      "roll": 60,
+      "yaw": 22
     },
     "retailCost": 17472260,
     "bulkheads": [

ships/type_9_heavy.json

@@ -10,13 +10,16 @@
       "speed": 130,
       "boost": 200,
       "boostEnergy": 19,
-      "agility": 0,
       "baseShieldStrength": 240,
-      "baseArmour": 240,
+      "baseArmour": 480,
+      "hardness": 65,
       "hullMass": 1000,
       "masslock": 16,
       "pipSpeed": 0.17375,
-      "fighterHangars": true
+      "fighterHangars": true,
+      "pitch": 20,
+      "roll": 20,
+      "yaw": 8
     },
     "retailCost": 76555840,
     "bulkheads": [

ships/viper.json

@@ -10,12 +10,15 @@
       "speed": 320,
       "boost": 400,
       "boostEnergy": 10,
-      "agility": 6,
       "baseShieldStrength": 105,
       "baseArmour": 70,
-      "hullMass": 60,
+      "hardness": 35,
+      "hullMass": 50,
       "masslock": 7,
-      "pipSpeed": 0.09375
+      "pipSpeed": 0.09375,
+      "pitch": 35,
+      "roll": 90,
+      "yaw": 15
     },
     "retailCost": 142930,
     "bulkheads": [
@@ -28,12 +31,16 @@
     "slots": {
       "standard": [3, 3, 3, 2, 3, 3, 2],
       "hardpoints": [2, 2, 1, 1, 0, 0],
-      "internal": [3, 3, 2, 1]
+      "internal": [
+        3, 3,
+        { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        2, 1
+      ]
     },
     "defaults": {
       "standard": ["3E", "3E", "3E", "2E", "3E", "3E", "2C"],
       "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["01", "44", 0, "2h"]
+      "internal": ["01", "44", 0, 0, "2h"]
     }
   }
 }

ships/viper_mk_iv.json

@@ -10,12 +10,15 @@
       "speed": 270,
       "boost": 340,
       "boostEnergy": 10,
-      "agility": 4,
       "baseShieldStrength": 150,
       "baseArmour": 150,
+      "hardness": 35,
       "hullMass": 190,
       "masslock": 7,
-      "pipSpeed": 0.0875
+      "pipSpeed": 0.0875,
+      "pitch": 30,
+      "roll": 90,
+      "yaw": 12
     },
     "retailCost": 437930,
     "bulkheads": [
@@ -28,12 +31,16 @@
     "slots": {
       "standard": [4, 4, 4, 2, 3, 3, 4],
       "hardpoints": [2, 2, 1, 1, 0, 0],
-      "internal": [4, 4, 3, 2, 2, 1]
+      "internal": [
+        4, 4, 3,
+        { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        2, 2, 1
+      ]
     },
     "defaults": {
       "standard": ["4E", "4E", "4E", "2E", "3E", "3E", "4C"],
       "hardpoints": [0, 0, 17, 17, 0, 0],
-      "internal": ["02", "02", "44", "00", 0, "2h"]
+      "internal": ["02", "02", "44", 0, "00", 0, "2h"]
     }
   }
 }

ships/vulture.json

@@ -10,12 +10,15 @@
       "speed": 210,
       "boost": 340,
       "boostEnergy": 16,
-      "agility": 9,
       "baseShieldStrength": 240,
       "baseArmour": 160,
+      "hardness": 55,
       "hullMass": 230,
       "masslock": 10,
-      "pipSpeed": 0.02375
+      "pipSpeed": 0.02375,
+      "pitch": 42,
+      "roll": 110,
+      "yaw": 17
     },
     "retailCost": 4925620,
     "bulkheads": [
@@ -28,12 +31,16 @@
     "slots": {
       "standard": [4, 5, 4, 3, 5, 4, 3],
       "hardpoints": [3, 3, 0, 0, 0, 0],
-      "internal": [5, 4, 2, 1, 1]
+      "internal": [
+        5, 
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        4, 2, 1, 1
+      ]
     },
     "defaults": {
       "standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"],
       "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["4e", "02", 0, 0, "2h"]
+      "internal": ["4e", 0, 0, "02", 0, "2h"]
     }
   }
 }

spec/data-spec.js

@@ -12,12 +12,15 @@ describe('JSON Data', function() {
     'speed',
     'boost',
     'boostEnergy',
-    'agility',
     'baseShieldStrength',
     'baseArmour',
+    'hardness',
     'hullMass',
     'masslock',
-    'pipSpeed'
+    'pipSpeed',
+    'pitch',
+    'roll',
+    'yaw'
   ];
 
   var edIDs = {};
@@ -37,10 +40,10 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
         expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
-	if (s != 'ft' && s != 'pas' ) {
+        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+        if (s != 'ft' && s != 'pas' ) {
           expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
-	}
+        }
         expect(group[i].grp).toBeDefined(`No group defined, Type: ${s}, ID: ${id}, Index: ${i}`);
         expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists for ID: ${id}, Index: ${i}`);
         expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists for ID: ${id}, Index: ${i}`);
@@ -67,7 +70,7 @@ describe('JSON Data', function() {
         expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`);
         expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`);
         expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
-        expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+        expect(group[i].edID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
         expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
         if (group[i].eddbID) {
@@ -76,19 +79,22 @@ describe('JSON Data', function() {
         if (group[i].edID) {
           edIDs[group[i].edID] = true;
         }
-	if (group[i].damage) {
-            expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+        if (group[i].damage) {
+          expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+          expect(group[i].damagedist).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage distribution`);
+          if (group[i].grp != 'po') {
+            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
             expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`);
             expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`);
             expect(group[i].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`);
             expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`);
-            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
             expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`);
+          }
         }
-	if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
-            expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
-            expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
-            expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
+        if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
+          expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
+          expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
+          expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
         }
         ids[id] = true;
       }
@@ -104,7 +110,7 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
+        expect(group[i].eddbID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
         expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs
           expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists:  ${id}`);
@@ -168,6 +174,17 @@ describe('JSON Data', function() {
       const blueprint = Modifications.blueprints[k];
       expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
       expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
+
+      for (var x in blueprint.features) {
+        var b = blueprint.features[x];
+        var bfs = {};
+        for (var bf in b) {
+          expect(bfs[bf]).toBeFalsy(`Blueprint feature [${bf}] already exists: ${blueprint.name}`);
+          expect(Modifications.modifications[bf]).toBeDefined(`Blueprint feature [${bf}] uknown: ${blueprint.name}`);
+          bfs[bf] = true;
+        }
+      }
+
       ids[blueprint.id] = true;
     }
   });
@@ -183,6 +200,7 @@ describe('JSON Data', function() {
       expect(modification.method).toBeDefined('Modification has no method, ID:' + modification.id);
       ids[modification.id] = true;
     }
+
   });
 
   it('has valid specials', function() {