From 6ea24b9790be4953ea7ba6d92f211bcd5b7ea24b Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Tue, 10 Jan 2017 18:11:32 +0000 Subject: [PATCH] Fixes for 2.2.03 --- dist/index.js | 25 ++++++++++++++++++++++++- dist/index.json | 25 ++++++++++++++++++++++++- ships/anaconda.json | 6 +++--- ships/beluga.json | 8 ++++---- ships/eagle.json | 2 +- ships/federal_assault_ship.json | 4 ++-- ships/federal_corvette.json | 4 ++-- ships/federal_dropship.json | 4 ++-- ships/federal_gunship.json | 6 +++--- ships/imperial_cutter.json | 6 +++--- ships/imperial_eagle.json | 2 +- ships/orca.json | 4 ++-- ships/viper.json | 2 +- ships/viper_mk_iv.json | 2 +- ships/vulture.json | 2 +- 15 files changed, 74 insertions(+), 28 deletions(-) diff --git a/dist/index.js b/dist/index.js index aa75984..9f3893f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -100,7 +100,7 @@ module.exports = { speed: 180, boost: 240, boostEnergy: 27, - baseShieldStrength: 385, + baseShieldStrength: 350, baseArmour: 525, hardness: 200, hullMass: 400, @@ -173,6 +173,7 @@ module.exports = { hardpoints: [ 4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ], internal: [ 7, 6, 6, 6, 5, 5, 5, { class: 5, + name: "Military", eligible: { hr: 1, scb: 1, @@ -449,6 +450,7 @@ module.exports = { hardpoints: [ 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0 ], internal: [ 6, 6, { class: 6, + name: "Passenger", eligible: { cr: 1, hr: 1, @@ -459,6 +461,7 @@ module.exports = { } }, { class: 6, + name: "Passenger", eligible: { cr: 1, hr: 1, @@ -469,6 +472,7 @@ module.exports = { } }, { class: 5, + name: "Passenger", eligible: { cr: 1, hr: 1, @@ -479,6 +483,7 @@ module.exports = { } }, { class: 5, + name: "Passenger", eligible: { cr: 1, hr: 1, @@ -934,6 +939,7 @@ module.exports = { hardpoints: [ 1, 1, 1, 0 ], internal: [ 3, 2, { class: 2, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1030,6 +1036,7 @@ module.exports = { hardpoints: [ 3, 3, 2, 2, 0, 0, 0, 0 ], internal: [ 5, 5, 4, { class: 4, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1037,6 +1044,7 @@ module.exports = { } }, { class: 4, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1134,6 +1142,7 @@ module.exports = { hardpoints: [ 4, 4, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ], internal: [ 7, 7, 7, 6, 6, 5, 5, { class: 5, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1141,6 +1150,7 @@ module.exports = { } }, { class: 5, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1237,6 +1247,7 @@ module.exports = { hardpoints: [ 3, 2, 2, 2, 2, 0, 0, 0, 0 ], internal: [ 6, 5, 5, 4, { class: 4, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1244,6 +1255,7 @@ module.exports = { } }, { class: 4, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1341,6 +1353,7 @@ module.exports = { hardpoints: [ 3, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0 ], internal: [ 6, 6, 5, { class: 4, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1348,6 +1361,7 @@ module.exports = { } }, { class: 4, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1355,6 +1369,7 @@ module.exports = { } }, { class: 4, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1808,6 +1823,7 @@ module.exports = { hardpoints: [ 4, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0 ], internal: [ 8, 8, 6, 6, 6, 5, 5, { class: 5, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1815,6 +1831,7 @@ module.exports = { } }, { class: 5, + name: "Military", eligible: { hr: 1, scb: 1, @@ -1911,6 +1928,7 @@ module.exports = { hardpoints: [ 2, 1, 1, 0 ], internal: [ 3, 2, { class: 2, + name: "Military", eligible: { hr: 1, scb: 1, @@ -2098,6 +2116,7 @@ module.exports = { hardpoints: [ 3, 2, 2, 0, 0, 0, 0 ], internal: [ { class: 6, + name: "Passenger", eligible: { cr: 1, hr: 1, @@ -2108,6 +2127,7 @@ module.exports = { } }, { class: 5, + name: "Passenger", eligible: { cr: 1, hr: 1, @@ -2653,6 +2673,7 @@ module.exports = { hardpoints: [ 2, 2, 1, 1, 0, 0 ], internal: [ 3, 3, { class: 3, + name: "Military", eligible: { hr: 1, scb: 1, @@ -2749,6 +2770,7 @@ module.exports = { hardpoints: [ 2, 2, 1, 1, 0, 0 ], internal: [ 4, 4, 3, { class: 2, + name: "Military", eligible: { hr: 1, scb: 1, @@ -2845,6 +2867,7 @@ module.exports = { hardpoints: [ 3, 3, 0, 0, 0, 0 ], internal: [ 5, { class: 5, + name: "Military", eligible: { hr: 1, scb: 1, diff --git a/dist/index.json b/dist/index.json index c96372a..536eb91 100644 --- a/dist/index.json +++ b/dist/index.json @@ -146,7 +146,7 @@ "speed": 180, "boost": 240, "boostEnergy": 27, - "baseShieldStrength": 385, + "baseShieldStrength": 350, "baseArmour": 525, "hardness": 200, "hullMass": 400, @@ -258,6 +258,7 @@ 5, { "class": 5, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -714,6 +715,7 @@ 6, { "class": 6, + "name": "Passenger", "eligible": { "cr": 1, "hr": 1, @@ -725,6 +727,7 @@ }, { "class": 6, + "name": "Passenger", "eligible": { "cr": 1, "hr": 1, @@ -736,6 +739,7 @@ }, { "class": 5, + "name": "Passenger", "eligible": { "cr": 1, "hr": 1, @@ -747,6 +751,7 @@ }, { "class": 5, + "name": "Passenger", "eligible": { "cr": 1, "hr": 1, @@ -1468,6 +1473,7 @@ 2, { "class": 2, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -1613,6 +1619,7 @@ 4, { "class": 4, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -1621,6 +1628,7 @@ }, { "class": 4, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -1786,6 +1794,7 @@ 5, { "class": 5, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -1794,6 +1803,7 @@ }, { "class": 5, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -1960,6 +1970,7 @@ 4, { "class": 4, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -1968,6 +1979,7 @@ }, { "class": 4, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -2127,6 +2139,7 @@ 5, { "class": 4, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -2135,6 +2148,7 @@ }, { "class": 4, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -2143,6 +2157,7 @@ }, { "class": 4, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -2874,6 +2889,7 @@ 5, { "class": 5, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -2882,6 +2898,7 @@ }, { "class": 5, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -3039,6 +3056,7 @@ 2, { "class": 2, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -3323,6 +3341,7 @@ "internal": [ { "class": 6, + "name": "Passenger", "eligible": { "cr": 1, "hr": 1, @@ -3334,6 +3353,7 @@ }, { "class": 5, + "name": "Passenger", "eligible": { "cr": 1, "hr": 1, @@ -4209,6 +4229,7 @@ 3, { "class": 3, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -4354,6 +4375,7 @@ 3, { "class": 2, + "name": "Military", "eligible": { "hr": 1, "scb": 1, @@ -4500,6 +4522,7 @@ 5, { "class": 5, + "name": "Military", "eligible": { "hr": 1, "scb": 1, diff --git a/ships/anaconda.json b/ships/anaconda.json index 65a8976..2bd6a1b 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -10,9 +10,9 @@ "speed": 180, "boost": 240, "boostEnergy": 27, - "baseShieldStrength": 385, + "baseShieldStrength": 350, "baseArmour": 525, - "hardness": 200, + "hardness": 65, "hullMass": 400, "masslock": 23, "pipSpeed": 0.13875, @@ -34,7 +34,7 @@ "hardpoints": [4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0], "internal": [ 7, 6, 6, 6, 5, 5, 5, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 4, 4, 2 ] }, diff --git a/ships/beluga.json b/ships/beluga.json index 80cc38e..5b875bf 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -35,10 +35,10 @@ "hardpoints": [2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0], "internal": [ 6, 6, - { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, - { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, - { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, - { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, + { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, + { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, + { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, + { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, 4, 3, 3, 3, 3 ] }, diff --git a/ships/eagle.json b/ships/eagle.json index 30a0c4d..e6ce6f5 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -33,7 +33,7 @@ "hardpoints": [1, 1, 1, 0], "internal": [ 3, 2, - { "class": 2, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 1, 1 ] }, diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index f5b9bf9..3e22eeb 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -32,8 +32,8 @@ "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0], "internal": [ 5, 5, 4, - { "class": 4, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 4, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 3, 2, 2 ] }, diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 8b2f521..f49a6bd 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -34,8 +34,8 @@ "hardpoints": [4, 4, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0], "internal": [ 7, 7, 7, 6, 6, 5, 5, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 4, 3 ] }, diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index ce83f1c..864dc51 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -33,8 +33,8 @@ "hardpoints": [3, 2, 2, 2, 2, 0, 0, 0, 0], "internal": [ 6, 5, 5, 4, - { "class": 4, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 4, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 3, 3, 2 ] }, diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index dc85aff..f010bca 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -34,9 +34,9 @@ "hardpoints": [3, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0], "internal": [ 6, 6, 5, - { "class": 4, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 4, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 4, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 2, 2 ] }, diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index e39d75d..301c554 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -11,7 +11,7 @@ "boostEnergy": 23, "baseShieldStrength": 690, "baseArmour": 400, - "hardness": 210, + "hardness": 70, "hullMass": 1100, "masslock": 27, "pipSpeed": 0.05, @@ -33,8 +33,8 @@ "hardpoints": [4, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0], "internal": [ 8, 8, 6, 6, 6, 5, 5, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 3 ] }, diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index f4afa7f..0368113 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -33,7 +33,7 @@ "hardpoints": [2, 1, 1, 0], "internal": [ 3, 2, - { "class": 2, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 1, 1 ] }, diff --git a/ships/orca.json b/ships/orca.json index d847fd2..15ce784 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -33,8 +33,8 @@ "standard": [5, 6, 5, 6, 5, 4, 5], "hardpoints": [3, 2, 2, 0, 0, 0, 0], "internal": [ - { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, - { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, + { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, + { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } }, 5, 5, 4, 3, 2, 2 ] }, diff --git a/ships/viper.json b/ships/viper.json index e920db9..8924a99 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -33,7 +33,7 @@ "hardpoints": [2, 2, 1, 1, 0, 0], "internal": [ 3, 3, - { "class": 3, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 2, 1 ] }, diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index cd6609e..9227d60 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -33,7 +33,7 @@ "hardpoints": [2, 2, 1, 1, 0, 0], "internal": [ 4, 4, 3, - { "class": 2, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 2, 2, 1 ] }, diff --git a/ships/vulture.json b/ships/vulture.json index 5416caf..1373352 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -33,7 +33,7 @@ "hardpoints": [3, 3, 0, 0, 0, 0], "internal": [ 5, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 2, 1, 1 ] },