Merge branch 'release/2.2.18'

ChangeLog.md

@@ -1,3 +1,34 @@
+#2.2.18
+  * Correct lower efficiency value to be better, not worse
+
+#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

modifications/modifications.json

@@ -1,46 +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": "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"},
-    "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"},
-    "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"},
-    "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"},
-    "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"}
+    "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": false},
+    "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": true},
+    "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}
 }

modifications/modules.json

@@ -45,6 +45,13 @@
       "power",
       "range",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_regeneration_sequence",
+      "special_thermal_conduit",
+      "special_thermalshock",
+      "special_thermal_vent"
     ]
   },
   "bsg": {
@@ -98,6 +105,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_dispersal_field",
+      "special_smart_rounds",
+      "special_force_shell",
+      "special_high_yield_shell",
+      "special_thermal_cascade"
     ]
   },
   "cc": {
@@ -194,6 +209,13 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_corrosive_shell",
+      "special_blinding_shell",
+      "special_incendiary_rounds",
+      "special_drag_munitions",
+      "special_screening_shell"
     ]
   },
   "fh": {
@@ -318,9 +340,9 @@
   },
   "ls": {
     "blueprints": {
-      "LifeSupport_LightWeight": [1, 2, 3, 4, 5],
-      "LifeSupport_Reinforced": [1, 2, 3, 4, 5],
-      "LifeSupport_Shielded": [1, 2, 3, 4, 5]
+      "LifeSupport_LightWeight": [1, 2, 3, 4],
+      "LifeSupport_Reinforced": [1, 2, 3, 4],
+      "LifeSupport_Shielded": [1, 2, 3, 4]
     },
     "modifications": [
       "boot",
@@ -357,6 +379,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_corrosive_shell",
+      "special_emissive_munitions",
+      "special_incendiary_rounds",
+      "special_smart_rounds",
+      "special_thermalshock"
     ]
   },
   "ml": {
@@ -387,6 +417,13 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_drag_munitions",
+      "special_emissive_munitions",
+      "special_overload_munitions",
+      "special_penetrator_payload",
+      "special_thermal_cascade"
     ]
   },
   "mrp": {
@@ -417,6 +454,14 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_ion_disruptor",
+      "special_overload_munitions",
+      "special_radiant_canister",
+      "special_reverberating_cascade",
+      "special_shiftlock_canister",
+      "special_emissive_munitions"
     ]
   },
   "pa": {
@@ -447,6 +492,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_blinding_shell",
+      "special_dispersal_field",
+      "special_phasing_sequence",
+      "special_plasma_slug",
+      "special_target_lock_breaker",
+      "special_thermal_conduit"
     ]
   },
   "pas": {
@@ -537,6 +590,13 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_emissive_munitions",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
     ]
   },
   "po": {
@@ -629,6 +689,11 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_feedback_cascade",
+      "special_plasma_slug",
+      "special_super_penetrator"
     ]
   },
   "s": {
@@ -663,13 +728,14 @@
   },
   "scb": {
     "blueprints": {
-      "ShieldCellBank_Rapid": [1, 2, 3, 4],
-      "ShieldCellBank_Specialised": [1, 2, 3, 4]
+      "ShieldCellBank_Rapid": [1, 2, 3],
+      "ShieldCellBank_Specialised": [1, 2, 3]
     },
     "modifications": [
       "boot",
       "duration",
       "integrity",
+      "mass",
       "power",
       "shieldreinforcement",
       "spinup",
@@ -732,6 +798,11 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_mass_lock_munition",
+      "special_penetrator_payload",
+      "special_reverberating_cascade"
     ]
   },
   "ul": {
@@ -760,13 +831,20 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_inertial_impact",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
     ]
   },
   "ws": {
     "blueprints": {
-      "WakeScanner_LightWeight": [1, 2, 3, 4, 5],
-      "WakeScanner_Reinforced": [1, 2, 3, 4, 5],
-      "WakeScanner_Shielded": [1, 2, 3, 4, 5]
+      "WakeScanner_LightWeight": [1, 2, 3],
+      "WakeScanner_Reinforced": [1, 2, 3],
+      "WakeScanner_Shielded": [1, 2, 3]
     },
     "modifications": [
       "boot",

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

modules/hardpoints/burst_laser.json

@@ -1,7 +1,7 @@
 {
   "ul": [
     {
-      "breachdmg": 7.05,
+      "breachdmg": 1.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -29,7 +29,7 @@
       "thermload": 0.4
     },
     {
-      "breachdmg": 5.3,
+      "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -57,9 +57,9 @@
       "thermload": 0.3
     },
     {
-      "breachdmg": 1.92,
+      "breachdmg": 0.4,
       "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
       "burst": 3,
       "burstrof": 19,
       "class": 1,
@@ -116,7 +116,7 @@
       "thermload": 0.3
     },
     {
-      "breachdmg": 11.1,
+      "breachdmg": 3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -144,7 +144,7 @@
       "thermload": 0.8
     },
     {
-      "breachdmg": 8.82,
+      "breachdmg": 2.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -172,9 +172,9 @@
       "thermload": 0.7
     },
     {
-      "breachdmg": 3.51,
+      "breachdmg": 0.9,
       "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
       "burst": 3,
       "burstrof": 15,
       "class": 2,
@@ -200,7 +200,7 @@
       "thermload": 0.4
     },
     {
-      "breachdmg": 10.53,
+      "breachdmg": 3.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -228,7 +228,7 @@
       "thermload": 1.7
     },
     {
-      "breachdmg": 14.08,
+      "breachdmg": 4.4,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -256,9 +256,9 @@
       "thermload": 1.4
     },
     {
-      "breachdmg": 5.58,
+      "breachdmg": 1.8,
       "breachmax": 0.8,
-      "breachmin": 0.4,
+      "breachmin": 0.6,
       "burst": 3,
       "burstrof": 11,
       "class": 3,
@@ -284,7 +284,7 @@
       "thermload": 0.8
     },
     {
-      "breachdmg": 28,
+      "breachdmg": 17.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,
@@ -312,7 +312,7 @@
       "thermload": 4.5
     },
     {
-      "breachdmg": 21.63,
+      "breachdmg": 10.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "burst": 3,

modules/hardpoints/mining_laser.json

@@ -7,8 +7,10 @@
       "class": 1,
       "cost": 6800,
       "damage": 2,
-      "damagedist": {},
-      "distdraw": 1.35,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 1.5,
       "edID": 128049525,
       "eddbID": 888,
       "falloff": 300,
@@ -34,6 +36,7 @@
         "T": 1
       },
       "distdraw": 1.75,
+      "edID": 128671347,
       "eddbID": 1479,
       "falloff": 400,
       "grp": "ml",
@@ -50,14 +53,16 @@
       "thermload": 6
     },
     {
-      "breachdmg": 1.2,
+      "breachdmg": 0.6,
       "breachmax": 0.2,
       "breachmin": 0.1,
       "class": 2,
       "cost": 22580,
-      "damage": 8,
-      "damagedist": {},
-      "distdraw": 1.75,
+      "damage": 4,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 3,
       "edID": 128049526,
       "eddbID": 889,
       "falloff": 300,

modules/hardpoints/multi_cannon.json

@@ -103,6 +103,7 @@
         "K": 1
       },
       "distdraw": 0.12,
+      "edID": 128671345,
       "eddbID": 1481,
       "falloff": 1800,
       "grp": "mc",

modules/hardpoints/pulse_laser.json

@@ -1,7 +1,7 @@
 {
   "pl": [
     {
-      "breachdmg": 2.04,
+      "breachdmg": 1.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
@@ -167,6 +167,7 @@
         "T": 1
       },
       "distdraw": 0.9,
+      "edID": 128671342,
       "eddbID": 1483,
       "falloff": 500,
       "grp": "pl",

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
     },
     {

modules/internal/economy_passenger_cabin.json

@@ -47,7 +47,7 @@
     {
       "class": 6,
       "cost": 61420,
-      "edID": 12872926,
+      "edID": 128727926,
       "eddbID": 1567,
       "grp": "pce",
       "id": "me",

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
     },
     {

package.json

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

ships/adder.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.13625,
       "pitch": 38,
       "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
     },
     "retailCost": 87810,
     "bulkheads": [

ships/anaconda.json

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 25,
       "roll": 60,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 3
     },
     "retailCost": 146969450,
     "bulkheads": [

ships/asp.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.13,
       "pitch": 38,
       "roll": 100,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
     },
     "retailCost": 6661150,
     "bulkheads": [

ships/asp_scout.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.125,
       "pitch": 40,
       "roll": 110,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 2
     },
     "retailCost": 3961150,
     "bulkheads": [

ships/beluga.json

@@ -20,7 +20,8 @@
       "fighterHangars": true,
       "pitch": 25,
       "roll": 60,
-      "yaw": 17 
+      "yaw": 17,
+      "crew": 3
     },
     "retailCost": 84532770,
     "bulkheads": [

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": [

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": [

ships/diamondback_explorer.json

@@ -17,7 +17,8 @@
       "pipSpeed": 0.09625,
       "pitch": 35,
       "roll": 90,
-      "yaw": 13
+      "yaw": 13,
+      "crew": 1
     },
     "retailCost": 1894760,
     "bulkheads": [

ships/diamondback_scout.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.09875,
       "pitch": 42,
       "roll": 100,
-      "yaw": 15 
+      "yaw": 15,
+      "crew": 1
     } ,
     "retailCost": 564330,
     "bulkheads": [

ships/eagle.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.0625,
       "pitch": 50,
       "roll": 120,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 1
     },
     "retailCost": 44800,
     "bulkheads": [

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": [

ships/federal_corvette.json

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 28,
       "roll": 75,
-      "yaw": 8 
+      "yaw": 8,
+      "crew": 3 
     },
     "retailCost": 187969450,
     "bulkheads": [

ships/federal_dropship.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.0725,
       "pitch": 30,
       "roll": 80,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 2
     },
     "retailCost": 14314210,
     "bulkheads": [

ships/federal_gunship.json

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 25,
       "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 35814210,
     "bulkheads": [

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": [

ships/hauler.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.1625,
       "pitch": 36,
       "roll": 100,
-      "yaw": 14
+      "yaw": 14,
+      "crew": 1
     },
     "retailCost": 52720,
     "bulkheads": [

ships/imperial_clipper.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.1,
       "pitch": 40,
       "roll": 80,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 22296860,
       "bulkheads": [

ships/imperial_courier.json

@@ -17,7 +17,8 @@
       "pipSpeed": 0.05375,
       "pitch": 38,
       "roll": 90,
-      "yaw": 16
+      "yaw": 16,
+      "crew": 1
     },
     "retailCost": 2542930,
     "bulkheads": [

ships/imperial_cutter.json

@@ -18,7 +18,8 @@
       "fighterHangars": true,
       "pitch": 18,
       "roll": 45,
-      "yaw":8 
+      "yaw": 8,
+      "crew": 3 
     },
     "retailCost": 208969450,
     "bulkheads": [

ships/imperial_eagle.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.075,
       "pitch": 40,
       "roll": 100,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
     },
     "retailCost": 110830,
     "bulkheads": [

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

ships/orca.json

@@ -19,7 +19,8 @@
       "luxuryCabins": true,
       "pitch": 25,
       "roll": 55,
-      "yaw": 18
+      "yaw": 18,
+      "crew": 2
     },
     "retailCost": 48539900,
     "bulkheads": [

ships/python.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.0975,
       "pitch": 29,
       "roll": 90,
-      "yaw": 10
+      "yaw": 10,
+      "crew": 2
     },
     "retailCost": 56978180,
     "bulkheads": [

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

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": [

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": [

ships/type_9_heavy.json

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 20,
       "roll": 20,
-      "yaw": 8
+      "yaw": 8,
+      "crew": 3
     },
     "retailCost": 76555840,
     "bulkheads": [

ships/viper.json

@@ -18,7 +18,8 @@
       "pipSpeed": 0.09375,
       "pitch": 35,
       "roll": 90,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
     },
     "retailCost": 142930,
     "bulkheads": [

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": [

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

spec/data-spec.js

@@ -20,7 +20,8 @@ describe('JSON Data', function() {
     'pipSpeed',
     'pitch',
     'roll',
-    'yaw'
+    'yaw',
+    'crew'
   ];
 
   var edIDs = {};
@@ -40,7 +41,7 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
         expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
         if (s != 'ft' && s != 'pas' ) {
           expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
         }
@@ -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) {
@@ -110,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}`);
@@ -169,23 +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);
-
-      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;
+      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);
+      }
     }
   });
 
@@ -200,7 +204,19 @@ describe('JSON Data', function() {
       expect(modification.method).toBeDefined('Modification has no method, ID:' + modification.id);
       ids[modification.id] = true;
     }
+  });
 
+  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() {