Merge branch 'release/2.2.19'

ChangeLog.md

@@ -1,3 +1,25 @@
+#2.2.19
+  * Remove shot speed modification - it is directly tied to range
+  * Fix incorrect minimal mass for 3C bi-weave shield generator
+
+#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

dist/index.js

@@ -19,7 +19,8 @@ module.exports = {
         pipSpeed: .13625,
         pitch: 38,
         roll: 100,
-        yaw: 14
+        yaw: 14,
+        crew: 2
       },
       retailCost: 87810,
       bulkheads: [ {
@@ -109,7 +110,8 @@ module.exports = {
         fighterHangars: true,
         pitch: 25,
         roll: 60,
-        yaw: 10
+        yaw: 10,
+        crew: 3
       },
       retailCost: 146969450,
       bulkheads: [ {
@@ -206,7 +208,8 @@ module.exports = {
         pipSpeed: .13,
         pitch: 38,
         roll: 100,
-        yaw: 10
+        yaw: 10,
+        crew: 2
       },
       retailCost: 6661150,
       bulkheads: [ {
@@ -295,7 +298,8 @@ module.exports = {
         pipSpeed: .125,
         pitch: 40,
         roll: 110,
-        yaw: 15
+        yaw: 15,
+        crew: 2
       },
       retailCost: 3961150,
       bulkheads: [ {
@@ -386,7 +390,8 @@ module.exports = {
         fighterHangars: true,
         pitch: 25,
         roll: 60,
-        yaw: 17
+        yaw: 17,
+        crew: 3
       },
       retailCost: 84532770,
       bulkheads: [ {
@@ -519,7 +524,8 @@ module.exports = {
         pipSpeed: .125,
         pitch: 40,
         roll: 100,
-        yaw: 10
+        yaw: 10,
+        crew: 2
       },
       retailCost: 349720,
       bulkheads: [ {
@@ -608,7 +614,8 @@ module.exports = {
         pipSpeed: .125,
         pitch: 30,
         roll: 90,
-        yaw: 10
+        yaw: 10,
+        crew: 2
       },
       retailCost: 747660,
       bulkheads: [ {
@@ -697,7 +704,8 @@ module.exports = {
         pipSpeed: .09625,
         pitch: 35,
         roll: 90,
-        yaw: 13
+        yaw: 13,
+        crew: 1
       },
       retailCost: 1894760,
       bulkheads: [ {
@@ -786,7 +794,8 @@ module.exports = {
         pipSpeed: .09875,
         pitch: 42,
         roll: 100,
-        yaw: 15
+        yaw: 15,
+        crew: 1
       },
       retailCost: 564330,
       bulkheads: [ {
@@ -875,7 +884,8 @@ module.exports = {
         pipSpeed: .0625,
         pitch: 50,
         roll: 120,
-        yaw: 18
+        yaw: 18,
+        crew: 1
       },
       retailCost: 44800,
       bulkheads: [ {
@@ -972,7 +982,8 @@ module.exports = {
         pipSpeed: .11125,
         pitch: 38,
         roll: 90,
-        yaw: 19
+        yaw: 19,
+        crew: 2
       },
       retailCost: 19814210,
       bulkheads: [ {
@@ -1078,7 +1089,8 @@ module.exports = {
         fighterHangars: true,
         pitch: 28,
         roll: 75,
-        yaw: 8
+        yaw: 8,
+        crew: 3
       },
       retailCost: 187969450,
       bulkheads: [ {
@@ -1183,7 +1195,8 @@ module.exports = {
         pipSpeed: .0725,
         pitch: 30,
         roll: 80,
-        yaw: 14
+        yaw: 14,
+        crew: 2
       },
       retailCost: 14314210,
       bulkheads: [ {
@@ -1289,7 +1302,8 @@ module.exports = {
         fighterHangars: true,
         pitch: 25,
         roll: 80,
-        yaw: 18
+        yaw: 18,
+        crew: 2
       },
       retailCost: 35814210,
       bulkheads: [ {
@@ -1402,7 +1416,8 @@ module.exports = {
         pipSpeed: .03875,
         pitch: 38,
         roll: 90,
-        yaw: 12
+        yaw: 12,
+        crew: 2
       },
       retailCost: 51567040,
       bulkheads: [ {
@@ -1491,7 +1506,8 @@ module.exports = {
         pipSpeed: .1625,
         pitch: 36,
         roll: 100,
-        yaw: 14
+        yaw: 14,
+        crew: 1
       },
       retailCost: 52720,
       bulkheads: [ {
@@ -1580,7 +1596,8 @@ module.exports = {
         pipSpeed: .1,
         pitch: 40,
         roll: 80,
-        yaw: 18
+        yaw: 18,
+        crew: 2
       },
       retailCost: 22296860,
       bulkheads: [ {
@@ -1669,7 +1686,8 @@ module.exports = {
         pipSpeed: .05375,
         pitch: 38,
         roll: 90,
-        yaw: 16
+        yaw: 16,
+        crew: 1
       },
       retailCost: 2542930,
       bulkheads: [ {
@@ -1759,7 +1777,8 @@ module.exports = {
         fighterHangars: true,
         pitch: 18,
         roll: 45,
-        yaw: 8
+        yaw: 8,
+        crew: 3
       },
       retailCost: 208969450,
       bulkheads: [ {
@@ -1864,7 +1883,8 @@ module.exports = {
         pipSpeed: .075,
         pitch: 40,
         roll: 100,
-        yaw: 15
+        yaw: 15,
+        crew: 1
       },
       retailCost: 110830,
       bulkheads: [ {
@@ -1962,7 +1982,8 @@ module.exports = {
         fighterHangars: true,
         pitch: 27,
         roll: 100,
-        yaw: 15
+        yaw: 15,
+        crew: 1
       },
       retailCost: 3126150,
       bulkheads: [ {
@@ -2052,7 +2073,8 @@ module.exports = {
         luxuryCabins: true,
         pitch: 25,
         roll: 55,
-        yaw: 18
+        yaw: 18,
+        crew: 2
       },
       retailCost: 48539900,
       bulkheads: [ {
@@ -2163,7 +2185,8 @@ module.exports = {
         pipSpeed: .0975,
         pitch: 29,
         roll: 90,
-        yaw: 10
+        yaw: 10,
+        crew: 2
       },
       retailCost: 56978180,
       bulkheads: [ {
@@ -2252,7 +2275,8 @@ module.exports = {
         pipSpeed: .1375,
         pitch: 42,
         roll: 110,
-        yaw: 16
+        yaw: 16,
+        crew: 1
       },
       retailCost: 32e3,
       bulkheads: [ {
@@ -2341,7 +2365,8 @@ module.exports = {
         pipSpeed: .1475,
         pitch: 30,
         roll: 100,
-        yaw: 17
+        yaw: 17,
+        crew: 1
       },
       retailCost: 1045950,
       bulkheads: [ {
@@ -2430,7 +2455,8 @@ module.exports = {
         pipSpeed: .16625,
         pitch: 22,
         roll: 60,
-        yaw: 22
+        yaw: 22,
+        crew: 1
       },
       retailCost: 17472260,
       bulkheads: [ {
@@ -2520,7 +2546,8 @@ module.exports = {
         fighterHangars: true,
         pitch: 20,
         roll: 20,
-        yaw: 8
+        yaw: 8,
+        crew: 3
       },
       retailCost: 76555840,
       bulkheads: [ {
@@ -2609,7 +2636,8 @@ module.exports = {
         pipSpeed: .09375,
         pitch: 35,
         roll: 90,
-        yaw: 15
+        yaw: 15,
+        crew: 1
       },
       retailCost: 142930,
       bulkheads: [ {
@@ -2706,7 +2734,8 @@ module.exports = {
         pipSpeed: .0875,
         pitch: 30,
         roll: 90,
-        yaw: 12
+        yaw: 12,
+        crew: 1
       },
       retailCost: 437930,
       bulkheads: [ {
@@ -2803,7 +2832,8 @@ module.exports = {
         pipSpeed: .02375,
         pitch: 42,
         roll: 110,
-        yaw: 17
+        yaw: 17,
+        crew: 2
       },
       retailCost: 4925620,
       bulkheads: [ {
@@ -2878,7 +2908,7 @@ module.exports = {
       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" ]
       }
     }
   },
@@ -6251,7 +6281,7 @@ module.exports = {
     },
     hardpoints: {
       pl: [ {
-        breachdmg: 2.04,
+        breachdmg: 1.7,
         breachmax: .8,
         breachmin: .4,
         class: 1,
@@ -6553,7 +6583,7 @@ module.exports = {
         thermload: 1.6
       } ],
       ul: [ {
-        breachdmg: 7.05,
+        breachdmg: 1.5,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -6580,7 +6610,7 @@ module.exports = {
         rof: 2,
         thermload: .4
       }, {
-        breachdmg: 5.3,
+        breachdmg: 1,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -6607,9 +6637,9 @@ module.exports = {
         rof: 2.23,
         thermload: .3
       }, {
-        breachdmg: 1.92,
+        breachdmg: .4,
         breachmax: .8,
-        breachmin: .4,
+        breachmin: .6,
         burst: 3,
         burstrof: 19,
         class: 1,
@@ -6664,7 +6694,7 @@ module.exports = {
         rof: 6.6,
         thermload: .3
       }, {
-        breachdmg: 11.1,
+        breachdmg: 3,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -6691,7 +6721,7 @@ module.exports = {
         rof: 1.6,
         thermload: .8
       }, {
-        breachdmg: 8.82,
+        breachdmg: 2.1,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -6718,9 +6748,9 @@ module.exports = {
         rof: 1.78,
         thermload: .7
       }, {
-        breachdmg: 3.51,
+        breachdmg: .9,
         breachmax: .8,
-        breachmin: .4,
+        breachmin: .6,
         burst: 3,
         burstrof: 15,
         class: 2,
@@ -6745,7 +6775,7 @@ module.exports = {
         rof: 1.57,
         thermload: .4
       }, {
-        breachdmg: 10.53,
+        breachdmg: 3.9,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -6772,7 +6802,7 @@ module.exports = {
         rof: 1.2,
         thermload: 1.7
       }, {
-        breachdmg: 14.08,
+        breachdmg: 4.4,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -6799,9 +6829,9 @@ module.exports = {
         rof: 1.4,
         thermload: 1.4
       }, {
-        breachdmg: 5.58,
+        breachdmg: 1.8,
         breachmax: .8,
-        breachmin: .4,
+        breachmin: .6,
         burst: 3,
         burstrof: 11,
         class: 3,
@@ -6826,7 +6856,7 @@ module.exports = {
         rof: 1.272,
         thermload: .8
       }, {
-        breachdmg: 28,
+        breachdmg: 17.5,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -6853,7 +6883,7 @@ module.exports = {
         rof: .8,
         thermload: 4.5
       }, {
-        breachdmg: 21.63,
+        breachdmg: 10.3,
         breachmax: .8,
         breachmin: .4,
         burst: 3,
@@ -8680,8 +8710,10 @@ module.exports = {
         class: 1,
         cost: 6800,
         damage: 2,
-        damagedist: {},
+        damagedist: {
-        distdraw: 1.35,
+          T: 1
+        },
+        distdraw: 1.5,
         edID: 128049525,
         eddbID: 888,
         falloff: 300,
@@ -8722,14 +8754,16 @@ module.exports = {
         rating: "D",
         thermload: 6
       }, {
-        breachdmg: 1.2,
+        breachdmg: .6,
         breachmax: .2,
         breachmin: .1,
         class: 2,
         cost: 22580,
-        damage: 8,
+        damage: 4,
-        damagedist: {},
+        damagedist: {
-        distdraw: 1.75,
+          T: 1
+        },
+        distdraw: 3,
         edID: 128049526,
         eddbID: 889,
         falloff: 300,
@@ -9624,7 +9658,7 @@ module.exports = {
         mass: 2.5,
         maxmass: 138,
         maxmul: 1.4,
-        minmass: 23,
+        minmass: 28,
         minmul: .4,
         optmass: 55,
         optmul: .9,
@@ -9652,7 +9686,7 @@ module.exports = {
         optmul: .9,
         power: 1.8,
         rating: "C",
-        regen: 2.2,
+        regen: 1.8,
         thermres: -.2
       }, {
         brokenregen: 3.8,
@@ -13844,7 +13878,7 @@ module.exports = {
         optmul: 1.1,
         power: 3.72,
         rating: "B",
-        regen: 3.1,
+        regen: 1.3,
         thermres: -.2
       }, {
         brokenregen: 5.3,
@@ -15190,8 +15224,8 @@ module.exports = {
               integrity: [ -.06, 0 ],
               optmass: [ -.04, 0 ],
               optmul: [ .04, .1 ],
-              power: [ -.04, 0 ],
+              power: [ .04, 0 ],
-              thermload: [ -.2, 0 ]
+              thermload: [ .2, 0 ]
             }
           },
           "2": {
@@ -15203,8 +15237,8 @@ module.exports = {
               integrity: [ -.12, .01 ],
               optmass: [ -.06, -.01 ],
               optmul: [ .1, .14 ],
-              power: [ -.08, .02 ],
+              power: [ .08, .02 ],
-              thermload: [ -.39, .1 ]
+              thermload: [ .39, .1 ]
             }
           },
           "3": {
@@ -15217,8 +15251,8 @@ module.exports = {
               integrity: [ -.18, .04 ],
               optmass: [ -.1, -.02 ],
               optmul: [ .14, .2 ],
-              power: [ -.11, .03 ],
+              power: [ .11, .03 ],
-              thermload: [ -.61, .2 ]
+              thermload: [ .61, .2 ]
             }
           },
           "4": {
@@ -15231,8 +15265,8 @@ module.exports = {
               integrity: [ -.24, .05 ],
               optmass: [ -.12, -.04 ],
               optmul: [ .2, .25 ],
-              power: [ -.15, .05 ],
+              power: [ .15, .05 ],
-              thermload: [ -.79, .29 ]
+              thermload: [ .79, .29 ]
             }
           },
           "5": {
@@ -15245,8 +15279,8 @@ module.exports = {
               integrity: [ -.31, .08 ],
               optmass: [ -.16, -.05 ],
               optmul: [ .25, .29 ],
-              power: [ -.2, .08 ],
+              power: [ .2, .08 ],
-              thermload: [ -1, .39 ]
+              thermload: [ 1, .39 ]
             }
           }
         },
@@ -19003,8 +19037,7 @@ module.exports = {
             features: {
               fallofffromrange: [ 1, 1 ],
               mass: [ .1, 0 ],
-              range: [ .1, .2 ],
+              range: [ .1, .2 ]
-              shotspeed: [ .1, .19 ]
             }
           },
           "2": {
@@ -19016,8 +19049,7 @@ module.exports = {
               fallofffromrange: [ 1, 1 ],
               mass: [ .2, .04 ],
               power: [ .04, 0 ],
-              range: [ .2, .4 ],
+              range: [ .2, .4 ]
-              shotspeed: [ .19, .39 ]
             }
           },
           "3": {
@@ -19030,8 +19062,7 @@ module.exports = {
               fallofffromrange: [ 1, 1 ],
               mass: [ .29, .1 ],
               power: [ .1, .04 ],
-              range: [ .31, .61 ],
+              range: [ .31, .61 ]
-              shotspeed: [ .29, .59 ]
             }
           },
           "4": {
@@ -19044,8 +19075,7 @@ module.exports = {
               fallofffromrange: [ 1, 1 ],
               mass: [ .39, .14 ],
               power: [ .14, .1 ],
-              range: [ .4, .81 ],
+              range: [ .4, .81 ]
-              shotspeed: [ .39, .79 ]
             }
           },
           "5": {
@@ -19058,8 +19088,7 @@ module.exports = {
               fallofffromrange: [ 1, 1 ],
               mass: [ .5, .2 ],
               power: [ .2, .14 ],
-              range: [ .5, 1 ],
+              range: [ .5, 1 ]
-              shotspeed: [ .5, 1 ]
             }
           }
         },
@@ -19345,25 +19374,29 @@ module.exports = {
         id: 0,
         name: "ammo",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       boot: {
         id: 1,
         name: "boot",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       brokenregen: {
         id: 2,
         name: "brokenregen",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       burst: {
         id: 3,
         name: "burst",
         type: "numeric",
-        method: "overwrite"
+        method: "overwrite",
+        higherbetter: true
       },
       burstrof: {
         id: 41,
@@ -19375,13 +19408,15 @@ module.exports = {
         id: 4,
         name: "clip",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       damage: {
         id: 5,
         name: "damage",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       damagedist: {
         id: 40,
@@ -19394,49 +19429,57 @@ module.exports = {
         id: 6,
         name: "distdraw",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       duration: {
         id: 7,
         name: "duration",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       eff: {
         id: 8,
         name: "eff",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       engcap: {
         id: 9,
         name: "engcap",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       engrate: {
         id: 10,
         name: "engrate",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       explres: {
         id: 11,
         name: "explres",
         type: "percentage",
-        method: "additive"
+        method: "additive",
+        higherbetter: true
       },
       facinglimit: {
         id: 12,
         name: "facinglimit",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       falloff: {
         id: 45,
         name: "falloff",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       fallofffromrange: {
         id: 42,
@@ -19449,175 +19492,204 @@ module.exports = {
         id: 13,
         name: "hullboost",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       hullreinforcement: {
         id: 14,
         name: "hullreinforcement",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       integrity: {
         id: 15,
         name: "integrity",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       jitter: {
         id: 16,
         name: "jitter",
         type: "numeric",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       kinres: {
         id: 17,
         name: "kinres",
         type: "percentage",
-        method: "additive"
+        method: "additive",
+        higherbetter: true
       },
       mass: {
         id: 18,
         name: "mass",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       maxfuel: {
         id: 19,
         name: "maxfuel",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       optmass: {
         id: 20,
         name: "optmass",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       optmul: {
         id: 21,
         name: "optmul",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       pgen: {
         id: 22,
         name: "pgen",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       piercing: {
         id: 23,
         name: "piercing",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       power: {
         id: 24,
         name: "power",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       protection: {
         id: 44,
         name: "protection",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       range: {
         id: 25,
         name: "range",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       ranget: {
         id: 26,
         name: "ranget",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       regen: {
         id: 27,
         name: "regen",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       reload: {
         id: 28,
         name: "reload",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       rof: {
         id: 29,
         name: "rof",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       shield: {
         id: 30,
         name: "shield",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       shieldboost: {
         id: 31,
         name: "shieldboost",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       shotspeed: {
         id: 43,
         name: "shotspeed",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       spinup: {
         id: 32,
         name: "spinup",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       syscap: {
         id: 33,
         name: "syscap",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       sysrate: {
         id: 34,
         name: "sysrate",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       thermload: {
         id: 35,
         name: "thermload",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: false
       },
       thermres: {
         id: 36,
         name: "thermres",
         type: "percentage",
-        method: "additive"
+        method: "additive",
+        higherbetter: true
       },
       wepcap: {
         id: 37,
         name: "wepcap",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       weprate: {
         id: 38,
         name: "weprate",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       },
       shieldreinforcement: {
         id: 39,
         name: "shieldreinforcement",
         type: "percentage",
-        method: "multiplicative"
+        method: "multiplicative",
+        higherbetter: true
       }
     },
     modifierActions: {
@@ -20021,7 +20093,7 @@ module.exports = {
           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" ],
+        modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
         specials: [ "special_auto_loader", "special_dispersal_field", "special_smart_rounds", "special_force_shell", "special_high_yield_shell", "special_thermal_cascade" ]
       },
       cc: {
@@ -20076,7 +20148,7 @@ module.exports = {
           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" ],
+        modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
         specials: [ "special_corrosive_shell", "special_blinding_shell", "special_incendiary_rounds", "special_drag_munitions", "special_screening_shell" ]
       },
       fh: {
@@ -20170,7 +20242,7 @@ module.exports = {
           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" ],
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
         specials: [ "special_auto_loader", "special_corrosive_shell", "special_emissive_munitions", "special_incendiary_rounds", "special_smart_rounds", "special_thermalshock" ]
       },
       ml: {
@@ -20212,7 +20284,7 @@ module.exports = {
           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" ],
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
         specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_target_lock_breaker", "special_thermal_conduit" ]
       },
       pas: {
@@ -20338,7 +20410,7 @@ module.exports = {
           ShieldCellBank_Rapid: [ 1, 2, 3 ],
           ShieldCellBank_Specialised: [ 1, 2, 3 ]
         },
-        modifications: [ "boot", "duration", "integrity", "power", "shieldreinforcement", "spinup", "thermload" ]
+        modifications: [ "boot", "duration", "integrity", "mass", "power", "shieldreinforcement", "spinup", "thermload" ]
       },
       sg: {
         blueprints: {
@@ -20381,9 +20453,9 @@ module.exports = {
       },
       ws: {
         blueprints: {
-          WakeScanner_LightWeight: [ 1, 2, 3, 4, 5 ],
+          WakeScanner_LightWeight: [ 1, 2, 3 ],
-          WakeScanner_Reinforced: [ 1, 2, 3, 4, 5 ],
+          WakeScanner_Reinforced: [ 1, 2, 3 ],
-          WakeScanner_Shielded: [ 1, 2, 3, 4, 5 ]
+          WakeScanner_Shielded: [ 1, 2, 3 ]
         },
         modifications: [ "boot", "integrity", "mass", "power" ]
       }

dist/index.json

@@ -19,7 +19,8 @@
 				"pipSpeed": 0.13625,
 				"pitch": 38,
 				"roll": 100,
-				"yaw": 14
+				"yaw": 14,
+				"crew": 2
 			},
 			"retailCost": 87810,
 			"bulkheads": [
@@ -155,7 +156,8 @@
 				"fighterHangars": true,
 				"pitch": 25,
 				"roll": 60,
-				"yaw": 10
+				"yaw": 10,
+				"crew": 3
 			},
 			"retailCost": 146969450,
 			"bulkheads": [
@@ -334,7 +336,8 @@
 				"pipSpeed": 0.13,
 				"pitch": 38,
 				"roll": 100,
-				"yaw": 10
+				"yaw": 10,
+				"crew": 2
 			},
 			"retailCost": 6661150,
 			"bulkheads": [
@@ -483,7 +486,8 @@
 				"pipSpeed": 0.125,
 				"pitch": 40,
 				"roll": 110,
-				"yaw": 15
+				"yaw": 15,
+				"crew": 2
 			},
 			"retailCost": 3961150,
 			"bulkheads": [
@@ -622,7 +626,8 @@
 				"fighterHangars": true,
 				"pitch": 25,
 				"roll": 60,
-				"yaw": 17
+				"yaw": 17,
+				"crew": 3
 			},
 			"retailCost": 84532770,
 			"bulkheads": [
@@ -825,7 +830,8 @@
 				"pipSpeed": 0.125,
 				"pitch": 40,
 				"roll": 100,
-				"yaw": 10
+				"yaw": 10,
+				"crew": 2
 			},
 			"retailCost": 349720,
 			"bulkheads": [
@@ -964,7 +970,8 @@
 				"pipSpeed": 0.125,
 				"pitch": 30,
 				"roll": 90,
-				"yaw": 10
+				"yaw": 10,
+				"crew": 2
 			},
 			"retailCost": 747660,
 			"bulkheads": [
@@ -1109,7 +1116,8 @@
 				"pipSpeed": 0.09625,
 				"pitch": 35,
 				"roll": 90,
-				"yaw": 13
+				"yaw": 13,
+				"crew": 1
 			},
 			"retailCost": 1894760,
 			"bulkheads": [
@@ -1248,7 +1256,8 @@
 				"pipSpeed": 0.09875,
 				"pitch": 42,
 				"roll": 100,
-				"yaw": 15
+				"yaw": 15,
+				"crew": 1
 			},
 			"retailCost": 564330,
 			"bulkheads": [
@@ -1387,7 +1396,8 @@
 				"pipSpeed": 0.0625,
 				"pitch": 50,
 				"roll": 120,
-				"yaw": 18
+				"yaw": 18,
+				"crew": 1
 			},
 			"retailCost": 44800,
 			"bulkheads": [
@@ -1528,7 +1538,8 @@
 				"pipSpeed": 0.11125,
 				"pitch": 38,
 				"roll": 90,
-				"yaw": 19
+				"yaw": 19,
+				"crew": 2
 			},
 			"retailCost": 19814210,
 			"bulkheads": [
@@ -1692,7 +1703,8 @@
 				"fighterHangars": true,
 				"pitch": 28,
 				"roll": 75,
-				"yaw": 8
+				"yaw": 8,
+				"crew": 3
 			},
 			"retailCost": 187969450,
 			"bulkheads": [
@@ -1877,7 +1889,8 @@
 				"pipSpeed": 0.0725,
 				"pitch": 30,
 				"roll": 80,
-				"yaw": 14
+				"yaw": 14,
+				"crew": 2
 			},
 			"retailCost": 14314210,
 			"bulkheads": [
@@ -2045,7 +2058,8 @@
 				"fighterHangars": true,
 				"pitch": 25,
 				"roll": 80,
-				"yaw": 18
+				"yaw": 18,
+				"crew": 2
 			},
 			"retailCost": 35814210,
 			"bulkheads": [
@@ -2222,7 +2236,8 @@
 				"pipSpeed": 0.03875,
 				"pitch": 38,
 				"roll": 90,
-				"yaw": 12
+				"yaw": 12,
+				"crew": 2
 			},
 			"retailCost": 51567040,
 			"bulkheads": [
@@ -2369,7 +2384,8 @@
 				"pipSpeed": 0.1625,
 				"pitch": 36,
 				"roll": 100,
-				"yaw": 14
+				"yaw": 14,
+				"crew": 1
 			},
 			"retailCost": 52720,
 			"bulkheads": [
@@ -2498,7 +2514,8 @@
 				"pipSpeed": 0.1,
 				"pitch": 40,
 				"roll": 80,
-				"yaw": 18
+				"yaw": 18,
+				"crew": 2
 			},
 			"retailCost": 22296860,
 			"bulkheads": [
@@ -2645,7 +2662,8 @@
 				"pipSpeed": 0.05375,
 				"pitch": 38,
 				"roll": 90,
-				"yaw": 16
+				"yaw": 16,
+				"crew": 1
 			},
 			"retailCost": 2542930,
 			"bulkheads": [
@@ -2787,7 +2805,8 @@
 				"fighterHangars": true,
 				"pitch": 18,
 				"roll": 45,
-				"yaw": 8
+				"yaw": 8,
+				"crew": 3
 			},
 			"retailCost": 208969450,
 			"bulkheads": [
@@ -2970,7 +2989,8 @@
 				"pipSpeed": 0.075,
 				"pitch": 40,
 				"roll": 100,
-				"yaw": 15
+				"yaw": 15,
+				"crew": 1
 			},
 			"retailCost": 110830,
 			"bulkheads": [
@@ -3112,7 +3132,8 @@
 				"fighterHangars": true,
 				"pitch": 27,
 				"roll": 100,
-				"yaw": 15
+				"yaw": 15,
+				"crew": 1
 			},
 			"retailCost": 3126150,
 			"bulkheads": [
@@ -3254,7 +3275,8 @@
 				"luxuryCabins": true,
 				"pitch": 25,
 				"roll": 55,
-				"yaw": 18
+				"yaw": 18,
+				"crew": 2
 			},
 			"retailCost": 48539900,
 			"bulkheads": [
@@ -3421,7 +3443,8 @@
 				"pipSpeed": 0.0975,
 				"pitch": 29,
 				"roll": 90,
-				"yaw": 10
+				"yaw": 10,
+				"crew": 2
 			},
 			"retailCost": 56978180,
 			"bulkheads": [
@@ -3572,7 +3595,8 @@
 				"pipSpeed": 0.1375,
 				"pitch": 42,
 				"roll": 110,
-				"yaw": 16
+				"yaw": 16,
+				"crew": 1
 			},
 			"retailCost": 32000,
 			"bulkheads": [
@@ -3703,7 +3727,8 @@
 				"pipSpeed": 0.1475,
 				"pitch": 30,
 				"roll": 100,
-				"yaw": 17
+				"yaw": 17,
+				"crew": 1
 			},
 			"retailCost": 1045950,
 			"bulkheads": [
@@ -3842,7 +3867,8 @@
 				"pipSpeed": 0.16625,
 				"pitch": 22,
 				"roll": 60,
-				"yaw": 22
+				"yaw": 22,
+				"crew": 1
 			},
 			"retailCost": 17472260,
 			"bulkheads": [
@@ -3990,7 +4016,8 @@
 				"fighterHangars": true,
 				"pitch": 20,
 				"roll": 20,
-				"yaw": 8
+				"yaw": 8,
+				"crew": 3
 			},
 			"retailCost": 76555840,
 			"bulkheads": [
@@ -4141,7 +4168,8 @@
 				"pipSpeed": 0.09375,
 				"pitch": 35,
 				"roll": 90,
-				"yaw": 15
+				"yaw": 15,
+				"crew": 1
 			},
 			"retailCost": 142930,
 			"bulkheads": [
@@ -4286,7 +4314,8 @@
 				"pipSpeed": 0.0875,
 				"pitch": 30,
 				"roll": 90,
-				"yaw": 12
+				"yaw": 12,
+				"crew": 1
 			},
 			"retailCost": 437930,
 			"bulkheads": [
@@ -4435,7 +4464,8 @@
 				"pipSpeed": 0.02375,
 				"pitch": 42,
 				"roll": 110,
-				"yaw": 17
+				"yaw": 17,
+				"crew": 2
 			},
 			"retailCost": 4925620,
 			"bulkheads": [
@@ -4556,9 +4586,9 @@
 				"internal": [
 					"4e",
 					0,
-					0,
 					"02",
 					0,
+					0,
 					"2h"
 				]
 			}
@@ -8178,7 +8208,7 @@
 		"hardpoints": {
 			"pl": [
 				{
-					"breachdmg": 2.04,
+					"breachdmg": 1.7,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"class": 1,
@@ -8493,7 +8523,7 @@
 			],
 			"ul": [
 				{
-					"breachdmg": 7.05,
+					"breachdmg": 1.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -8521,7 +8551,7 @@
 					"thermload": 0.4
 				},
 				{
-					"breachdmg": 5.3,
+					"breachdmg": 1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -8549,9 +8579,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,
@@ -8608,7 +8638,7 @@
 					"thermload": 0.3
 				},
 				{
-					"breachdmg": 11.1,
+					"breachdmg": 3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -8636,7 +8666,7 @@
 					"thermload": 0.8
 				},
 				{
-					"breachdmg": 8.82,
+					"breachdmg": 2.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -8664,9 +8694,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,
@@ -8692,7 +8722,7 @@
 					"thermload": 0.4
 				},
 				{
-					"breachdmg": 10.53,
+					"breachdmg": 3.9,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -8720,7 +8750,7 @@
 					"thermload": 1.7
 				},
 				{
-					"breachdmg": 14.08,
+					"breachdmg": 4.4,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -8748,9 +8778,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,
@@ -8776,7 +8806,7 @@
 					"thermload": 0.8
 				},
 				{
-					"breachdmg": 28,
+					"breachdmg": 17.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -8804,7 +8834,7 @@
 					"thermload": 4.5
 				},
 				{
-					"breachdmg": 21.63,
+					"breachdmg": 10.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
 					"burst": 3,
@@ -10704,8 +10734,10 @@
 					"class": 1,
 					"cost": 6800,
 					"damage": 2,
-					"damagedist": {},
+					"damagedist": {
-					"distdraw": 1.35,
+						"T": 1
+					},
+					"distdraw": 1.5,
 					"edID": 128049525,
 					"eddbID": 888,
 					"falloff": 300,
@@ -10748,14 +10780,16 @@
 					"thermload": 6
 				},
 				{
-					"breachdmg": 1.2,
+					"breachdmg": 0.6,
 					"breachmax": 0.2,
 					"breachmin": 0.1,
 					"class": 2,
 					"cost": 22580,
-					"damage": 8,
+					"damage": 4,
-					"damagedist": {},
+					"damagedist": {
-					"distdraw": 1.75,
+						"T": 1
+					},
+					"distdraw": 3,
 					"edID": 128049526,
 					"eddbID": 889,
 					"falloff": 300,
@@ -11726,7 +11760,7 @@
 					"mass": 2.5,
 					"maxmass": 138,
 					"maxmul": 1.4,
-					"minmass": 23,
+					"minmass": 28,
 					"minmul": 0.4,
 					"optmass": 55,
 					"optmul": 0.9,
@@ -11755,7 +11789,7 @@
 					"optmul": 0.9,
 					"power": 1.8,
 					"rating": "C",
-					"regen": 2.2,
+					"regen": 1.8,
 					"thermres": -0.2
 				},
 				{
@@ -16273,7 +16307,7 @@
 					"optmul": 1.1,
 					"power": 3.72,
 					"rating": "B",
-					"regen": 3.1,
+					"regen": 1.3,
 					"thermres": -0.2
 				},
 				{
@@ -18319,11 +18353,11 @@
 								0.1
 							],
 							"power": [
-								-0.04,
+								0.04,
 								0
 							],
 							"thermload": [
-								-0.2,
+								0.2,
 								0
 							]
 						}
@@ -18347,11 +18381,11 @@
 								0.14
 							],
 							"power": [
-								-0.08,
+								0.08,
 								0.02
 							],
 							"thermload": [
-								-0.39,
+								0.39,
 								0.1
 							]
 						}
@@ -18376,11 +18410,11 @@
 								0.2
 							],
 							"power": [
-								-0.11,
+								0.11,
 								0.03
 							],
 							"thermload": [
-								-0.61,
+								0.61,
 								0.2
 							]
 						}
@@ -18405,11 +18439,11 @@
 								0.25
 							],
 							"power": [
-								-0.15,
+								0.15,
 								0.05
 							],
 							"thermload": [
-								-0.79,
+								0.79,
 								0.29
 							]
 						}
@@ -18434,11 +18468,11 @@
 								0.29
 							],
 							"power": [
-								-0.2,
+								0.2,
 								0.08
 							],
 							"thermload": [
-								-1,
+								1,
 								0.39
 							]
 						}
@@ -24969,10 +25003,6 @@
 							"range": [
 								0.1,
 								0.2
-							],
-							"shotspeed": [
-								0.1,
-								0.19
 							]
 						}
 					},
@@ -24997,10 +25027,6 @@
 							"range": [
 								0.2,
 								0.4
-							],
-							"shotspeed": [
-								0.19,
-								0.39
 							]
 						}
 					},
@@ -25026,10 +25052,6 @@
 							"range": [
 								0.31,
 								0.61
-							],
-							"shotspeed": [
-								0.29,
-								0.59
 							]
 						}
 					},
@@ -25055,10 +25077,6 @@
 							"range": [
 								0.4,
 								0.81
-							],
-							"shotspeed": [
-								0.39,
-								0.79
 							]
 						}
 					},
@@ -25084,10 +25102,6 @@
 							"range": [
 								0.5,
 								1
-							],
-							"shotspeed": [
-								0.5,
-								1
 							]
 						}
 					}
@@ -25617,25 +25631,29 @@
 				"id": 0,
 				"name": "ammo",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"boot": {
 				"id": 1,
 				"name": "boot",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"brokenregen": {
 				"id": 2,
 				"name": "brokenregen",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"burst": {
 				"id": 3,
 				"name": "burst",
 				"type": "numeric",
-				"method": "overwrite"
+				"method": "overwrite",
+				"higherbetter": true
 			},
 			"burstrof": {
 				"id": 41,
@@ -25647,13 +25665,15 @@
 				"id": 4,
 				"name": "clip",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"damage": {
 				"id": 5,
 				"name": "damage",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"damagedist": {
 				"id": 40,
@@ -25666,49 +25686,57 @@
 				"id": 6,
 				"name": "distdraw",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"duration": {
 				"id": 7,
 				"name": "duration",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"eff": {
 				"id": 8,
 				"name": "eff",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"engcap": {
 				"id": 9,
 				"name": "engcap",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"engrate": {
 				"id": 10,
 				"name": "engrate",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"explres": {
 				"id": 11,
 				"name": "explres",
 				"type": "percentage",
-				"method": "additive"
+				"method": "additive",
+				"higherbetter": true
 			},
 			"facinglimit": {
 				"id": 12,
 				"name": "facinglimit",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"falloff": {
 				"id": 45,
 				"name": "falloff",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"fallofffromrange": {
 				"id": 42,
@@ -25721,175 +25749,204 @@
 				"id": 13,
 				"name": "hullboost",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"hullreinforcement": {
 				"id": 14,
 				"name": "hullreinforcement",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"integrity": {
 				"id": 15,
 				"name": "integrity",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"jitter": {
 				"id": 16,
 				"name": "jitter",
 				"type": "numeric",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"kinres": {
 				"id": 17,
 				"name": "kinres",
 				"type": "percentage",
-				"method": "additive"
+				"method": "additive",
+				"higherbetter": true
 			},
 			"mass": {
 				"id": 18,
 				"name": "mass",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"maxfuel": {
 				"id": 19,
 				"name": "maxfuel",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"optmass": {
 				"id": 20,
 				"name": "optmass",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"optmul": {
 				"id": 21,
 				"name": "optmul",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"pgen": {
 				"id": 22,
 				"name": "pgen",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"piercing": {
 				"id": 23,
 				"name": "piercing",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"power": {
 				"id": 24,
 				"name": "power",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"protection": {
 				"id": 44,
 				"name": "protection",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"range": {
 				"id": 25,
 				"name": "range",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"ranget": {
 				"id": 26,
 				"name": "ranget",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"regen": {
 				"id": 27,
 				"name": "regen",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"reload": {
 				"id": 28,
 				"name": "reload",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"rof": {
 				"id": 29,
 				"name": "rof",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"shield": {
 				"id": 30,
 				"name": "shield",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"shieldboost": {
 				"id": 31,
 				"name": "shieldboost",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"shotspeed": {
 				"id": 43,
 				"name": "shotspeed",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"spinup": {
 				"id": 32,
 				"name": "spinup",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"syscap": {
 				"id": 33,
 				"name": "syscap",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"sysrate": {
 				"id": 34,
 				"name": "sysrate",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"thermload": {
 				"id": 35,
 				"name": "thermload",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": false
 			},
 			"thermres": {
 				"id": 36,
 				"name": "thermres",
 				"type": "percentage",
-				"method": "additive"
+				"method": "additive",
+				"higherbetter": true
 			},
 			"wepcap": {
 				"id": 37,
 				"name": "wepcap",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"weprate": {
 				"id": 38,
 				"name": "weprate",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			},
 			"shieldreinforcement": {
 				"id": 39,
 				"name": "shieldreinforcement",
 				"type": "percentage",
-				"method": "multiplicative"
+				"method": "multiplicative",
+				"higherbetter": true
 			}
 		},
 		"modifierActions": {
@@ -26492,7 +26549,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -26714,7 +26770,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -27079,7 +27134,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -27284,7 +27338,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -27742,6 +27795,7 @@
 					"boot",
 					"duration",
 					"integrity",
+					"mass",
 					"power",
 					"shieldreinforcement",
 					"spinup",
@@ -27953,23 +28007,17 @@
 					"WakeScanner_LightWeight": [
 						1,
 						2,
-						3,
+						3
-						4,
-						5
 					],
 					"WakeScanner_Reinforced": [
 						1,
 						2,
-						3,
+						3
-						4,
-						5
 					],
 					"WakeScanner_Shielded": [
 						1,
 						2,
-						3,
+						3
-						4,
-						5
 					]
 				},
 				"modifications": [

modifications/blueprints.json

@@ -1096,8 +1096,8 @@
           "integrity": [ -0.06, 0 ],
           "optmass": [ -0.04, 0 ],
           "optmul": [ 0.04, 0.1 ],
-          "power": [ -0.04, 0 ],
+          "power": [ 0.04, 0 ],
-          "thermload": [ -0.2, 0 ]
+          "thermload": [ 0.2, 0 ]
         }
       },
       "2": {
@@ -1109,8 +1109,8 @@
           "integrity": [ -0.12, 0.01 ],
           "optmass": [ -0.06, -0.01 ],
           "optmul": [ 0.1, 0.14 ],
-          "power": [ -0.08, 0.02 ],
+          "power": [ 0.08, 0.02 ],
-          "thermload": [ -0.39, 0.1 ]
+          "thermload": [ 0.39, 0.1 ]
         }
       },
       "3": {
@@ -1123,8 +1123,8 @@
           "integrity": [ -0.18, 0.04 ],
           "optmass": [ -0.1, -0.02 ],
           "optmul": [ 0.14, 0.2 ],
-          "power": [ -0.11, 0.03 ],
+          "power": [ 0.11, 0.03 ],
-          "thermload": [ -0.61, 0.2 ]
+          "thermload": [ 0.61, 0.2 ]
         }
       },
       "4": {
@@ -1137,8 +1137,8 @@
           "integrity": [ -0.24, 0.05 ],
           "optmass": [ -0.12, -0.04 ],
           "optmul": [ 0.2, 0.25 ],
-          "power": [ -0.15, 0.05 ],
+          "power": [ 0.15, 0.05 ],
-          "thermload": [ -0.79, 0.29 ]
+          "thermload": [ 0.79, 0.29 ]
         }
       },
       "5": {
@@ -1151,8 +1151,8 @@
           "integrity": [ -0.31, 0.08 ],
           "optmass": [ -0.16, -0.05 ],
           "optmul": [ 0.25, 0.29 ],
-          "power": [ -0.2, 0.08 ],
+          "power": [ 0.2, 0.08 ],
-          "thermload": [ -1, 0.39 ]
+          "thermload": [ 1, 0.39 ]
         }
       }
     },
@@ -4909,8 +4909,7 @@
         "features": {
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.1, 0 ],
-          "range": [ 0.1, 0.2 ],
+          "range": [ 0.1, 0.2 ]
-          "shotspeed": [ 0.1, 0.19 ]
         }
       },
       "2": {
@@ -4922,8 +4921,7 @@
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.2, 0.04 ],
           "power": [ 0.04, 0 ],
-          "range": [ 0.2, 0.4 ],
+          "range": [ 0.2, 0.4 ]
-          "shotspeed": [ 0.19, 0.39 ]
         }
       },
       "3": {
@@ -4936,8 +4934,7 @@
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.29, 0.1 ],
           "power": [ 0.1, 0.04 ],
-          "range": [ 0.31, 0.61 ],
+          "range": [ 0.31, 0.61 ]
-          "shotspeed": [ 0.29, 0.59 ]
         }
       },
       "4": {
@@ -4950,8 +4947,7 @@
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.39, 0.14 ],
           "power": [ 0.14, 0.1 ],
-          "range": [ 0.4, 0.81 ],
+          "range": [ 0.4, 0.81 ]
-          "shotspeed": [ 0.39, 0.79 ]
         }
       },
       "5": {
@@ -4964,8 +4960,7 @@
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.5, 0.2 ],
           "power": [ 0.2, 0.14 ],
-          "range": [ 0.5, 1 ],
+          "range": [ 0.5, 1 ]
-          "shotspeed": [ 0.5, 1 ]
         }
       }
     },

modifications/modifications.json

@@ -1,48 +1,48 @@
 {
-    "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative"},
+    "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative"},
+    "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative"},
+    "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite"},
+    "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"},
+    "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
+    "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"},
+    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
+    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
+    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative"},
+    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
+    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
+    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
-    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
+    "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative"},
+    "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"},
+    "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
+    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative"},
+    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative"},
+    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative", "higherbetter": true},
-    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive"},
+    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive", "higherbetter": true},
-    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative"},
+    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative"},
+    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative"},
+    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative"},
+    "optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
+    "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
+    "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
+    "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative"},
+    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
+    "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
+    "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},
+    "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative"},
+    "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"},
+    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"},
+    "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"},
+    "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative"},
+    "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"},
+    "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"},
+    "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"},
+    "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative"},
+    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive"},
+    "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
-    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative"},
+    "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative"},
+    "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"}
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true}
 }

modifications/modules.json

@@ -103,7 +103,6 @@
       "range",
       "reload",
       "rof",
-      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -207,7 +206,6 @@
       "range",
       "reload",
       "rof",
-      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -377,7 +375,6 @@
       "range",
       "reload",
       "rof",
-      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -490,7 +487,6 @@
       "range",
       "reload",
       "rof",
-      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -735,6 +731,7 @@
       "boot",
       "duration",
       "integrity",
+      "mass",
       "power",
       "shieldreinforcement",
       "spinup",
@@ -841,9 +838,9 @@
   },
   "ws": {
     "blueprints": {
-      "WakeScanner_LightWeight": [1, 2, 3, 4, 5],
+      "WakeScanner_LightWeight": [1, 2, 3],
-      "WakeScanner_Reinforced": [1, 2, 3, 4, 5],
+      "WakeScanner_Reinforced": [1, 2, 3],
-      "WakeScanner_Shielded": [1, 2, 3, 4, 5]
+      "WakeScanner_Shielded": [1, 2, 3]
     },
     "modifications": [
       "boot",

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": {},
+      "damagedist": {
-      "distdraw": 1.35,
+        "T": 1
+      },
+      "distdraw": 1.5,
       "edID": 128049525,
       "eddbID": 888,
       "falloff": 300,
@@ -51,14 +53,16 @@
       "thermload": 6
     },
     {
-      "breachdmg": 1.2,
+      "breachdmg": 0.6,
       "breachmax": 0.2,
       "breachmin": 0.1,
       "class": 2,
       "cost": 22580,
-      "damage": 8,
+      "damage": 4,
-      "damagedist": {},
+      "damagedist": {
-      "distdraw": 1.75,
+        "T": 1
+      },
+      "distdraw": 3,
       "edID": 128049526,
       "eddbID": 889,
       "falloff": 300,

modules/hardpoints/pulse_laser.json

@@ -1,7 +1,7 @@
 {
   "pl": [
     {
-      "breachdmg": 2.04,
+      "breachdmg": 1.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,

modules/internal/bi_weave_shield_generator.json

@@ -37,7 +37,7 @@
       "mass": 2.5,
       "maxmass": 138,
       "maxmul": 1.4,
-      "minmass": 23,
+      "minmass": 28,
       "minmul": 0.4,
       "optmass": 55,
       "optmul": 0.9,
@@ -66,7 +66,7 @@
       "optmul": 0.9,
       "power": 1.8,
       "rating": "C",
-      "regen": 2.2,
+      "regen": 1.8,
       "thermres": -0.2
     },
     {

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.14",
+  "version": "2.2.19",
   "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

@@ -19,7 +19,8 @@
       "fighterHangars": true,
       "pitch": 27,
       "roll": 100,
-      "yaw": 15
+      "yaw": 15,
+      "crew": 1
     },
     "retailCost": 3126150,
     "bulkheads": [

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

@@ -18,7 +18,8 @@
       "pipSpeed": 0.1375,
       "pitch": 42,
       "roll": 110,
-      "yaw": 16
+      "yaw": 16,
+      "crew": 1
     },
     "retailCost": 32000,
     "bulkheads": [

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 = {};
@@ -203,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() {