From fd188237ca49e45a3e5183ffdadfc4a4632505f4 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 11 Dec 2016 21:47:39 +0000 Subject: [PATCH] Updates for 2.2.03 changes; add pitch/yaw/roll to ships --- dist/index.js | 232 ++++++++++++++------- dist/index.json | 232 ++++++++++++++------- modifications/modifierActions.json | 3 + modules/hardpoints/burst_laser.json | 9 +- modules/hardpoints/fragment_cannon.json | 2 + modules/hardpoints/mining_laser.json | 9 +- modules/hardpoints/multi_cannon.json | 8 +- modules/hardpoints/plasma_accelerator.json | 10 +- modules/hardpoints/pulse_laser.json | 2 +- modules/hardpoints/rail_gun.json | 3 +- modules/standard/thrusters.json | 4 +- ships/adder.json | 6 +- ships/anaconda.json | 6 +- ships/asp.json | 6 +- ships/asp_scout.json | 6 +- ships/beluga.json | 8 +- ships/cobra_mk_iii.json | 6 +- ships/cobra_mk_iv.json | 6 +- ships/diamondback_explorer.json | 6 +- ships/diamondback_scout.json | 8 +- ships/eagle.json | 6 +- ships/federal_assault_ship.json | 6 +- ships/federal_corvette.json | 6 +- ships/federal_dropship.json | 6 +- ships/federal_gunship.json | 6 +- ships/fer_de_lance.json | 6 +- ships/hauler.json | 6 +- ships/imperial_clipper.json | 6 +- ships/imperial_courier.json | 6 +- ships/imperial_cutter.json | 6 +- ships/imperial_eagle.json | 6 +- ships/keelback.json | 6 +- ships/orca.json | 6 +- ships/python.json | 6 +- ships/sidewinder.json | 6 +- ships/type_6_transporter.json | 6 +- ships/type_7_transport.json | 6 +- ships/type_9_heavy.json | 6 +- ships/viper.json | 6 +- ships/viper_mk_iv.json | 6 +- ships/vulture.json | 6 +- spec/data-spec.js | 6 +- 42 files changed, 458 insertions(+), 246 deletions(-) diff --git a/dist/index.js b/dist/index.js index 634d090..c376fc3 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11,12 +11,14 @@ module.exports = { speed: 220, boost: 320, boostEnergy: 9, - agility: 8, baseShieldStrength: 60, baseArmour: 90, hullMass: 35, masslock: 7, - pipSpeed: .13625 + pipSpeed: .13625, + pitch: 38, + roll: 100, + yaw: 14 }, retailCost: 87810, bulkheads: [ { @@ -97,13 +99,15 @@ module.exports = { speed: 180, boost: 240, boostEnergy: 27, - agility: 2, baseShieldStrength: 350, baseArmour: 525, hullMass: 400, masslock: 23, pipSpeed: .13875, - fighterHangars: true + fighterHangars: true, + pitch: 25, + roll: 60, + yaw: 10 }, retailCost: 146969450, bulkheads: [ { @@ -184,12 +188,14 @@ module.exports = { speed: 250, boost: 340, boostEnergy: 13, - agility: 6, baseShieldStrength: 140, baseArmour: 210, hullMass: 280, masslock: 11, - pipSpeed: .13 + pipSpeed: .13, + pitch: 38, + roll: 100, + yaw: 10 }, retailCost: 6661150, bulkheads: [ { @@ -270,12 +276,14 @@ module.exports = { speed: 220, boost: 300, boostEnergy: 13, - agility: 8, baseShieldStrength: 120, baseArmour: 180, hullMass: 150, masslock: 8, - pipSpeed: .125 + pipSpeed: .125, + pitch: 40, + roll: 110, + yaw: 15 }, retailCost: 3961150, bulkheads: [ { @@ -356,14 +364,16 @@ module.exports = { speed: 200, boost: 280, boostEnergy: 19, - agility: 2, baseShieldStrength: 280, baseArmour: 280, hullMass: 1100, masslock: 18, - pipSpeed: -1, + pipSpeed: .1125, luxuryCabins: true, - fighterHangars: true + fighterHangars: true, + pitch: 25, + roll: 60, + yaw: 17 }, retailCost: 84532770, bulkheads: [ { @@ -484,12 +494,14 @@ module.exports = { speed: 280, boost: 400, boostEnergy: 10, - agility: 6, baseShieldStrength: 80, baseArmour: 120, hullMass: 180, masslock: 8, - pipSpeed: .125 + pipSpeed: .125, + pitch: 40, + roll: 100, + yaw: 10 }, retailCost: 349720, bulkheads: [ { @@ -570,12 +582,14 @@ module.exports = { speed: 200, boost: 300, boostEnergy: 10, - agility: 4, baseShieldStrength: 120, baseArmour: 120, hullMass: 210, masslock: 8, - pipSpeed: .125 + pipSpeed: .125, + pitch: 30, + roll: 90, + yaw: 10 }, retailCost: 747660, bulkheads: [ { @@ -656,12 +670,14 @@ module.exports = { speed: 260, boost: 340, boostEnergy: 13, - agility: 5, baseShieldStrength: 150, baseArmour: 150, hullMass: 298, masslock: 10, - pipSpeed: .09625 + pipSpeed: .09625, + pitch: 35, + roll: 90, + yaw: 13 }, retailCost: 1894760, bulkheads: [ { @@ -742,12 +758,14 @@ module.exports = { speed: 280, boost: 380, boostEnergy: 10, - agility: 8, baseShieldStrength: 120, baseArmour: 120, hullMass: 170, masslock: 8, - pipSpeed: .09875 + pipSpeed: .09875, + pitch: 42, + roll: 100, + yaw: 15 }, retailCost: 564330, bulkheads: [ { @@ -828,12 +846,14 @@ module.exports = { speed: 240, boost: 350, boostEnergy: 8, - agility: 10, baseShieldStrength: 60, baseArmour: 40, hullMass: 50, masslock: 6, - pipSpeed: .0625 + pipSpeed: .0625, + pitch: 50, + roll: 120, + yaw: 18 }, retailCost: 44800, bulkheads: [ { @@ -914,12 +934,14 @@ module.exports = { speed: 210, boost: 350, boostEnergy: 19, - agility: 6, baseShieldStrength: 200, baseArmour: 300, hullMass: 480, masslock: 14, - pipSpeed: .11125 + pipSpeed: .11125, + pitch: 38, + roll: 90, + yaw: 19 }, retailCost: 19814210, bulkheads: [ { @@ -1000,13 +1022,15 @@ module.exports = { speed: 200, boost: 260, boostEnergy: 27, - agility: 2, baseShieldStrength: 555, baseArmour: 370, hullMass: 900, masslock: 24, pipSpeed: .125, - fighterHangars: true + fighterHangars: true, + pitch: 28, + roll: 75, + yaw: 8 }, retailCost: 187969450, bulkheads: [ { @@ -1087,12 +1111,14 @@ module.exports = { speed: 180, boost: 300, boostEnergy: 19, - agility: 2, baseShieldStrength: 200, baseArmour: 300, hullMass: 580, masslock: 14, - pipSpeed: .0725 + pipSpeed: .0725, + pitch: 30, + roll: 80, + yaw: 14 }, retailCost: 14314210, bulkheads: [ { @@ -1173,13 +1199,15 @@ module.exports = { speed: 170, boost: 280, boostEnergy: 23, - agility: 2, baseShieldStrength: 250, baseArmour: 350, hullMass: 580, masslock: 14, pipSpeed: .1025, - fighterHangars: true + fighterHangars: true, + pitch: 25, + roll: 80, + yaw: 18 }, retailCost: 35814210, bulkheads: [ { @@ -1260,12 +1288,14 @@ module.exports = { speed: 260, boost: 350, boostEnergy: 19, - agility: 6, baseShieldStrength: 300, baseArmour: 225, hullMass: 250, masslock: 12, - pipSpeed: .03875 + pipSpeed: .03875, + pitch: 38, + roll: 90, + yaw: 12 }, retailCost: 51567040, bulkheads: [ { @@ -1345,13 +1375,15 @@ module.exports = { hullCost: 29790, speed: 200, boost: 300, - agility: 6, boostEnergy: 7, baseShieldStrength: 50, baseArmour: 50, hullMass: 14, masslock: 6, - pipSpeed: .1625 + pipSpeed: .1625, + pitch: 36, + roll: 100, + yaw: 14 }, retailCost: 52720, bulkheads: [ { @@ -1432,12 +1464,14 @@ module.exports = { speed: 300, boost: 380, boostEnergy: 19, - agility: 2, baseShieldStrength: 180, baseArmour: 270, hullMass: 400, masslock: 12, - pipSpeed: .1 + pipSpeed: .1, + pitch: 40, + roll: 80, + yaw: 18 }, retailCost: 22296860, bulkheads: [ { @@ -1518,12 +1552,14 @@ module.exports = { speed: 280, boost: 380, boostEnergy: 10, - agility: 6, baseShieldStrength: 200, baseArmour: 80, hullMass: 35, masslock: 7, - pipSpeed: .05375 + pipSpeed: .05375, + pitch: 38, + roll: 90, + yaw: 16 }, retailCost: 2542930, bulkheads: [ { @@ -1604,13 +1640,15 @@ module.exports = { speed: 200, boost: 320, boostEnergy: 23, - agility: 2, baseShieldStrength: 600, baseArmour: 400, hullMass: 1100, masslock: 27, pipSpeed: .05, - fighterHangars: true + fighterHangars: true, + pitch: 18, + roll: 45, + yaw: 8 }, retailCost: 208969450, bulkheads: [ { @@ -1691,12 +1729,14 @@ module.exports = { speed: 300, boost: 400, boostEnergy: 8, - agility: 6, baseShieldStrength: 80, baseArmour: 60, hullMass: 50, masslock: 6, - pipSpeed: .075 + pipSpeed: .075, + pitch: 40, + roll: 100, + yaw: 15 }, retailCost: 110830, bulkheads: [ { @@ -1777,13 +1817,15 @@ module.exports = { speed: 200, boost: 300, boostEnergy: 10, - agility: 2, baseShieldStrength: 135, baseArmour: 135, hullMass: 180, masslock: 8, pipSpeed: .1375, - fighterHangars: true + fighterHangars: true, + pitch: 27, + roll: 100, + yaw: 15 }, retailCost: 3126160, bulkheads: [ { @@ -1864,13 +1906,15 @@ module.exports = { speed: 300, boost: 380, boostEnergy: 16, - agility: 2, baseShieldStrength: 220, baseArmour: 220, hullMass: 580, masslock: 13, pipSpeed: .08375, - luxuryCabins: true + luxuryCabins: true, + pitch: 25, + roll: 55, + yaw: 18 }, retailCost: 48539900, bulkheads: [ { @@ -1971,12 +2015,14 @@ module.exports = { speed: 230, boost: 300, boostEnergy: 23, - agility: 6, baseShieldStrength: 260, baseArmour: 260, hullMass: 350, masslock: 17, - pipSpeed: .0975 + pipSpeed: .0975, + pitch: 29, + roll: 90, + yaw: 10 }, retailCost: 56978180, bulkheads: [ { @@ -2057,12 +2103,14 @@ module.exports = { speed: 220, boost: 320, boostEnergy: 7, - agility: 8, baseShieldStrength: 40, baseArmour: 60, hullMass: 25, masslock: 6, - pipSpeed: .1375 + pipSpeed: .1375, + pitch: 42, + roll: 110, + yaw: 16 }, retailCost: 40800, bulkheads: [ { @@ -2143,12 +2191,14 @@ module.exports = { speed: 220, boost: 350, boostEnergy: 10, - agility: 3, baseShieldStrength: 90, baseArmour: 90, hullMass: 155, masslock: 8, - pipSpeed: .1475 + pipSpeed: .1475, + pitch: 30, + roll: 100, + yaw: 17 }, retailCost: 1045950, bulkheads: [ { @@ -2229,12 +2279,14 @@ module.exports = { speed: 180, boost: 300, boostEnergy: 10, - agility: 2, baseShieldStrength: 155, baseArmour: 170, hullMass: 420, masslock: 10, - pipSpeed: .16625 + pipSpeed: .16625, + pitch: 22, + roll: 60, + yaw: 22 }, retailCost: 17472260, bulkheads: [ { @@ -2315,13 +2367,15 @@ module.exports = { speed: 130, boost: 200, boostEnergy: 19, - agility: 0, baseShieldStrength: 240, baseArmour: 240, hullMass: 1e3, masslock: 16, pipSpeed: .17375, - fighterHangars: true + fighterHangars: true, + pitch: 20, + roll: 20, + yaw: 8 }, retailCost: 76555840, bulkheads: [ { @@ -2402,12 +2456,14 @@ module.exports = { speed: 320, boost: 400, boostEnergy: 10, - agility: 6, baseShieldStrength: 105, baseArmour: 70, hullMass: 60, masslock: 7, - pipSpeed: .09375 + pipSpeed: .09375, + pitch: 35, + roll: 90, + yaw: 15 }, retailCost: 142930, bulkheads: [ { @@ -2488,12 +2544,14 @@ module.exports = { speed: 270, boost: 340, boostEnergy: 10, - agility: 4, baseShieldStrength: 150, baseArmour: 150, hullMass: 190, masslock: 7, - pipSpeed: .0875 + pipSpeed: .0875, + pitch: 30, + roll: 90, + yaw: 12 }, retailCost: 437930, bulkheads: [ { @@ -2574,12 +2632,14 @@ module.exports = { speed: 210, boost: 340, boostEnergy: 16, - agility: 9, baseShieldStrength: 240, baseArmour: 160, hullMass: 230, masslock: 10, - pipSpeed: .02375 + pipSpeed: .02375, + pitch: 42, + roll: 110, + yaw: 17 }, retailCost: 4925620, bulkheads: [ { @@ -3661,9 +3721,9 @@ module.exports = { integrity: 56, mass: 2.5, maxmass: 108, - maxmul: .96, + maxmul: 1.16, minmass: 36, - minmul: 1.16, + minmul: .96, optmass: 72, optmul: 1, power: 3, @@ -6147,7 +6207,7 @@ module.exports = { mass: 4, mount: "F", name: "Disruptor", - piercing: "A", + piercing: 35, power: .7, pp: "Felicia Winters", rating: "E", @@ -6338,11 +6398,11 @@ module.exports = { thermload: .2, type: "T" }, { - breachdmg: 1.5, + breachdmg: 2, breachmax: 0, breachmin: 0, - burst: 3, - burstrof: 15, + burst: 8, + burstrof: 20, class: 1, cost: 8800, damage: 2.4, @@ -6352,6 +6412,7 @@ module.exports = { grp: "ul", id: "cy", integrity: 40, + jitter: 3.5, mass: 2, mount: "F", name: "Cytoscrambler", @@ -6360,7 +6421,7 @@ module.exports = { pp: "Archon Delaine", range: 600, rating: "F", - rof: 1.98, + rof: 6.6, thermload: .3, type: "T" }, { @@ -6893,13 +6954,13 @@ module.exports = { type: "K" }, { ammo: 1e3, - breachdmg: 2.7, + breachdmg: 2.6, breachmax: .8, breachmin: .4, class: 1, - clip: 100, + clip: 60, cost: 13980, - damage: 3, + damage: 2.9, distdraw: .12, eddbID: 1481, grp: "mc", @@ -6908,7 +6969,7 @@ module.exports = { mass: 2, mount: "F", name: "Enforcer", - piercing: "A", + piercing: 30, power: .28, pp: "Pranav Antal", range: 4500, @@ -7663,6 +7724,7 @@ module.exports = { grp: "fc", id: "pa", integrity: 64, + jitter: 1.7, mass: 8, mount: "F", name: "Pacifier", @@ -7672,6 +7734,7 @@ module.exports = { rating: "C", reload: 2.5, rof: 4.5, + roundspershot: 12, speed: 1e3, thermload: 1.1, type: "K" @@ -7746,9 +7809,10 @@ module.exports = { mass: 4, mount: "F", name: "Imperial Hammer", - piercing: "A", + piercing: 48, power: 1.63, pp: "Arissa Lavigny-Duval", + range: 3e3, rating: "B", reload: 1, rof: 4.1, @@ -7772,7 +7836,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", - piercing: 55, + piercing: 100, power: 1.43, range: 3500, rating: "C", @@ -7798,7 +7862,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", - piercing: 70, + piercing: 100, power: 1.97, range: 3500, rating: "B", @@ -7809,7 +7873,7 @@ module.exports = { type: "KT" }, { ammo: 300, - breachdmg: 28.1, + breachdmg: 30.9, breachmax: .8, breachmin: .4, class: 3, @@ -7825,7 +7889,7 @@ module.exports = { mass: 8, mount: "F", name: "Advanced Plasma Accelerator", - piercing: 70, + piercing: 100, power: 1.97, pp: "Denton Patreus", range: 3500, @@ -7852,7 +7916,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", - piercing: 85, + piercing: 100, power: 2.63, range: 3500, rating: "A", @@ -8171,16 +8235,17 @@ module.exports = { mount: "F", piercing: 18, power: .5, + range: 500, rating: "D", thermload: 2 }, { - breachdmg: .6, + breachdmg: 1.2, breachmax: .2, breachmin: .1, class: 1, cost: 13600, damage: 8, - distdraw: 1.58, + distdraw: 1.75, eddbID: 1479, grp: "ml", id: "ml", @@ -8188,9 +8253,10 @@ module.exports = { mass: 2, mount: "F", name: "Mining Lance", - piercing: "D", + piercing: 18, power: .7, pp: "Zemina Torval", + range: 2e3, rating: "D", thermload: 6, type: "T" @@ -8211,6 +8277,7 @@ module.exports = { mount: "F", piercing: 18, power: .75, + range: 500, rating: "D", thermload: 4 } ], @@ -14173,6 +14240,9 @@ module.exports = { thermload: 2, type: "T" }, + special_inertial_impact: { + type: "KT" + }, special_overload_munitions: {}, special_phasing_sequence: {}, special_radiant_canister: { diff --git a/dist/index.json b/dist/index.json index f341b9a..ec999f2 100644 --- a/dist/index.json +++ b/dist/index.json @@ -11,12 +11,14 @@ "speed": 220, "boost": 320, "boostEnergy": 9, - "agility": 8, "baseShieldStrength": 60, "baseArmour": 90, "hullMass": 35, "masslock": 7, - "pipSpeed": 0.13625 + "pipSpeed": 0.13625, + "pitch": 38, + "roll": 100, + "yaw": 14 }, "retailCost": 87810, "bulkheads": [ @@ -143,13 +145,15 @@ "speed": 180, "boost": 240, "boostEnergy": 27, - "agility": 2, "baseShieldStrength": 350, "baseArmour": 525, "hullMass": 400, "masslock": 23, "pipSpeed": 0.13875, - "fighterHangars": true + "fighterHangars": true, + "pitch": 25, + "roll": 60, + "yaw": 10 }, "retailCost": 146969450, "bulkheads": [ @@ -310,12 +314,14 @@ "speed": 250, "boost": 340, "boostEnergy": 13, - "agility": 6, "baseShieldStrength": 140, "baseArmour": 210, "hullMass": 280, "masslock": 11, - "pipSpeed": 0.13 + "pipSpeed": 0.13, + "pitch": 38, + "roll": 100, + "yaw": 10 }, "retailCost": 6661150, "bulkheads": [ @@ -456,12 +462,14 @@ "speed": 220, "boost": 300, "boostEnergy": 13, - "agility": 8, "baseShieldStrength": 120, "baseArmour": 180, "hullMass": 150, "masslock": 8, - "pipSpeed": 0.125 + "pipSpeed": 0.125, + "pitch": 40, + "roll": 110, + "yaw": 15 }, "retailCost": 3961150, "bulkheads": [ @@ -590,14 +598,16 @@ "speed": 200, "boost": 280, "boostEnergy": 19, - "agility": 2, "baseShieldStrength": 280, "baseArmour": 280, "hullMass": 1100, "masslock": 18, - "pipSpeed": -1, + "pipSpeed": 0.1125, "luxuryCabins": true, - "fighterHangars": true + "fighterHangars": true, + "pitch": 25, + "roll": 60, + "yaw": 17 }, "retailCost": 84532770, "bulkheads": [ @@ -788,12 +798,14 @@ "speed": 280, "boost": 400, "boostEnergy": 10, - "agility": 6, "baseShieldStrength": 80, "baseArmour": 120, "hullMass": 180, "masslock": 8, - "pipSpeed": 0.125 + "pipSpeed": 0.125, + "pitch": 40, + "roll": 100, + "yaw": 10 }, "retailCost": 349720, "bulkheads": [ @@ -924,12 +936,14 @@ "speed": 200, "boost": 300, "boostEnergy": 10, - "agility": 4, "baseShieldStrength": 120, "baseArmour": 120, "hullMass": 210, "masslock": 8, - "pipSpeed": 0.125 + "pipSpeed": 0.125, + "pitch": 30, + "roll": 90, + "yaw": 10 }, "retailCost": 747660, "bulkheads": [ @@ -1066,12 +1080,14 @@ "speed": 260, "boost": 340, "boostEnergy": 13, - "agility": 5, "baseShieldStrength": 150, "baseArmour": 150, "hullMass": 298, "masslock": 10, - "pipSpeed": 0.09625 + "pipSpeed": 0.09625, + "pitch": 35, + "roll": 90, + "yaw": 13 }, "retailCost": 1894760, "bulkheads": [ @@ -1202,12 +1218,14 @@ "speed": 280, "boost": 380, "boostEnergy": 10, - "agility": 8, "baseShieldStrength": 120, "baseArmour": 120, "hullMass": 170, "masslock": 8, - "pipSpeed": 0.09875 + "pipSpeed": 0.09875, + "pitch": 42, + "roll": 100, + "yaw": 15 }, "retailCost": 564330, "bulkheads": [ @@ -1338,12 +1356,14 @@ "speed": 240, "boost": 350, "boostEnergy": 8, - "agility": 10, "baseShieldStrength": 60, "baseArmour": 40, "hullMass": 50, "masslock": 6, - "pipSpeed": 0.0625 + "pipSpeed": 0.0625, + "pitch": 50, + "roll": 120, + "yaw": 18 }, "retailCost": 44800, "bulkheads": [ @@ -1466,12 +1486,14 @@ "speed": 210, "boost": 350, "boostEnergy": 19, - "agility": 6, "baseShieldStrength": 200, "baseArmour": 300, "hullMass": 480, "masslock": 14, - "pipSpeed": 0.11125 + "pipSpeed": 0.11125, + "pitch": 38, + "roll": 90, + "yaw": 19 }, "retailCost": 19814210, "bulkheads": [ @@ -1606,13 +1628,15 @@ "speed": 200, "boost": 260, "boostEnergy": 27, - "agility": 2, "baseShieldStrength": 555, "baseArmour": 370, "hullMass": 900, "masslock": 24, "pipSpeed": 0.125, - "fighterHangars": true + "fighterHangars": true, + "pitch": 28, + "roll": 75, + "yaw": 8 }, "retailCost": 187969450, "bulkheads": [ @@ -1769,12 +1793,14 @@ "speed": 180, "boost": 300, "boostEnergy": 19, - "agility": 2, "baseShieldStrength": 200, "baseArmour": 300, "hullMass": 580, "masslock": 14, - "pipSpeed": 0.0725 + "pipSpeed": 0.0725, + "pitch": 30, + "roll": 80, + "yaw": 14 }, "retailCost": 14314210, "bulkheads": [ @@ -1913,13 +1939,15 @@ "speed": 170, "boost": 280, "boostEnergy": 23, - "agility": 2, "baseShieldStrength": 250, "baseArmour": 350, "hullMass": 580, "masslock": 14, "pipSpeed": 0.1025, - "fighterHangars": true + "fighterHangars": true, + "pitch": 25, + "roll": 80, + "yaw": 18 }, "retailCost": 35814210, "bulkheads": [ @@ -2058,12 +2086,14 @@ "speed": 260, "boost": 350, "boostEnergy": 19, - "agility": 6, "baseShieldStrength": 300, "baseArmour": 225, "hullMass": 250, "masslock": 12, - "pipSpeed": 0.03875 + "pipSpeed": 0.03875, + "pitch": 38, + "roll": 90, + "yaw": 12 }, "retailCost": 51567040, "bulkheads": [ @@ -2201,13 +2231,15 @@ "hullCost": 29790, "speed": 200, "boost": 300, - "agility": 6, "boostEnergy": 7, "baseShieldStrength": 50, "baseArmour": 50, "hullMass": 14, "masslock": 6, - "pipSpeed": 0.1625 + "pipSpeed": 0.1625, + "pitch": 36, + "roll": 100, + "yaw": 14 }, "retailCost": 52720, "bulkheads": [ @@ -2328,12 +2360,14 @@ "speed": 300, "boost": 380, "boostEnergy": 19, - "agility": 2, "baseShieldStrength": 180, "baseArmour": 270, "hullMass": 400, "masslock": 12, - "pipSpeed": 0.1 + "pipSpeed": 0.1, + "pitch": 40, + "roll": 80, + "yaw": 18 }, "retailCost": 22296860, "bulkheads": [ @@ -2472,12 +2506,14 @@ "speed": 280, "boost": 380, "boostEnergy": 10, - "agility": 6, "baseShieldStrength": 200, "baseArmour": 80, "hullMass": 35, "masslock": 7, - "pipSpeed": 0.05375 + "pipSpeed": 0.05375, + "pitch": 38, + "roll": 90, + "yaw": 16 }, "retailCost": 2542930, "bulkheads": [ @@ -2610,13 +2646,15 @@ "speed": 200, "boost": 320, "boostEnergy": 23, - "agility": 2, "baseShieldStrength": 600, "baseArmour": 400, "hullMass": 1100, "masslock": 27, "pipSpeed": 0.05, - "fighterHangars": true + "fighterHangars": true, + "pitch": 18, + "roll": 45, + "yaw": 8 }, "retailCost": 208969450, "bulkheads": [ @@ -2771,12 +2809,14 @@ "speed": 300, "boost": 400, "boostEnergy": 8, - "agility": 6, "baseShieldStrength": 80, "baseArmour": 60, "hullMass": 50, "masslock": 6, - "pipSpeed": 0.075 + "pipSpeed": 0.075, + "pitch": 40, + "roll": 100, + "yaw": 15 }, "retailCost": 110830, "bulkheads": [ @@ -2899,13 +2939,15 @@ "speed": 200, "boost": 300, "boostEnergy": 10, - "agility": 2, "baseShieldStrength": 135, "baseArmour": 135, "hullMass": 180, "masslock": 8, "pipSpeed": 0.1375, - "fighterHangars": true + "fighterHangars": true, + "pitch": 27, + "roll": 100, + "yaw": 15 }, "retailCost": 3126160, "bulkheads": [ @@ -3038,13 +3080,15 @@ "speed": 300, "boost": 380, "boostEnergy": 16, - "agility": 2, "baseShieldStrength": 220, "baseArmour": 220, "hullMass": 580, "masslock": 13, "pipSpeed": 0.08375, - "luxuryCabins": true + "luxuryCabins": true, + "pitch": 25, + "roll": 55, + "yaw": 18 }, "retailCost": 48539900, "bulkheads": [ @@ -3201,12 +3245,14 @@ "speed": 230, "boost": 300, "boostEnergy": 23, - "agility": 6, "baseShieldStrength": 260, "baseArmour": 260, "hullMass": 350, "masslock": 17, - "pipSpeed": 0.0975 + "pipSpeed": 0.0975, + "pitch": 29, + "roll": 90, + "yaw": 10 }, "retailCost": 56978180, "bulkheads": [ @@ -3349,12 +3395,14 @@ "speed": 220, "boost": 320, "boostEnergy": 7, - "agility": 8, "baseShieldStrength": 40, "baseArmour": 60, "hullMass": 25, "masslock": 6, - "pipSpeed": 0.1375 + "pipSpeed": 0.1375, + "pitch": 42, + "roll": 110, + "yaw": 16 }, "retailCost": 40800, "bulkheads": [ @@ -3477,12 +3525,14 @@ "speed": 220, "boost": 350, "boostEnergy": 10, - "agility": 3, "baseShieldStrength": 90, "baseArmour": 90, "hullMass": 155, "masslock": 8, - "pipSpeed": 0.1475 + "pipSpeed": 0.1475, + "pitch": 30, + "roll": 100, + "yaw": 17 }, "retailCost": 1045950, "bulkheads": [ @@ -3613,12 +3663,14 @@ "speed": 180, "boost": 300, "boostEnergy": 10, - "agility": 2, "baseShieldStrength": 155, "baseArmour": 170, "hullMass": 420, "masslock": 10, - "pipSpeed": 0.16625 + "pipSpeed": 0.16625, + "pitch": 22, + "roll": 60, + "yaw": 22 }, "retailCost": 17472260, "bulkheads": [ @@ -3757,13 +3809,15 @@ "speed": 130, "boost": 200, "boostEnergy": 19, - "agility": 0, "baseShieldStrength": 240, "baseArmour": 240, "hullMass": 1000, "masslock": 16, "pipSpeed": 0.17375, - "fighterHangars": true + "fighterHangars": true, + "pitch": 20, + "roll": 20, + "yaw": 8 }, "retailCost": 76555840, "bulkheads": [ @@ -3906,12 +3960,14 @@ "speed": 320, "boost": 400, "boostEnergy": 10, - "agility": 6, "baseShieldStrength": 105, "baseArmour": 70, "hullMass": 60, "masslock": 7, - "pipSpeed": 0.09375 + "pipSpeed": 0.09375, + "pitch": 35, + "roll": 90, + "yaw": 15 }, "retailCost": 142930, "bulkheads": [ @@ -4038,12 +4094,14 @@ "speed": 270, "boost": 340, "boostEnergy": 10, - "agility": 4, "baseShieldStrength": 150, "baseArmour": 150, "hullMass": 190, "masslock": 7, - "pipSpeed": 0.0875 + "pipSpeed": 0.0875, + "pitch": 30, + "roll": 90, + "yaw": 12 }, "retailCost": 437930, "bulkheads": [ @@ -4174,12 +4232,14 @@ "speed": 210, "boost": 340, "boostEnergy": 16, - "agility": 9, "baseShieldStrength": 240, "baseArmour": 160, "hullMass": 230, "masslock": 10, - "pipSpeed": 0.02375 + "pipSpeed": 0.02375, + "pitch": 42, + "roll": 110, + "yaw": 17 }, "retailCost": 4925620, "bulkheads": [ @@ -5380,9 +5440,9 @@ "integrity": 56, "mass": 2.5, "maxmass": 108, - "maxmul": 0.96, + "maxmul": 1.16, "minmass": 36, - "minmul": 1.16, + "minmul": 0.96, "optmass": 72, "optmul": 1, "power": 3, @@ -8046,7 +8106,7 @@ "mass": 4, "mount": "F", "name": "Disruptor", - "piercing": "A", + "piercing": 35, "power": 0.7, "pp": "Felicia Winters", "rating": "E", @@ -8247,11 +8307,11 @@ "type": "T" }, { - "breachdmg": 1.5, + "breachdmg": 2, "breachmax": 0, "breachmin": 0, - "burst": 3, - "burstrof": 15, + "burst": 8, + "burstrof": 20, "class": 1, "cost": 8800, "damage": 2.4, @@ -8261,6 +8321,7 @@ "grp": "ul", "id": "cy", "integrity": 40, + "jitter": 3.5, "mass": 2, "mount": "F", "name": "Cytoscrambler", @@ -8269,7 +8330,7 @@ "pp": "Archon Delaine", "range": 600, "rating": "F", - "rof": 1.98, + "rof": 6.6, "thermload": 0.3, "type": "T" }, @@ -8828,13 +8889,13 @@ }, { "ammo": 1000, - "breachdmg": 2.7, + "breachdmg": 2.6, "breachmax": 0.8, "breachmin": 0.4, "class": 1, - "clip": 100, + "clip": 60, "cost": 13980, - "damage": 3, + "damage": 2.9, "distdraw": 0.12, "eddbID": 1481, "grp": "mc", @@ -8843,7 +8904,7 @@ "mass": 2, "mount": "F", "name": "Enforcer", - "piercing": "A", + "piercing": 30, "power": 0.28, "pp": "Pranav Antal", "range": 4500, @@ -9628,6 +9689,7 @@ "grp": "fc", "id": "pa", "integrity": 64, + "jitter": 1.7, "mass": 8, "mount": "F", "name": "Pacifier", @@ -9637,6 +9699,7 @@ "rating": "C", "reload": 2.5, "rof": 4.5, + "roundspershot": 12, "speed": 1000, "thermload": 1.1, "type": "K" @@ -9715,9 +9778,10 @@ "mass": 4, "mount": "F", "name": "Imperial Hammer", - "piercing": "A", + "piercing": 48, "power": 1.63, "pp": "Arissa Lavigny-Duval", + "range": 3000, "rating": "B", "reload": 1, "rof": 4.1, @@ -9743,7 +9807,7 @@ "integrity": 51, "mass": 4, "mount": "F", - "piercing": 55, + "piercing": 100, "power": 1.43, "range": 3500, "rating": "C", @@ -9770,7 +9834,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 70, + "piercing": 100, "power": 1.97, "range": 3500, "rating": "B", @@ -9782,7 +9846,7 @@ }, { "ammo": 300, - "breachdmg": 28.1, + "breachdmg": 30.9, "breachmax": 0.8, "breachmin": 0.4, "class": 3, @@ -9798,7 +9862,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", - "piercing": 70, + "piercing": 100, "power": 1.97, "pp": "Denton Patreus", "range": 3500, @@ -9826,7 +9890,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 85, + "piercing": 100, "power": 2.63, "range": 3500, "rating": "A", @@ -10161,17 +10225,18 @@ "mount": "F", "piercing": 18, "power": 0.5, + "range": 500, "rating": "D", "thermload": 2 }, { - "breachdmg": 0.6, + "breachdmg": 1.2, "breachmax": 0.2, "breachmin": 0.1, "class": 1, "cost": 13600, "damage": 8, - "distdraw": 1.58, + "distdraw": 1.75, "eddbID": 1479, "grp": "ml", "id": "ml", @@ -10179,9 +10244,10 @@ "mass": 2, "mount": "F", "name": "Mining Lance", - "piercing": "D", + "piercing": 18, "power": 0.7, "pp": "Zemina Torval", + "range": 2000, "rating": "D", "thermload": 6, "type": "T" @@ -10203,6 +10269,7 @@ "mount": "F", "piercing": 18, "power": 0.75, + "range": 500, "rating": "D", "thermload": 4 } @@ -16569,6 +16636,9 @@ "thermload": 2, "type": "T" }, + "special_inertial_impact": { + "type": "KT" + }, "special_overload_munitions": {}, "special_phasing_sequence": {}, "special_radiant_canister": { diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index 9129e8f..bbc1849 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -208,6 +208,9 @@ "thermload": 2, "type": "T" }, + "special_inertial_impact": { + "type": "KT" + }, "special_overload_munitions": { }, "special_phasing_sequence": {}, diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json index f91c5ef..6cb55fb 100644 --- a/modules/hardpoints/burst_laser.json +++ b/modules/hardpoints/burst_laser.json @@ -76,11 +76,11 @@ "type": "T" }, { - "breachdmg": 1.5, + "breachdmg": 2, "breachmax": 0, "breachmin": 0, - "burst": 3, - "burstrof": 15, + "burst": 8, + "burstrof": 20, "class": 1, "cost": 8800, "damage": 2.4, @@ -90,6 +90,7 @@ "grp": "ul", "id": "cy", "integrity": 40, + "jitter": 3.5, "mass": 2, "mount": "F", "name": "Cytoscrambler", @@ -98,7 +99,7 @@ "pp": "Archon Delaine", "range": 600, "rating": "F", - "rof": 1.98, + "rof": 6.6, "thermload": 0.3, "type": "T" }, diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index d15c8a4..3add6d3 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -276,6 +276,7 @@ "grp": "fc", "id": "pa", "integrity": 64, + "jitter": 1.7, "mass": 8, "mount": "F", "name": "Pacifier", @@ -285,6 +286,7 @@ "rating": "C", "reload": 2.5, "rof": 4.5, + "roundspershot": 12, "speed": 1000, "thermload": 1.1, "type": "K" diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index fad4e5b..e852358 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -17,17 +17,18 @@ "mount": "F", "piercing": 18, "power": 0.5, + "range": 500, "rating": "D", "thermload": 2 }, { - "breachdmg": 0.6, + "breachdmg": 1.2, "breachmax": 0.2, "breachmin": 0.1, "class": 1, "cost": 13600, "damage": 8, - "distdraw": 1.58, + "distdraw": 1.75, "eddbID": 1479, "grp": "ml", "id": "ml", @@ -35,9 +36,10 @@ "mass": 2, "mount": "F", "name": "Mining Lance", - "piercing": "D", + "piercing": 18, "power": 0.7, "pp": "Zemina Torval", + "range": 2000, "rating": "D", "thermload": 6, "type": "T" @@ -59,6 +61,7 @@ "mount": "F", "piercing": 18, "power": 0.75, + "range": 500, "rating": "D", "thermload": 4 } diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index 5093ff7..ddfa283 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -83,13 +83,13 @@ }, { "ammo": 1000, - "breachdmg": 2.7, + "breachdmg": 2.6, "breachmax": 0.8, "breachmin": 0.4, "class": 1, - "clip": 100, + "clip": 60, "cost": 13980, - "damage": 3, + "damage": 2.9, "distdraw": 0.12, "eddbID": 1481, "grp": "mc", @@ -98,7 +98,7 @@ "mass": 2, "mount": "F", "name": "Enforcer", - "piercing": "A", + "piercing": 30, "power": 0.28, "pp": "Pranav Antal", "range": 4500, diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index 62b8d0a..ac73142 100644 --- a/modules/hardpoints/plasma_accelerator.json +++ b/modules/hardpoints/plasma_accelerator.json @@ -17,7 +17,7 @@ "integrity": 51, "mass": 4, "mount": "F", - "piercing": 55, + "piercing": 100, "power": 1.43, "range": 3500, "rating": "C", @@ -44,7 +44,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 70, + "piercing": 100, "power": 1.97, "range": 3500, "rating": "B", @@ -56,7 +56,7 @@ }, { "ammo": 300, - "breachdmg": 28.1, + "breachdmg": 30.9, "breachmax": 0.8, "breachmin": 0.4, "class": 3, @@ -72,7 +72,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", - "piercing": 70, + "piercing": 100, "power": 1.97, "pp": "Denton Patreus", "range": 3500, @@ -100,7 +100,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 85, + "piercing": 100, "power": 2.63, "range": 3500, "rating": "A", diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json index 3ebaee1..8f8a787 100644 --- a/modules/hardpoints/pulse_laser.json +++ b/modules/hardpoints/pulse_laser.json @@ -153,7 +153,7 @@ "mass": 4, "mount": "F", "name": "Disruptor", - "piercing": "A", + "piercing": 35, "power": 0.7, "pp": "Felicia Winters", "rating": "E", diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json index 3c5120f..b2ecd10 100644 --- a/modules/hardpoints/rail_gun.json +++ b/modules/hardpoints/rail_gun.json @@ -72,9 +72,10 @@ "mass": 4, "mount": "F", "name": "Imperial Hammer", - "piercing": "A", + "piercing": 48, "power": 1.63, "pp": "Arissa Lavigny-Duval", + "range": 3000, "rating": "B", "reload": 1, "rof": 4.1, diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index 84f071c..c034ab8 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -622,9 +622,9 @@ "integrity": 56, "mass": 2.5, "maxmass": 108, - "maxmul": 0.96, + "maxmul": 1.16, "minmass": 36, - "minmul": 1.16, + "minmul": 0.96, "optmass": 72, "optmul": 1, "power": 3, diff --git a/ships/adder.json b/ships/adder.json index 5642773..ea7ba4c 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -10,12 +10,14 @@ "speed": 220, "boost": 320, "boostEnergy": 9, - "agility": 8, "baseShieldStrength": 60, "baseArmour": 90, "hullMass": 35, "masslock": 7, - "pipSpeed": 0.13625 + "pipSpeed": 0.13625, + "pitch": 38, + "roll": 100, + "yaw": 14 }, "retailCost": 87810, "bulkheads": [ diff --git a/ships/anaconda.json b/ships/anaconda.json index 2d1599e..6fef808 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -10,13 +10,15 @@ "speed": 180, "boost": 240, "boostEnergy": 27, - "agility": 2, "baseShieldStrength": 350, "baseArmour": 525, "hullMass": 400, "masslock": 23, "pipSpeed": 0.13875, - "fighterHangars": true + "fighterHangars": true, + "pitch": 25, + "roll": 60, + "yaw": 10 }, "retailCost": 146969450, "bulkheads": [ diff --git a/ships/asp.json b/ships/asp.json index f6f19ab..07bf803 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -10,12 +10,14 @@ "speed": 250, "boost": 340, "boostEnergy": 13, - "agility": 6, "baseShieldStrength": 140, "baseArmour": 210, "hullMass": 280, "masslock": 11, - "pipSpeed": 0.13 + "pipSpeed": 0.13, + "pitch": 38, + "roll": 100, + "yaw": 10 }, "retailCost": 6661150, "bulkheads": [ diff --git a/ships/asp_scout.json b/ships/asp_scout.json index ae58c7c..4e13433 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -10,12 +10,14 @@ "speed": 220, "boost": 300, "boostEnergy": 13, - "agility": 8, "baseShieldStrength": 120, "baseArmour": 180, "hullMass": 150, "masslock": 8, - "pipSpeed": 0.125 + "pipSpeed": 0.125, + "pitch": 40, + "roll": 110, + "yaw": 15 }, "retailCost": 3961150, "bulkheads": [ diff --git a/ships/beluga.json b/ships/beluga.json index 6335210..58e1970 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -10,14 +10,16 @@ "speed": 200, "boost": 280, "boostEnergy": 19, - "agility": 2, "baseShieldStrength": 280, "baseArmour": 280, "hullMass": 1100, "masslock": 18, - "pipSpeed": -1, + "pipSpeed": 0.1125, "luxuryCabins": true, - "fighterHangars": true + "fighterHangars": true, + "pitch": 25, + "roll": 60, + "yaw": 17 }, "retailCost": 84532770, "bulkheads": [ diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 68d30d6..fabeb14 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -10,12 +10,14 @@ "speed": 280, "boost": 400, "boostEnergy": 10, - "agility": 6, "baseShieldStrength": 80, "baseArmour": 120, "hullMass": 180, "masslock": 8, - "pipSpeed": 0.125 + "pipSpeed": 0.125, + "pitch": 40, + "roll": 100, + "yaw": 10 }, "retailCost": 349720, "bulkheads": [ diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 82aca1b..d707c68 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -10,12 +10,14 @@ "speed": 200, "boost": 300, "boostEnergy": 10, - "agility": 4, "baseShieldStrength": 120, "baseArmour": 120, "hullMass": 210, "masslock": 8, - "pipSpeed": 0.125 + "pipSpeed": 0.125, + "pitch": 30, + "roll": 90, + "yaw": 10 }, "retailCost": 747660, "bulkheads": [ diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 6e12b77..151ac5c 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -9,12 +9,14 @@ "speed": 260, "boost": 340, "boostEnergy": 13, - "agility": 5, "baseShieldStrength": 150, "baseArmour": 150, "hullMass": 298, "masslock": 10, - "pipSpeed": 0.09625 + "pipSpeed": 0.09625, + "pitch": 35, + "roll": 90, + "yaw": 13 }, "retailCost": 1894760, "bulkheads": [ diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index c30c44d..228dfe5 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -10,13 +10,15 @@ "speed": 280, "boost": 380, "boostEnergy": 10, - "agility": 8, "baseShieldStrength": 120, "baseArmour": 120, "hullMass": 170, "masslock": 8, - "pipSpeed": 0.09875 - }, + "pipSpeed": 0.09875, + "pitch": 42, + "roll": 100, + "yaw": 15 + } , "retailCost": 564330, "bulkheads": [ { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, diff --git a/ships/eagle.json b/ships/eagle.json index ce3639e..6de6d1c 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -10,12 +10,14 @@ "speed": 240, "boost": 350, "boostEnergy": 8, - "agility": 10, "baseShieldStrength": 60, "baseArmour": 40, "hullMass": 50, "masslock": 6, - "pipSpeed": 0.0625 + "pipSpeed": 0.0625, + "pitch": 50, + "roll": 120, + "yaw": 18 }, "retailCost": 44800, "bulkheads": [ diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index bdc7019..deb10e0 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -9,12 +9,14 @@ "speed": 210, "boost": 350, "boostEnergy": 19, - "agility": 6, "baseShieldStrength": 200, "baseArmour": 300, "hullMass": 480, "masslock": 14, - "pipSpeed": 0.11125 + "pipSpeed": 0.11125, + "pitch": 38, + "roll": 90, + "yaw": 19 }, "retailCost": 19814210, "bulkheads": [ diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 1a2c60d..a62860a 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -10,13 +10,15 @@ "speed": 200, "boost": 260, "boostEnergy": 27, - "agility": 2, "baseShieldStrength": 555, "baseArmour": 370, "hullMass": 900, "masslock": 24, "pipSpeed": 0.125, - "fighterHangars": true + "fighterHangars": true, + "pitch": 28, + "roll": 75, + "yaw": 8 }, "retailCost": 187969450, "bulkheads": [ diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 524301c..f92f82f 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -10,12 +10,14 @@ "speed": 180, "boost": 300, "boostEnergy": 19, - "agility": 2, "baseShieldStrength": 200, "baseArmour": 300, "hullMass": 580, "masslock": 14, - "pipSpeed": 0.0725 + "pipSpeed": 0.0725, + "pitch": 30, + "roll": 80, + "yaw": 14 }, "retailCost": 14314210, "bulkheads": [ diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 50b8e12..bd3912d 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -10,13 +10,15 @@ "speed": 170, "boost": 280, "boostEnergy": 23, - "agility": 2, "baseShieldStrength": 250, "baseArmour": 350, "hullMass": 580, "masslock": 14, "pipSpeed": 0.1025, - "fighterHangars": true + "fighterHangars": true, + "pitch": 25, + "roll": 80, + "yaw": 18 }, "retailCost": 35814210, "bulkheads": [ diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index 6b26248..6ec19df 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -10,12 +10,14 @@ "speed": 260, "boost": 350, "boostEnergy": 19, - "agility": 6, "baseShieldStrength": 300, "baseArmour": 225, "hullMass": 250, "masslock": 12, - "pipSpeed": 0.03875 + "pipSpeed": 0.03875, + "pitch": 38, + "roll": 90, + "yaw": 12 }, "retailCost": 51567040, "bulkheads": [ diff --git a/ships/hauler.json b/ships/hauler.json index d1f00ca..fda389a 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -9,13 +9,15 @@ "hullCost": 29790, "speed": 200, "boost": 300, - "agility": 6, "boostEnergy": 7, "baseShieldStrength": 50, "baseArmour": 50, "hullMass": 14, "masslock": 6, - "pipSpeed": 0.1625 + "pipSpeed": 0.1625, + "pitch": 36, + "roll": 100, + "yaw": 14 }, "retailCost": 52720, "bulkheads": [ diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index 9f5d108..06d4ebf 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -10,12 +10,14 @@ "speed": 300, "boost": 380, "boostEnergy": 19, - "agility": 2, "baseShieldStrength": 180, "baseArmour": 270, "hullMass": 400, "masslock": 12, - "pipSpeed": 0.1 + "pipSpeed": 0.1, + "pitch": 40, + "roll": 80, + "yaw": 18 }, "retailCost": 22296860, "bulkheads": [ diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index 33ac090..339348c 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -9,12 +9,14 @@ "speed": 280, "boost": 380, "boostEnergy": 10, - "agility": 6, "baseShieldStrength": 200, "baseArmour": 80, "hullMass": 35, "masslock": 7, - "pipSpeed": 0.05375 + "pipSpeed": 0.05375, + "pitch": 38, + "roll": 90, + "yaw": 16 }, "retailCost": 2542930, "bulkheads": [ diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 449f01f..92a2e63 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -9,13 +9,15 @@ "speed": 200, "boost": 320, "boostEnergy": 23, - "agility": 2, "baseShieldStrength": 600, "baseArmour": 400, "hullMass": 1100, "masslock": 27, "pipSpeed": 0.05, - "fighterHangars": true + "fighterHangars": true, + "pitch": 18, + "roll": 45, + "yaw":8 }, "retailCost": 208969450, "bulkheads": [ diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index e22b413..a81211d 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -10,12 +10,14 @@ "speed": 300, "boost": 400, "boostEnergy": 8, - "agility": 6, "baseShieldStrength": 80, "baseArmour": 60, "hullMass": 50, "masslock": 6, - "pipSpeed": 0.075 + "pipSpeed": 0.075, + "pitch": 40, + "roll": 100, + "yaw": 15 }, "retailCost": 110830, "bulkheads": [ diff --git a/ships/keelback.json b/ships/keelback.json index 691b747..9aa8178 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -10,13 +10,15 @@ "speed": 200, "boost": 300, "boostEnergy": 10, - "agility": 2, "baseShieldStrength": 135, "baseArmour": 135, "hullMass": 180, "masslock": 8, "pipSpeed": 0.1375, - "fighterHangars": true + "fighterHangars": true, + "pitch": 27, + "roll": 100, + "yaw": 15 }, "retailCost": 3126160, "bulkheads": [ diff --git a/ships/orca.json b/ships/orca.json index 84cd29d..440a248 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -10,13 +10,15 @@ "speed": 300, "boost": 380, "boostEnergy": 16, - "agility": 2, "baseShieldStrength": 220, "baseArmour": 220, "hullMass": 580, "masslock": 13, "pipSpeed": 0.08375, - "luxuryCabins": true + "luxuryCabins": true, + "pitch": 25, + "roll": 55, + "yaw": 18 }, "retailCost": 48539900, "bulkheads": [ diff --git a/ships/python.json b/ships/python.json index 15a88fa..0613379 100755 --- a/ships/python.json +++ b/ships/python.json @@ -10,12 +10,14 @@ "speed": 230, "boost": 300, "boostEnergy": 23, - "agility": 6, "baseShieldStrength": 260, "baseArmour": 260, "hullMass": 350, "masslock": 17, - "pipSpeed": 0.0975 + "pipSpeed": 0.0975, + "pitch": 29, + "roll": 90, + "yaw": 10 }, "retailCost": 56978180, "bulkheads": [ diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 8b94253..5878496 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -10,12 +10,14 @@ "speed": 220, "boost": 320, "boostEnergy": 7, - "agility": 8, "baseShieldStrength": 40, "baseArmour": 60, "hullMass": 25, "masslock": 6, - "pipSpeed": 0.1375 + "pipSpeed": 0.1375, + "pitch": 42, + "roll": 110, + "yaw": 16 }, "retailCost": 40800, "bulkheads": [ diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index c1f23f2..9664739 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -10,12 +10,14 @@ "speed": 220, "boost": 350, "boostEnergy": 10, - "agility": 3, "baseShieldStrength": 90, "baseArmour": 90, "hullMass": 155, "masslock": 8, - "pipSpeed": 0.1475 + "pipSpeed": 0.1475, + "pitch": 30, + "roll": 100, + "yaw": 17 }, "retailCost": 1045950, "bulkheads": [ diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index 7ea27b0..93df032 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -10,12 +10,14 @@ "speed": 180, "boost": 300, "boostEnergy": 10, - "agility": 2, "baseShieldStrength": 155, "baseArmour": 170, "hullMass": 420, "masslock": 10, - "pipSpeed": 0.16625 + "pipSpeed": 0.16625, + "pitch": 22, + "roll": 60, + "yaw": 22 }, "retailCost": 17472260, "bulkheads": [ diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 97dd917..554bfa1 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -10,13 +10,15 @@ "speed": 130, "boost": 200, "boostEnergy": 19, - "agility": 0, "baseShieldStrength": 240, "baseArmour": 240, "hullMass": 1000, "masslock": 16, "pipSpeed": 0.17375, - "fighterHangars": true + "fighterHangars": true, + "pitch": 20, + "roll": 20, + "yaw": 8 }, "retailCost": 76555840, "bulkheads": [ diff --git a/ships/viper.json b/ships/viper.json index ef3d00c..83a93c1 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -10,12 +10,14 @@ "speed": 320, "boost": 400, "boostEnergy": 10, - "agility": 6, "baseShieldStrength": 105, "baseArmour": 70, "hullMass": 60, "masslock": 7, - "pipSpeed": 0.09375 + "pipSpeed": 0.09375, + "pitch": 35, + "roll": 90, + "yaw": 15 }, "retailCost": 142930, "bulkheads": [ diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index c2c5bcd..9c0d0dc 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -10,12 +10,14 @@ "speed": 270, "boost": 340, "boostEnergy": 10, - "agility": 4, "baseShieldStrength": 150, "baseArmour": 150, "hullMass": 190, "masslock": 7, - "pipSpeed": 0.0875 + "pipSpeed": 0.0875, + "pitch": 30, + "roll": 90, + "yaw": 12 }, "retailCost": 437930, "bulkheads": [ diff --git a/ships/vulture.json b/ships/vulture.json index 079fca6..8f409d7 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -10,12 +10,14 @@ "speed": 210, "boost": 340, "boostEnergy": 16, - "agility": 9, "baseShieldStrength": 240, "baseArmour": 160, "hullMass": 230, "masslock": 10, - "pipSpeed": 0.02375 + "pipSpeed": 0.02375, + "pitch": 42, + "roll": 110, + "yaw": 17 }, "retailCost": 4925620, "bulkheads": [ diff --git a/spec/data-spec.js b/spec/data-spec.js index 196374b..3335dd0 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -12,12 +12,14 @@ describe('JSON Data', function() { 'speed', 'boost', 'boostEnergy', - 'agility', 'baseShieldStrength', 'baseArmour', 'hullMass', 'masslock', - 'pipSpeed' + 'pipSpeed', + 'pitch', + 'roll', + 'yaw' ]; var edIDs = {};