Merge branch 'release/2.2.11'

ChangeLog.md

@@ -1,3 +1,21 @@
+#2.2.11
+  * Remove non-existant chaff launcher capacity blueprint grades
+  * Fix incorrect values for charge enhanced power distributor
+  * Remove incorrect AFMU blueprints
+  * Correct fragment cannon Double Shot blueprint information
+  * Correct Focused weapon blueprint information
+
+#2.2.10
+  * Fix incorrect base shield values for Cutter and Corvette
+  * Update weapons to have %-based damage distributions
+  * Remove power draw for detailed surface scanner - although shown in outfitting it is not part of active power
+  * Fix incorrect names for lightweight and kinetic armour
+  * Add engineering blueprints
+
+#2.2.9
+  * Add falloff metric for weapons
+  * Add falloff from range modification
+
 #2.2.8
   * Set military slot of Viper Mk IV to class 3; was incorrectly set as class 2
   * Update base regeneration rate of prismatic shield generators to values in 2.2.03

modifications/index.js

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

modifications/modifications.json

@@ -2,10 +2,11 @@
     "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative"},
     "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative"},
     "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative"},
-    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "multiplicative"},
-    "burstrof": {"id": 41, "name": "burstrof", "type": "percentage", "method": "multiplicative"},
+    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite"},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite"},
     "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative"},
     "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
+    "damagedist": {"id": 40, "name": "damage", "type": "hidden", "method": "overwrite"},
     "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative"},
     "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
     "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
@@ -13,6 +14,7 @@
     "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"},
@@ -32,6 +34,7 @@
     "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"},
     "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"},
     "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"},
+    "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative"},
     "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"},
     "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"},
     "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"},
@@ -39,6 +42,5 @@
     "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive"},
     "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative"},
     "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative"},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"},
-    "type": {"id": 40, "name": "type", "type": "alphabetic", "method": "overwrite"}
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"}
 }

modifications/modifierActions.json

@@ -174,6 +174,8 @@
   "mod_weapon_damage": {
     "damage": 1
   },
+  "mod_weapon_falloffrange_from_range": {
+  },
   "mod_weapon_hardness_piercing": {
     "piercing": 1
   },
@@ -215,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": {
   },

modifications/modules.json

@@ -0,0 +1,778 @@
+{
+  "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"
+    ]
+  },
+  "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"
+    ]
+  },
+  "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"
+    ]
+  },
+  "fh": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "fi": {
+    "blueprints": {
+      "FSDinterdictor_Expanded": [1, 2, 3, 4],
+      "FSDinterdictor_LongRange": [1, 2, 3]
+    },
+    "modifications": [
+      "boot",
+      "facinglimit",
+      "integrity",
+      "mass",
+      "power",
+      "ranget"
+    ]
+  },
+  "fs": {
+    "blueprints": {
+      "FuelScoop_Shielded": [1, 2, 3, 4]
+    },
+    "modifications": [
+      "integrity",
+      "power"
+    ]
+  },
+  "fsd": {
+    "blueprints": {
+      "FSD_FastBoot": [1, 2, 3, 4, 5],
+      "FSD_LongRange": [1, 2, 3, 4, 5],
+      "FSD_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "maxfuel",
+      "optmass",
+      "power",
+      "thermload"
+    ]
+  },
+  "ft": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "fx": {
+    "blueprints": {
+      "FuelTransferLimpet_LightWeight": [1, 2, 3, 4, 5],
+      "FuelTransferLimpet_Reinforced": [1, 2, 3, 4, 5],
+      "FuelTransferLimpet_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "hb": {
+    "blueprints": {
+      "HatchBreakerLimpet_LightWeight": [1, 2, 3, 4, 5],
+      "HatchBreakerLimpet_Reinforced": [1, 2, 3, 4, 5],
+      "HatchBreakerLimpet_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "hr": {
+    "blueprints": {
+      "HullReinforcement_Advanced": [1, 2, 3, 4, 5],
+      "HullReinforcement_Explosive": [1, 2, 3, 4, 5],
+      "HullReinforcement_HeavyDuty": [1, 2, 3, 4, 5],
+      "HullReinforcement_Kinetic": [1, 2, 3, 4, 5],
+      "HullReinforcement_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "hullreinforcement",
+      "explres",
+      "hullboost",
+      "kinres",
+      "mass",
+      "thermres"
+    ]
+  },
+  "hs": {
+    "blueprints": {
+      "HeatSinkLauncher_HeatSinkCapacity": [3],
+      "HeatSinkLauncher_LightWeight": [1, 2, 3, 4, 5],
+      "HeatSinkLauncher_Reinforced": [1, 2, 3, 4, 5],
+      "HeatSinkLauncher_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "integrity",
+      "mass",
+      "power",
+      "reload"
+    ]
+  },
+  "kw": {
+    "blueprints": {
+      "KillWarrantScanner_LightWeight": [1, 2, 3, 4, 5],
+      "KillWarrantScanner_Reinforced": [1, 2, 3, 4, 5],
+      "KillWarrantScanner_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "ls": {
+    "blueprints": {
+      "LifeSupport_LightWeight": [1, 2, 3, 4, 5],
+      "LifeSupport_Reinforced": [1, 2, 3, 4, 5],
+      "LifeSupport_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  },
+  "mc": {
+    "blueprints": {
+      "Weapon_Efficient": [1, 2, 3, 4, 5],
+      "Weapon_HighCapacity": [1, 2, 3, 4, 5],
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_LongRange": [1, 2, 3, 4, 5],
+      "Weapon_Overcharged": [1, 2, 3, 4, 5],
+      "Weapon_RapidFire": [1, 2, 3, 4, 5],
+      "Weapon_ShortRange": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "ammo",
+      "clip",
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "reload",
+      "rof",
+      "shotspeed",
+      "thermload"
+    ]
+  },
+  "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"
+    ]
+  },
+  "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"
+    ]
+  },
+  "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"
+    ]
+  },
+  "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"
+    ]
+  },
+  "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"
+    ]
+  },
+  "s": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "sb": {
+    "blueprints": {
+      "ShieldBooster_Explosive": [1, 2, 3, 4, 5],
+      "ShieldBooster_HeavyDuty": [1, 2, 3, 4, 5],
+      "ShieldBooster_Kinetic": [1, 2, 3, 4, 5],
+      "ShieldBooster_Resistive": [1, 2, 3, 4, 5],
+      "ShieldBooster_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "explres",
+      "integrity",
+      "kinres",
+      "mass",
+      "power",
+      "shieldboost",
+      "thermres"
+    ]
+  },
+  "sc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "scb": {
+    "blueprints": {
+      "ShieldCellBank_Rapid": [1, 2, 3, 4],
+      "ShieldCellBank_Specialised": [1, 2, 3, 4]
+    },
+    "modifications": [
+      "boot",
+      "duration",
+      "integrity",
+      "power",
+      "shieldreinforcement",
+      "spinup",
+      "thermload"
+    ]
+  },
+  "sg": {
+    "blueprints": {
+      "ShieldGenerator_Kinetic": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Optimised": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Reinforced": [1, 2, 3, 4, 5],
+      "ShieldGenerator_Thermic": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "brokenregen",
+      "distdraw",
+      "explres",
+      "integrity",
+      "kinres",
+      "mass",
+      "optmass",
+      "optmul",
+      "power",
+      "regen",
+      "thermload",
+      "thermres"
+    ]
+  },
+  "t": {
+    "blueprints": {
+      "Engine_Dirty": [1, 2, 3, 4, 5],
+      "Engine_Reinforced": [1, 2, 3, 4, 5],
+      "Engine_Tuned": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "integrity",
+      "mass",
+      "optmass",
+      "optmul",
+      "power",
+      "thermload"
+    ]
+  },
+  "tp": {
+    "blueprints": {
+      "Weapon_LightWeight": [1, 2, 3, 4, 5],
+      "Weapon_Sturdy": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "damage",
+      "damagedist",
+      "fallofffromrange",
+      "distdraw",
+      "integrity",
+      "jitter",
+      "mass",
+      "piercing",
+      "power",
+      "range",
+      "rof",
+      "thermload"
+    ]
+  },
+  "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"
+    ]
+  },
+  "ws": {
+    "blueprints": {
+      "WakeScanner_LightWeight": [1, 2, 3, 4, 5],
+      "WakeScanner_Reinforced": [1, 2, 3, 4, 5],
+      "WakeScanner_Shielded": [1, 2, 3, 4, 5]
+    },
+    "modifications": [
+      "boot",
+      "integrity",
+      "mass",
+      "power"
+    ]
+  }
+}

modifications/validity.json

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

modules/hardpoints/beam_laser.json

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

modules/hardpoints/burst_laser.json

@@ -9,9 +9,13 @@
       "class": 1,
       "cost": 4400,
       "damage": 1.72,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.24,
       "edID": 128049400,
       "eddbID": 832,
+      "falloff": 500,
       "grp": "ul",
       "id": "11",
       "integrity": 40,
@@ -22,8 +26,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 2,
-      "thermload": 0.4,
-      "type": "T"
+      "thermload": 0.4
     },
     {
       "breachdmg": 5.3,
@@ -34,9 +37,13 @@
       "class": 1,
       "cost": 8600,
       "damage": 1.2,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.23,
       "edID": 128049404,
       "eddbID": 835,
+      "falloff": 500,
       "grp": "ul",
       "id": "12",
       "integrity": 40,
@@ -47,8 +54,7 @@
       "range": 3000,
       "rating": "G",
       "rof": 2.23,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
     },
     {
       "breachdmg": 1.92,
@@ -59,9 +65,13 @@
       "class": 1,
       "cost": 52800,
       "damage": 0.87,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.136,
       "edID": 128049407,
       "eddbID": 838,
+      "falloff": 500,
       "grp": "ul",
       "id": "13",
       "integrity": 40,
@@ -72,8 +82,7 @@
       "range": 3000,
       "rating": "G",
       "rof": 1.92,
-      "thermload": 0.2,
-      "type": "T"
+      "thermload": 0.2
     },
     {
       "breachdmg": 2,
@@ -84,9 +93,13 @@
       "class": 1,
       "cost": 8800,
       "damage": 2.4,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.31,
       "edID": 128671449,
       "eddbID": 1477,
+      "falloff": 500,
       "grp": "ul",
       "id": "cy",
       "integrity": 40,
@@ -100,8 +113,7 @@
       "range": 600,
       "rating": "F",
       "rof": 6.6,
-      "thermload": 0.3,
-      "type": "T"
+      "thermload": 0.3
     },
     {
       "breachdmg": 11.1,
@@ -112,9 +124,13 @@
       "class": 2,
       "cost": 23000,
       "damage": 3.5,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.482,
       "edID": 128049401,
       "eddbID": 833,
+      "falloff": 500,
       "grp": "ul",
       "id": "7h",
       "integrity": 40,
@@ -125,8 +141,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.6,
-      "thermload": 0.8,
-      "type": "T"
+      "thermload": 0.8
     },
     {
       "breachdmg": 8.82,
@@ -137,9 +152,13 @@
       "class": 2,
       "cost": 48500,
       "damage": 2.45,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.468,
       "edID": 128049405,
       "eddbID": 836,
+      "falloff": 500,
       "grp": "ul",
       "id": "7i",
       "integrity": 40,
@@ -150,8 +169,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.78,
-      "thermload": 0.7,
-      "type": "T"
+      "thermload": 0.7
     },
     {
       "breachdmg": 3.51,
@@ -162,9 +180,13 @@
       "class": 2,
       "cost": 162800,
       "damage": 1.74,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.26,
       "edID": 128049408,
       "eddbID": 839,
+      "falloff": 500,
       "grp": "ul",
       "id": "7j",
       "integrity": 40,
@@ -175,8 +197,7 @@
       "range": 3000,
       "rating": "F",
       "rof": 1.57,
-      "thermload": 0.4,
-      "type": "T"
+      "thermload": 0.4
     },
     {
       "breachdmg": 10.53,
@@ -187,9 +208,13 @@
       "class": 3,
       "cost": 140400,
       "damage": 7.75,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.06,
       "edID": 128049402,
       "eddbID": 834,
+      "falloff": 500,
       "grp": "ul",
       "id": "14",
       "integrity": 64,
@@ -200,8 +225,7 @@
       "range": 3000,
       "rating": "D",
       "rof": 1.2,
-      "thermload": 1.7,
-      "type": "T"
+      "thermload": 1.7
     },
     {
       "breachdmg": 14.08,
@@ -212,9 +236,13 @@
       "class": 3,
       "cost": 281600,
       "damage": 5.18,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.986,
       "edID": 128049406,
       "eddbID": 837,
+      "falloff": 500,
       "grp": "ul",
       "id": "15",
       "integrity": 64,
@@ -225,8 +253,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.4,
-      "thermload": 1.4,
-      "type": "T"
+      "thermload": 1.4
     },
     {
       "breachdmg": 5.58,
@@ -237,9 +264,13 @@
       "class": 3,
       "cost": 800400,
       "damage": 3.54,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 0.536,
       "edID": 128049409,
       "eddbID": 840,
+      "falloff": 500,
       "grp": "ul",
       "id": "16",
       "integrity": 64,
@@ -250,8 +281,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1.272,
-      "thermload": 0.8,
-      "type": "T"
+      "thermload": 0.8
     },
     {
       "breachdmg": 28,
@@ -262,9 +292,13 @@
       "class": 4,
       "cost": 281600,
       "damage": 20.6,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 2.84,
       "edID": 128049403,
       "eddbID": 1549,
+      "falloff": 500,
       "grp": "ul",
       "id": "7s",
       "integrity": 80,
@@ -275,8 +309,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 0.8,
-      "thermload": 4.5,
-      "type": "T"
+      "thermload": 4.5
     },
     {
       "breachdmg": 21.63,
@@ -287,9 +320,13 @@
       "class": 4,
       "cost": 1245600,
       "damage": 12.1,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 2.31,
       "edID": 128727920,
       "eddbID": 1550,
+      "falloff": 500,
       "grp": "ul",
       "id": "7t",
       "integrity": 80,
@@ -300,8 +337,7 @@
       "range": 3000,
       "rating": "E",
       "rof": 1,
-      "thermload": 3.3,
-      "type": "T"
+      "thermload": 3.3
     }
   ]
 }

modules/hardpoints/cannon.json

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

modules/hardpoints/fragment_cannon.json

@@ -9,9 +9,13 @@
       "clip": 3,
       "cost": 36000,
       "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.21,
       "edID": 128049448,
       "eddbID": 860,
+      "falloff": 1800,
       "grp": "fc",
       "id": "20",
       "integrity": 40,
@@ -25,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,
@@ -38,9 +41,13 @@
       "clip": 3,
       "cost": 54720,
       "damage": 1.01,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.26,
       "edID": 128049451,
       "eddbID": 863,
+      "falloff": 1800,
       "grp": "fc",
       "id": "21",
       "integrity": 40,
@@ -54,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,
@@ -67,9 +73,13 @@
       "clip": 3,
       "cost": 182400,
       "damage": 0.69,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.1,
       "edID": 128049453,
       "eddbID": 865,
+      "falloff": 1800,
       "grp": "fc",
       "id": "22",
       "integrity": 40,
@@ -83,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,
@@ -96,9 +105,13 @@
       "clip": 3,
       "cost": 291840,
       "damage": 2.56,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128049449,
       "eddbID": 861,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1s",
       "integrity": 80,
@@ -112,9 +125,8 @@
       "reload": 2.5,
       "rof": 5,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
     },
     {
       "ammo": 180,
@@ -125,9 +137,13 @@
       "clip": 3,
       "cost": 437800,
       "damage": 1.95,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.49,
       "edID": 128049452,
       "eddbID": 864,
+      "falloff": 1800,
       "grp": "fc",
       "id": "7e",
       "integrity": 80,
@@ -141,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,
@@ -154,9 +169,13 @@
       "clip": 3,
       "cost": 1459200,
       "damage": 1.43,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.21,
       "edID": 128049454,
       "eddbID": 866,
+      "falloff": 1800,
       "grp": "fc",
       "id": "7f",
       "integrity": 80,
@@ -170,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,
@@ -183,9 +201,13 @@
       "clip": 3,
       "cost": 1167360,
       "damage": 3.92,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.57,
       "edID": 128049450,
       "eddbID": 862,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1t",
       "integrity": 80,
@@ -199,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,
@@ -212,9 +233,13 @@
       "clip": 3,
       "cost": 1751040,
       "damage": 3.23,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.81,
       "edID": 128671321,
       "eddbID": 1454,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1u",
       "integrity": 80,
@@ -228,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,
@@ -241,9 +265,13 @@
       "clip": 3,
       "cost": 5836800,
       "damage": 2.56,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128671322,
       "eddbID": 1455,
+      "falloff": 1800,
       "grp": "fc",
       "id": "1v",
       "integrity": 80,
@@ -257,9 +285,8 @@
       "reload": 2.5,
       "rof": 4,
       "roundspershot": 12,
-      "speed": 667,
-      "thermload": 0.7,
-      "type": "K"
+      "shotspeed": 667,
+      "thermload": 0.7
     },
     {
       "ammo": 180,
@@ -270,9 +297,13 @@
       "clip": 3,
       "cost": 1400830,
       "damage": 3.4,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.57,
       "edID": 128671343,
       "eddbID": 1478,
+      "falloff": 1800,
       "grp": "fc",
       "id": "pa",
       "integrity": 64,
@@ -287,9 +318,8 @@
       "reload": 2.5,
       "rof": 4.5,
       "roundspershot": 12,
-      "speed": 1000,
-      "thermload": 1.1,
-      "type": "K"
+      "shotspeed": 1000,
+      "thermload": 1.1
     }
   ]
 }

modules/hardpoints/mine_launcher.json

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

modules/hardpoints/mining_laser.json

@@ -7,9 +7,11 @@
       "class": 1,
       "cost": 6800,
       "damage": 2,
+      "damagedist": {},
       "distdraw": 1.35,
       "edID": 128049525,
       "eddbID": 888,
+      "falloff": 300,
       "grp": "ml",
       "id": "2l",
       "integrity": 40,
@@ -28,8 +30,12 @@
       "class": 1,
       "cost": 13600,
       "damage": 8,
+      "damagedist": {
+        "T": 1
+      },
       "distdraw": 1.75,
       "eddbID": 1479,
+      "falloff": 400,
       "grp": "ml",
       "id": "ml",
       "integrity": 40,
@@ -41,8 +47,7 @@
       "pp": "Zemina Torval",
       "range": 2000,
       "rating": "D",
-      "thermload": 6,
-      "type": "T"
+      "thermload": 6
     },
     {
       "breachdmg": 1.2,
@@ -51,9 +56,11 @@
       "class": 2,
       "cost": 22580,
       "damage": 8,
+      "damagedist": {},
       "distdraw": 1.75,
       "edID": 128049526,
       "eddbID": 889,
+      "falloff": 300,
       "grp": "ml",
       "id": "2m",
       "integrity": 51,

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

modules/hardpoints/multi_cannon.json

@@ -9,9 +9,13 @@
       "clip": 100,
       "cost": 9500,
       "damage": 1.12,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.06,
       "edID": 128049455,
       "eddbID": 867,
+      "falloff": 1800,
       "grp": "mc",
       "id": "23",
       "integrity": 40,
@@ -23,9 +27,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
     },
     {
       "ammo": 2100,
@@ -36,9 +39,13 @@
       "clip": 90,
       "cost": 14250,
       "damage": 0.82,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.07,
       "edID": 128049459,
       "eddbID": 869,
+      "falloff": 1800,
       "grp": "mc",
       "id": "24",
       "integrity": 40,
@@ -50,9 +57,8 @@
       "rating": "G",
       "reload": 5,
       "rof": 8.33,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
     },
     {
       "ammo": 2100,
@@ -63,9 +69,13 @@
       "clip": 90,
       "cost": 81600,
       "damage": 0.56,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.03,
       "edID": 128049462,
       "eddbID": 871,
+      "falloff": 1800,
       "grp": "mc",
       "id": "25",
       "integrity": 40,
@@ -77,9 +87,8 @@
       "rating": "G",
       "reload": 4,
       "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0
     },
     {
       "ammo": 1000,
@@ -90,8 +99,12 @@
       "clip": 60,
       "cost": 13980,
       "damage": 2.9,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.12,
       "eddbID": 1481,
+      "falloff": 1800,
       "grp": "mc",
       "id": "e0",
       "integrity": 40,
@@ -105,9 +118,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 4.3,
-      "speed": 1800,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1800,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -118,9 +130,13 @@
       "clip": 100,
       "cost": 38000,
       "damage": 2.19,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.11,
       "edID": 128049456,
       "eddbID": 868,
+      "falloff": 1800,
       "grp": "mc",
       "id": "26",
       "integrity": 51,
@@ -132,9 +148,8 @@
       "rating": "E",
       "reload": 4,
       "rof": 7.14,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -145,9 +160,13 @@
       "clip": 90,
       "cost": 57000,
       "damage": 1.64,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.14,
       "edID": 128049460,
       "eddbID": 870,
+      "falloff": 1800,
       "grp": "mc",
       "id": "27",
       "integrity": 51,
@@ -159,9 +178,8 @@
       "rating": "F",
       "reload": 5,
       "rof": 7.69,
-      "speed": 1600,
-      "thermload": 0.2,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.2
     },
     {
       "ammo": 2100,
@@ -172,9 +190,13 @@
       "clip": 90,
       "cost": 1292800,
       "damage": 1.17,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.06,
       "edID": 128049463,
       "eddbID": 872,
+      "falloff": 1800,
       "grp": "mc",
       "id": "28",
       "integrity": 51,
@@ -186,9 +208,8 @@
       "rating": "F",
       "reload": 4,
       "rof": 6.25,
-      "speed": 1600,
-      "thermload": 0.1,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.1
     },
     {
       "ammo": 2100,
@@ -199,9 +220,13 @@
       "clip": 100,
       "cost": 140400,
       "damage": 3.93,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.18,
       "edID": 128049457,
       "eddbID": 1541,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7k",
       "integrity": 64,
@@ -213,9 +238,8 @@
       "rating": "C",
       "reload": 4,
       "rof": 5.88,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.3
     },
     {
       "ammo": 2100,
@@ -226,9 +250,13 @@
       "clip": 90,
       "cost": 578436,
       "damage": 2.84,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.25,
       "edID": 128049461,
       "eddbID": 1543,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7l",
       "integrity": 64,
@@ -240,9 +268,8 @@
       "rating": "C",
       "reload": 5,
       "rof": 6.665,
-      "speed": 1600,
-      "thermload": 0.3,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.3
     },
     {
       "ammo": 2100,
@@ -253,9 +280,13 @@
       "clip": 100,
       "cost": 1177600,
       "damage": 4.62,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.24,
       "edID": 128049458,
       "eddbID": 1542,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7n",
       "integrity": 80,
@@ -268,9 +299,8 @@
       "reload": 4,
       "rof": 3.03,
       "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.4,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.4
     },
     {
       "ammo": 2100,
@@ -281,9 +311,13 @@
       "clip": 90,
       "cost": 6377600,
       "damage": 3.46,
+      "damagedist": {
+        "K": 1
+      },
       "distdraw": 0.37,
       "edID": 128681996,
       "eddbID": 1546,
+      "falloff": 1800,
       "grp": "mc",
       "id": "7o",
       "integrity": 80,
@@ -296,9 +330,8 @@
       "reload": 5,
       "rof": 3.365,
       "roundspershot": 2,
-      "speed": 1600,
-      "thermload": 0.5,
-      "type": "K"
+      "shotspeed": 1600,
+      "thermload": 0.5
     }
   ]
 }

modules/hardpoints/plasma_accelerator.json

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

modules/hardpoints/point_defence.json

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

modules/hardpoints/pulse_laser.json

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

modules/hardpoints/rail_gun.json

@@ -9,9 +9,14 @@
       "clip": 1,
       "cost": 51600,
       "damage": 23.3,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 2.69,
       "edID": 128049488,
       "eddbID": 876,
+      "falloff": 1000,
       "grp": "rg",
       "id": "29",
       "integrity": 40,
@@ -23,8 +28,7 @@
       "rating": "D",
       "reload": 1,
       "rof": 1.6,
-      "thermload": 17.8,
-      "type": "KT"
+      "thermload": 17.8
     },
     {
       "ammo": 80,
@@ -35,9 +39,14 @@
       "clip": 1,
       "cost": 412800,
       "damage": 41.5,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 5.11,
       "edID": 128049489,
       "eddbID": 877,
+      "falloff": 1000,
       "grp": "rg",
       "id": "2a",
       "integrity": 51,
@@ -49,8 +58,7 @@
       "rating": "B",
       "reload": 1,
       "rof": 1.2,
-      "thermload": 30,
-      "type": "KT"
+      "thermload": 30
     },
     {
       "ammo": 90,
@@ -63,9 +71,14 @@
       "clip": 3,
       "cost": 619200,
       "damage": 15,
+      "damagedist": {
+        "K": 0.5,
+        "T": 0.5
+      },
       "distdraw": 2,
       "edID": 128671341,
       "eddbID": 1484,
+      "falloff": 1000,
       "grp": "rg",
       "id": "ih",
       "integrity": 51,
@@ -79,8 +92,7 @@
       "rating": "B",
       "reload": 1,
       "rof": 4.1,
-      "thermload": 16,
-      "type": "KT"
+      "thermload": 16
     }
   ]
 }

modules/hardpoints/torpedo_pylon.json

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

modules/internal/pristmatic_shield_generator.json

@@ -189,7 +189,7 @@
       "power": 8.4,
       "pp": "Aisling Duval",
       "rating": "A",
-      "regen": 1.2,
+      "regen": 1.4,
       "thermres": -0.2
     }
   ]

modules/internal/scanner.json

@@ -48,7 +48,7 @@
       "id": "2i",
       "mass": 1.3,
       "name": "Detailed Surface Scanner",
-      "power": 0.6,
+      "power": 0,
       "rating": "C"
     }
   ]

package.json

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

ships/federal_corvette.json

@@ -10,7 +10,7 @@
       "speed": 200,
       "boost": 260,
       "boostEnergy": 27,
-      "baseShieldStrength": 610.5,
+      "baseShieldStrength": 555,
       "baseArmour": 370,
       "hardness": 70,
       "hullMass": 900,

ships/imperial_cutter.json

@@ -9,7 +9,7 @@
       "speed": 200,
       "boost": 320,
       "boostEnergy": 23,
-      "baseShieldStrength": 690,
+      "baseShieldStrength": 600,
       "baseArmour": 400,
       "hardness": 70,
       "hullMass": 1100,

spec/data-spec.js

@@ -41,9 +41,9 @@ describe('JSON Data', function() {
         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' ) {
+        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}`);
@@ -79,19 +79,22 @@ describe('JSON Data', function() {
         if (group[i].edID) {
           edIDs[group[i].edID] = true;
         }
-	if (group[i].damage) {
-            expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+        if (group[i].damage) {
+          expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
+          expect(group[i].damagedist).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage distribution`);
+          if (group[i].grp != 'po') {
+            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
             expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`);
             expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`);
             expect(group[i].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`);
             expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`);
-            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
             expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`);
+          }
         }
-	if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
-            expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
-            expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
-            expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
+        if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
+          expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);
+          expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`);
+          expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`);
         }
         ids[id] = true;
       }
@@ -171,6 +174,17 @@ describe('JSON Data', function() {
       const blueprint = Modifications.blueprints[k];
       expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
       expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
+
+      for (var x in blueprint.features) {
+        var b = blueprint.features[x];
+        var bfs = {};
+        for (var bf in b) {
+          expect(bfs[bf]).toBeFalsy(`Blueprint feature [${bf}] already exists: ${blueprint.name}`);
+          expect(Modifications.modifications[bf]).toBeDefined(`Blueprint feature [${bf}] uknown: ${blueprint.name}`);
+          bfs[bf] = true;
+        }
+      }
+
       ids[blueprint.id] = true;
     }
   });
@@ -186,6 +200,7 @@ describe('JSON Data', function() {
       expect(modification.method).toBeDefined('Modification has no method, ID:' + modification.id);
       ids[modification.id] = true;
     }
+
   });
 
   it('has valid specials', function() {