Merge branch 'release/2.2.17'

Package bupm
Merge branch 'feature/multicrew' into develop
2025-12-08 15:13:23 +00:00 · 2017-02-18 09:51:54 +00:00 · 2017-02-18 09:51:46 +00:00 · 2017-02-18 09:49:44 +00:00 · 2017-02-18 08:28:37 +00:00 · 2017-02-17 18:26:37 +00:00
59 changed files with 23946 additions and 2002 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,45 @@
+#2.2.17
+  * Add mass as potential SCB modification
+  * Fix mining laser statistics
+  * Remove non-existent grade 4 and 5 wake scanner modifications
+  * Add number of crew for each ship
+
+#2.2.16
+  * Fix incorrect thermal load modifiers for dirty drives
+  * Provide explicit information about if values are higher numeric value == better or not
+
+#2.2.15
+  * Fix location of initial cargo rack for Vulture
+  * Fix broken regeneration rate for 6B shield generators
+  * Tidy up breach damage values
+
+#2.2.14
+  * Alter blueprint structure to combine components and features
+  * Make hidden value of modifications its own attribute
+  * Fix incorrect ED ID for class 6 passenger cabins
+
+#2.2.13
+  * Add plasma slug special effect for plasma accelerator
+  * Tweak hull costs of ships
+
+#2.2.12
+  * Add special effects for each blueprint
+  * Add IDs for most Powerplay modules
+
+#2.2.11
+  * Remove non-existant chaff launcher capacity blueprint grades
+  * Fix incorrect values for charge enhanced power distributor
+  * Remove incorrect AFMU blueprints
+  * Correct fragment cannon Double Shot blueprint information
+  * Correct Focused weapon blueprint information
+
+#2.2.10
+  * Fix incorrect base shield values for Cutter and Corvette
+  * Update weapons to have %-based damage distributions
+  * Remove power draw for detailed surface scanner - although shown in outfitting it is not part of active power
+  * Fix incorrect names for lightweight and kinetic armour
+  * Add engineering blueprints
+
 #2.2.9
  * Add falloff metric for weapons
  * Add falloff from range modification
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.json
+++ b/dist/index.json
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
--- a/modifications/index.js
+++ b/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')
 };
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -1,45 +1,48 @@
 {
-    "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative"},
-    "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative"},
-    "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative"},
-    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "multiplicative"},
-    "burstrof": {"id": 41, "name": "burstrof", "type": "percentage", "method": "multiplicative"},
-    "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative"},
-    "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
-    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative"},
-    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
-    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
-    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative"},
-    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
-    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
-    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
-    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "hidden", "method": "overwrite"},
-    "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
-    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
-    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative"},
-    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative"},
-    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive"},
-    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative"},
-    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative"},
-    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative"},
-    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative"},
-    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
-    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
-    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
-    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
-    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
-    "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},
-    "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative"},
-    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"},
-    "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"},
-    "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"},
-    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"},
-    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"},
-    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"},
-    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative"},
-    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive"},
-    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative"},
-    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative"},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"},
-    "type": {"id": 40, "name": "type", "type": "alphabetic", "method": "overwrite"}
+    "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite", "higherbetter": true},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite"},
+    "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
+    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
+    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "numeric", "hidden": true, "method": "overwrite"},
+    "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative", "higherbetter": true},
+    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive", "higherbetter": false},
+    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
+    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true}
 }
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -217,12 +217,17 @@
  "special_incendiary_rounds": {
    "rof": 0.05263157894736842,
    "thermload": 2,
-    "type": "T"
+    "damagedist": { 
+      "T": 1
+    }
  },
  "special_inertial_impact": {
    "damage": 0.5,
    "jitter": 1,
-    "type": "KT"
+    "damagedist": { 
+      "K": 0.5,
+      "T": 0.5
+    }
  },
  "special_overload_munitions": {
  },
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -0,0 +1,856 @@
+{
+  "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],
+      "LifeSupport_Reinforced": [1, 2, 3, 4],
+      "LifeSupport_Shielded": [1, 2, 3, 4]
+    },
+    "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_plasma_slug",
+      "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],
+      "ShieldCellBank_Specialised": [1, 2, 3]
+    },
+    "modifications": [
+      "boot",
+      "duration",
+      "integrity",
+      "mass",
+      "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],
+      "WakeScanner_Reinforced": [1, 2, 3],
+      "WakeScanner_Shielded": [1, 2, 3]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  }
+}
--- a/modifications/specials.json
+++ b/modifications/specials.json
@@ -1,35 +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_inertial_impact": {"id": 32, "name": "Inertial impact"},
-    "special_ion_disruptor": {"id": 13, "name": "Ion disruptor"},
-    "special_mass_lock_munition": {"id": 14, "name": "Mass lock munition"},
-    "special_overload_munitions": {"id": 15, "name": "Overload munitions"},
-    "special_penetrator_payload": {"id": 16, "name": "Penetrator payload"},
-    "special_phasing_sequence": {"id": 17, "name": "Phasing sequence"},
-    "special_plasma_slug": {"id": 18, "name": "Plasma slug"},
-    "special_radiant_canister": {"id": 19, "name": "Radiant Canister"},
-    "special_regeneration_sequence": {"id": 20, "name": "Regeneration sequence"},
-    "special_reverberating_cascade": {"id": 21, "name": "Reverberating cascade"},
-    "special_scramble_spectrum": {"id": 22, "name": "Scramble spectrum"},
-    "special_screening_shell": {"id": 23, "name": "Screening shell"},
-    "special_shiftlock_canister": {"id": 24, "name": "Shift-lock canister"},
-    "special_smart_rounds": {"id": 25, "name": "Smart rounds"},
-    "special_super_penetrator": {"id": 26, "name": "Super penetrator"},
-    "special_target_lock_breaker": {"id": 27, "name": "Target lock breaker"},
-    "special_thermal_cascade": {"id": 28, "name": "Thermal cascade"},
-    "special_thermal_conduit": {"id": 29, "name": "Thermal conduit"},
-    "special_thermal_vent": {"id": 30, "name": "Thermal vent"},
-    "special_thermalshock": {"id": 31, "name": "Thermal shock"}
+    "special_auto_loader": {"id": 0, "edname": "special_auto_loader", "name": "Auto loader"},
+    "special_choke_canister": {"id": 1, "edname": "special_choke_canister", "name": "Choke canister"},
+    "special_concordant_sequence": {"id": 2, "edname": "special_concordant_sequence", "name": "Concordant sequence"},
+    "special_corrosive_shell": {"id": 3, "edname": "special_corrosive_shell", "name": "Corrosive shell"},
+    "special_blinding_shell": {"id": 4, "edname": "special_blinding_shell", "name": "Dazzle shell"},
+    "special_dispersal_field": {"id": 5, "edname": "special_dispersal_field", "name": "Dispersal field"},
+    "special_distortion_field": {"id": 6, "edname": "special_distortion_field", "name": "Distortion field"},
+    "special_drag_munitions": {"id": 7, "edname": "special_drag_munitions", "name": "Drag munitions"},
+    "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
+    "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
+    "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
+    "special_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"}
 }
--- a/modifications/validity.json
+++ b/modifications/validity.json
@@ -1,371 +0,0 @@
-{
-  "am": [
-    "integrity",
-    "power"
-  ],
-  "bh": [
-    "explres",
-    "hullboost",
-    "kinres",
-    "mass",
-    "thermres"
-  ],
-  "bl": [
-    "damage",
-    "distdraw",
-    "fallofffromrange",
-    "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",
-    "fallofffromrange",
-    "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",
-    "fallofffromrange",
-    "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",
-    "fallofffromrange",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "reload",
-    "rof",
-    "thermload",
-    "type"
-  ],
-  "mr": [
-    "ammo",
-    "clip",
-    "damage",
-    "fallofffromrange",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "reload",
-    "rof",
-    "thermload"
-  ],
-  "nl": [
-    "ammo",
-    "boot",
-    "clip",
-    "damage",
-    "fallofffromrange",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "reload",
-    "rof",
-    "thermload"
-  ],
-  "pa": [
-    "ammo",
-    "clip",
-    "damage",
-    "fallofffromrange",
-    "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",
-    "fallofffromrange",
-    "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",
-    "fallofffromrange",
-    "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",
-    "fallofffromrange",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "rof",
-    "thermload"
-  ],
-  "ul": [
-    "burst",
-    "burstrof",
-    "damage",
-    "fallofffromrange",
-    "distdraw",
-    "integrity",
-    "jitter",
-    "mass",
-    "piercing",
-    "power",
-    "range",
-    "rof",
-    "thermload"
-  ],
-  "ws": [
-    "boot",
-    "integrity",
-    "mass",
-    "power"
-  ]
-}
--- a/modules/hardpoints/beam_laser.json
+++ b/modules/hardpoints/beam_laser.json
@@ -7,6 +7,9 @@
      "class": 1,
      "cost": 37430,
      "damage": 9.8,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 1.94,
      "edID": 128049428,
      "eddbID": 841,
@@ -20,8 +23,7 @@
      "power": 0.62,
      "range": 3000,
      "rating": "E",
-      "thermload": 3.5,
-      "type": "T"
+      "thermload": 3.5
    },
    {
      "breachdmg": 6.1,
@@ -30,6 +32,9 @@
      "class": 1,
      "cost": 74650,
      "damage": 7.66,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 2.11,
      "edID": 128049432,
      "eddbID": 844,
@@ -43,8 +48,7 @@
      "power": 0.6,
      "range": 3000,
      "rating": "E",
-      "thermload": 3.6,
-      "type": "T"
+      "thermload": 3.6
    },
    {
      "breachdmg": 4.3,
@@ -53,6 +57,9 @@
      "class": 1,
      "cost": 500000,
      "damage": 5.4,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 1.32,
      "edID": 128049435,
      "eddbID": 847,
@@ -68,8 +75,7 @@
      "power": 0.57,
      "range": 3000,
      "rating": "F",
-      "thermload": 2.4,
-      "type": "T"
+      "thermload": 2.4
    },
    {
      "breachdmg": 3.9,
@@ -78,6 +84,9 @@
      "class": 1,
      "cost": 56150,
      "damage": 4.9,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 2.52,
      "edID": 128671346,
      "eddbID": 1476,
@@ -93,8 +102,7 @@
      "pp": "Edmund Mahon",
      "range": 3000,
      "rating": "E",
-      "thermload": 2.7,
-      "type": "T"
+      "thermload": 2.7
    },
    {
      "breachdmg": 12.8,
@@ -103,6 +111,9 @@
      "class": 2,
      "cost": 299520,
      "damage": 15.96,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 3.16,
      "edID": 128049429,
      "eddbID": 842,
@@ -116,8 +127,7 @@
      "power": 1.01,
      "range": 3000,
      "rating": "D",
-      "thermload": 5.1,
-      "type": "T"
+      "thermload": 5.1
    },
    {
      "breachdmg": 10,
@@ -126,6 +136,9 @@
      "class": 2,
      "cost": 500600,
      "damage": 12.52,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 3.44,
      "edID": 128049433,
      "eddbID": 845,
@@ -139,8 +152,7 @@
      "power": 0.99,
      "range": 3000,
      "rating": "D",
-      "thermload": 5.3,
-      "type": "T"
+      "thermload": 5.3
    },
    {
      "breachdmg": 7.1,
@@ -149,6 +161,9 @@
      "class": 2,
      "cost": 2099900,
      "damage": 8.82,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 2.16,
      "edID": 128049436,
      "eddbID": 848,
@@ -162,8 +177,7 @@
      "power": 0.93,
      "range": 3000,
      "rating": "E",
-      "thermload": 3.5,
-      "type": "T"
+      "thermload": 3.5
    },
    {
      "breachdmg": 20.6,
@@ -172,6 +186,9 @@
      "class": 3,
      "cost": 1177600,
      "damage": 25.78,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 5.1,
      "edID": 128049430,
      "eddbID": 843,
@@ -185,8 +202,7 @@
      "power": 1.62,
      "range": 3000,
      "rating": "C",
-      "thermload": 7.2,
-      "type": "T"
+      "thermload": 7.2
    },
    {
      "breachdmg": 16.2,
@@ -195,6 +211,9 @@
      "class": 3,
      "cost": 2396160,
      "damage": 20.28,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 5.58,
      "edID": 128049434,
      "eddbID": 846,
@@ -208,8 +227,7 @@
      "power": 1.6,
      "range": 3000,
      "rating": "C",
-      "thermload": 7.6,
-      "type": "T"
+      "thermload": 7.6
    },
    {
      "breachdmg": 11.5,
@@ -218,6 +236,9 @@
      "class": 3,
      "cost": 19399600,
      "damage": 14.34,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 3.51,
      "edID": 128049437,
      "eddbID": 849,
@@ -231,8 +252,7 @@
      "power": 1.51,
      "range": 3000,
      "rating": "D",
-      "thermload": 5.1,
-      "type": "T"
+      "thermload": 5.1
    },
    {
      "breachdmg": 33.1,
@@ -241,6 +261,9 @@
      "class": 4,
      "cost": 2396160,
      "damage": 41.38,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 8.19,
      "edID": 128049431,
      "eddbID": 1540,
@@ -254,8 +277,7 @@
      "power": 2.61,
      "range": 3000,
      "rating": "A",
-      "thermload": 9.9,
-      "type": "T"
+      "thermload": 9.9
    },
    {
      "breachdmg": 26.1,
@@ -264,6 +286,9 @@
      "class": 4,
      "cost": 8746160,
      "damage": 32.68,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 8.99,
      "edID": 128681994,
      "eddbID": 1544,
@@ -277,8 +302,7 @@
      "power": 2.57,
      "range": 3000,
      "rating": "A",
-      "thermload": 10.6,
-      "type": "T"
+      "thermload": 10.6
    }
  ]
 }
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -1,7 +1,7 @@
 {
  "ul": [
    {
-      "breachdmg": 7.05,
+      "breachdmg": 1.5,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -9,6 +9,9 @@
      "class": 1,
      "cost": 4400,
      "damage": 1.72,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.24,
      "edID": 128049400,
      "eddbID": 832,
@@ -23,11 +26,10 @@
      "range": 3000,
      "rating": "F",
      "rof": 2,
-      "thermload": 0.4,
-      "type": "T"
+      "thermload": 0.4
    },
    {
-      "breachdmg": 5.3,
+      "breachdmg": 1,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -35,6 +37,9 @@
      "class": 1,
      "cost": 8600,
      "damage": 1.2,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.23,
      "edID": 128049404,
      "eddbID": 835,
@@ -49,18 +54,20 @@
      "range": 3000,
      "rating": "G",
      "rof": 2.23,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
    },
    {
-      "breachdmg": 1.92,
+      "breachdmg": 0.4,
      "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
      "burst": 3,
      "burstrof": 19,
      "class": 1,
      "cost": 52800,
      "damage": 0.87,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.136,
      "edID": 128049407,
      "eddbID": 838,
@@ -75,8 +82,7 @@
      "range": 3000,
      "rating": "G",
      "rof": 1.92,
-      "thermload": 0.2,
-      "type": "T"
+      "thermload": 0.2
    },
    {
      "breachdmg": 2,
@@ -87,6 +93,9 @@
      "class": 1,
      "cost": 8800,
      "damage": 2.4,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.31,
      "edID": 128671449,
      "eddbID": 1477,
@@ -104,11 +113,10 @@
      "range": 600,
      "rating": "F",
      "rof": 6.6,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
    },
    {
-      "breachdmg": 11.1,
+      "breachdmg": 3,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -116,6 +124,9 @@
      "class": 2,
      "cost": 23000,
      "damage": 3.5,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.482,
      "edID": 128049401,
      "eddbID": 833,
@@ -130,11 +141,10 @@
      "range": 3000,
      "rating": "E",
      "rof": 1.6,
-      "thermload": 0.8,
-      "type": "T"
+      "thermload": 0.8
    },
    {
-      "breachdmg": 8.82,
+      "breachdmg": 2.1,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -142,6 +152,9 @@
      "class": 2,
      "cost": 48500,
      "damage": 2.45,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.468,
      "edID": 128049405,
      "eddbID": 836,
@@ -156,18 +169,20 @@
      "range": 3000,
      "rating": "F",
      "rof": 1.78,
-      "thermload": 0.7,
-      "type": "T"
+      "thermload": 0.7
    },
    {
-      "breachdmg": 3.51,
+      "breachdmg": 0.9,
      "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
      "burst": 3,
      "burstrof": 15,
      "class": 2,
      "cost": 162800,
      "damage": 1.74,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.26,
      "edID": 128049408,
      "eddbID": 839,
@@ -182,11 +197,10 @@
      "range": 3000,
      "rating": "F",
      "rof": 1.57,
-      "thermload": 0.4,
-      "type": "T"
+      "thermload": 0.4
    },
    {
-      "breachdmg": 10.53,
+      "breachdmg": 3.9,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -194,6 +208,9 @@
      "class": 3,
      "cost": 140400,
      "damage": 7.75,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 1.06,
      "edID": 128049402,
      "eddbID": 834,
@@ -208,11 +225,10 @@
      "range": 3000,
      "rating": "D",
      "rof": 1.2,
-      "thermload": 1.7,
-      "type": "T"
+      "thermload": 1.7
    },
    {
-      "breachdmg": 14.08,
+      "breachdmg": 4.4,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -220,6 +236,9 @@
      "class": 3,
      "cost": 281600,
      "damage": 5.18,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.986,
      "edID": 128049406,
      "eddbID": 837,
@@ -234,18 +253,20 @@
      "range": 3000,
      "rating": "E",
      "rof": 1.4,
-      "thermload": 1.4,
-      "type": "T"
+      "thermload": 1.4
    },
    {
-      "breachdmg": 5.58,
+      "breachdmg": 1.8,
      "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
      "burst": 3,
      "burstrof": 11,
      "class": 3,
      "cost": 800400,
      "damage": 3.54,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.536,
      "edID": 128049409,
      "eddbID": 840,
@@ -260,11 +281,10 @@
      "range": 3000,
      "rating": "E",
      "rof": 1.272,
-      "thermload": 0.8,
-      "type": "T"
+      "thermload": 0.8
    },
    {
-      "breachdmg": 28,
+      "breachdmg": 17.5,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -272,6 +292,9 @@
      "class": 4,
      "cost": 281600,
      "damage": 20.6,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 2.84,
      "edID": 128049403,
      "eddbID": 1549,
@@ -286,11 +309,10 @@
      "range": 3000,
      "rating": "E",
      "rof": 0.8,
-      "thermload": 4.5,
-      "type": "T"
+      "thermload": 4.5
    },
    {
-      "breachdmg": 21.63,
+      "breachdmg": 10.3,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "burst": 3,
@@ -298,6 +320,9 @@
      "class": 4,
      "cost": 1245600,
      "damage": 12.1,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 2.31,
      "edID": 128727920,
      "eddbID": 1550,
@@ -312,8 +337,7 @@
      "range": 3000,
      "rating": "E",
      "rof": 1,
-      "thermload": 3.3,
-      "type": "T"
+      "thermload": 3.3
    }
  ]
 }
--- a/modules/hardpoints/cannon.json
+++ b/modules/hardpoints/cannon.json
@@ -9,6 +9,9 @@
      "clip": 6,
      "cost": 21100,
      "damage": 22.5,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.46,
      "edID": 128049438,
      "eddbID": 850,
@@ -24,9 +27,8 @@
      "rating": "D",
      "reload": 3,
      "rof": 0.5,
-      "speed": 1200,
-      "thermload": 1.4,
-      "type": "K"
+      "shotspeed": 1200,
+      "thermload": 1.4
    },
    {
      "ammo": 100,
@@ -37,6 +39,9 @@
      "clip": 5,
      "cost": 42200,
      "damage": 16,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.48,
      "edID": 128049442,
      "eddbID": 854,
@@ -52,9 +57,8 @@
      "rating": "E",
      "reload": 4,
      "rof": 0.52,
-      "speed": 1000,
-      "thermload": 1.3,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 1.3
    },
    {
      "ammo": 100,
@@ -65,6 +69,9 @@
      "clip": 5,
      "cost": 506400,
      "damage": 12.75,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.22,
      "edID": 128049445,
      "eddbID": 857,
@@ -80,9 +87,8 @@
      "rating": "F",
      "reload": 4,
      "rof": 0.435,
-      "speed": 1000,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 0.7
    },
    {
      "ammo": 120,
@@ -93,6 +99,9 @@
      "clip": 6,
      "cost": 168430,
      "damage": 36.5,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.7,
      "edID": 128049439,
      "eddbID": 851,
@@ -108,9 +117,8 @@
      "rating": "D",
      "reload": 3,
      "rof": 0.465,
-      "speed": 1051,
-      "thermload": 2.1,
-      "type": "K"
+      "shotspeed": 1051,
+      "thermload": 2.1
    },
    {
      "ammo": 100,
@@ -121,6 +129,9 @@
      "clip": 5,
      "cost": 337600,
      "damage": 24.5,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.75,
      "edID": 128049443,
      "eddbID": 855,
@@ -136,9 +147,8 @@
      "rating": "D",
      "reload": 4,
      "rof": 0.485,
-      "speed": 875,
-      "thermload": 1.9,
-      "type": "K"
+      "shotspeed": 875,
+      "thermload": 1.9
    },
    {
      "ammo": 100,
@@ -149,6 +159,9 @@
      "clip": 5,
      "cost": 4051200,
      "damage": 19.77,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.34,
      "edID": 128049446,
      "eddbID": 858,
@@ -164,9 +177,8 @@
      "rating": "E",
      "reload": 4,
      "rof": 0.405,
-      "speed": 875,
-      "thermload": 1,
-      "type": "K"
+      "shotspeed": 875,
+      "thermload": 1
    },
    {
      "ammo": 120,
@@ -177,6 +189,9 @@
      "clip": 6,
      "cost": 675200,
      "damage": 54.94,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 1.07,
      "edID": 128049440,
      "eddbID": 852,
@@ -192,9 +207,8 @@
      "rating": "C",
      "reload": 3,
      "rof": 0.425,
-      "speed": 959,
-      "thermload": 3.2,
-      "type": "K"
+      "shotspeed": 959,
+      "thermload": 3.2
    },
    {
      "ammo": 100,
@@ -205,6 +219,9 @@
      "clip": 5,
      "cost": 1350400,
      "damage": 37.39,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 1.14,
      "edID": 128671120,
      "eddbID": 1383,
@@ -222,9 +239,8 @@
      "rating": "C",
      "reload": 4,
      "rof": 0.445,
-      "speed": 800,
-      "thermload": 2.9,
-      "type": "K"
+      "shotspeed": 800,
+      "thermload": 2.9
    },
    {
      "ammo": 100,
@@ -235,6 +251,9 @@
      "clip": 5,
      "cost": 16204800,
      "damage": 30.4,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.53,
      "edID": 128049447,
      "eddbID": 859,
@@ -250,9 +269,8 @@
      "rating": "D",
      "reload": 4,
      "rof": 0.37,
-      "speed": 800,
-      "thermload": 1.6,
-      "type": "K"
+      "shotspeed": 800,
+      "thermload": 1.6
    },
    {
      "ammo": 120,
@@ -263,6 +281,9 @@
      "clip": 6,
      "cost": 2700800,
      "damage": 82.1,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 1.61,
      "edID": 128049441,
      "eddbID": 853,
@@ -280,9 +301,8 @@
      "rating": "B",
      "reload": 3,
      "rof": 0.385,
-      "speed": 900,
-      "thermload": 4.8,
-      "type": "K"
+      "shotspeed": 900,
+      "thermload": 4.8
    },
    {
      "ammo": 100,
@@ -293,6 +313,9 @@
      "clip": 5,
      "cost": 5401600,
      "damage": 56.58,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 1.72,
      "edID": 128049444,
      "eddbID": 856,
@@ -310,9 +333,8 @@
      "rating": "B",
      "reload": 4,
      "rof": 0.4,
-      "speed": 750,
-      "thermload": 4.4,
-      "type": "K"
+      "shotspeed": 750,
+      "thermload": 4.4
    }
  ]
 }
--- a/modules/hardpoints/fragment_cannon.json
+++ b/modules/hardpoints/fragment_cannon.json
@@ -9,6 +9,9 @@
      "clip": 3,
      "cost": 36000,
      "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.21,
      "edID": 128049448,
      "eddbID": 860,
@@ -26,9 +29,8 @@
      "reload": 2.5,
      "rof": 5.555,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
    },
    {
      "ammo": 180,
@@ -39,6 +41,9 @@
      "clip": 3,
      "cost": 54720,
      "damage": 1.01,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.26,
      "edID": 128049451,
      "eddbID": 863,
@@ -56,9 +61,8 @@
      "reload": 2.5,
      "rof": 5.88,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
    },
    {
      "ammo": 180,
@@ -69,6 +73,9 @@
      "clip": 3,
      "cost": 182400,
      "damage": 0.69,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.1,
      "edID": 128049453,
      "eddbID": 865,
@@ -86,9 +93,8 @@
      "reload": 2.5,
      "rof": 4.76,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.2
    },
    {
      "ammo": 180,
@@ -99,6 +105,9 @@
      "clip": 3,
      "cost": 291840,
      "damage": 2.56,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.37,
      "edID": 128049449,
      "eddbID": 861,
@@ -116,9 +125,8 @@
      "reload": 2.5,
      "rof": 5,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
    },
    {
      "ammo": 180,
@@ -129,6 +137,9 @@
      "clip": 3,
      "cost": 437800,
      "damage": 1.95,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.49,
      "edID": 128049452,
      "eddbID": 864,
@@ -146,9 +157,8 @@
      "reload": 2.5,
      "rof": 5.26,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.8,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.8
    },
    {
      "ammo": 180,
@@ -159,6 +169,9 @@
      "clip": 3,
      "cost": 1459200,
      "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.21,
      "edID": 128049454,
      "eddbID": 866,
@@ -176,9 +189,8 @@
      "reload": 2.5,
      "rof": 4.345,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.4
    },
    {
      "ammo": 180,
@@ -189,6 +201,9 @@
      "clip": 3,
      "cost": 1167360,
      "damage": 3.92,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.57,
      "edID": 128049450,
      "eddbID": 862,
@@ -206,9 +221,8 @@
      "reload": 2.5,
      "rof": 4.545,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 1.1,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.1
    },
    {
      "ammo": 180,
@@ -219,6 +233,9 @@
      "clip": 3,
      "cost": 1751040,
      "damage": 3.23,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.81,
      "edID": 128671321,
      "eddbID": 1454,
@@ -236,9 +253,8 @@
      "reload": 2.5,
      "rof": 4.76,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 1.4,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 1.4
    },
    {
      "ammo": 180,
@@ -249,6 +265,9 @@
      "clip": 3,
      "cost": 5836800,
      "damage": 2.56,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.37,
      "edID": 128671322,
      "eddbID": 1455,
@@ -266,9 +285,8 @@
      "reload": 2.5,
      "rof": 4,
      "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
    },
    {
      "ammo": 180,
@@ -279,6 +297,9 @@
      "clip": 3,
      "cost": 1400830,
      "damage": 3.4,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.57,
      "edID": 128671343,
      "eddbID": 1478,
@@ -297,9 +318,8 @@
      "reload": 2.5,
      "rof": 4.5,
      "roundspershot": 12,
-      "speed": 1000,
-      "thermload": 1.1,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 1.1
    }
  ]
 }
--- a/modules/hardpoints/mine_launcher.json
+++ b/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
    }
  ]
 }
--- a/modules/hardpoints/mining_laser.json
+++ b/modules/hardpoints/mining_laser.json
@@ -7,7 +7,10 @@
      "class": 1,
      "cost": 6800,
      "damage": 2,
-      "distdraw": 1.35,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.5,
      "edID": 128049525,
      "eddbID": 888,
      "falloff": 300,
@@ -29,7 +32,11 @@
      "class": 1,
      "cost": 13600,
      "damage": 8,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 1.75,
+      "edID": 128671347,
      "eddbID": 1479,
      "falloff": 400,
      "grp": "ml",
@@ -43,17 +50,19 @@
      "pp": "Zemina Torval",
      "range": 2000,
      "rating": "D",
-      "thermload": 6,
-      "type": "T"
+      "thermload": 6
    },
    {
-      "breachdmg": 1.2,
+      "breachdmg": 0.6,
      "breachmax": 0.2,
      "breachmin": 0.1,
      "class": 2,
      "cost": 22580,
-      "damage": 8,
-      "distdraw": 1.75,
+      "damage": 4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3,
      "edID": 128049526,
      "eddbID": 889,
      "falloff": 300,
--- a/modules/hardpoints/missile_rack.json
+++ b/modules/hardpoints/missile_rack.json
@@ -9,6 +9,9 @@
      "clip": 8,
      "cost": 32180,
      "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
      "distdraw": 0.24,
      "edID": 128666724,
      "eddbID": 1326,
@@ -23,9 +26,8 @@
      "rating": "B",
      "reload": 5,
      "rof": 0.5,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
    },
    {
      "ammo": 6,
@@ -36,6 +38,9 @@
      "clip": 6,
      "cost": 72600,
      "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
      "distdraw": 0.24,
      "edID": 128049492,
      "eddbID": 878,
@@ -50,9 +55,8 @@
      "rating": "B",
      "reload": 12,
      "rof": 0.333,
-      "speed": 625,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 625,
+      "thermload": 3.6
    },
    {
      "ammo": 48,
@@ -63,6 +67,9 @@
      "clip": 12,
      "cost": 240400,
      "damage": 50,
+      "damagedist": {
+        "E": 1
+      },
      "distdraw": 0.24,
      "edID": 128666725,
      "eddbID": 1327,
@@ -79,9 +86,8 @@
      "rating": "B",
      "reload": 5,
      "rof": 0.5,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
    },
    {
      "ammo": 18,
@@ -92,6 +98,9 @@
      "clip": 6,
      "cost": 512400,
      "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
      "distdraw": 0.24,
      "edID": 128049493,
      "eddbID": 879,
@@ -108,9 +117,8 @@
      "rating": "B",
      "reload": 12,
      "rof": 0.333,
-      "speed": 625,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 625,
+      "thermload": 3.6
    },
    {
      "ammo": 48,
@@ -121,6 +129,9 @@
      "clip": 12,
      "cost": 190227,
      "damage": 40,
+      "damagedist": {
+        "E": 1
+      },
      "distdraw": 0.24,
      "eddbID": 1559,
      "grp": "mr",
@@ -136,9 +147,8 @@
      "rating": "B",
      "reload": 5,
      "rof": 0.333,
-      "speed": 750,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 750,
+      "thermload": 3.6
    },
    {
      "ammo": 120,
@@ -149,6 +159,9 @@
      "clip": 12,
      "cost": 768600,
      "damage": 7.5,
+      "damagedist": {
+        "E": 1
+      },
      "distdraw": 0.24,
      "edID": 128671344,
      "eddbID": 1480,
@@ -168,9 +181,8 @@
      "reload": 5,
      "rof": 2,
      "roundspershot": 4,
-      "speed": 600,
-      "thermload": 3.6,
-      "type": "E"
+      "shotspeed": 600,
+      "thermload": 3.6
    }
  ]
 }
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -9,6 +9,9 @@
      "clip": 100,
      "cost": 9500,
      "damage": 1.12,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.06,
      "edID": 128049455,
      "eddbID": 867,
@@ -24,9 +27,8 @@
      "rating": "F",
      "reload": 4,
      "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
    },
    {
      "ammo": 2100,
@@ -37,6 +39,9 @@
      "clip": 90,
      "cost": 14250,
      "damage": 0.82,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.07,
      "edID": 128049459,
      "eddbID": 869,
@@ -52,9 +57,8 @@
      "rating": "G",
      "reload": 5,
      "rof": 8.33,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
    },
    {
      "ammo": 2100,
@@ -65,6 +69,9 @@
      "clip": 90,
      "cost": 81600,
      "damage": 0.56,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.03,
      "edID": 128049462,
      "eddbID": 871,
@@ -80,9 +87,8 @@
      "rating": "G",
      "reload": 4,
      "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0
    },
    {
      "ammo": 1000,
@@ -93,7 +99,11 @@
      "clip": 60,
      "cost": 13980,
      "damage": 2.9,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.12,
+      "edID": 128671345,
      "eddbID": 1481,
      "falloff": 1800,
      "grp": "mc",
@@ -109,9 +119,8 @@
      "rating": "F",
      "reload": 4,
      "rof": 4.3,
-      "speed": 1800,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1800,
+      "thermload": 0.2
    },
    {
      "ammo": 2100,
@@ -122,6 +131,9 @@
      "clip": 100,
      "cost": 38000,
      "damage": 2.19,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.11,
      "edID": 128049456,
      "eddbID": 868,
@@ -137,9 +149,8 @@
      "rating": "E",
      "reload": 4,
      "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.2
    },
    {
      "ammo": 2100,
@@ -150,6 +161,9 @@
      "clip": 90,
      "cost": 57000,
      "damage": 1.64,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.14,
      "edID": 128049460,
      "eddbID": 870,
@@ -165,9 +179,8 @@
      "rating": "F",
      "reload": 5,
      "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.2
    },
    {
      "ammo": 2100,
@@ -178,6 +191,9 @@
      "clip": 90,
      "cost": 1292800,
      "damage": 1.17,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.06,
      "edID": 128049463,
      "eddbID": 872,
@@ -193,9 +209,8 @@
      "rating": "F",
      "reload": 4,
      "rof": 6.25,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
    },
    {
      "ammo": 2100,
@@ -206,6 +221,9 @@
      "clip": 100,
      "cost": 140400,
      "damage": 3.93,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.18,
      "edID": 128049457,
      "eddbID": 1541,
@@ -221,9 +239,8 @@
      "rating": "C",
      "reload": 4,
      "rof": 5.88,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.3
    },
    {
      "ammo": 2100,
@@ -234,6 +251,9 @@
      "clip": 90,
      "cost": 578436,
      "damage": 2.84,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.25,
      "edID": 128049461,
      "eddbID": 1543,
@@ -249,9 +269,8 @@
      "rating": "C",
      "reload": 5,
      "rof": 6.665,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.3
    },
    {
      "ammo": 2100,
@@ -262,6 +281,9 @@
      "clip": 100,
      "cost": 1177600,
      "damage": 4.62,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.24,
      "edID": 128049458,
      "eddbID": 1542,
@@ -278,9 +300,8 @@
      "reload": 4,
      "rof": 3.03,
      "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.4
    },
    {
      "ammo": 2100,
@@ -291,6 +312,9 @@
      "clip": 90,
      "cost": 6377600,
      "damage": 3.46,
+      "damagedist": {
+        "K": 1
+      },
      "distdraw": 0.37,
      "edID": 128681996,
      "eddbID": 1546,
@@ -307,9 +331,8 @@
      "reload": 5,
      "rof": 3.365,
      "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.5,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.5
    }
  ]
 }
--- a/modules/hardpoints/plasma_accelerator.json
+++ b/modules/hardpoints/plasma_accelerator.json
@@ -9,6 +9,11 @@
      "clip": 5,
      "cost": 834200,
      "damage": 54.3,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
      "distdraw": 8.65,
      "edID": 128049465,
      "eddbID": 873,
@@ -24,9 +29,8 @@
      "rating": "C",
      "reload": 6,
      "rof": 0.33,
-      "speed": 875,
-      "thermload": 15.6,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 15.6
    },
    {
      "ammo": 100,
@@ -37,6 +41,11 @@
      "clip": 5,
      "cost": 3051200,
      "damage": 83.4,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
      "distdraw": 13.6,
      "edID": 128049466,
      "eddbID": 874,
@@ -52,9 +61,8 @@
      "rating": "B",
      "reload": 6,
      "rof": 0.29,
-      "speed": 875,
-      "thermload": 21.8,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 21.8
    },
    {
      "ammo": 300,
@@ -65,6 +73,11 @@
      "clip": 20,
      "cost": 4119120,
      "damage": 34.5,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
      "distdraw": 5.5,
      "edID": 128671339,
      "eddbID": 1482,
@@ -82,9 +95,8 @@
      "rating": "B",
      "reload": 6,
      "rof": 0.8,
-      "speed": 875,
-      "thermload": 11,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 11
    },
    {
      "ammo": 100,
@@ -95,6 +107,11 @@
      "clip": 5,
      "cost": 13793600,
      "damage": 125.2,
+      "damagedist": {
+        "A": 0.6,
+        "K": 0.2,
+        "T": 0.2
+      },
      "distdraw": 21.04,
      "edID": 128049467,
      "eddbID": 875,
@@ -110,9 +127,8 @@
      "rating": "A",
      "reload": 6,
      "rof": 0.25,
-      "speed": 875,
-      "thermload": 29.5,
-      "type": "A"
+      "shotspeed": 875,
+      "thermload": 29.5
    }
  ]
 }
--- a/modules/hardpoints/point_defence.json
+++ b/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
    }
  ]
 }
--- a/modules/hardpoints/pulse_laser.json
+++ b/modules/hardpoints/pulse_laser.json
@@ -1,12 +1,15 @@
 {
  "pl": [
    {
-      "breachdmg": 2.04,
+      "breachdmg": 1.7,
      "breachmax": 0.8,
      "breachmin": 0.4,
      "class": 1,
      "cost": 2200,
      "damage": 2.04,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.30,
      "edID": 128049381,
      "eddbID": 823,
@@ -21,8 +24,7 @@
      "range": 3000,
      "rating": "F",
      "rof": 3.847,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
    },
    {
      "breachdmg": 1.3,
@@ -31,6 +33,9 @@
      "class": 1,
      "cost": 6600,
      "damage": 1.56,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.31,
      "edID": 128049385,
      "eddbID": 826,
@@ -45,8 +50,7 @@
      "range": 3000,
      "rating": "G",
      "rof": 3.987,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
    },
    {
      "breachdmg": 1,
@@ -55,6 +59,9 @@
      "class": 1,
      "cost": 26000,
      "damage": 1.18,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.19,
      "edID": 128049388,
      "eddbID": 829,
@@ -69,8 +76,7 @@
      "range": 3000,
      "rating": "G",
      "rof": 3.339,
-      "thermload": 0.2,
-      "type": "T"
+      "thermload": 0.2
    },
    {
      "breachdmg": 3,
@@ -79,6 +85,9 @@
      "class": 2,
      "cost": 17600,
      "damage": 3.49,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.5,
      "edID": 128049382,
      "eddbID": 824,
@@ -91,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,
@@ -103,6 +111,9 @@
      "class": 2,
      "cost": 35400,
      "damage": 2.68,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.54,
      "edID": 128049386,
      "eddbID": 827,
@@ -117,8 +128,7 @@
      "range": 3000,
      "rating": "F",
      "rof": 3.567,
-      "thermload": 0.5,
-      "type": "T"
+      "thermload": 0.5
    },
    {
      "breachdmg": 1.7,
@@ -127,6 +137,9 @@
      "class": 2,
      "cost": 132800,
      "damage": 2.04,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.33,
      "edID": 128049389,
      "eddbID": 830,
@@ -141,8 +154,7 @@
      "range": 3000,
      "rating": "F",
      "rof": 3.037,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
    },
    {
      "breachdmg": 2.4,
@@ -151,7 +163,11 @@
      "class": 2,
      "cost": 26400,
      "damage": 2.8,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.9,
+      "edID": 128671342,
      "eddbID": 1483,
      "falloff": 500,
      "grp": "pl",
@@ -165,8 +181,7 @@
      "pp": "Felicia Winters",
      "rating": "E",
      "rof": 1.664,
-      "thermload": 1,
-      "type": "T"
+      "thermload": 1
    },
    {
      "breachdmg": 5.1,
@@ -175,6 +190,9 @@
      "class": 3,
      "cost": 70400,
      "damage": 5.98,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.86,
      "edID": 128049383,
      "eddbID": 825,
@@ -189,8 +207,7 @@
      "range": 3000,
      "rating": "D",
      "rof": 3.3,
-      "thermload": 1,
-      "type": "T"
+      "thermload": 1
    },
    {
      "breachdmg": 3.9,
@@ -199,6 +216,9 @@
      "class": 3,
      "cost": 140600,
      "damage": 4.58,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.92,
      "edID": 128049387,
      "eddbID": 828,
@@ -213,8 +233,7 @@
      "range": 3000,
      "rating": "E",
      "rof": 3.223,
-      "thermload": 0.9,
-      "type": "T"
+      "thermload": 0.9
    },
    {
      "breachdmg": 3,
@@ -223,6 +242,9 @@
      "class": 3,
      "cost": 400400,
      "damage": 3.49,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 0.56,
      "edID": 128049390,
      "eddbID": 831,
@@ -237,8 +259,7 @@
      "range": 3000,
      "rating": "F",
      "rof": 2.705,
-      "thermload": 0.6,
-      "type": "T"
+      "thermload": 0.6
    },
    {
      "breachdmg": 8.7,
@@ -247,6 +268,9 @@
      "class": 4,
      "cost": 177600,
      "damage": 10.23,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 1.48,
      "edID": 128049384,
      "eddbID": 1539,
@@ -261,8 +285,7 @@
      "range": 3000,
      "rating": "A",
      "rof": 2.633,
-      "thermload": 1.6,
-      "type": "T"
+      "thermload": 1.6
    },
    {
      "breachdmg": 6.6,
@@ -271,6 +294,9 @@
      "class": 4,
      "cost": 877600,
      "damage": 7.82,
+      "damagedist": {
+        "T": 1
+      },
      "distdraw": 1.56,
      "edID": 128681995,
      "eddbID": 1545,
@@ -285,8 +311,7 @@
      "range": 3000,
      "rating": "A",
      "rof": 2.777,
-      "thermload": 1.6,
-      "type": "T"
+      "thermload": 1.6
    }
  ]
 }
--- a/modules/hardpoints/rail_gun.json
+++ b/modules/hardpoints/rail_gun.json
@@ -9,6 +9,10 @@
      "clip": 1,
      "cost": 51600,
      "damage": 23.3,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
      "distdraw": 2.69,
      "edID": 128049488,
      "eddbID": 876,
@@ -24,8 +28,7 @@
      "rating": "D",
      "reload": 1,
      "rof": 1.6,
-      "thermload": 17.8,
-      "type": "KT"
+      "thermload": 17.8
    },
    {
      "ammo": 80,
@@ -36,6 +39,10 @@
      "clip": 1,
      "cost": 412800,
      "damage": 41.5,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
      "distdraw": 5.11,
      "edID": 128049489,
      "eddbID": 877,
@@ -51,8 +58,7 @@
      "rating": "B",
      "reload": 1,
      "rof": 1.2,
-      "thermload": 30,
-      "type": "KT"
+      "thermload": 30
    },
    {
      "ammo": 90,
@@ -65,6 +71,10 @@
      "clip": 3,
      "cost": 619200,
      "damage": 15,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
      "distdraw": 2,
      "edID": 128671341,
      "eddbID": 1484,
@@ -82,8 +92,7 @@
      "rating": "B",
      "reload": 1,
      "rof": 4.1,
-      "thermload": 16,
-      "type": "KT"
+      "thermload": 16
    }
  ]
 }
--- a/modules/hardpoints/torpedo_pylon.json
+++ b/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
    }
  ]
 }
--- a/modules/internal/bi_weave_shield_generator.json
+++ b/modules/internal/bi_weave_shield_generator.json
@@ -66,7 +66,7 @@
      "optmul": 0.9,
      "power": 1.8,
      "rating": "C",
-      "regen": 2.2,
+      "regen": 1.8,
      "thermres": -0.2
    },
    {
--- a/modules/internal/economy_passenger_cabin.json
+++ b/modules/internal/economy_passenger_cabin.json
@@ -47,7 +47,7 @@
    {
      "class": 6,
      "cost": 61420,
-      "edID": 12872926,
+      "edID": 128727926,
      "eddbID": 1567,
      "grp": "pce",
      "id": "me",
--- a/modules/internal/scanner.json
+++ b/modules/internal/scanner.json
@@ -48,7 +48,7 @@
      "id": "2i",
      "mass": 1.3,
      "name": "Detailed Surface Scanner",
-      "power": 0.6,
+      "power": 0,
      "rating": "C"
    }
  ]
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
@@ -572,7 +572,7 @@
      "optmul": 1.1,
      "power": 3.72,
      "rating": "B",
-      "regen": 3.1,
+      "regen": 1.3,
      "thermres": -0.2
    },
    {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.2.9",
+  "version": "2.2.17",
  "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"
  }
 }
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.13625,
      "pitch": 38,
      "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
    },
    "retailCost": 87810,
    "bulkheads": [
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 25,
      "roll": 60,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 3
    },
    "retailCost": 146969450,
    "bulkheads": [
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.13,
      "pitch": 38,
      "roll": 100,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
    },
    "retailCost": 6661150,
    "bulkheads": [
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.125,
      "pitch": 40,
      "roll": 110,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 2
    },
    "retailCost": 3961150,
    "bulkheads": [
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -20,7 +20,8 @@
      "fighterHangars": true,
      "pitch": 25,
      "roll": 60,
-      "yaw": 17 
+      "yaw": 17,
+      "crew": 3
    },
    "retailCost": 84532770,
    "bulkheads": [
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.125,
      "pitch": 40,
      "roll": 100,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
    },
    "retailCost": 349720,
    "bulkheads": [
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.125,
      "pitch": 30,
      "roll": 90,
-      "yaw": 10 
+      "yaw": 10,
+      "crew": 2 
    },
    "retailCost": 747660,
    "bulkheads": [
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -17,7 +17,8 @@
      "pipSpeed": 0.09625,
      "pitch": 35,
      "roll": 90,
-      "yaw": 13
+      "yaw": 13,
+      "crew": 1
    },
    "retailCost": 1894760,
    "bulkheads": [
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.09875,
      "pitch": 42,
      "roll": 100,
-      "yaw": 15 
+      "yaw": 15,
+      "crew": 1
    } ,
    "retailCost": 564330,
    "bulkheads": [
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0625,
      "pitch": 50,
      "roll": 120,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 1
    },
    "retailCost": 44800,
    "bulkheads": [
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -17,7 +17,8 @@
      "pipSpeed": 0.11125,
      "pitch": 38,
      "roll": 90,
-      "yaw": 19
+      "yaw": 19,
+      "crew": 2
    },
    "retailCost": 19814210,
    "bulkheads": [
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -10,7 +10,7 @@
      "speed": 200,
      "boost": 260,
      "boostEnergy": 27,
-      "baseShieldStrength": 610.5,
+      "baseShieldStrength": 555,
      "baseArmour": 370,
      "hardness": 70,
      "hullMass": 900,
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 28,
      "roll": 75,
-      "yaw": 8 
+      "yaw": 8,
+      "crew": 3 
    },
    "retailCost": 187969450,
    "bulkheads": [
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0725,
      "pitch": 30,
      "roll": 80,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
    },
    "retailCost": 14314210,
    "bulkheads": [
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 25,
      "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
    },
    "retailCost": 35814210,
    "bulkheads": [
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.03875,
      "pitch": 38,
      "roll": 90,
-      "yaw": 12
+      "yaw": 12,
+      "crew": 2
    },
    "retailCost": 51567040,
    "bulkheads": [
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.1625,
      "pitch": 36,
      "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 1
    },
    "retailCost": 52720,
    "bulkheads": [
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.1,
      "pitch": 40,
      "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
    },
    "retailCost": 22296860,
      "bulkheads": [
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -17,7 +17,8 @@
      "pipSpeed": 0.05375,
      "pitch": 38,
      "roll": 90,
-      "yaw": 16
+      "yaw": 16,
+      "crew": 1
    },
    "retailCost": 2542930,
    "bulkheads": [
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -9,7 +9,7 @@
      "speed": 200,
      "boost": 320,
      "boostEnergy": 23,
-      "baseShieldStrength": 690,
+      "baseShieldStrength": 600,
      "baseArmour": 400,
      "hardness": 70,
      "hullMass": 1100,
@@ -18,7 +18,8 @@
      "fighterHangars": true,
      "pitch": 18,
      "roll": 45,
-      "yaw":8 
+      "yaw": 8,
+      "crew": 3 
    },
    "retailCost": 208969450,
    "bulkheads": [
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.075,
      "pitch": 40,
      "roll": 100,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
    },
    "retailCost": 110830,
    "bulkheads": [
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -6,7 +6,7 @@
      "name": "Keelback",
      "manufacturer": "Lakon",
      "class": 2,
-      "hullCost": 2943880,
+      "hullCost": 2943870,
      "speed": 200,
      "boost": 300,
      "boostEnergy": 10,
@@ -19,9 +19,10 @@
      "fighterHangars": true,
      "pitch": 27,
      "roll": 100,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
    },
-    "retailCost": 3126160,
+    "retailCost": 3126150,
    "bulkheads": [
      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -19,7 +19,8 @@
      "luxuryCabins": true,
      "pitch": 25,
      "roll": 55,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
    },
    "retailCost": 48539900,
    "bulkheads": [
--- a/ships/python.json
+++ b/ships/python.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0975,
      "pitch": 29,
      "roll": 90,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
    },
    "retailCost": 56978180,
    "bulkheads": [
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -6,7 +6,7 @@
      "name": "Sidewinder",
      "manufacturer": "Faulcon DeLacy",
      "class": 1,
-      "hullCost": 12870,
+      "hullCost": 4070,
      "speed": 220,
      "boost": 320,
      "boostEnergy": 7,
@@ -18,9 +18,10 @@
      "pipSpeed": 0.1375,
      "pitch": 42,
      "roll": 110,
-      "yaw": 16
+      "yaw": 16,
+      "crew": 1
    },
-    "retailCost": 40800,
+    "retailCost": 32000,
    "bulkheads": [
      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
      { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.1475,
      "pitch": 30,
      "roll": 100,
-      "yaw": 17
+      "yaw": 17,
+      "crew": 1
    },
    "retailCost": 1045950,
    "bulkheads": [
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.16625,
      "pitch": 22,
      "roll": 60,
-      "yaw": 22
+      "yaw": 22,
+      "crew": 1
    },
    "retailCost": 17472260,
    "bulkheads": [
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -19,7 +19,8 @@
      "fighterHangars": true,
      "pitch": 20,
      "roll": 20,
-      "yaw": 8
+      "yaw": 8,
+      "crew": 3
    },
    "retailCost": 76555840,
    "bulkheads": [
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.09375,
      "pitch": 35,
      "roll": 90,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
    },
    "retailCost": 142930,
    "bulkheads": [
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.0875,
      "pitch": 30,
      "roll": 90,
-      "yaw": 12
+      "yaw": 12,
+      "crew": 1
    },
    "retailCost": 437930,
    "bulkheads": [
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -18,7 +18,8 @@
      "pipSpeed": 0.02375,
      "pitch": 42,
      "roll": 110,
-      "yaw": 17
+      "yaw": 17,
+      "crew": 2
    },
    "retailCost": 4925620,
    "bulkheads": [
@@ -40,7 +41,7 @@
    "defaults": {
      "standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"],
      "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["4e", 0, 0, "02", 0, "2h"]
+      "internal": ["4e", 0, "02", 0, 0, "2h"]
    }
  }
 }
--- a/spec/data-spec.js
+++ b/spec/data-spec.js
@@ -20,7 +20,8 @@ describe('JSON Data', function() {
    'pipSpeed',
    'pitch',
    'roll',
-    'yaw'
+    'yaw',
+    'crew'
  ];

  var edIDs = {};
@@ -40,10 +41,10 @@ describe('JSON Data', function() {
        var id = group[i].id;
        expect(ids[id]).toBeFalsy('ID already exists: ' + id);
        expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
-	if (s != 'ft' && s != 'pas' ) {
+        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+        if (s != 'ft' && s != 'pas' ) {
          expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
-	}
+        }
        expect(group[i].grp).toBeDefined(`No group defined, Type: ${s}, ID: ${id}, Index: ${i}`);
        expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists for ID: ${id}, Index: ${i}`);
        expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists for ID: ${id}, Index: ${i}`);
@@ -70,7 +71,7 @@ describe('JSON Data', function() {
        expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`);
        expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`);
        expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
-        expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+        expect(group[i].edID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
        expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
        expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
        if (group[i].eddbID) {
@@ -79,19 +80,22 @@ describe('JSON Data', function() {
        if (group[i].edID) {
          edIDs[group[i].edID] = true;
        }
-	if (group[i].damage) {
-            expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+        if (group[i].damage) {
+          expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+          expect(group[i].damagedist).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage distribution`);
+          if (group[i].grp != 'po') {
+            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
            expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`);
            expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`);
            expect(group[i].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`);
            expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`);
-            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
            expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`);
+          }
        }
-	if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
-            expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
-            expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
-            expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
+        if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
+          expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
+          expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
+          expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
        }
        ids[id] = true;
      }
@@ -107,7 +111,7 @@ describe('JSON Data', function() {
        var id = group[i].id;
        expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
        expect(ids[id]).toBeFalsy('ID already exists: ' + id);
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
+        expect(group[i].eddbID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
        expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
        if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs
          expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists:  ${id}`);
@@ -166,12 +170,26 @@ describe('JSON Data', function() {

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

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

@@ -188,6 +206,19 @@ describe('JSON Data', function() {
    }
  });

+  it('has valid module modifications', function() {
+    for (var m in Modifications.modules) {
+      const module = Modifications.modules[m];
+      for (var bp in module.blueprints) {
+        expect(Modifications.blueprints[bp]).toBeDefined('Missing ' + bp + ' for ' + m);
+        for (var g in module.blueprints[bp]) {
+          const grade = module.blueprints[bp][g];
+          expect(Modifications.blueprints[bp].grades[grade]).toBeDefined('Missing ' + bp + ' grade ' + grade + ' for ' + m);
+        }
+      }
+    }
+  });
+
  it('has valid specials', function() {
    var ids = {};
Author	SHA1	Message	Date
Cmdr McDonald	a4a4d315c2	Merge branch 'release/2.2.17'	2017-02-18 09:51:54 +00:00
Cmdr McDonald	daa6d74c2e	Package bupm	2017-02-18 09:51:46 +00:00
Cmdr McDonald	2c5e658181	Merge branch 'feature/multicrew' into develop	2017-02-18 09:49:44 +00:00
Cmdr McDonald	4e5ea494f5	Remove non-existent wake scanner blueprints	2017-02-18 08:28:37 +00:00
Cmdr McDonald	c21575f26d	Merge	2017-02-17 18:26:37 +00:00
Cmdr McDonald	9f6993b466	Change seats to crew	2017-02-17 18:26:02 +00:00
Cmdr McDonald	ed41236bba	Initial stab at seats	2017-02-17 18:25:48 +00:00
Cmdr McDonald	29f67ee228	Fix mining laser stats	2017-02-17 18:23:20 +00:00
Cmdr McDonald	4b8951d032	Change seats to crew	2017-02-16 22:37:05 +00:00
Cmdr McDonald	5096a3f740	Initial stab at seats	2017-02-16 22:32:26 +00:00
Cmdr McDonald	28a7d9446d	Add mass as potential SCB modification	2017-02-16 22:19:54 +00:00
Cmdr McDonald	dca6fe643d	Merge branch 'release/2.2.16' into develop	2017-02-15 20:37:04 +00:00
Cmdr McDonald	e791d73f2a	Merge branch 'release/2.2.16'	2017-02-15 20:36:58 +00:00
Cmdr McDonald	11d39dc0b5	Update package number	2017-02-15 20:36:51 +00:00
Cmdr McDonald	3d47dd2fb7	Set higherbetter for modifications	2017-02-15 19:12:56 +00:00
Cmdr McDonald	c90ebd0f3f	Merge branch 'release/2.2.15' into develop	2017-02-13 19:49:05 +00:00
Cmdr McDonald	19e111b6a4	Merge branch 'release/2.2.15'	2017-02-13 19:49:01 +00:00
Cmdr McDonald	a74b6cfb51	Bump package number	2017-02-13 19:48:57 +00:00
Cmdr McDonald	926e89cf1e	Merge branch 'feature/fixes' into develop	2017-02-13 19:48:24 +00:00
Cmdr McDonald	ba1ccdedb0	Tidy up module values	2017-02-13 19:48:13 +00:00
Cmdr McDonald	d1644df794	Fix location of initial cargo rack for Vulture	2017-02-08 09:41:13 +00:00
Cmdr McDonald	e99e86cfce	Merge branch 'release/2.2.14' into develop	2017-02-08 09:25:35 +00:00
Cmdr McDonald	fc649c6bbe	Merge branch 'release/2.2.14'	2017-02-08 09:25:31 +00:00
Cmdr McDonald	41bc89df58	Package bump	2017-02-08 09:25:27 +00:00
Cmdr McDonald	229e2742a7	Merge branch 'feature/x' into develop	2017-02-08 09:24:27 +00:00
Cmdr McDonald	6d4f79dda9	Correct EDID for class 6 passenger cabin	2017-02-08 07:58:44 +00:00
Cmdr McDonald	827ed4a6dd	Fix incorrect retail price for Keelback	2017-02-05 21:11:45 +00:00
Cmdr McDonald	c82b28448c	Separate hidden attribute of modifications	2017-02-05 19:04:41 +00:00
Cmdr McDonald	f3e4a19645	Tidy-ups for blueprint info	2017-02-05 15:34:00 +00:00
Cmdr McDonald	0d803c7c50	Additional data for blueprints	2017-02-05 12:42:18 +00:00
Cmdr McDonald	f02b9e0cac	Remove grade 5 life support modifications	2017-02-03 22:29:20 +00:00
Cmdr McDonald	ea9294fd88	Merge branch 'release/2.2.13' into develop	2017-02-02 23:00:04 +00:00
Cmdr McDonald	e020ee62c1	Merge branch 'release/2.2.13'	2017-02-02 23:00:00 +00:00
Cmdr McDonald	fa51463972	Bump package number	2017-02-02 22:59:55 +00:00
Cmdr McDonald	443ce708a5	Merge branch 'feature/fixes' into develop	2017-02-02 22:58:36 +00:00
Cmdr McDonald	1d2bb2d307	Tidy up blueprints	2017-02-01 18:49:53 +00:00
Cmdr McDonald	0026c1026e	Dist	2017-02-01 08:49:13 +00:00
Cmdr McDonald	2d6ef26ab2	Tweak hull costs	2017-02-01 08:27:05 +00:00
Cmdr McDonald	3a27604d01	Add plasma slug special for PAs. Fix for #64	2017-01-29 21:50:54 +00:00
Cmdr McDonald	a62adecffa	Merge branch 'release/2.2.12' into develop	2017-01-29 08:26:05 +00:00
Cmdr McDonald	67cb16da99	Merge branch 'release/2.2.12'	2017-01-29 08:26:02 +00:00
Cmdr McDonald	913406774c	Version number bump	2017-01-29 08:25:55 +00:00
Cmdr McDonald	4e297e01db	Merge branch 'feature/specials' into develop	2017-01-29 08:25:18 +00:00
Cmdr McDonald	9e330ea31a	Add IDs for most powerplay modules	2017-01-29 08:22:51 +00:00
Cmdr McDonald	ff9060e5f1	Tidy up thruster information	2017-01-27 18:15:51 +00:00
Cmdr McDonald	4ffbab8ef1	Add per-blueprint specials	2017-01-26 16:01:03 +00:00
Cmdr McDonald	3e2b13654d	Merge branch 'release/2.2.11' into develop	2017-01-25 19:33:43 +00:00
Cmdr McDonald	2d2f3548b5	Merge branch 'release/2.2.11'	2017-01-25 19:33:39 +00:00
Cmdr McDonald	91bbd53657	Bump version number	2017-01-25 19:33:31 +00:00
Cmdr McDonald	f34c839670	Merge branch 'feature/fixes' into develop	2017-01-25 19:31:51 +00:00
Cmdr McDonald	d6602dca06	Updates	2017-01-25 19:31:47 +00:00
Cmdr McDonald	7a63d71b0f	Fixed for frag cannons	2017-01-25 14:25:16 +00:00
Cmdr McDonald	73d1c15609	Remove non-existant AFMU blueprints	2017-01-25 07:43:53 +00:00
Cmdr McDonald	bb3b299c7b	dist	2017-01-24 11:50:04 +00:00
Cmdr McDonald	dfdc170639	Fix incorrect values for charge enhanced power distributor. Fixes #55	2017-01-24 11:41:32 +00:00
Cmdr McDonald	93166c2ea1	Changelog	2017-01-24 07:37:13 +00:00
Cmdr McDonald	700f730075	Remove erroneous chaff launcher capacity blueprint grades	2017-01-24 07:36:56 +00:00
Cmdr McDonald	3ad159fc4d	Merge branch 'release/2.2.10' into develop	2017-01-23 13:04:12 +00:00
Cmdr McDonald	131db379b4	Merge branch 'release/2.2.10'	2017-01-23 13:04:05 +00:00
Cmdr McDonald	2382dc6d91	Fixes for data prior to release	2017-01-23 13:03:57 +00:00
Cmdr McDonald	5f87d933de	Merge branch 'feature/blueprints' into develop	2017-01-22 17:15:54 +00:00
Cmdr McDonald	b011b0a565	Add engineering blueprints	2017-01-22 17:08:13 +00:00
Cmdr McDonald	9006a6ca0e	Update dependencies	2017-01-22 09:03:26 +00:00
Cmdr McDonald	16266fec29	Updates for blueprints	2017-01-21 23:32:48 +00:00
Cmdr McDonald	454fa30884	Fix incorrect modification names	2017-01-21 10:31:38 +00:00
Cmdr McDonald	866eedd599	Add high capacity weapon	2017-01-20 16:17:13 +00:00
Cmdr McDonald	13e3946f2c	Fix incorrect armour names	2017-01-20 15:07:22 +00:00
Cmdr McDonald	f0ffb8b3ca	Partial addition of blueprints	2017-01-19 22:23:58 +00:00
Cmdr McDonald	f0f1e9aea9	Merge branch 'feature/fixes' into develop	2017-01-15 23:05:42 +00:00
Cmdr McDonald	74e18f1fe0	Remove power draw for detailed surface scanner	2017-01-15 23:05:37 +00:00
Cmdr McDonald	2dd730cfa8	Update weapons to have %-based damage distributions	2017-01-15 17:08:52 +00:00
Cmdr McDonald	5a1ebf72d9	Fix base shield values for cutter and corvette	2017-01-15 08:37:01 +00:00
Cmdr McDonald	8f141ff5d5	Merge branch 'release/2.2.9' into develop	2017-01-14 16:22:37 +00:00