From be51784658543d9ed89121a74417d46d1111b0aa Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Tue, 1 Nov 2016 08:14:21 +0000 Subject: [PATCH] Fix issue with thrusters; examine using derived DPS --- dist/index.js | 17 ++++++----------- dist/index.json | 17 ++++++----------- modules/hardpoints/multi_cannon.json | 15 +++++---------- modules/standard/thrusters.json | 2 +- 4 files changed, 18 insertions(+), 33 deletions(-) diff --git a/dist/index.js b/dist/index.js index 10df595..d6e21c9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2435,7 +2435,7 @@ module.exports = { integrity: 105, mass: 32, maxmass: 2430, - maxmul: .86, + maxmul: 1.86, minmass: 810, minmul: .86, optmass: 1620, @@ -6055,7 +6055,6 @@ module.exports = { rating: "C", reload: 4, rof: 5.9, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6067,12 +6066,14 @@ module.exports = { class: 3, clip: 90, cost: 578436, + damage: 2.83, + distdraw: .25, dps: 18.9, edID: 128049461, eddbID: 1543, eps: 1.675, grp: "mc", - hps: 2.01, + hps: 2.22, id: "7l", integrity: 64, mass: 8, @@ -6081,9 +6082,9 @@ module.exports = { range: 4e3, rating: "C", reload: 4, - rof: 6.7, - roundspershot: 1, + rof: 6.667, speed: 1600, + thermload: .333, type: "K" }, { ammo: 2100, @@ -6109,7 +6110,6 @@ module.exports = { rating: "E", reload: 4, rof: 7.1, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6136,7 +6136,6 @@ module.exports = { rating: "F", reload: 4, rof: 7.7, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6163,7 +6162,6 @@ module.exports = { rating: "F", reload: 4, rof: 6.2, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6190,7 +6188,6 @@ module.exports = { rating: "F", reload: 4, rof: 7.7, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6217,7 +6214,6 @@ module.exports = { rating: "G", reload: 4, rof: 8.3, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6244,7 +6240,6 @@ module.exports = { rating: "G", reload: 4, rof: 7.1, - roundspershot: 1, speed: 1600, type: "K" }, { diff --git a/dist/index.json b/dist/index.json index 6051406..faf88e7 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4126,7 +4126,7 @@ "integrity": 105, "mass": 32, "maxmass": 2430, - "maxmul": 0.86, + "maxmul": 1.86, "minmass": 810, "minmul": 0.86, "optmass": 1620, @@ -7989,7 +7989,6 @@ "rating": "C", "reload": 4, "rof": 5.9, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8002,12 +8001,14 @@ "class": 3, "clip": 90, "cost": 578436, + "damage": 2.83, + "distdraw": 0.25, "dps": 18.9, "edID": 128049461, "eddbID": 1543, "eps": 1.675, "grp": "mc", - "hps": 2.01, + "hps": 2.22, "id": "7l", "integrity": 64, "mass": 8, @@ -8016,9 +8017,9 @@ "range": 4000, "rating": "C", "reload": 4, - "rof": 6.7, - "roundspershot": 1, + "rof": 6.667, "speed": 1600, + "thermload": 0.333, "type": "K" }, { @@ -8045,7 +8046,6 @@ "rating": "E", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8073,7 +8073,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8101,7 +8100,6 @@ "rating": "F", "reload": 4, "rof": 6.2, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8129,7 +8127,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8157,7 +8154,6 @@ "rating": "G", "reload": 4, "rof": 8.3, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8185,7 +8181,6 @@ "rating": "G", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index aedf347..b8aca62 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -80,7 +80,6 @@ "rating": "C", "reload": 4, "rof": 5.9, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -93,12 +92,14 @@ "class": 3, "clip": 90, "cost": 578436, + "damage": 2.83, + "distdraw": 0.25, "dps": 18.9, "edID": 128049461, "eddbID": 1543, "eps": 1.675, "grp": "mc", - "hps": 2.01, + "hps": 2.22, "id": "7l", "integrity": 64, "mass": 8, @@ -107,9 +108,9 @@ "range": 4000, "rating": "C", "reload": 4, - "rof": 6.7, - "roundspershot": 1, + "rof": 6.667, "speed": 1600, + "thermload": 0.333, "type": "K" }, { @@ -136,7 +137,6 @@ "rating": "E", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -164,7 +164,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -192,7 +191,6 @@ "rating": "F", "reload": 4, "rof": 6.2, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -220,7 +218,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -248,7 +245,6 @@ "rating": "G", "reload": 4, "rof": 8.3, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -276,7 +272,6 @@ "rating": "G", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index 2349a3c..2e09108 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -118,7 +118,7 @@ "integrity": 105, "mass": 32, "maxmass": 2430, - "maxmul": 0.86, + "maxmul": 1.86, "minmass": 810, "minmul": 0.86, "optmass": 1620,