From 5096a3f740ee054ab19bf46f6169fcefd8676b3b Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 16 Feb 2017 22:32:26 +0000 Subject: [PATCH 1/4] Initial stab at seats --- ChangeLog.md | 1 + dist/index.js | 90 ++++++++++++++++++++++----------- dist/index.json | 90 ++++++++++++++++++++++----------- ships/adder.json | 3 +- ships/anaconda.json | 3 +- ships/asp.json | 3 +- ships/asp_scout.json | 3 +- ships/beluga.json | 3 +- ships/cobra_mk_iii.json | 3 +- ships/cobra_mk_iv.json | 3 +- ships/diamondback_explorer.json | 3 +- ships/diamondback_scout.json | 3 +- ships/eagle.json | 3 +- ships/federal_assault_ship.json | 3 +- ships/federal_corvette.json | 3 +- ships/federal_dropship.json | 3 +- ships/federal_gunship.json | 3 +- ships/fer_de_lance.json | 3 +- ships/hauler.json | 3 +- ships/imperial_clipper.json | 3 +- ships/imperial_courier.json | 3 +- ships/imperial_cutter.json | 3 +- ships/imperial_eagle.json | 3 +- ships/keelback.json | 3 +- ships/orca.json | 3 +- ships/python.json | 3 +- ships/sidewinder.json | 3 +- ships/type_6_transporter.json | 3 +- ships/type_7_transport.json | 3 +- ships/type_9_heavy.json | 3 +- ships/viper.json | 3 +- ships/viper_mk_iv.json | 3 +- ships/vulture.json | 3 +- 33 files changed, 181 insertions(+), 90 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index e0919c9..0957a76 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,6 @@ #2.2.17 * Add mass as potential SCB modification + * Add number of seats for each ship #2.2.16 * Fix incorrect thermal load modifiers for dirty drives diff --git a/dist/index.js b/dist/index.js index ba780e5..3ca8c5c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -19,7 +19,8 @@ module.exports = { pipSpeed: .13625, pitch: 38, roll: 100, - yaw: 14 + yaw: 14, + seats: 2 }, retailCost: 87810, bulkheads: [ { @@ -109,7 +110,8 @@ module.exports = { fighterHangars: true, pitch: 25, roll: 60, - yaw: 10 + yaw: 10, + seats: 3 }, retailCost: 146969450, bulkheads: [ { @@ -206,7 +208,8 @@ module.exports = { pipSpeed: .13, pitch: 38, roll: 100, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 6661150, bulkheads: [ { @@ -295,7 +298,8 @@ module.exports = { pipSpeed: .125, pitch: 40, roll: 110, - yaw: 15 + yaw: 15, + seats: 2 }, retailCost: 3961150, bulkheads: [ { @@ -386,7 +390,8 @@ module.exports = { fighterHangars: true, pitch: 25, roll: 60, - yaw: 17 + yaw: 17, + seats: 3 }, retailCost: 84532770, bulkheads: [ { @@ -519,7 +524,8 @@ module.exports = { pipSpeed: .125, pitch: 40, roll: 100, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 349720, bulkheads: [ { @@ -608,7 +614,8 @@ module.exports = { pipSpeed: .125, pitch: 30, roll: 90, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 747660, bulkheads: [ { @@ -697,7 +704,8 @@ module.exports = { pipSpeed: .09625, pitch: 35, roll: 90, - yaw: 13 + yaw: 13, + seats: 1 }, retailCost: 1894760, bulkheads: [ { @@ -786,7 +794,8 @@ module.exports = { pipSpeed: .09875, pitch: 42, roll: 100, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 564330, bulkheads: [ { @@ -875,7 +884,8 @@ module.exports = { pipSpeed: .0625, pitch: 50, roll: 120, - yaw: 18 + yaw: 18, + seats: 1 }, retailCost: 44800, bulkheads: [ { @@ -972,7 +982,8 @@ module.exports = { pipSpeed: .11125, pitch: 38, roll: 90, - yaw: 19 + yaw: 19, + seats: 2 }, retailCost: 19814210, bulkheads: [ { @@ -1078,7 +1089,8 @@ module.exports = { fighterHangars: true, pitch: 28, roll: 75, - yaw: 8 + yaw: 8, + seats: 3 }, retailCost: 187969450, bulkheads: [ { @@ -1183,7 +1195,8 @@ module.exports = { pipSpeed: .0725, pitch: 30, roll: 80, - yaw: 14 + yaw: 14, + seats: 2 }, retailCost: 14314210, bulkheads: [ { @@ -1289,7 +1302,8 @@ module.exports = { fighterHangars: true, pitch: 25, roll: 80, - yaw: 18 + yaw: 18, + seats: 2 }, retailCost: 35814210, bulkheads: [ { @@ -1402,7 +1416,8 @@ module.exports = { pipSpeed: .03875, pitch: 38, roll: 90, - yaw: 12 + yaw: 12, + seats: 2 }, retailCost: 51567040, bulkheads: [ { @@ -1491,7 +1506,8 @@ module.exports = { pipSpeed: .1625, pitch: 36, roll: 100, - yaw: 14 + yaw: 14, + seats: 1 }, retailCost: 52720, bulkheads: [ { @@ -1580,7 +1596,8 @@ module.exports = { pipSpeed: .1, pitch: 40, roll: 80, - yaw: 18 + yaw: 18, + seats: 2 }, retailCost: 22296860, bulkheads: [ { @@ -1669,7 +1686,8 @@ module.exports = { pipSpeed: .05375, pitch: 38, roll: 90, - yaw: 16 + yaw: 16, + seats: 1 }, retailCost: 2542930, bulkheads: [ { @@ -1759,7 +1777,8 @@ module.exports = { fighterHangars: true, pitch: 18, roll: 45, - yaw: 8 + yaw: 8, + seats: 3 }, retailCost: 208969450, bulkheads: [ { @@ -1864,7 +1883,8 @@ module.exports = { pipSpeed: .075, pitch: 40, roll: 100, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 110830, bulkheads: [ { @@ -1962,7 +1982,8 @@ module.exports = { fighterHangars: true, pitch: 27, roll: 100, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 3126150, bulkheads: [ { @@ -2052,7 +2073,8 @@ module.exports = { luxuryCabins: true, pitch: 25, roll: 55, - yaw: 18 + yaw: 18, + seats: 2 }, retailCost: 48539900, bulkheads: [ { @@ -2163,7 +2185,8 @@ module.exports = { pipSpeed: .0975, pitch: 29, roll: 90, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 56978180, bulkheads: [ { @@ -2252,7 +2275,8 @@ module.exports = { pipSpeed: .1375, pitch: 42, roll: 110, - yaw: 16 + yaw: 16, + seats: 1 }, retailCost: 32e3, bulkheads: [ { @@ -2341,7 +2365,8 @@ module.exports = { pipSpeed: .1475, pitch: 30, roll: 100, - yaw: 17 + yaw: 17, + seats: 1 }, retailCost: 1045950, bulkheads: [ { @@ -2430,7 +2455,8 @@ module.exports = { pipSpeed: .16625, pitch: 22, roll: 60, - yaw: 22 + yaw: 22, + seats: 1 }, retailCost: 17472260, bulkheads: [ { @@ -2520,7 +2546,8 @@ module.exports = { fighterHangars: true, pitch: 20, roll: 20, - yaw: 8 + yaw: 8, + seats: 3 }, retailCost: 76555840, bulkheads: [ { @@ -2609,7 +2636,8 @@ module.exports = { pipSpeed: .09375, pitch: 35, roll: 90, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 142930, bulkheads: [ { @@ -2706,7 +2734,8 @@ module.exports = { pipSpeed: .0875, pitch: 30, roll: 90, - yaw: 12 + yaw: 12, + seats: 1 }, retailCost: 437930, bulkheads: [ { @@ -2803,7 +2832,8 @@ module.exports = { pipSpeed: .02375, pitch: 42, roll: 110, - yaw: 17 + yaw: 17, + seats: 2 }, retailCost: 4925620, bulkheads: [ { diff --git a/dist/index.json b/dist/index.json index 91d097b..62cc04d 100644 --- a/dist/index.json +++ b/dist/index.json @@ -19,7 +19,8 @@ "pipSpeed": 0.13625, "pitch": 38, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 87810, "bulkheads": [ @@ -155,7 +156,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 10 + "yaw": 10, + "seats": 3 }, "retailCost": 146969450, "bulkheads": [ @@ -334,7 +336,8 @@ "pipSpeed": 0.13, "pitch": 38, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 6661150, "bulkheads": [ @@ -483,7 +486,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 110, - "yaw": 15 + "yaw": 15, + "seats": 2 }, "retailCost": 3961150, "bulkheads": [ @@ -622,7 +626,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 17 + "yaw": 17, + "seats": 3 }, "retailCost": 84532770, "bulkheads": [ @@ -825,7 +830,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 349720, "bulkheads": [ @@ -964,7 +970,8 @@ "pipSpeed": 0.125, "pitch": 30, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 747660, "bulkheads": [ @@ -1109,7 +1116,8 @@ "pipSpeed": 0.09625, "pitch": 35, "roll": 90, - "yaw": 13 + "yaw": 13, + "seats": 1 }, "retailCost": 1894760, "bulkheads": [ @@ -1248,7 +1256,8 @@ "pipSpeed": 0.09875, "pitch": 42, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 564330, "bulkheads": [ @@ -1387,7 +1396,8 @@ "pipSpeed": 0.0625, "pitch": 50, "roll": 120, - "yaw": 18 + "yaw": 18, + "seats": 1 }, "retailCost": 44800, "bulkheads": [ @@ -1528,7 +1538,8 @@ "pipSpeed": 0.11125, "pitch": 38, "roll": 90, - "yaw": 19 + "yaw": 19, + "seats": 2 }, "retailCost": 19814210, "bulkheads": [ @@ -1692,7 +1703,8 @@ "fighterHangars": true, "pitch": 28, "roll": 75, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 187969450, "bulkheads": [ @@ -1877,7 +1889,8 @@ "pipSpeed": 0.0725, "pitch": 30, "roll": 80, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 14314210, "bulkheads": [ @@ -2045,7 +2058,8 @@ "fighterHangars": true, "pitch": 25, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 35814210, "bulkheads": [ @@ -2222,7 +2236,8 @@ "pipSpeed": 0.03875, "pitch": 38, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 2 }, "retailCost": 51567040, "bulkheads": [ @@ -2369,7 +2384,8 @@ "pipSpeed": 0.1625, "pitch": 36, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 1 }, "retailCost": 52720, "bulkheads": [ @@ -2498,7 +2514,8 @@ "pipSpeed": 0.1, "pitch": 40, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 22296860, "bulkheads": [ @@ -2645,7 +2662,8 @@ "pipSpeed": 0.05375, "pitch": 38, "roll": 90, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 2542930, "bulkheads": [ @@ -2787,7 +2805,8 @@ "fighterHangars": true, "pitch": 18, "roll": 45, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 208969450, "bulkheads": [ @@ -2970,7 +2989,8 @@ "pipSpeed": 0.075, "pitch": 40, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 110830, "bulkheads": [ @@ -3112,7 +3132,8 @@ "fighterHangars": true, "pitch": 27, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 3126150, "bulkheads": [ @@ -3254,7 +3275,8 @@ "luxuryCabins": true, "pitch": 25, "roll": 55, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 48539900, "bulkheads": [ @@ -3421,7 +3443,8 @@ "pipSpeed": 0.0975, "pitch": 29, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 56978180, "bulkheads": [ @@ -3572,7 +3595,8 @@ "pipSpeed": 0.1375, "pitch": 42, "roll": 110, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 32000, "bulkheads": [ @@ -3703,7 +3727,8 @@ "pipSpeed": 0.1475, "pitch": 30, "roll": 100, - "yaw": 17 + "yaw": 17, + "seats": 1 }, "retailCost": 1045950, "bulkheads": [ @@ -3842,7 +3867,8 @@ "pipSpeed": 0.16625, "pitch": 22, "roll": 60, - "yaw": 22 + "yaw": 22, + "seats": 1 }, "retailCost": 17472260, "bulkheads": [ @@ -3990,7 +4016,8 @@ "fighterHangars": true, "pitch": 20, "roll": 20, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 76555840, "bulkheads": [ @@ -4141,7 +4168,8 @@ "pipSpeed": 0.09375, "pitch": 35, "roll": 90, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 142930, "bulkheads": [ @@ -4286,7 +4314,8 @@ "pipSpeed": 0.0875, "pitch": 30, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 1 }, "retailCost": 437930, "bulkheads": [ @@ -4435,7 +4464,8 @@ "pipSpeed": 0.02375, "pitch": 42, "roll": 110, - "yaw": 17 + "yaw": 17, + "seats": 2 }, "retailCost": 4925620, "bulkheads": [ diff --git a/ships/adder.json b/ships/adder.json index 7cdecd4..134e5d3 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -18,7 +18,8 @@ "pipSpeed": 0.13625, "pitch": 38, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 87810, "bulkheads": [ diff --git a/ships/anaconda.json b/ships/anaconda.json index 2bd6a1b..2104c6a 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 10 + "yaw": 10, + "seats": 3 }, "retailCost": 146969450, "bulkheads": [ diff --git a/ships/asp.json b/ships/asp.json index 8136127..a4db6c4 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -18,7 +18,8 @@ "pipSpeed": 0.13, "pitch": 38, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 6661150, "bulkheads": [ diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 7847b9f..879641c 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -18,7 +18,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 110, - "yaw": 15 + "yaw": 15, + "seats": 2 }, "retailCost": 3961150, "bulkheads": [ diff --git a/ships/beluga.json b/ships/beluga.json index 5b875bf..155379d 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -20,7 +20,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 17 + "yaw": 17, + "seats": 3 }, "retailCost": 84532770, "bulkheads": [ diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 7e8841f..790b748 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -18,7 +18,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 349720, "bulkheads": [ diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index d7bba92..860d707 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -18,7 +18,8 @@ "pipSpeed": 0.125, "pitch": 30, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 747660, "bulkheads": [ diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index d58e05a..bf7ce07 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -17,7 +17,8 @@ "pipSpeed": 0.09625, "pitch": 35, "roll": 90, - "yaw": 13 + "yaw": 13, + "seats": 1 }, "retailCost": 1894760, "bulkheads": [ diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 392edce..dcf7158 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -18,7 +18,8 @@ "pipSpeed": 0.09875, "pitch": 42, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 } , "retailCost": 564330, "bulkheads": [ diff --git a/ships/eagle.json b/ships/eagle.json index e6ce6f5..018c7d2 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0625, "pitch": 50, "roll": 120, - "yaw": 18 + "yaw": 18, + "seats": 1 }, "retailCost": 44800, "bulkheads": [ diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 3e22eeb..431da60 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -17,7 +17,8 @@ "pipSpeed": 0.11125, "pitch": 38, "roll": 90, - "yaw": 19 + "yaw": 19, + "seats": 2 }, "retailCost": 19814210, "bulkheads": [ diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 5fbf925..c9f6a26 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 28, "roll": 75, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 187969450, "bulkheads": [ diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 864dc51..4cca8fc 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0725, "pitch": 30, "roll": 80, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 14314210, "bulkheads": [ diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index f010bca..6b60f1c 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 25, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 35814210, "bulkheads": [ diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index 2e51b88..cf989c7 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -18,7 +18,8 @@ "pipSpeed": 0.03875, "pitch": 38, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 2 }, "retailCost": 51567040, "bulkheads": [ diff --git a/ships/hauler.json b/ships/hauler.json index e33ef89..4531d13 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1625, "pitch": 36, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 1 }, "retailCost": 52720, "bulkheads": [ diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index fbcc2f6..cbea54b 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1, "pitch": 40, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 22296860, "bulkheads": [ diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index e51cc25..fdbf2ce 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -17,7 +17,8 @@ "pipSpeed": 0.05375, "pitch": 38, "roll": 90, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 2542930, "bulkheads": [ diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index a5720f8..4261769 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -18,7 +18,8 @@ "fighterHangars": true, "pitch": 18, "roll": 45, - "yaw":8 + "yaw": 8, + "seats": 3 }, "retailCost": 208969450, "bulkheads": [ diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 0368113..26ab115 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -18,7 +18,8 @@ "pipSpeed": 0.075, "pitch": 40, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 110830, "bulkheads": [ diff --git a/ships/keelback.json b/ships/keelback.json index 4cf85e8..a16b822 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 27, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 3126150, "bulkheads": [ diff --git a/ships/orca.json b/ships/orca.json index 15ce784..4f3de4e 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -19,7 +19,8 @@ "luxuryCabins": true, "pitch": 25, "roll": 55, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 48539900, "bulkheads": [ diff --git a/ships/python.json b/ships/python.json index 91cdbef..e7e42b9 100755 --- a/ships/python.json +++ b/ships/python.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0975, "pitch": 29, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 56978180, "bulkheads": [ diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 0c41338..4e52bc0 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1375, "pitch": 42, "roll": 110, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 32000, "bulkheads": [ diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 746ca5f..6a16eeb 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1475, "pitch": 30, "roll": 100, - "yaw": 17 + "yaw": 17, + "seats": 1 }, "retailCost": 1045950, "bulkheads": [ diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index d57eeba..b65c4f7 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -18,7 +18,8 @@ "pipSpeed": 0.16625, "pitch": 22, "roll": 60, - "yaw": 22 + "yaw": 22, + "seats": 1 }, "retailCost": 17472260, "bulkheads": [ diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 4d15ab6..6b9a072 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 20, "roll": 20, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 76555840, "bulkheads": [ diff --git a/ships/viper.json b/ships/viper.json index 8924a99..b94434f 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -18,7 +18,8 @@ "pipSpeed": 0.09375, "pitch": 35, "roll": 90, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 142930, "bulkheads": [ diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 6471fe8..927c98f 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0875, "pitch": 30, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 1 }, "retailCost": 437930, "bulkheads": [ diff --git a/ships/vulture.json b/ships/vulture.json index d0b218c..04b9dbf 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -18,7 +18,8 @@ "pipSpeed": 0.02375, "pitch": 42, "roll": 110, - "yaw": 17 + "yaw": 17, + "seats": 2 }, "retailCost": 4925620, "bulkheads": [ From 4b8951d032b1273ad52d0b4f0a6377dbd722f369 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 16 Feb 2017 22:37:05 +0000 Subject: [PATCH 2/4] Change seats to crew --- ChangeLog.md | 2 +- dist/index.js | 60 ++++++++++++++++----------------- dist/index.json | 60 ++++++++++++++++----------------- ships/adder.json | 2 +- ships/anaconda.json | 2 +- ships/asp.json | 2 +- ships/asp_scout.json | 2 +- ships/beluga.json | 2 +- ships/cobra_mk_iii.json | 2 +- ships/cobra_mk_iv.json | 2 +- ships/diamondback_explorer.json | 2 +- ships/diamondback_scout.json | 2 +- ships/eagle.json | 2 +- ships/federal_assault_ship.json | 2 +- ships/federal_corvette.json | 2 +- ships/federal_dropship.json | 2 +- ships/federal_gunship.json | 2 +- ships/fer_de_lance.json | 2 +- ships/hauler.json | 2 +- ships/imperial_clipper.json | 2 +- ships/imperial_courier.json | 2 +- ships/imperial_cutter.json | 2 +- ships/imperial_eagle.json | 2 +- ships/keelback.json | 2 +- ships/orca.json | 2 +- ships/python.json | 2 +- ships/sidewinder.json | 2 +- ships/type_6_transporter.json | 2 +- ships/type_7_transport.json | 2 +- ships/type_9_heavy.json | 2 +- ships/viper.json | 2 +- ships/viper_mk_iv.json | 2 +- ships/vulture.json | 2 +- spec/data-spec.js | 3 +- 34 files changed, 93 insertions(+), 92 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 0957a76..cc26fcb 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,6 @@ #2.2.17 * Add mass as potential SCB modification - * Add number of seats for each ship + * Add number of crew for each ship #2.2.16 * Fix incorrect thermal load modifiers for dirty drives diff --git a/dist/index.js b/dist/index.js index 3ca8c5c..53c6c02 100644 --- a/dist/index.js +++ b/dist/index.js @@ -20,7 +20,7 @@ module.exports = { pitch: 38, roll: 100, yaw: 14, - seats: 2 + crew: 2 }, retailCost: 87810, bulkheads: [ { @@ -111,7 +111,7 @@ module.exports = { pitch: 25, roll: 60, yaw: 10, - seats: 3 + crew: 3 }, retailCost: 146969450, bulkheads: [ { @@ -209,7 +209,7 @@ module.exports = { pitch: 38, roll: 100, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 6661150, bulkheads: [ { @@ -299,7 +299,7 @@ module.exports = { pitch: 40, roll: 110, yaw: 15, - seats: 2 + crew: 2 }, retailCost: 3961150, bulkheads: [ { @@ -391,7 +391,7 @@ module.exports = { pitch: 25, roll: 60, yaw: 17, - seats: 3 + crew: 3 }, retailCost: 84532770, bulkheads: [ { @@ -525,7 +525,7 @@ module.exports = { pitch: 40, roll: 100, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 349720, bulkheads: [ { @@ -615,7 +615,7 @@ module.exports = { pitch: 30, roll: 90, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 747660, bulkheads: [ { @@ -705,7 +705,7 @@ module.exports = { pitch: 35, roll: 90, yaw: 13, - seats: 1 + crew: 1 }, retailCost: 1894760, bulkheads: [ { @@ -795,7 +795,7 @@ module.exports = { pitch: 42, roll: 100, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 564330, bulkheads: [ { @@ -885,7 +885,7 @@ module.exports = { pitch: 50, roll: 120, yaw: 18, - seats: 1 + crew: 1 }, retailCost: 44800, bulkheads: [ { @@ -983,7 +983,7 @@ module.exports = { pitch: 38, roll: 90, yaw: 19, - seats: 2 + crew: 2 }, retailCost: 19814210, bulkheads: [ { @@ -1090,7 +1090,7 @@ module.exports = { pitch: 28, roll: 75, yaw: 8, - seats: 3 + crew: 3 }, retailCost: 187969450, bulkheads: [ { @@ -1196,7 +1196,7 @@ module.exports = { pitch: 30, roll: 80, yaw: 14, - seats: 2 + crew: 2 }, retailCost: 14314210, bulkheads: [ { @@ -1303,7 +1303,7 @@ module.exports = { pitch: 25, roll: 80, yaw: 18, - seats: 2 + crew: 2 }, retailCost: 35814210, bulkheads: [ { @@ -1417,7 +1417,7 @@ module.exports = { pitch: 38, roll: 90, yaw: 12, - seats: 2 + crew: 2 }, retailCost: 51567040, bulkheads: [ { @@ -1507,7 +1507,7 @@ module.exports = { pitch: 36, roll: 100, yaw: 14, - seats: 1 + crew: 1 }, retailCost: 52720, bulkheads: [ { @@ -1597,7 +1597,7 @@ module.exports = { pitch: 40, roll: 80, yaw: 18, - seats: 2 + crew: 2 }, retailCost: 22296860, bulkheads: [ { @@ -1687,7 +1687,7 @@ module.exports = { pitch: 38, roll: 90, yaw: 16, - seats: 1 + crew: 1 }, retailCost: 2542930, bulkheads: [ { @@ -1778,7 +1778,7 @@ module.exports = { pitch: 18, roll: 45, yaw: 8, - seats: 3 + crew: 3 }, retailCost: 208969450, bulkheads: [ { @@ -1884,7 +1884,7 @@ module.exports = { pitch: 40, roll: 100, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 110830, bulkheads: [ { @@ -1983,7 +1983,7 @@ module.exports = { pitch: 27, roll: 100, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 3126150, bulkheads: [ { @@ -2074,7 +2074,7 @@ module.exports = { pitch: 25, roll: 55, yaw: 18, - seats: 2 + crew: 2 }, retailCost: 48539900, bulkheads: [ { @@ -2186,7 +2186,7 @@ module.exports = { pitch: 29, roll: 90, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 56978180, bulkheads: [ { @@ -2276,7 +2276,7 @@ module.exports = { pitch: 42, roll: 110, yaw: 16, - seats: 1 + crew: 1 }, retailCost: 32e3, bulkheads: [ { @@ -2366,7 +2366,7 @@ module.exports = { pitch: 30, roll: 100, yaw: 17, - seats: 1 + crew: 1 }, retailCost: 1045950, bulkheads: [ { @@ -2456,7 +2456,7 @@ module.exports = { pitch: 22, roll: 60, yaw: 22, - seats: 1 + crew: 1 }, retailCost: 17472260, bulkheads: [ { @@ -2547,7 +2547,7 @@ module.exports = { pitch: 20, roll: 20, yaw: 8, - seats: 3 + crew: 3 }, retailCost: 76555840, bulkheads: [ { @@ -2637,7 +2637,7 @@ module.exports = { pitch: 35, roll: 90, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 142930, bulkheads: [ { @@ -2735,7 +2735,7 @@ module.exports = { pitch: 30, roll: 90, yaw: 12, - seats: 1 + crew: 1 }, retailCost: 437930, bulkheads: [ { @@ -2833,7 +2833,7 @@ module.exports = { pitch: 42, roll: 110, yaw: 17, - seats: 2 + crew: 2 }, retailCost: 4925620, bulkheads: [ { diff --git a/dist/index.json b/dist/index.json index 62cc04d..0d65190 100644 --- a/dist/index.json +++ b/dist/index.json @@ -20,7 +20,7 @@ "pitch": 38, "roll": 100, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 87810, "bulkheads": [ @@ -157,7 +157,7 @@ "pitch": 25, "roll": 60, "yaw": 10, - "seats": 3 + "crew": 3 }, "retailCost": 146969450, "bulkheads": [ @@ -337,7 +337,7 @@ "pitch": 38, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 6661150, "bulkheads": [ @@ -487,7 +487,7 @@ "pitch": 40, "roll": 110, "yaw": 15, - "seats": 2 + "crew": 2 }, "retailCost": 3961150, "bulkheads": [ @@ -627,7 +627,7 @@ "pitch": 25, "roll": 60, "yaw": 17, - "seats": 3 + "crew": 3 }, "retailCost": 84532770, "bulkheads": [ @@ -831,7 +831,7 @@ "pitch": 40, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 349720, "bulkheads": [ @@ -971,7 +971,7 @@ "pitch": 30, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 747660, "bulkheads": [ @@ -1117,7 +1117,7 @@ "pitch": 35, "roll": 90, "yaw": 13, - "seats": 1 + "crew": 1 }, "retailCost": 1894760, "bulkheads": [ @@ -1257,7 +1257,7 @@ "pitch": 42, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 564330, "bulkheads": [ @@ -1397,7 +1397,7 @@ "pitch": 50, "roll": 120, "yaw": 18, - "seats": 1 + "crew": 1 }, "retailCost": 44800, "bulkheads": [ @@ -1539,7 +1539,7 @@ "pitch": 38, "roll": 90, "yaw": 19, - "seats": 2 + "crew": 2 }, "retailCost": 19814210, "bulkheads": [ @@ -1704,7 +1704,7 @@ "pitch": 28, "roll": 75, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 187969450, "bulkheads": [ @@ -1890,7 +1890,7 @@ "pitch": 30, "roll": 80, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 14314210, "bulkheads": [ @@ -2059,7 +2059,7 @@ "pitch": 25, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 35814210, "bulkheads": [ @@ -2237,7 +2237,7 @@ "pitch": 38, "roll": 90, "yaw": 12, - "seats": 2 + "crew": 2 }, "retailCost": 51567040, "bulkheads": [ @@ -2385,7 +2385,7 @@ "pitch": 36, "roll": 100, "yaw": 14, - "seats": 1 + "crew": 1 }, "retailCost": 52720, "bulkheads": [ @@ -2515,7 +2515,7 @@ "pitch": 40, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 22296860, "bulkheads": [ @@ -2663,7 +2663,7 @@ "pitch": 38, "roll": 90, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 2542930, "bulkheads": [ @@ -2806,7 +2806,7 @@ "pitch": 18, "roll": 45, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 208969450, "bulkheads": [ @@ -2990,7 +2990,7 @@ "pitch": 40, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 110830, "bulkheads": [ @@ -3133,7 +3133,7 @@ "pitch": 27, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 3126150, "bulkheads": [ @@ -3276,7 +3276,7 @@ "pitch": 25, "roll": 55, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 48539900, "bulkheads": [ @@ -3444,7 +3444,7 @@ "pitch": 29, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 56978180, "bulkheads": [ @@ -3596,7 +3596,7 @@ "pitch": 42, "roll": 110, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 32000, "bulkheads": [ @@ -3728,7 +3728,7 @@ "pitch": 30, "roll": 100, "yaw": 17, - "seats": 1 + "crew": 1 }, "retailCost": 1045950, "bulkheads": [ @@ -3868,7 +3868,7 @@ "pitch": 22, "roll": 60, "yaw": 22, - "seats": 1 + "crew": 1 }, "retailCost": 17472260, "bulkheads": [ @@ -4017,7 +4017,7 @@ "pitch": 20, "roll": 20, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 76555840, "bulkheads": [ @@ -4169,7 +4169,7 @@ "pitch": 35, "roll": 90, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 142930, "bulkheads": [ @@ -4315,7 +4315,7 @@ "pitch": 30, "roll": 90, "yaw": 12, - "seats": 1 + "crew": 1 }, "retailCost": 437930, "bulkheads": [ @@ -4465,7 +4465,7 @@ "pitch": 42, "roll": 110, "yaw": 17, - "seats": 2 + "crew": 2 }, "retailCost": 4925620, "bulkheads": [ diff --git a/ships/adder.json b/ships/adder.json index 134e5d3..8293278 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -19,7 +19,7 @@ "pitch": 38, "roll": 100, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 87810, "bulkheads": [ diff --git a/ships/anaconda.json b/ships/anaconda.json index 2104c6a..ab0cb35 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -20,7 +20,7 @@ "pitch": 25, "roll": 60, "yaw": 10, - "seats": 3 + "crew": 3 }, "retailCost": 146969450, "bulkheads": [ diff --git a/ships/asp.json b/ships/asp.json index a4db6c4..e1d4414 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -19,7 +19,7 @@ "pitch": 38, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 6661150, "bulkheads": [ diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 879641c..3c13631 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 110, "yaw": 15, - "seats": 2 + "crew": 2 }, "retailCost": 3961150, "bulkheads": [ diff --git a/ships/beluga.json b/ships/beluga.json index 155379d..4051b4c 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -21,7 +21,7 @@ "pitch": 25, "roll": 60, "yaw": 17, - "seats": 3 + "crew": 3 }, "retailCost": 84532770, "bulkheads": [ diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 790b748..ee0e00a 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 349720, "bulkheads": [ diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 860d707..702caca 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 747660, "bulkheads": [ diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index bf7ce07..0e77415 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -18,7 +18,7 @@ "pitch": 35, "roll": 90, "yaw": 13, - "seats": 1 + "crew": 1 }, "retailCost": 1894760, "bulkheads": [ diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index dcf7158..326aee6 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -19,7 +19,7 @@ "pitch": 42, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 } , "retailCost": 564330, "bulkheads": [ diff --git a/ships/eagle.json b/ships/eagle.json index 018c7d2..7b3470c 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -19,7 +19,7 @@ "pitch": 50, "roll": 120, "yaw": 18, - "seats": 1 + "crew": 1 }, "retailCost": 44800, "bulkheads": [ diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 431da60..bd480b6 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -18,7 +18,7 @@ "pitch": 38, "roll": 90, "yaw": 19, - "seats": 2 + "crew": 2 }, "retailCost": 19814210, "bulkheads": [ diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index c9f6a26..7edb589 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -20,7 +20,7 @@ "pitch": 28, "roll": 75, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 187969450, "bulkheads": [ diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 4cca8fc..1ef41b2 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 80, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 14314210, "bulkheads": [ diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 6b60f1c..f0a6ef3 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -20,7 +20,7 @@ "pitch": 25, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 35814210, "bulkheads": [ diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index cf989c7..f59c9cb 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -19,7 +19,7 @@ "pitch": 38, "roll": 90, "yaw": 12, - "seats": 2 + "crew": 2 }, "retailCost": 51567040, "bulkheads": [ diff --git a/ships/hauler.json b/ships/hauler.json index 4531d13..be2e055 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -19,7 +19,7 @@ "pitch": 36, "roll": 100, "yaw": 14, - "seats": 1 + "crew": 1 }, "retailCost": 52720, "bulkheads": [ diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index cbea54b..c345075 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 22296860, "bulkheads": [ diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index fdbf2ce..3dd0c4b 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -18,7 +18,7 @@ "pitch": 38, "roll": 90, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 2542930, "bulkheads": [ diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 4261769..838b155 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -19,7 +19,7 @@ "pitch": 18, "roll": 45, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 208969450, "bulkheads": [ diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 26ab115..83fb4fa 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 110830, "bulkheads": [ diff --git a/ships/keelback.json b/ships/keelback.json index a16b822..bf13552 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -20,7 +20,7 @@ "pitch": 27, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 3126150, "bulkheads": [ diff --git a/ships/orca.json b/ships/orca.json index 4f3de4e..df80081 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -20,7 +20,7 @@ "pitch": 25, "roll": 55, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 48539900, "bulkheads": [ diff --git a/ships/python.json b/ships/python.json index e7e42b9..b5236f0 100755 --- a/ships/python.json +++ b/ships/python.json @@ -19,7 +19,7 @@ "pitch": 29, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 56978180, "bulkheads": [ diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 4e52bc0..25dce4f 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -19,7 +19,7 @@ "pitch": 42, "roll": 110, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 32000, "bulkheads": [ diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 6a16eeb..c016af2 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 100, "yaw": 17, - "seats": 1 + "crew": 1 }, "retailCost": 1045950, "bulkheads": [ diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index b65c4f7..cca463b 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -19,7 +19,7 @@ "pitch": 22, "roll": 60, "yaw": 22, - "seats": 1 + "crew": 1 }, "retailCost": 17472260, "bulkheads": [ diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 6b9a072..71026f8 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -20,7 +20,7 @@ "pitch": 20, "roll": 20, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 76555840, "bulkheads": [ diff --git a/ships/viper.json b/ships/viper.json index b94434f..e7d5626 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -19,7 +19,7 @@ "pitch": 35, "roll": 90, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 142930, "bulkheads": [ diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 927c98f..1ab7d09 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 90, "yaw": 12, - "seats": 1 + "crew": 1 }, "retailCost": 437930, "bulkheads": [ diff --git a/ships/vulture.json b/ships/vulture.json index 04b9dbf..010f0e0 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -19,7 +19,7 @@ "pitch": 42, "roll": 110, "yaw": 17, - "seats": 2 + "crew": 2 }, "retailCost": 4925620, "bulkheads": [ diff --git a/spec/data-spec.js b/spec/data-spec.js index a52cdfe..50c3ad4 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -20,7 +20,8 @@ describe('JSON Data', function() { 'pipSpeed', 'pitch', 'roll', - 'yaw' + 'yaw', + 'crew' ]; var edIDs = {}; From ed41236bba84566ca2a79d4d38561c8bcf2fc4f2 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 16 Feb 2017 22:32:26 +0000 Subject: [PATCH 3/4] Initial stab at seats --- ChangeLog.md | 1 + dist/index.js | 90 ++++++++++++++++++++++----------- dist/index.json | 90 ++++++++++++++++++++++----------- ships/adder.json | 3 +- ships/anaconda.json | 3 +- ships/asp.json | 3 +- ships/asp_scout.json | 3 +- ships/beluga.json | 3 +- ships/cobra_mk_iii.json | 3 +- ships/cobra_mk_iv.json | 3 +- ships/diamondback_explorer.json | 3 +- ships/diamondback_scout.json | 3 +- ships/eagle.json | 3 +- ships/federal_assault_ship.json | 3 +- ships/federal_corvette.json | 3 +- ships/federal_dropship.json | 3 +- ships/federal_gunship.json | 3 +- ships/fer_de_lance.json | 3 +- ships/hauler.json | 3 +- ships/imperial_clipper.json | 3 +- ships/imperial_courier.json | 3 +- ships/imperial_cutter.json | 3 +- ships/imperial_eagle.json | 3 +- ships/keelback.json | 3 +- ships/orca.json | 3 +- ships/python.json | 3 +- ships/sidewinder.json | 3 +- ships/type_6_transporter.json | 3 +- ships/type_7_transport.json | 3 +- ships/type_9_heavy.json | 3 +- ships/viper.json | 3 +- ships/viper_mk_iv.json | 3 +- ships/vulture.json | 3 +- 33 files changed, 181 insertions(+), 90 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 5e4e183..6c3e693 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,7 @@ #2.2.17 * Add mass as potential SCB modification * Fix mining laser statistics + * Add number of seats for each ship #2.2.16 * Fix incorrect thermal load modifiers for dirty drives diff --git a/dist/index.js b/dist/index.js index 4243c70..6027c7a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -19,7 +19,8 @@ module.exports = { pipSpeed: .13625, pitch: 38, roll: 100, - yaw: 14 + yaw: 14, + seats: 2 }, retailCost: 87810, bulkheads: [ { @@ -109,7 +110,8 @@ module.exports = { fighterHangars: true, pitch: 25, roll: 60, - yaw: 10 + yaw: 10, + seats: 3 }, retailCost: 146969450, bulkheads: [ { @@ -206,7 +208,8 @@ module.exports = { pipSpeed: .13, pitch: 38, roll: 100, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 6661150, bulkheads: [ { @@ -295,7 +298,8 @@ module.exports = { pipSpeed: .125, pitch: 40, roll: 110, - yaw: 15 + yaw: 15, + seats: 2 }, retailCost: 3961150, bulkheads: [ { @@ -386,7 +390,8 @@ module.exports = { fighterHangars: true, pitch: 25, roll: 60, - yaw: 17 + yaw: 17, + seats: 3 }, retailCost: 84532770, bulkheads: [ { @@ -519,7 +524,8 @@ module.exports = { pipSpeed: .125, pitch: 40, roll: 100, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 349720, bulkheads: [ { @@ -608,7 +614,8 @@ module.exports = { pipSpeed: .125, pitch: 30, roll: 90, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 747660, bulkheads: [ { @@ -697,7 +704,8 @@ module.exports = { pipSpeed: .09625, pitch: 35, roll: 90, - yaw: 13 + yaw: 13, + seats: 1 }, retailCost: 1894760, bulkheads: [ { @@ -786,7 +794,8 @@ module.exports = { pipSpeed: .09875, pitch: 42, roll: 100, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 564330, bulkheads: [ { @@ -875,7 +884,8 @@ module.exports = { pipSpeed: .0625, pitch: 50, roll: 120, - yaw: 18 + yaw: 18, + seats: 1 }, retailCost: 44800, bulkheads: [ { @@ -972,7 +982,8 @@ module.exports = { pipSpeed: .11125, pitch: 38, roll: 90, - yaw: 19 + yaw: 19, + seats: 2 }, retailCost: 19814210, bulkheads: [ { @@ -1078,7 +1089,8 @@ module.exports = { fighterHangars: true, pitch: 28, roll: 75, - yaw: 8 + yaw: 8, + seats: 3 }, retailCost: 187969450, bulkheads: [ { @@ -1183,7 +1195,8 @@ module.exports = { pipSpeed: .0725, pitch: 30, roll: 80, - yaw: 14 + yaw: 14, + seats: 2 }, retailCost: 14314210, bulkheads: [ { @@ -1289,7 +1302,8 @@ module.exports = { fighterHangars: true, pitch: 25, roll: 80, - yaw: 18 + yaw: 18, + seats: 2 }, retailCost: 35814210, bulkheads: [ { @@ -1402,7 +1416,8 @@ module.exports = { pipSpeed: .03875, pitch: 38, roll: 90, - yaw: 12 + yaw: 12, + seats: 2 }, retailCost: 51567040, bulkheads: [ { @@ -1491,7 +1506,8 @@ module.exports = { pipSpeed: .1625, pitch: 36, roll: 100, - yaw: 14 + yaw: 14, + seats: 1 }, retailCost: 52720, bulkheads: [ { @@ -1580,7 +1596,8 @@ module.exports = { pipSpeed: .1, pitch: 40, roll: 80, - yaw: 18 + yaw: 18, + seats: 2 }, retailCost: 22296860, bulkheads: [ { @@ -1669,7 +1686,8 @@ module.exports = { pipSpeed: .05375, pitch: 38, roll: 90, - yaw: 16 + yaw: 16, + seats: 1 }, retailCost: 2542930, bulkheads: [ { @@ -1759,7 +1777,8 @@ module.exports = { fighterHangars: true, pitch: 18, roll: 45, - yaw: 8 + yaw: 8, + seats: 3 }, retailCost: 208969450, bulkheads: [ { @@ -1864,7 +1883,8 @@ module.exports = { pipSpeed: .075, pitch: 40, roll: 100, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 110830, bulkheads: [ { @@ -1962,7 +1982,8 @@ module.exports = { fighterHangars: true, pitch: 27, roll: 100, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 3126150, bulkheads: [ { @@ -2052,7 +2073,8 @@ module.exports = { luxuryCabins: true, pitch: 25, roll: 55, - yaw: 18 + yaw: 18, + seats: 2 }, retailCost: 48539900, bulkheads: [ { @@ -2163,7 +2185,8 @@ module.exports = { pipSpeed: .0975, pitch: 29, roll: 90, - yaw: 10 + yaw: 10, + seats: 2 }, retailCost: 56978180, bulkheads: [ { @@ -2252,7 +2275,8 @@ module.exports = { pipSpeed: .1375, pitch: 42, roll: 110, - yaw: 16 + yaw: 16, + seats: 1 }, retailCost: 32e3, bulkheads: [ { @@ -2341,7 +2365,8 @@ module.exports = { pipSpeed: .1475, pitch: 30, roll: 100, - yaw: 17 + yaw: 17, + seats: 1 }, retailCost: 1045950, bulkheads: [ { @@ -2430,7 +2455,8 @@ module.exports = { pipSpeed: .16625, pitch: 22, roll: 60, - yaw: 22 + yaw: 22, + seats: 1 }, retailCost: 17472260, bulkheads: [ { @@ -2520,7 +2546,8 @@ module.exports = { fighterHangars: true, pitch: 20, roll: 20, - yaw: 8 + yaw: 8, + seats: 3 }, retailCost: 76555840, bulkheads: [ { @@ -2609,7 +2636,8 @@ module.exports = { pipSpeed: .09375, pitch: 35, roll: 90, - yaw: 15 + yaw: 15, + seats: 1 }, retailCost: 142930, bulkheads: [ { @@ -2706,7 +2734,8 @@ module.exports = { pipSpeed: .0875, pitch: 30, roll: 90, - yaw: 12 + yaw: 12, + seats: 1 }, retailCost: 437930, bulkheads: [ { @@ -2803,7 +2832,8 @@ module.exports = { pipSpeed: .02375, pitch: 42, roll: 110, - yaw: 17 + yaw: 17, + seats: 2 }, retailCost: 4925620, bulkheads: [ { diff --git a/dist/index.json b/dist/index.json index 942c63f..3de9bc0 100644 --- a/dist/index.json +++ b/dist/index.json @@ -19,7 +19,8 @@ "pipSpeed": 0.13625, "pitch": 38, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 87810, "bulkheads": [ @@ -155,7 +156,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 10 + "yaw": 10, + "seats": 3 }, "retailCost": 146969450, "bulkheads": [ @@ -334,7 +336,8 @@ "pipSpeed": 0.13, "pitch": 38, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 6661150, "bulkheads": [ @@ -483,7 +486,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 110, - "yaw": 15 + "yaw": 15, + "seats": 2 }, "retailCost": 3961150, "bulkheads": [ @@ -622,7 +626,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 17 + "yaw": 17, + "seats": 3 }, "retailCost": 84532770, "bulkheads": [ @@ -825,7 +830,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 349720, "bulkheads": [ @@ -964,7 +970,8 @@ "pipSpeed": 0.125, "pitch": 30, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 747660, "bulkheads": [ @@ -1109,7 +1116,8 @@ "pipSpeed": 0.09625, "pitch": 35, "roll": 90, - "yaw": 13 + "yaw": 13, + "seats": 1 }, "retailCost": 1894760, "bulkheads": [ @@ -1248,7 +1256,8 @@ "pipSpeed": 0.09875, "pitch": 42, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 564330, "bulkheads": [ @@ -1387,7 +1396,8 @@ "pipSpeed": 0.0625, "pitch": 50, "roll": 120, - "yaw": 18 + "yaw": 18, + "seats": 1 }, "retailCost": 44800, "bulkheads": [ @@ -1528,7 +1538,8 @@ "pipSpeed": 0.11125, "pitch": 38, "roll": 90, - "yaw": 19 + "yaw": 19, + "seats": 2 }, "retailCost": 19814210, "bulkheads": [ @@ -1692,7 +1703,8 @@ "fighterHangars": true, "pitch": 28, "roll": 75, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 187969450, "bulkheads": [ @@ -1877,7 +1889,8 @@ "pipSpeed": 0.0725, "pitch": 30, "roll": 80, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 14314210, "bulkheads": [ @@ -2045,7 +2058,8 @@ "fighterHangars": true, "pitch": 25, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 35814210, "bulkheads": [ @@ -2222,7 +2236,8 @@ "pipSpeed": 0.03875, "pitch": 38, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 2 }, "retailCost": 51567040, "bulkheads": [ @@ -2369,7 +2384,8 @@ "pipSpeed": 0.1625, "pitch": 36, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 1 }, "retailCost": 52720, "bulkheads": [ @@ -2498,7 +2514,8 @@ "pipSpeed": 0.1, "pitch": 40, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 22296860, "bulkheads": [ @@ -2645,7 +2662,8 @@ "pipSpeed": 0.05375, "pitch": 38, "roll": 90, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 2542930, "bulkheads": [ @@ -2787,7 +2805,8 @@ "fighterHangars": true, "pitch": 18, "roll": 45, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 208969450, "bulkheads": [ @@ -2970,7 +2989,8 @@ "pipSpeed": 0.075, "pitch": 40, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 110830, "bulkheads": [ @@ -3112,7 +3132,8 @@ "fighterHangars": true, "pitch": 27, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 3126150, "bulkheads": [ @@ -3254,7 +3275,8 @@ "luxuryCabins": true, "pitch": 25, "roll": 55, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 48539900, "bulkheads": [ @@ -3421,7 +3443,8 @@ "pipSpeed": 0.0975, "pitch": 29, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 56978180, "bulkheads": [ @@ -3572,7 +3595,8 @@ "pipSpeed": 0.1375, "pitch": 42, "roll": 110, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 32000, "bulkheads": [ @@ -3703,7 +3727,8 @@ "pipSpeed": 0.1475, "pitch": 30, "roll": 100, - "yaw": 17 + "yaw": 17, + "seats": 1 }, "retailCost": 1045950, "bulkheads": [ @@ -3842,7 +3867,8 @@ "pipSpeed": 0.16625, "pitch": 22, "roll": 60, - "yaw": 22 + "yaw": 22, + "seats": 1 }, "retailCost": 17472260, "bulkheads": [ @@ -3990,7 +4016,8 @@ "fighterHangars": true, "pitch": 20, "roll": 20, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 76555840, "bulkheads": [ @@ -4141,7 +4168,8 @@ "pipSpeed": 0.09375, "pitch": 35, "roll": 90, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 142930, "bulkheads": [ @@ -4286,7 +4314,8 @@ "pipSpeed": 0.0875, "pitch": 30, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 1 }, "retailCost": 437930, "bulkheads": [ @@ -4435,7 +4464,8 @@ "pipSpeed": 0.02375, "pitch": 42, "roll": 110, - "yaw": 17 + "yaw": 17, + "seats": 2 }, "retailCost": 4925620, "bulkheads": [ diff --git a/ships/adder.json b/ships/adder.json index 7cdecd4..134e5d3 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -18,7 +18,8 @@ "pipSpeed": 0.13625, "pitch": 38, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 87810, "bulkheads": [ diff --git a/ships/anaconda.json b/ships/anaconda.json index 2bd6a1b..2104c6a 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 10 + "yaw": 10, + "seats": 3 }, "retailCost": 146969450, "bulkheads": [ diff --git a/ships/asp.json b/ships/asp.json index 8136127..a4db6c4 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -18,7 +18,8 @@ "pipSpeed": 0.13, "pitch": 38, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 6661150, "bulkheads": [ diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 7847b9f..879641c 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -18,7 +18,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 110, - "yaw": 15 + "yaw": 15, + "seats": 2 }, "retailCost": 3961150, "bulkheads": [ diff --git a/ships/beluga.json b/ships/beluga.json index 5b875bf..155379d 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -20,7 +20,8 @@ "fighterHangars": true, "pitch": 25, "roll": 60, - "yaw": 17 + "yaw": 17, + "seats": 3 }, "retailCost": 84532770, "bulkheads": [ diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 7e8841f..790b748 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -18,7 +18,8 @@ "pipSpeed": 0.125, "pitch": 40, "roll": 100, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 349720, "bulkheads": [ diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index d7bba92..860d707 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -18,7 +18,8 @@ "pipSpeed": 0.125, "pitch": 30, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 747660, "bulkheads": [ diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index d58e05a..bf7ce07 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -17,7 +17,8 @@ "pipSpeed": 0.09625, "pitch": 35, "roll": 90, - "yaw": 13 + "yaw": 13, + "seats": 1 }, "retailCost": 1894760, "bulkheads": [ diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 392edce..dcf7158 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -18,7 +18,8 @@ "pipSpeed": 0.09875, "pitch": 42, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 } , "retailCost": 564330, "bulkheads": [ diff --git a/ships/eagle.json b/ships/eagle.json index e6ce6f5..018c7d2 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0625, "pitch": 50, "roll": 120, - "yaw": 18 + "yaw": 18, + "seats": 1 }, "retailCost": 44800, "bulkheads": [ diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 3e22eeb..431da60 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -17,7 +17,8 @@ "pipSpeed": 0.11125, "pitch": 38, "roll": 90, - "yaw": 19 + "yaw": 19, + "seats": 2 }, "retailCost": 19814210, "bulkheads": [ diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 5fbf925..c9f6a26 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 28, "roll": 75, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 187969450, "bulkheads": [ diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 864dc51..4cca8fc 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0725, "pitch": 30, "roll": 80, - "yaw": 14 + "yaw": 14, + "seats": 2 }, "retailCost": 14314210, "bulkheads": [ diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index f010bca..6b60f1c 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 25, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 35814210, "bulkheads": [ diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index 2e51b88..cf989c7 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -18,7 +18,8 @@ "pipSpeed": 0.03875, "pitch": 38, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 2 }, "retailCost": 51567040, "bulkheads": [ diff --git a/ships/hauler.json b/ships/hauler.json index e33ef89..4531d13 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1625, "pitch": 36, "roll": 100, - "yaw": 14 + "yaw": 14, + "seats": 1 }, "retailCost": 52720, "bulkheads": [ diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index fbcc2f6..cbea54b 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1, "pitch": 40, "roll": 80, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 22296860, "bulkheads": [ diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index e51cc25..fdbf2ce 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -17,7 +17,8 @@ "pipSpeed": 0.05375, "pitch": 38, "roll": 90, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 2542930, "bulkheads": [ diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index a5720f8..4261769 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -18,7 +18,8 @@ "fighterHangars": true, "pitch": 18, "roll": 45, - "yaw":8 + "yaw": 8, + "seats": 3 }, "retailCost": 208969450, "bulkheads": [ diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 0368113..26ab115 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -18,7 +18,8 @@ "pipSpeed": 0.075, "pitch": 40, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 110830, "bulkheads": [ diff --git a/ships/keelback.json b/ships/keelback.json index 4cf85e8..a16b822 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 27, "roll": 100, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 3126150, "bulkheads": [ diff --git a/ships/orca.json b/ships/orca.json index 15ce784..4f3de4e 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -19,7 +19,8 @@ "luxuryCabins": true, "pitch": 25, "roll": 55, - "yaw": 18 + "yaw": 18, + "seats": 2 }, "retailCost": 48539900, "bulkheads": [ diff --git a/ships/python.json b/ships/python.json index 91cdbef..e7e42b9 100755 --- a/ships/python.json +++ b/ships/python.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0975, "pitch": 29, "roll": 90, - "yaw": 10 + "yaw": 10, + "seats": 2 }, "retailCost": 56978180, "bulkheads": [ diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 0c41338..4e52bc0 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1375, "pitch": 42, "roll": 110, - "yaw": 16 + "yaw": 16, + "seats": 1 }, "retailCost": 32000, "bulkheads": [ diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 746ca5f..6a16eeb 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -18,7 +18,8 @@ "pipSpeed": 0.1475, "pitch": 30, "roll": 100, - "yaw": 17 + "yaw": 17, + "seats": 1 }, "retailCost": 1045950, "bulkheads": [ diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index d57eeba..b65c4f7 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -18,7 +18,8 @@ "pipSpeed": 0.16625, "pitch": 22, "roll": 60, - "yaw": 22 + "yaw": 22, + "seats": 1 }, "retailCost": 17472260, "bulkheads": [ diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 4d15ab6..6b9a072 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -19,7 +19,8 @@ "fighterHangars": true, "pitch": 20, "roll": 20, - "yaw": 8 + "yaw": 8, + "seats": 3 }, "retailCost": 76555840, "bulkheads": [ diff --git a/ships/viper.json b/ships/viper.json index 8924a99..b94434f 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -18,7 +18,8 @@ "pipSpeed": 0.09375, "pitch": 35, "roll": 90, - "yaw": 15 + "yaw": 15, + "seats": 1 }, "retailCost": 142930, "bulkheads": [ diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 6471fe8..927c98f 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -18,7 +18,8 @@ "pipSpeed": 0.0875, "pitch": 30, "roll": 90, - "yaw": 12 + "yaw": 12, + "seats": 1 }, "retailCost": 437930, "bulkheads": [ diff --git a/ships/vulture.json b/ships/vulture.json index d0b218c..04b9dbf 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -18,7 +18,8 @@ "pipSpeed": 0.02375, "pitch": 42, "roll": 110, - "yaw": 17 + "yaw": 17, + "seats": 2 }, "retailCost": 4925620, "bulkheads": [ From 9f6993b4665cfe3348d3fd3a5333d62317835bdf Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 16 Feb 2017 22:37:05 +0000 Subject: [PATCH 4/4] Change seats to crew --- ChangeLog.md | 1 + dist/index.js | 60 ++++++++++++++++----------------- dist/index.json | 60 ++++++++++++++++----------------- ships/adder.json | 2 +- ships/anaconda.json | 2 +- ships/asp.json | 2 +- ships/asp_scout.json | 2 +- ships/beluga.json | 2 +- ships/cobra_mk_iii.json | 2 +- ships/cobra_mk_iv.json | 2 +- ships/diamondback_explorer.json | 2 +- ships/diamondback_scout.json | 2 +- ships/eagle.json | 2 +- ships/federal_assault_ship.json | 2 +- ships/federal_corvette.json | 2 +- ships/federal_dropship.json | 2 +- ships/federal_gunship.json | 2 +- ships/fer_de_lance.json | 2 +- ships/hauler.json | 2 +- ships/imperial_clipper.json | 2 +- ships/imperial_courier.json | 2 +- ships/imperial_cutter.json | 2 +- ships/imperial_eagle.json | 2 +- ships/keelback.json | 2 +- ships/orca.json | 2 +- ships/python.json | 2 +- ships/sidewinder.json | 2 +- ships/type_6_transporter.json | 2 +- ships/type_7_transport.json | 2 +- ships/type_9_heavy.json | 2 +- ships/viper.json | 2 +- ships/viper_mk_iv.json | 2 +- ships/vulture.json | 2 +- spec/data-spec.js | 3 +- 34 files changed, 93 insertions(+), 91 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 6c3e693..542eb49 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,7 @@ * Add mass as potential SCB modification * Fix mining laser statistics * Add number of seats for each ship + * Add number of crew for each ship #2.2.16 * Fix incorrect thermal load modifiers for dirty drives diff --git a/dist/index.js b/dist/index.js index 6027c7a..1b1cc85 100644 --- a/dist/index.js +++ b/dist/index.js @@ -20,7 +20,7 @@ module.exports = { pitch: 38, roll: 100, yaw: 14, - seats: 2 + crew: 2 }, retailCost: 87810, bulkheads: [ { @@ -111,7 +111,7 @@ module.exports = { pitch: 25, roll: 60, yaw: 10, - seats: 3 + crew: 3 }, retailCost: 146969450, bulkheads: [ { @@ -209,7 +209,7 @@ module.exports = { pitch: 38, roll: 100, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 6661150, bulkheads: [ { @@ -299,7 +299,7 @@ module.exports = { pitch: 40, roll: 110, yaw: 15, - seats: 2 + crew: 2 }, retailCost: 3961150, bulkheads: [ { @@ -391,7 +391,7 @@ module.exports = { pitch: 25, roll: 60, yaw: 17, - seats: 3 + crew: 3 }, retailCost: 84532770, bulkheads: [ { @@ -525,7 +525,7 @@ module.exports = { pitch: 40, roll: 100, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 349720, bulkheads: [ { @@ -615,7 +615,7 @@ module.exports = { pitch: 30, roll: 90, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 747660, bulkheads: [ { @@ -705,7 +705,7 @@ module.exports = { pitch: 35, roll: 90, yaw: 13, - seats: 1 + crew: 1 }, retailCost: 1894760, bulkheads: [ { @@ -795,7 +795,7 @@ module.exports = { pitch: 42, roll: 100, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 564330, bulkheads: [ { @@ -885,7 +885,7 @@ module.exports = { pitch: 50, roll: 120, yaw: 18, - seats: 1 + crew: 1 }, retailCost: 44800, bulkheads: [ { @@ -983,7 +983,7 @@ module.exports = { pitch: 38, roll: 90, yaw: 19, - seats: 2 + crew: 2 }, retailCost: 19814210, bulkheads: [ { @@ -1090,7 +1090,7 @@ module.exports = { pitch: 28, roll: 75, yaw: 8, - seats: 3 + crew: 3 }, retailCost: 187969450, bulkheads: [ { @@ -1196,7 +1196,7 @@ module.exports = { pitch: 30, roll: 80, yaw: 14, - seats: 2 + crew: 2 }, retailCost: 14314210, bulkheads: [ { @@ -1303,7 +1303,7 @@ module.exports = { pitch: 25, roll: 80, yaw: 18, - seats: 2 + crew: 2 }, retailCost: 35814210, bulkheads: [ { @@ -1417,7 +1417,7 @@ module.exports = { pitch: 38, roll: 90, yaw: 12, - seats: 2 + crew: 2 }, retailCost: 51567040, bulkheads: [ { @@ -1507,7 +1507,7 @@ module.exports = { pitch: 36, roll: 100, yaw: 14, - seats: 1 + crew: 1 }, retailCost: 52720, bulkheads: [ { @@ -1597,7 +1597,7 @@ module.exports = { pitch: 40, roll: 80, yaw: 18, - seats: 2 + crew: 2 }, retailCost: 22296860, bulkheads: [ { @@ -1687,7 +1687,7 @@ module.exports = { pitch: 38, roll: 90, yaw: 16, - seats: 1 + crew: 1 }, retailCost: 2542930, bulkheads: [ { @@ -1778,7 +1778,7 @@ module.exports = { pitch: 18, roll: 45, yaw: 8, - seats: 3 + crew: 3 }, retailCost: 208969450, bulkheads: [ { @@ -1884,7 +1884,7 @@ module.exports = { pitch: 40, roll: 100, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 110830, bulkheads: [ { @@ -1983,7 +1983,7 @@ module.exports = { pitch: 27, roll: 100, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 3126150, bulkheads: [ { @@ -2074,7 +2074,7 @@ module.exports = { pitch: 25, roll: 55, yaw: 18, - seats: 2 + crew: 2 }, retailCost: 48539900, bulkheads: [ { @@ -2186,7 +2186,7 @@ module.exports = { pitch: 29, roll: 90, yaw: 10, - seats: 2 + crew: 2 }, retailCost: 56978180, bulkheads: [ { @@ -2276,7 +2276,7 @@ module.exports = { pitch: 42, roll: 110, yaw: 16, - seats: 1 + crew: 1 }, retailCost: 32e3, bulkheads: [ { @@ -2366,7 +2366,7 @@ module.exports = { pitch: 30, roll: 100, yaw: 17, - seats: 1 + crew: 1 }, retailCost: 1045950, bulkheads: [ { @@ -2456,7 +2456,7 @@ module.exports = { pitch: 22, roll: 60, yaw: 22, - seats: 1 + crew: 1 }, retailCost: 17472260, bulkheads: [ { @@ -2547,7 +2547,7 @@ module.exports = { pitch: 20, roll: 20, yaw: 8, - seats: 3 + crew: 3 }, retailCost: 76555840, bulkheads: [ { @@ -2637,7 +2637,7 @@ module.exports = { pitch: 35, roll: 90, yaw: 15, - seats: 1 + crew: 1 }, retailCost: 142930, bulkheads: [ { @@ -2735,7 +2735,7 @@ module.exports = { pitch: 30, roll: 90, yaw: 12, - seats: 1 + crew: 1 }, retailCost: 437930, bulkheads: [ { @@ -2833,7 +2833,7 @@ module.exports = { pitch: 42, roll: 110, yaw: 17, - seats: 2 + crew: 2 }, retailCost: 4925620, bulkheads: [ { diff --git a/dist/index.json b/dist/index.json index 3de9bc0..b429ca0 100644 --- a/dist/index.json +++ b/dist/index.json @@ -20,7 +20,7 @@ "pitch": 38, "roll": 100, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 87810, "bulkheads": [ @@ -157,7 +157,7 @@ "pitch": 25, "roll": 60, "yaw": 10, - "seats": 3 + "crew": 3 }, "retailCost": 146969450, "bulkheads": [ @@ -337,7 +337,7 @@ "pitch": 38, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 6661150, "bulkheads": [ @@ -487,7 +487,7 @@ "pitch": 40, "roll": 110, "yaw": 15, - "seats": 2 + "crew": 2 }, "retailCost": 3961150, "bulkheads": [ @@ -627,7 +627,7 @@ "pitch": 25, "roll": 60, "yaw": 17, - "seats": 3 + "crew": 3 }, "retailCost": 84532770, "bulkheads": [ @@ -831,7 +831,7 @@ "pitch": 40, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 349720, "bulkheads": [ @@ -971,7 +971,7 @@ "pitch": 30, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 747660, "bulkheads": [ @@ -1117,7 +1117,7 @@ "pitch": 35, "roll": 90, "yaw": 13, - "seats": 1 + "crew": 1 }, "retailCost": 1894760, "bulkheads": [ @@ -1257,7 +1257,7 @@ "pitch": 42, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 564330, "bulkheads": [ @@ -1397,7 +1397,7 @@ "pitch": 50, "roll": 120, "yaw": 18, - "seats": 1 + "crew": 1 }, "retailCost": 44800, "bulkheads": [ @@ -1539,7 +1539,7 @@ "pitch": 38, "roll": 90, "yaw": 19, - "seats": 2 + "crew": 2 }, "retailCost": 19814210, "bulkheads": [ @@ -1704,7 +1704,7 @@ "pitch": 28, "roll": 75, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 187969450, "bulkheads": [ @@ -1890,7 +1890,7 @@ "pitch": 30, "roll": 80, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 14314210, "bulkheads": [ @@ -2059,7 +2059,7 @@ "pitch": 25, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 35814210, "bulkheads": [ @@ -2237,7 +2237,7 @@ "pitch": 38, "roll": 90, "yaw": 12, - "seats": 2 + "crew": 2 }, "retailCost": 51567040, "bulkheads": [ @@ -2385,7 +2385,7 @@ "pitch": 36, "roll": 100, "yaw": 14, - "seats": 1 + "crew": 1 }, "retailCost": 52720, "bulkheads": [ @@ -2515,7 +2515,7 @@ "pitch": 40, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 22296860, "bulkheads": [ @@ -2663,7 +2663,7 @@ "pitch": 38, "roll": 90, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 2542930, "bulkheads": [ @@ -2806,7 +2806,7 @@ "pitch": 18, "roll": 45, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 208969450, "bulkheads": [ @@ -2990,7 +2990,7 @@ "pitch": 40, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 110830, "bulkheads": [ @@ -3133,7 +3133,7 @@ "pitch": 27, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 3126150, "bulkheads": [ @@ -3276,7 +3276,7 @@ "pitch": 25, "roll": 55, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 48539900, "bulkheads": [ @@ -3444,7 +3444,7 @@ "pitch": 29, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 56978180, "bulkheads": [ @@ -3596,7 +3596,7 @@ "pitch": 42, "roll": 110, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 32000, "bulkheads": [ @@ -3728,7 +3728,7 @@ "pitch": 30, "roll": 100, "yaw": 17, - "seats": 1 + "crew": 1 }, "retailCost": 1045950, "bulkheads": [ @@ -3868,7 +3868,7 @@ "pitch": 22, "roll": 60, "yaw": 22, - "seats": 1 + "crew": 1 }, "retailCost": 17472260, "bulkheads": [ @@ -4017,7 +4017,7 @@ "pitch": 20, "roll": 20, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 76555840, "bulkheads": [ @@ -4169,7 +4169,7 @@ "pitch": 35, "roll": 90, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 142930, "bulkheads": [ @@ -4315,7 +4315,7 @@ "pitch": 30, "roll": 90, "yaw": 12, - "seats": 1 + "crew": 1 }, "retailCost": 437930, "bulkheads": [ @@ -4465,7 +4465,7 @@ "pitch": 42, "roll": 110, "yaw": 17, - "seats": 2 + "crew": 2 }, "retailCost": 4925620, "bulkheads": [ diff --git a/ships/adder.json b/ships/adder.json index 134e5d3..8293278 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -19,7 +19,7 @@ "pitch": 38, "roll": 100, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 87810, "bulkheads": [ diff --git a/ships/anaconda.json b/ships/anaconda.json index 2104c6a..ab0cb35 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -20,7 +20,7 @@ "pitch": 25, "roll": 60, "yaw": 10, - "seats": 3 + "crew": 3 }, "retailCost": 146969450, "bulkheads": [ diff --git a/ships/asp.json b/ships/asp.json index a4db6c4..e1d4414 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -19,7 +19,7 @@ "pitch": 38, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 6661150, "bulkheads": [ diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 879641c..3c13631 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 110, "yaw": 15, - "seats": 2 + "crew": 2 }, "retailCost": 3961150, "bulkheads": [ diff --git a/ships/beluga.json b/ships/beluga.json index 155379d..4051b4c 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -21,7 +21,7 @@ "pitch": 25, "roll": 60, "yaw": 17, - "seats": 3 + "crew": 3 }, "retailCost": 84532770, "bulkheads": [ diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 790b748..ee0e00a 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 100, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 349720, "bulkheads": [ diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 860d707..702caca 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 747660, "bulkheads": [ diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index bf7ce07..0e77415 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -18,7 +18,7 @@ "pitch": 35, "roll": 90, "yaw": 13, - "seats": 1 + "crew": 1 }, "retailCost": 1894760, "bulkheads": [ diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index dcf7158..326aee6 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -19,7 +19,7 @@ "pitch": 42, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 } , "retailCost": 564330, "bulkheads": [ diff --git a/ships/eagle.json b/ships/eagle.json index 018c7d2..7b3470c 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -19,7 +19,7 @@ "pitch": 50, "roll": 120, "yaw": 18, - "seats": 1 + "crew": 1 }, "retailCost": 44800, "bulkheads": [ diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 431da60..bd480b6 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -18,7 +18,7 @@ "pitch": 38, "roll": 90, "yaw": 19, - "seats": 2 + "crew": 2 }, "retailCost": 19814210, "bulkheads": [ diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index c9f6a26..7edb589 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -20,7 +20,7 @@ "pitch": 28, "roll": 75, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 187969450, "bulkheads": [ diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 4cca8fc..1ef41b2 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 80, "yaw": 14, - "seats": 2 + "crew": 2 }, "retailCost": 14314210, "bulkheads": [ diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 6b60f1c..f0a6ef3 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -20,7 +20,7 @@ "pitch": 25, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 35814210, "bulkheads": [ diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index cf989c7..f59c9cb 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -19,7 +19,7 @@ "pitch": 38, "roll": 90, "yaw": 12, - "seats": 2 + "crew": 2 }, "retailCost": 51567040, "bulkheads": [ diff --git a/ships/hauler.json b/ships/hauler.json index 4531d13..be2e055 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -19,7 +19,7 @@ "pitch": 36, "roll": 100, "yaw": 14, - "seats": 1 + "crew": 1 }, "retailCost": 52720, "bulkheads": [ diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index cbea54b..c345075 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 80, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 22296860, "bulkheads": [ diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index fdbf2ce..3dd0c4b 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -18,7 +18,7 @@ "pitch": 38, "roll": 90, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 2542930, "bulkheads": [ diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 4261769..838b155 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -19,7 +19,7 @@ "pitch": 18, "roll": 45, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 208969450, "bulkheads": [ diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 26ab115..83fb4fa 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -19,7 +19,7 @@ "pitch": 40, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 110830, "bulkheads": [ diff --git a/ships/keelback.json b/ships/keelback.json index a16b822..bf13552 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -20,7 +20,7 @@ "pitch": 27, "roll": 100, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 3126150, "bulkheads": [ diff --git a/ships/orca.json b/ships/orca.json index 4f3de4e..df80081 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -20,7 +20,7 @@ "pitch": 25, "roll": 55, "yaw": 18, - "seats": 2 + "crew": 2 }, "retailCost": 48539900, "bulkheads": [ diff --git a/ships/python.json b/ships/python.json index e7e42b9..b5236f0 100755 --- a/ships/python.json +++ b/ships/python.json @@ -19,7 +19,7 @@ "pitch": 29, "roll": 90, "yaw": 10, - "seats": 2 + "crew": 2 }, "retailCost": 56978180, "bulkheads": [ diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 4e52bc0..25dce4f 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -19,7 +19,7 @@ "pitch": 42, "roll": 110, "yaw": 16, - "seats": 1 + "crew": 1 }, "retailCost": 32000, "bulkheads": [ diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 6a16eeb..c016af2 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 100, "yaw": 17, - "seats": 1 + "crew": 1 }, "retailCost": 1045950, "bulkheads": [ diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index b65c4f7..cca463b 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -19,7 +19,7 @@ "pitch": 22, "roll": 60, "yaw": 22, - "seats": 1 + "crew": 1 }, "retailCost": 17472260, "bulkheads": [ diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 6b9a072..71026f8 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -20,7 +20,7 @@ "pitch": 20, "roll": 20, "yaw": 8, - "seats": 3 + "crew": 3 }, "retailCost": 76555840, "bulkheads": [ diff --git a/ships/viper.json b/ships/viper.json index b94434f..e7d5626 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -19,7 +19,7 @@ "pitch": 35, "roll": 90, "yaw": 15, - "seats": 1 + "crew": 1 }, "retailCost": 142930, "bulkheads": [ diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 927c98f..1ab7d09 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -19,7 +19,7 @@ "pitch": 30, "roll": 90, "yaw": 12, - "seats": 1 + "crew": 1 }, "retailCost": 437930, "bulkheads": [ diff --git a/ships/vulture.json b/ships/vulture.json index 04b9dbf..010f0e0 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -19,7 +19,7 @@ "pitch": 42, "roll": 110, "yaw": 17, - "seats": 2 + "crew": 2 }, "retailCost": 4925620, "bulkheads": [ diff --git a/spec/data-spec.js b/spec/data-spec.js index a52cdfe..50c3ad4 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -20,7 +20,8 @@ describe('JSON Data', function() { 'pipSpeed', 'pitch', 'roll', - 'yaw' + 'yaw', + 'crew' ]; var edIDs = {};