From 7516fb8783f432689c8492a04d41f04445770d23 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 31 Mar 2017 16:31:16 +0100 Subject: [PATCH] Revert changes not going in to 2.3 --- dist/index.js | 68 +++++++++++----------- dist/index.json | 68 +++++++++++----------- modules/hardpoints/beam_laser.json | 10 ++-- modules/hardpoints/burst_laser.json | 10 ++-- modules/hardpoints/cannon.json | 10 ++-- modules/hardpoints/fragment_cannon.json | 8 +-- modules/hardpoints/plasma_accelerator.json | 8 +-- modules/hardpoints/pulse_laser.json | 10 ++-- modules/hardpoints/rail_gun.json | 6 +- ships/anaconda.json | 2 +- ships/federal_corvette.json | 2 +- ships/imperial_cutter.json | 2 +- 12 files changed, 102 insertions(+), 102 deletions(-) diff --git a/dist/index.js b/dist/index.js index e830d2f..cfd7062 100644 --- a/dist/index.js +++ b/dist/index.js @@ -103,7 +103,7 @@ module.exports = { boostEnergy: 27, baseShieldStrength: 350, baseArmour: 525, - hardness: 170, + hardness: 65, hullMass: 400, masslock: 23, pipSpeed: .13875, @@ -1178,7 +1178,7 @@ module.exports = { boostEnergy: 27, baseShieldStrength: 555, baseArmour: 370, - hardness: 185, + hardness: 70, hullMass: 900, masslock: 24, pipSpeed: .125, @@ -1866,7 +1866,7 @@ module.exports = { boostEnergy: 23, baseShieldStrength: 600, baseArmour: 400, - hardness: 185, + hardness: 70, hullMass: 1100, masslock: 27, pipSpeed: .05, @@ -6611,7 +6611,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", - piercing: 95, + piercing: 52, power: .9, range: 3e3, rating: "D", @@ -6636,7 +6636,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", - piercing: 95, + piercing: 52, power: .92, range: 3e3, rating: "E", @@ -6661,7 +6661,7 @@ module.exports = { integrity: 64, mass: 8, mount: "T", - piercing: 95, + piercing: 52, power: .89, range: 3e3, rating: "F", @@ -6686,7 +6686,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", - piercing: 170, + piercing: 65, power: 1.33, range: 3e3, rating: "A", @@ -6711,7 +6711,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", - piercing: 170, + piercing: 65, power: 1.37, range: 3e3, rating: "A", @@ -6931,7 +6931,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", - piercing: 95, + piercing: 52, power: 1.66, range: 3e3, rating: "D", @@ -6958,7 +6958,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", - piercing: 95, + piercing: 52, power: 1.65, range: 3e3, rating: "E", @@ -6985,7 +6985,7 @@ module.exports = { integrity: 64, mass: 8, mount: "T", - piercing: 95, + piercing: 52, power: 1.57, range: 3e3, rating: "E", @@ -7012,7 +7012,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", - piercing: 170, + piercing: 65, power: 2.58, range: 3e3, rating: "E", @@ -7039,7 +7039,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", - piercing: 170, + piercing: 65, power: 2.59, range: 3e3, rating: "E", @@ -7237,7 +7237,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", - piercing: 90, + piercing: 50, power: 1.62, range: 3e3, rating: "C", @@ -7261,7 +7261,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", - piercing: 90, + piercing: 50, power: 1.6, range: 3e3, rating: "C", @@ -7285,7 +7285,7 @@ module.exports = { integrity: 64, mass: 8, mount: "T", - piercing: 90, + piercing: 50, power: 1.51, range: 3e3, rating: "D", @@ -7309,7 +7309,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", - piercing: 155, + piercing: 60, power: 2.61, range: 3e3, rating: "A", @@ -7333,7 +7333,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", - piercing: 155, + piercing: 60, power: 2.57, range: 3e3, rating: "A", @@ -7858,7 +7858,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", - piercing: 125, + piercing: 70, power: .67, range: 4e3, rating: "C", @@ -7889,7 +7889,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", - piercing: 125, + piercing: 70, power: .75, range: 4e3, rating: "C", @@ -7918,7 +7918,7 @@ module.exports = { integrity: 64, mass: 8, mount: "T", - piercing: 125, + piercing: 70, power: .64, range: 4e3, rating: "D", @@ -7949,7 +7949,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", - piercing: 200, + piercing: 90, power: .92, range: 4500, rating: "B", @@ -7980,7 +7980,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", - piercing: 200, + piercing: 90, power: 1.03, range: 4500, rating: "B", @@ -8197,7 +8197,7 @@ module.exports = { jitter: 5, mass: 8, mount: "F", - piercing: 60, + piercing: 45, power: 1.02, range: 2e3, rating: "C", @@ -8228,7 +8228,7 @@ module.exports = { jitter: 5, mass: 8, mount: "G", - piercing: 60, + piercing: 45, power: 1.55, range: 2e3, rating: "C", @@ -8259,7 +8259,7 @@ module.exports = { jitter: 5, mass: 8, mount: "T", - piercing: 60, + piercing: 45, power: 1.29, range: 2e3, rating: "C", @@ -8291,7 +8291,7 @@ module.exports = { mass: 8, mount: "F", name: "Pacifier", - piercing: 60, + piercing: 45, power: 1.02, pp: "Zachary Hudson", rating: "C", @@ -8323,7 +8323,7 @@ module.exports = { integrity: 40, mass: 2, mount: "F", - piercing: 200, + piercing: 30, power: 1.15, range: 3e3, rating: "D", @@ -8352,7 +8352,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", - piercing: 200, + piercing: 48, power: 1.63, range: 3e3, rating: "B", @@ -8384,7 +8384,7 @@ module.exports = { mass: 4, mount: "F", name: "Imperial Hammer", - piercing: 200, + piercing: 48, power: 1.63, pp: "Arissa Lavigny-Duval", range: 3e3, @@ -8416,7 +8416,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", - piercing: 200, + piercing: 100, power: 1.43, range: 3500, rating: "C", @@ -8447,7 +8447,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", - piercing: 200, + piercing: 100, power: 1.97, range: 3500, rating: "B", @@ -8479,7 +8479,7 @@ module.exports = { mass: 8, mount: "F", name: "Advanced Plasma Accelerator", - piercing: 200, + piercing: 100, power: 1.97, pp: "Denton Patreus", range: 3500, @@ -8511,7 +8511,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", - piercing: 200, + piercing: 100, power: 2.63, range: 3500, rating: "A", diff --git a/dist/index.json b/dist/index.json index 2b8c7bb..53b0e36 100644 --- a/dist/index.json +++ b/dist/index.json @@ -149,7 +149,7 @@ "boostEnergy": 27, "baseShieldStrength": 350, "baseArmour": 525, - "hardness": 170, + "hardness": 65, "hullMass": 400, "masslock": 23, "pipSpeed": 0.13875, @@ -1846,7 +1846,7 @@ "boostEnergy": 27, "baseShieldStrength": 555, "baseArmour": 370, - "hardness": 185, + "hardness": 70, "hullMass": 900, "masslock": 24, "pipSpeed": 0.125, @@ -2948,7 +2948,7 @@ "boostEnergy": 23, "baseShieldStrength": 600, "baseArmour": 400, - "hardness": 185, + "hardness": 70, "hullMass": 1100, "masslock": 27, "pipSpeed": 0.05, @@ -8599,7 +8599,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 95, + "piercing": 52, "power": 0.9, "range": 3000, "rating": "D", @@ -8625,7 +8625,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 95, + "piercing": 52, "power": 0.92, "range": 3000, "rating": "E", @@ -8651,7 +8651,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 95, + "piercing": 52, "power": 0.89, "range": 3000, "rating": "F", @@ -8677,7 +8677,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 170, + "piercing": 65, "power": 1.33, "range": 3000, "rating": "A", @@ -8703,7 +8703,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 170, + "piercing": 65, "power": 1.37, "range": 3000, "rating": "A", @@ -8932,7 +8932,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 95, + "piercing": 52, "power": 1.66, "range": 3000, "rating": "D", @@ -8960,7 +8960,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 95, + "piercing": 52, "power": 1.65, "range": 3000, "rating": "E", @@ -8988,7 +8988,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 95, + "piercing": 52, "power": 1.57, "range": 3000, "rating": "E", @@ -9016,7 +9016,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 170, + "piercing": 65, "power": 2.58, "range": 3000, "rating": "E", @@ -9044,7 +9044,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 170, + "piercing": 65, "power": 2.59, "range": 3000, "rating": "E", @@ -9251,7 +9251,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 90, + "piercing": 50, "power": 1.62, "range": 3000, "rating": "C", @@ -9276,7 +9276,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 90, + "piercing": 50, "power": 1.6, "range": 3000, "rating": "C", @@ -9301,7 +9301,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 90, + "piercing": 50, "power": 1.51, "range": 3000, "rating": "D", @@ -9326,7 +9326,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 155, + "piercing": 60, "power": 2.61, "range": 3000, "rating": "A", @@ -9351,7 +9351,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 155, + "piercing": 60, "power": 2.57, "range": 3000, "rating": "A", @@ -9896,7 +9896,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 125, + "piercing": 70, "power": 0.67, "range": 4000, "rating": "C", @@ -9928,7 +9928,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 125, + "piercing": 70, "power": 0.75, "range": 4000, "rating": "C", @@ -9958,7 +9958,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 125, + "piercing": 70, "power": 0.64, "range": 4000, "rating": "D", @@ -9990,7 +9990,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 200, + "piercing": 90, "power": 0.92, "range": 4500, "rating": "B", @@ -10022,7 +10022,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 200, + "piercing": 90, "power": 1.03, "range": 4500, "rating": "B", @@ -10247,7 +10247,7 @@ "jitter": 5, "mass": 8, "mount": "F", - "piercing": 60, + "piercing": 45, "power": 1.02, "range": 2000, "rating": "C", @@ -10279,7 +10279,7 @@ "jitter": 5, "mass": 8, "mount": "G", - "piercing": 60, + "piercing": 45, "power": 1.55, "range": 2000, "rating": "C", @@ -10311,7 +10311,7 @@ "jitter": 5, "mass": 8, "mount": "T", - "piercing": 60, + "piercing": 45, "power": 1.29, "range": 2000, "rating": "C", @@ -10344,7 +10344,7 @@ "mass": 8, "mount": "F", "name": "Pacifier", - "piercing": 60, + "piercing": 45, "power": 1.02, "pp": "Zachary Hudson", "rating": "C", @@ -10378,7 +10378,7 @@ "integrity": 40, "mass": 2, "mount": "F", - "piercing": 200, + "piercing": 30, "power": 1.15, "range": 3000, "rating": "D", @@ -10408,7 +10408,7 @@ "integrity": 51, "mass": 4, "mount": "F", - "piercing": 200, + "piercing": 48, "power": 1.63, "range": 3000, "rating": "B", @@ -10441,7 +10441,7 @@ "mass": 4, "mount": "F", "name": "Imperial Hammer", - "piercing": 200, + "piercing": 48, "power": 1.63, "pp": "Arissa Lavigny-Duval", "range": 3000, @@ -10475,7 +10475,7 @@ "integrity": 51, "mass": 4, "mount": "F", - "piercing": 200, + "piercing": 100, "power": 1.43, "range": 3500, "rating": "C", @@ -10507,7 +10507,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 200, + "piercing": 100, "power": 1.97, "range": 3500, "rating": "B", @@ -10540,7 +10540,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", - "piercing": 200, + "piercing": 100, "power": 1.97, "pp": "Denton Patreus", "range": 3500, @@ -10573,7 +10573,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 200, + "piercing": 100, "power": 2.63, "range": 3500, "rating": "A", diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json index e3fd192..26aab6f 100644 --- a/modules/hardpoints/beam_laser.json +++ b/modules/hardpoints/beam_laser.json @@ -198,7 +198,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 90, + "piercing": 50, "power": 1.62, "range": 3000, "rating": "C", @@ -223,7 +223,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 90, + "piercing": 50, "power": 1.6, "range": 3000, "rating": "C", @@ -248,7 +248,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 90, + "piercing": 50, "power": 1.51, "range": 3000, "rating": "D", @@ -273,7 +273,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 155, + "piercing": 60, "power": 2.61, "range": 3000, "rating": "A", @@ -298,7 +298,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 155, + "piercing": 60, "power": 2.57, "range": 3000, "rating": "A", diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json index 85c7e77..3724991 100644 --- a/modules/hardpoints/burst_laser.json +++ b/modules/hardpoints/burst_laser.json @@ -220,7 +220,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 95, + "piercing": 52, "power": 1.66, "range": 3000, "rating": "D", @@ -248,7 +248,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 95, + "piercing": 52, "power": 1.65, "range": 3000, "rating": "E", @@ -276,7 +276,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 95, + "piercing": 52, "power": 1.57, "range": 3000, "rating": "E", @@ -304,7 +304,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 170, + "piercing": 65, "power": 2.58, "range": 3000, "rating": "E", @@ -332,7 +332,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 170, + "piercing": 65, "power": 2.59, "range": 3000, "rating": "E", diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index 9b2071f..adb9edd 100644 --- a/modules/hardpoints/cannon.json +++ b/modules/hardpoints/cannon.json @@ -201,7 +201,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 125, + "piercing": 70, "power": 0.67, "range": 4000, "rating": "C", @@ -233,7 +233,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 125, + "piercing": 70, "power": 0.75, "range": 4000, "rating": "C", @@ -263,7 +263,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 125, + "piercing": 70, "power": 0.64, "range": 4000, "rating": "D", @@ -295,7 +295,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 200, + "piercing": 90, "power": 0.92, "range": 4500, "rating": "B", @@ -327,7 +327,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 200, + "piercing": 90, "power": 1.03, "range": 4500, "rating": "B", diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index aa57c94..608819c 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -214,7 +214,7 @@ "jitter": 5, "mass": 8, "mount": "F", - "piercing": 60, + "piercing": 45, "power": 1.02, "range": 2000, "rating": "C", @@ -246,7 +246,7 @@ "jitter": 5, "mass": 8, "mount": "G", - "piercing": 60, + "piercing": 45, "power": 1.55, "range": 2000, "rating": "C", @@ -278,7 +278,7 @@ "jitter": 5, "mass": 8, "mount": "T", - "piercing": 60, + "piercing": 45, "power": 1.29, "range": 2000, "rating": "C", @@ -311,7 +311,7 @@ "mass": 8, "mount": "F", "name": "Pacifier", - "piercing": 60, + "piercing": 45, "power": 1.02, "pp": "Zachary Hudson", "rating": "C", diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index 3cd932d..756b7dd 100644 --- a/modules/hardpoints/plasma_accelerator.json +++ b/modules/hardpoints/plasma_accelerator.json @@ -23,7 +23,7 @@ "integrity": 51, "mass": 4, "mount": "F", - "piercing": 200, + "piercing": 100, "power": 1.43, "range": 3500, "rating": "C", @@ -55,7 +55,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 200, + "piercing": 100, "power": 1.97, "range": 3500, "rating": "B", @@ -88,7 +88,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", - "piercing": 200, + "piercing": 100, "power": 1.97, "pp": "Denton Patreus", "range": 3500, @@ -121,7 +121,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 200, + "piercing": 100, "power": 2.63, "range": 3500, "rating": "A", diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json index 1422422..adb3de2 100644 --- a/modules/hardpoints/pulse_laser.json +++ b/modules/hardpoints/pulse_laser.json @@ -202,7 +202,7 @@ "integrity": 64, "mass": 8, "mount": "F", - "piercing": 95, + "piercing": 52, "power": 0.9, "range": 3000, "rating": "D", @@ -228,7 +228,7 @@ "integrity": 64, "mass": 8, "mount": "G", - "piercing": 95, + "piercing": 52, "power": 0.92, "range": 3000, "rating": "E", @@ -254,7 +254,7 @@ "integrity": 64, "mass": 8, "mount": "T", - "piercing": 95, + "piercing": 52, "power": 0.89, "range": 3000, "rating": "F", @@ -280,7 +280,7 @@ "integrity": 80, "mass": 16, "mount": "F", - "piercing": 170, + "piercing": 65, "power": 1.33, "range": 3000, "rating": "A", @@ -306,7 +306,7 @@ "integrity": 80, "mass": 16, "mount": "G", - "piercing": 170, + "piercing": 65, "power": 1.37, "range": 3000, "rating": "A", diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json index 4ab6a76..919eace 100644 --- a/modules/hardpoints/rail_gun.json +++ b/modules/hardpoints/rail_gun.json @@ -22,7 +22,7 @@ "integrity": 40, "mass": 2, "mount": "F", - "piercing": 200, + "piercing": 30, "power": 1.15, "range": 3000, "rating": "D", @@ -52,7 +52,7 @@ "integrity": 51, "mass": 4, "mount": "F", - "piercing": 200, + "piercing": 48, "power": 1.63, "range": 3000, "rating": "B", @@ -85,7 +85,7 @@ "mass": 4, "mount": "F", "name": "Imperial Hammer", - "piercing": 200, + "piercing": 48, "power": 1.63, "pp": "Arissa Lavigny-Duval", "range": 3000, diff --git a/ships/anaconda.json b/ships/anaconda.json index 0c29210..ab0cb35 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -12,7 +12,7 @@ "boostEnergy": 27, "baseShieldStrength": 350, "baseArmour": 525, - "hardness": 170, + "hardness": 65, "hullMass": 400, "masslock": 23, "pipSpeed": 0.13875, diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index db96784..7edb589 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -12,7 +12,7 @@ "boostEnergy": 27, "baseShieldStrength": 555, "baseArmour": 370, - "hardness": 185, + "hardness": 70, "hullMass": 900, "masslock": 24, "pipSpeed": 0.125, diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index d30fedd..5b6eb3a 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -12,7 +12,7 @@ "boostEnergy": 23, "baseShieldStrength": 600, "baseArmour": 400, - "hardness": 185, + "hardness": 70, "hullMass": 1100, "masslock": 27, "pipSpeed": 0.05,