Merge branch 'feature/multicrew' into develop

This commit is contained in:
Cmdr McDonald
2017-02-18 09:49:44 +00:00
34 changed files with 183 additions and 91 deletions

View File

@@ -2,6 +2,7 @@
* 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

90
dist/index.js vendored
View File

@@ -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: [ {

90
dist/index.json vendored
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -18,7 +18,8 @@
"pipSpeed": 0.125,
"pitch": 40,
"roll": 100,
"yaw": 10
"yaw": 10,
"crew": 2
},
"retailCost": 349720,
"bulkheads": [

View File

@@ -18,7 +18,8 @@
"pipSpeed": 0.125,
"pitch": 30,
"roll": 90,
"yaw": 10
"yaw": 10,
"crew": 2
},
"retailCost": 747660,
"bulkheads": [

View File

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

View File

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

View File

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

View File

@@ -17,7 +17,8 @@
"pipSpeed": 0.11125,
"pitch": 38,
"roll": 90,
"yaw": 19
"yaw": 19,
"crew": 2
},
"retailCost": 19814210,
"bulkheads": [

View File

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

View File

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

View File

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

View File

@@ -18,7 +18,8 @@
"pipSpeed": 0.03875,
"pitch": 38,
"roll": 90,
"yaw": 12
"yaw": 12,
"crew": 2
},
"retailCost": 51567040,
"bulkheads": [

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -18,7 +18,8 @@
"pipSpeed": 0.1475,
"pitch": 30,
"roll": 100,
"yaw": 17
"yaw": 17,
"crew": 1
},
"retailCost": 1045950,
"bulkheads": [

View File

@@ -18,7 +18,8 @@
"pipSpeed": 0.16625,
"pitch": 22,
"roll": 60,
"yaw": 22
"yaw": 22,
"crew": 1
},
"retailCost": 17472260,
"bulkheads": [

View File

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

View File

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

View File

@@ -18,7 +18,8 @@
"pipSpeed": 0.0875,
"pitch": 30,
"roll": 90,
"yaw": 12
"yaw": 12,
"crew": 1
},
"retailCost": 437930,
"bulkheads": [

View File

@@ -18,7 +18,8 @@
"pipSpeed": 0.02375,
"pitch": 42,
"roll": 110,
"yaw": 17
"yaw": 17,
"crew": 2
},
"retailCost": 4925620,
"bulkheads": [

View File

@@ -20,7 +20,8 @@ describe('JSON Data', function() {
'pipSpeed',
'pitch',
'roll',
'yaw'
'yaw',
'crew'
];
var edIDs = {};