From d4242e6846f8f6dd175a16a87187e2eac8e65dc0 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 24 Dec 2016 22:03:47 +0000 Subject: [PATCH] Updates --- ChangeLog.md | 1 + dist/index.js | 83 ++++----------------------------- dist/index.json | 83 +-------------------------------- ships/anaconda.json | 3 +- ships/federal_assault_ship.json | 3 +- ships/federal_corvette.json | 3 +- ships/federal_dropship.json | 3 +- ships/federal_gunship.json | 3 +- ships/imperial_cutter.json | 3 +- ships/viper.json | 5 +- ships/viper_mk_iv.json | 3 +- ships/vulture.json | 3 +- 12 files changed, 22 insertions(+), 174 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index f7829c4..41523a2 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -10,6 +10,7 @@ * Add military compartments * Fix missing damage value for 2B dumbfires * Update shield recharge rates + * Reduce hull mass of Viper to 50T #2.2.5 * Fix incorrect ID for emissive munitions special diff --git a/dist/index.js b/dist/index.js index 15d0836..ae1ee0f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -178,19 +178,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 5, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 4, 4, 4, 2 ] }, defaults: { standard: [ "8E", "7E", "6E", "5E", "8E", "8E", "5C" ], hardpoints: [ 0, 0, 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0 ], - internal: [ "05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, 0, "2h", "00" ] + internal: [ "05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, "2h", "00" ] } }, asp: { @@ -1049,19 +1042,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 4, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 3, 2, 2 ] }, defaults: { standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ], hardpoints: [ 0, 0, 17, 17, 0, 0, 0, 0 ], - internal: [ "4e", "03", "02", 0, 0, 0, "02", 0, 0 ] + internal: [ "4e", "03", "02", 0, 0, "02", 0, 0 ] } }, federal_corvette: { @@ -1160,19 +1146,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 5, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 4, 4, 3 ] }, defaults: { standard: [ "8E", "7E", "6E", "5E", "8E", "8E", "5C" ], hardpoints: [ 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], - internal: [ "4o", "05", 0, 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h" ] + internal: [ "4o", "05", 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h" ] } }, federal_dropship: { @@ -1270,19 +1249,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 4, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 3, 3, 2 ] }, defaults: { standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ], hardpoints: [ 0, 17, 17, 0, 0, 0, 0, 0, 0 ], - internal: [ "04", "03", "4e", "02", 0, 0, 0, 0, 0, "2h" ] + internal: [ "04", "03", "4e", "02", 0, 0, 0, 0, "2h" ] } }, federal_gunship: { @@ -1381,19 +1353,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 4, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 2, 2 ] }, defaults: { standard: [ "6E", "6E", "5E", "5E", "7E", "5E", "4C" ], hardpoints: [ 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0 ], - internal: [ 0, "4j", "03", 0, 0, 0, 0, "2h" ] + internal: [ 0, "4j", "03", 0, 0, 0, "2h" ] } }, fer_de_lance: { @@ -1848,19 +1813,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 5, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 4, 3 ] }, defaults: { standard: [ "8E", "8E", "7E", "7E", "7E", "7E", "6C" ], hardpoints: [ 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], - internal: [ "4t", "06", "04", 0, 0, 0, 0, 0, 0, 0, "01", "2h" ] + internal: [ "4t", "06", "04", 0, 0, 0, 0, 0, 0, "01", "2h" ] } }, imperial_eagle: { @@ -2619,7 +2577,7 @@ module.exports = { baseShieldStrength: 105, baseArmour: 70, hardness: 35, - hullMass: 60, + hullMass: 50, masslock: 7, pipSpeed: .09375, pitch: 35, @@ -2693,19 +2651,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 3, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 2, 1 ] }, defaults: { standard: [ "3E", "3E", "3E", "2E", "3E", "3E", "2C" ], hardpoints: [ 17, 17, 0, 0, 0, 0 ], - internal: [ "01", "44", 0, 0, 0, "2h" ] + internal: [ "01", "44", 0, 0, "2h" ] } }, viper_mk_iv: { @@ -2796,19 +2747,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 2, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 2, 2, 1 ] }, defaults: { standard: [ "4E", "4E", "4E", "2E", "3E", "3E", "4C" ], hardpoints: [ 0, 0, 17, 17, 0, 0 ], - internal: [ "02", "02", "44", 0, 0, "00", 0, "2h" ] + internal: [ "02", "02", "44", 0, "00", 0, "2h" ] } }, vulture: { @@ -2899,19 +2843,12 @@ module.exports = { scb: 1, mrp: 1 } - }, { - class: 5, - eligible: { - hr: 1, - scb: 1, - mrp: 1 - } }, 4, 2, 1, 1 ] }, defaults: { standard: [ "4E", "5E", "4E", "3E", "5E", "4E", "3C" ], hardpoints: [ 17, 17, 0, 0, 0, 0 ], - internal: [ "4e", 0, 0, "02", 0, 0, "2h" ] + internal: [ "4e", 0, 0, "02", 0, "2h" ] } } }, diff --git a/dist/index.json b/dist/index.json index 8d88773..ed54e9c 100644 --- a/dist/index.json +++ b/dist/index.json @@ -264,14 +264,6 @@ "mrp": 1 } }, - { - "class": 5, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 4, 4, 4, @@ -317,7 +309,6 @@ 0, 0, 0, - 0, "2h", "00" ] @@ -1636,14 +1627,6 @@ "mrp": 1 } }, - { - "class": 4, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 3, 2, 2 @@ -1675,7 +1658,6 @@ "02", 0, 0, - 0, "02", 0, 0 @@ -1818,14 +1800,6 @@ "mrp": 1 } }, - { - "class": 5, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 4, 4, 3 @@ -1868,7 +1842,6 @@ 0, 0, 0, - 0, "02", "01", "2h" @@ -2001,14 +1974,6 @@ "mrp": 1 } }, - { - "class": 4, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 3, 3, 2 @@ -2044,7 +2009,6 @@ 0, 0, 0, - 0, "2h" ] } @@ -2177,14 +2141,6 @@ "mrp": 1 } }, - { - "class": 4, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 2, 2 ] @@ -2219,7 +2175,6 @@ 0, 0, 0, - 0, "2h" ] } @@ -2924,14 +2879,6 @@ "mrp": 1 } }, - { - "class": 5, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 4, 3 ] @@ -2973,7 +2920,6 @@ 0, 0, 0, - 0, "01", "2h" ] @@ -4161,7 +4107,7 @@ "baseShieldStrength": 105, "baseArmour": 70, "hardness": 35, - "hullMass": 60, + "hullMass": 50, "masslock": 7, "pipSpeed": 0.09375, "pitch": 35, @@ -4260,14 +4206,6 @@ "mrp": 1 } }, - { - "class": 3, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 2, 1 ] @@ -4295,7 +4233,6 @@ "44", 0, 0, - 0, "2h" ] } @@ -4414,14 +4351,6 @@ "mrp": 1 } }, - { - "class": 2, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 2, 2, 1 @@ -4450,7 +4379,6 @@ "02", "44", 0, - 0, "00", 0, "2h" @@ -4569,14 +4497,6 @@ "mrp": 1 } }, - { - "class": 5, - "eligible": { - "hr": 1, - "scb": 1, - "mrp": 1 - } - }, 4, 2, 1, @@ -4607,7 +4527,6 @@ 0, "02", 0, - 0, "2h" ] } diff --git a/ships/anaconda.json b/ships/anaconda.json index a66cfee..65a8976 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -35,14 +35,13 @@ "internal": [ 7, 6, 6, 6, 5, 5, 5, { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 4, 4, 2 ] }, "defaults": { "standard": ["8E", "7E", "6E", "5E", "8E", "8E", "5C"], "hardpoints": [0, 0, 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0], - "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, 0, "2h", "00"] + "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, "2h", "00"] } } } diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index 8c80743..f5b9bf9 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -34,14 +34,13 @@ 5, 5, 4, { "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 } }, 3, 2, 2 ] }, "defaults": { "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"], "hardpoints": [0, 0, 17, 17, 0, 0, 0, 0], - "internal": ["4e", "03", "02", 0, 0, 0, "02", 0, 0] + "internal": ["4e", "03", "02", 0, 0, "02", 0, 0] } } } diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 99b59bf..8b2f521 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -36,14 +36,13 @@ 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, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 4, 3 ] }, "defaults": { "standard": ["8E", "7E" ,"6E", "5E", "8E", "8E", "5C"], "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - "internal": ["4o", "05", 0, 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h"] + "internal": ["4o", "05", 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h"] } } } diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index fba0d3f..ce83f1c 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -35,14 +35,13 @@ 6, 5, 5, 4, { "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 } }, 3, 3, 2 ] }, "defaults": { "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"], "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0], - "internal": ["04", "03", "4e", "02", 0, 0, 0, 0, 0, "2h"] + "internal": ["04", "03", "4e", "02", 0, 0, 0, 0, "2h"] } } } diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index dc85aff..d852e9e 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -36,14 +36,13 @@ 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 } }, 2, 2 ] }, "defaults": { "standard": ["6E", "6E", "5E", "5E", "7E", "5E", "4C"], "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0], - "internal": [0, "4j", "03", 0, 0, 0, 0, "2h"] + "internal": [0, "4j", "03", 0, 0, 0, "2h"] } } } diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 8e4d5b6..e39d75d 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -35,14 +35,13 @@ 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, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 3 ] }, "defaults": { "standard": ["8E", "8E", "7E", "7E", "7E", "7E", "6C"], "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - "internal": ["4t", "06", "04", 0, 0, 0, 0, 0, 0, 0, "01", "2h"] + "internal": ["4t", "06", "04", 0, 0, 0, 0, 0, 0, "01", "2h"] } } } diff --git a/ships/viper.json b/ships/viper.json index da101a0..e920db9 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -13,7 +13,7 @@ "baseShieldStrength": 105, "baseArmour": 70, "hardness": 35, - "hullMass": 60, + "hullMass": 50, "masslock": 7, "pipSpeed": 0.09375, "pitch": 35, @@ -34,14 +34,13 @@ "internal": [ 3, 3, { "class": 3, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 3, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 2, 1 ] }, "defaults": { "standard": ["3E", "3E", "3E", "2E", "3E", "3E", "2C"], "hardpoints": [17, 17, 0, 0, 0, 0], - "internal": ["01", "44", 0, 0, 0, "2h"] + "internal": ["01", "44", 0, 0, "2h"] } } } diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 25f359a..cd6609e 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -34,14 +34,13 @@ "internal": [ 4, 4, 3, { "class": 2, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 2, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 2, 2, 1 ] }, "defaults": { "standard": ["4E", "4E", "4E", "2E", "3E", "3E", "4C"], "hardpoints": [0, 0, 17, 17, 0, 0], - "internal": ["02", "02", "44", 0, 0, "00", 0, "2h"] + "internal": ["02", "02", "44", 0, "00", 0, "2h"] } } } diff --git a/ships/vulture.json b/ships/vulture.json index 6bd4bb4..5416caf 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -34,14 +34,13 @@ "internal": [ 5, { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, - { "class": 5, "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, 4, 2, 1, 1 ] }, "defaults": { "standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"], "hardpoints": [17, 17, 0, 0, 0, 0], - "internal": ["4e", 0, 0, "02", 0, 0, "2h"] + "internal": ["4e", 0, 0, "02", 0, "2h"] } } }