From 53b7f8e316f69256bfad7e79361d8a17c78de6c5 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 14 Oct 2016 20:36:05 +0100 Subject: [PATCH] New tets and fixes due to new tests --- dist/index.js | 76 +++++++++++++++---- dist/index.json | 76 +++++++++++++++---- modules/hardpoints/beam_laser.json | 2 +- modules/hardpoints/cargo_scanner.json | 10 +-- modules/hardpoints/countermeasures.json | 8 +- .../hardpoints/frame_shift_wake_scanner.json | 10 +-- modules/hardpoints/kill_warrant_scanner.json | 10 +-- modules/hardpoints/mine_launcher.json | 4 +- modules/hardpoints/missile_rack.json | 4 +- modules/hardpoints/shield_booster.json | 12 +-- spec/data-spec.js | 16 ++++ 11 files changed, 166 insertions(+), 62 deletions(-) diff --git a/dist/index.js b/dist/index.js index 0d4da26..d5c7e5b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -5582,7 +5582,7 @@ module.exports = { breachmin: .4, breachmax: .8, dps: 12.5, - edps: 3.44, + eps: 3.44, hps: 5.3 }, { id: "0t", @@ -6720,19 +6720,20 @@ module.exports = { cost: 190227, mass: 4, power: 1.2, + integrity: 51, mount: "F", - type: "?", - damage: 50, - armourpen: "?", + type: "E", + armourpen: 60, rof: .5, - dps: 0, - thermload: 0, + dps: 25, + eps: .12, clip: 12, ammo: 48, - mjdps: 0, - ssdam: 0, missile: "D", - ammocost: 0 + speed: 750, + breachdps: 0, + breachmin: 0, + breachmax: 0 }, { id: "2f", edID: 128666725, @@ -6860,7 +6861,10 @@ module.exports = { clip: 12, ammo: 120, missile: "S", - pp: "Li Yong-Rui" + pp: "Li Yong-Rui", + breachdps: 0, + breachmin: 0, + breachmax: 0 } ], tp: [ { id: "2h", @@ -6933,6 +6937,7 @@ module.exports = { breachmin: 0, breachmax: 0, dps: 44, + eps: 0, hps: 5, rof: 1, clip: 3, @@ -6956,6 +6961,7 @@ module.exports = { breachmin: 0, breachmax: 0, dps: 44, + eps: 0, hps: 7.5, rof: 1, clip: 3, @@ -7049,10 +7055,12 @@ module.exports = { grp: "cs", class: 0, rating: "E", + integrity: 32, cost: 13540, mass: 1.3, power: .2, range: 2e3, + angle: 15, time: 10 }, { id: "0c", @@ -7061,10 +7069,12 @@ module.exports = { grp: "cs", class: 0, rating: "D", + integrity: 24, cost: 40630, mass: 1.3, power: .4, range: 2500, + angle: 15, time: 10 }, { id: "0b", @@ -7073,10 +7083,12 @@ module.exports = { grp: "cs", class: 0, rating: "C", + integrity: 40, cost: 121900, mass: 1.3, power: .8, range: 3e3, + angle: 15, time: 10 }, { id: "0a", @@ -7085,10 +7097,12 @@ module.exports = { grp: "cs", class: 0, rating: "B", + integrity: 56, cost: 365700, mass: 1.3, power: 1.6, range: 3500, + angle: 15, time: 10 }, { id: "09", @@ -7097,10 +7111,12 @@ module.exports = { grp: "cs", class: 0, rating: "A", + integrity: 48, cost: 1097100, mass: 1.3, power: 3.2, range: 4e3, + angle: 15, time: 10 } ], cm: [ { @@ -7113,12 +7129,15 @@ module.exports = { rating: "I", cost: 8500, mass: 1.3, + integrity: 20, power: .2, passive: 1, - thermload: 2, + eps: 4, + hps: 4, clip: 1, ammo: 10, - ammocost: 30 + reload: 10, + duration: 20 }, { id: "01", edID: 128049516, @@ -7129,6 +7148,7 @@ module.exports = { rating: "F", cost: 12500, mass: 1.3, + integrity: 20, power: .2, range: 3e3, chargeup: 4, @@ -7144,12 +7164,15 @@ module.exports = { rating: "I", cost: 3500, mass: 1.3, + integrity: 20, power: .2, passive: 1, - thermload: 0, + rof: .2, + eps: .4, clip: 1, ammo: 2, - ammocost: 25 + duration: 10, + reload: 10 }, { id: "03", edID: 128049522, @@ -7157,15 +7180,21 @@ module.exports = { grp: "cm", name: "Point Defence", class: 0, + type: "K", rating: "I", cost: 18550, mass: .5, + integrity: 20, power: .2, passive: 1, - thermload: 1, + speed: 1e3, + rof: 10, clip: 50, ammo: 1e4, - ammocost: 1 + reload: 0, + burst: 4, + burstrof: 15, + jitter: 1.5 } ], ws: [ { id: "0i", @@ -7176,6 +7205,7 @@ module.exports = { rating: "E", cost: 13540, mass: 1.3, + integrity: 32, power: .2, range: 2e3, time: 10 @@ -7188,6 +7218,7 @@ module.exports = { rating: "D", cost: 40630, mass: 1.3, + integrity: 24, power: .4, range: 2500, time: 10 @@ -7200,6 +7231,7 @@ module.exports = { rating: "C", cost: 121900, mass: 1.3, + integrity: 40, power: .8, range: 3e3, time: 10 @@ -7212,6 +7244,7 @@ module.exports = { rating: "B", cost: 365700, mass: 1.3, + integrity: 56, power: 1.6, range: 3500, time: 10 @@ -7224,6 +7257,7 @@ module.exports = { rating: "A", cost: 1097100, mass: 1.3, + integrity: 48, power: 3.2, range: 4e3, time: 10 @@ -7237,6 +7271,7 @@ module.exports = { rating: "E", cost: 13540, mass: 1.3, + integrity: 32, power: .2, range: 2e3, time: 10 @@ -7249,6 +7284,7 @@ module.exports = { rating: "D", cost: 40630, mass: 1.3, + integrity: 24, power: .4, range: 2500, time: 10 @@ -7261,6 +7297,7 @@ module.exports = { rating: "C", cost: 121900, mass: 1.3, + integrity: 40, power: .8, range: 3e3, time: 10 @@ -7273,6 +7310,7 @@ module.exports = { rating: "B", cost: 365700, mass: 1.3, + integrity: 56, power: 1.6, range: 3500, time: 10 @@ -7285,6 +7323,7 @@ module.exports = { rating: "A", cost: 1097100, mass: 1.3, + integrity: 48, power: 3.2, range: 4e3, time: 10 @@ -7298,6 +7337,7 @@ module.exports = { rating: "E", cost: 1e4, mass: .5, + integrity: 25, power: .2, passive: 1, shieldmul: .04 @@ -7310,6 +7350,7 @@ module.exports = { rating: "D", cost: 23e3, mass: 1, + integrity: 35, power: .5, passive: 1, shieldmul: .08 @@ -7322,6 +7363,7 @@ module.exports = { rating: "C", cost: 53e3, mass: 2, + integrity: 40, power: .7, passive: 1, shieldmul: .12 @@ -7334,6 +7376,7 @@ module.exports = { rating: "B", cost: 122e3, mass: 3, + integrity: 45, power: 1, passive: 1, shieldmul: .16 @@ -7346,6 +7389,7 @@ module.exports = { rating: "A", cost: 281e3, mass: 3.5, + integrity: 48, power: 1.2, passive: 1, shieldmul: .2 diff --git a/dist/index.json b/dist/index.json index fe5dfd3..64439fb 100644 --- a/dist/index.json +++ b/dist/index.json @@ -7507,7 +7507,7 @@ "breachmin": 0.4, "breachmax": 0.8, "dps": 12.5, - "edps": 3.44, + "eps": 3.44, "hps": 5.3 }, { @@ -8696,19 +8696,20 @@ "cost": 190227, "mass": 4, "power": 1.2, + "integrity": 51, "mount": "F", - "type": "?", - "damage": 50, - "armourpen": "?", + "type": "E", + "armourpen": 60, "rof": 0.5, - "dps": 0, - "thermload": 0, + "dps": 25, + "eps": 0.12, "clip": 12, "ammo": 48, - "mjdps": 0, - "ssdam": 0, "missile": "D", - "ammocost": 0 + "speed": 750, + "breachdps": 0, + "breachmin": 0, + "breachmax": 0 }, { "id": "2f", @@ -8841,7 +8842,10 @@ "clip": 12, "ammo": 120, "missile": "S", - "pp": "Li Yong-Rui" + "pp": "Li Yong-Rui", + "breachdps": 0, + "breachmin": 0, + "breachmax": 0 } ], "tp": [ @@ -8919,6 +8923,7 @@ "breachmin": 0, "breachmax": 0, "dps": 44, + "eps": 0, "hps": 5, "rof": 1, "clip": 3, @@ -8943,6 +8948,7 @@ "breachmin": 0, "breachmax": 0, "dps": 44, + "eps": 0, "hps": 7.5, "rof": 1, "clip": 3, @@ -9043,10 +9049,12 @@ "grp": "cs", "class": 0, "rating": "E", + "integrity": 32, "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, + "angle": 15, "time": 10 }, { @@ -9056,10 +9064,12 @@ "grp": "cs", "class": 0, "rating": "D", + "integrity": 24, "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, + "angle": 15, "time": 10 }, { @@ -9069,10 +9079,12 @@ "grp": "cs", "class": 0, "rating": "C", + "integrity": 40, "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, + "angle": 15, "time": 10 }, { @@ -9082,10 +9094,12 @@ "grp": "cs", "class": 0, "rating": "B", + "integrity": 56, "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, + "angle": 15, "time": 10 }, { @@ -9095,10 +9109,12 @@ "grp": "cs", "class": 0, "rating": "A", + "integrity": 48, "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, + "angle": 15, "time": 10 } ], @@ -9113,12 +9129,15 @@ "rating": "I", "cost": 8500, "mass": 1.3, + "integrity": 20, "power": 0.2, "passive": 1, - "thermload": 2, + "eps": 4, + "hps": 4, "clip": 1, "ammo": 10, - "ammocost": 30 + "reload": 10, + "duration": 20 }, { "id": "01", @@ -9130,6 +9149,7 @@ "rating": "F", "cost": 12500, "mass": 1.3, + "integrity": 20, "power": 0.2, "range": 3000, "chargeup": 4, @@ -9146,12 +9166,15 @@ "rating": "I", "cost": 3500, "mass": 1.3, + "integrity": 20, "power": 0.2, "passive": 1, - "thermload": 0, + "rof": 0.2, + "eps": 0.4, "clip": 1, "ammo": 2, - "ammocost": 25 + "duration": 10, + "reload": 10 }, { "id": "03", @@ -9160,15 +9183,21 @@ "grp": "cm", "name": "Point Defence", "class": 0, + "type": "K", "rating": "I", "cost": 18550, "mass": 0.5, + "integrity": 20, "power": 0.2, "passive": 1, - "thermload": 1, + "speed": 1000, + "rof": 10, "clip": 50, "ammo": 10000, - "ammocost": 1 + "reload": 0, + "burst": 4, + "burstrof": 15, + "jitter": 1.5 } ], "ws": [ @@ -9181,6 +9210,7 @@ "rating": "E", "cost": 13540, "mass": 1.3, + "integrity": 32, "power": 0.2, "range": 2000, "time": 10 @@ -9194,6 +9224,7 @@ "rating": "D", "cost": 40630, "mass": 1.3, + "integrity": 24, "power": 0.4, "range": 2500, "time": 10 @@ -9207,6 +9238,7 @@ "rating": "C", "cost": 121900, "mass": 1.3, + "integrity": 40, "power": 0.8, "range": 3000, "time": 10 @@ -9220,6 +9252,7 @@ "rating": "B", "cost": 365700, "mass": 1.3, + "integrity": 56, "power": 1.6, "range": 3500, "time": 10 @@ -9233,6 +9266,7 @@ "rating": "A", "cost": 1097100, "mass": 1.3, + "integrity": 48, "power": 3.2, "range": 4000, "time": 10 @@ -9248,6 +9282,7 @@ "rating": "E", "cost": 13540, "mass": 1.3, + "integrity": 32, "power": 0.2, "range": 2000, "time": 10 @@ -9261,6 +9296,7 @@ "rating": "D", "cost": 40630, "mass": 1.3, + "integrity": 24, "power": 0.4, "range": 2500, "time": 10 @@ -9274,6 +9310,7 @@ "rating": "C", "cost": 121900, "mass": 1.3, + "integrity": 40, "power": 0.8, "range": 3000, "time": 10 @@ -9287,6 +9324,7 @@ "rating": "B", "cost": 365700, "mass": 1.3, + "integrity": 56, "power": 1.6, "range": 3500, "time": 10 @@ -9300,6 +9338,7 @@ "rating": "A", "cost": 1097100, "mass": 1.3, + "integrity": 48, "power": 3.2, "range": 4000, "time": 10 @@ -9315,6 +9354,7 @@ "rating": "E", "cost": 10000, "mass": 0.5, + "integrity": 25, "power": 0.2, "passive": 1, "shieldmul": 0.04 @@ -9328,6 +9368,7 @@ "rating": "D", "cost": 23000, "mass": 1, + "integrity": 35, "power": 0.5, "passive": 1, "shieldmul": 0.08 @@ -9341,6 +9382,7 @@ "rating": "C", "cost": 53000, "mass": 2, + "integrity": 40, "power": 0.7, "passive": 1, "shieldmul": 0.12 @@ -9354,6 +9396,7 @@ "rating": "B", "cost": 122000, "mass": 3, + "integrity": 45, "power": 1, "passive": 1, "shieldmul": 0.16 @@ -9367,6 +9410,7 @@ "rating": "A", "cost": 281000, "mass": 3.5, + "integrity": 48, "power": 1.2, "passive": 1, "shieldmul": 0.2 diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json index 0bcb774..905cef0 100755 --- a/modules/hardpoints/beam_laser.json +++ b/modules/hardpoints/beam_laser.json @@ -8,7 +8,7 @@ { "id": "0o", "edID": 128049437, "eddbID": 849, "grp": "bl", "class": 3, "rating": "D", "cost": 19399600, "mass": 8, "integrity": 64, "power": 1.68, "mount": "T", "type": "T", "armourpen": 50, "breachdps": 11.5, "breachmin": 0.4, "breachmax": 0.8, "dps": 14.4, "eps" : 3.51, "hps" : 5.1 }, { "id": "0r", "edID": 128049429, "eddbID": 842, "grp": "bl", "class": 2, "rating": "D", "cost": 299520, "mass": 4, "integrity": 51, "power": 1.12, "mount": "F", "type": "T", "armourpen": 35, "breachdps": 12.8, "breachmin": 0.4, "breachmax": 0.8, "dps": 16, "eps" : 3.51, "hps" : 5.1 }, - { "id": "0s", "edID": 128049433, "eddbID": 845, "grp": "bl", "class": 2, "rating": "D", "cost": 500600, "mass": 4, "integrity": 51, "power": 1.1, "mount": "G", "type": "T", "armourpen": 35, "breachdps": 10, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.5, "edps": 3.44, "hps" : 5.3 }, + { "id": "0s", "edID": 128049433, "eddbID": 845, "grp": "bl", "class": 2, "rating": "D", "cost": 500600, "mass": 4, "integrity": 51, "power": 1.1, "mount": "G", "type": "T", "armourpen": 35, "breachdps": 10, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.5, "eps": 3.44, "hps" : 5.3 }, { "id": "0t", "edID": 128049436, "eddbID": 848, "grp": "bl", "class": 2, "rating": "E", "cost": 2099900, "mass": 4, "integrity": 51, "power": 1.03, "mount": "T", "type": "T", "armourpen": 35, "breachdps": 7.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 8.8, "eps" : 2.16, "hps" : 3.5 }, { "id": "10", "edID": 128049428, "eddbID": 841, "grp": "bl", "class": 1, "rating": "E", "cost": 37430, "mass": 2, "integrity": 40, "power": 0.69, "mount": "F", "type": "T", "armourpen": 18, "breachdps": 7.9, "breachmin": 0.4, "breachmax": 0.8, "dps": 9.8, "eps" : 2.16, "hps" : 3.5 }, diff --git a/modules/hardpoints/cargo_scanner.json b/modules/hardpoints/cargo_scanner.json index 3d6e570..51aed96 100755 --- a/modules/hardpoints/cargo_scanner.json +++ b/modules/hardpoints/cargo_scanner.json @@ -1,9 +1,9 @@ { "cs": [ - { "id": "0d", "edID": 128662520, "eddbID": 1227, "grp": "cs", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 }, - { "id": "0c", "edID": 128662521, "eddbID": 1228, "grp": "cs", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 }, - { "id": "0b", "edID": 128662522, "eddbID": 1229, "grp": "cs", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 }, - { "id": "0a", "edID": 128662523, "eddbID": 1230, "grp": "cs", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 }, - { "id": "09", "edID": 128662524, "eddbID": 1231, "grp": "cs", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 } + { "id": "0d", "edID": 128662520, "eddbID": 1227, "grp": "cs", "class": 0, "rating": "E", "integrity": 32, "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "angle": 15, "time": 10 }, + { "id": "0c", "edID": 128662521, "eddbID": 1228, "grp": "cs", "class": 0, "rating": "D", "integrity": 24, "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "angle": 15, "time": 10 }, + { "id": "0b", "edID": 128662522, "eddbID": 1229, "grp": "cs", "class": 0, "rating": "C", "integrity": 40, "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "angle": 15, "time": 10 }, + { "id": "0a", "edID": 128662523, "eddbID": 1230, "grp": "cs", "class": 0, "rating": "B", "integrity": 56, "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "angle": 15, "time": 10 }, + { "id": "09", "edID": 128662524, "eddbID": 1231, "grp": "cs", "class": 0, "rating": "A", "integrity": 48, "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "angle": 15, "time": 10 } ] } diff --git a/modules/hardpoints/countermeasures.json b/modules/hardpoints/countermeasures.json index 47e4f69..1ed32dc 100755 --- a/modules/hardpoints/countermeasures.json +++ b/modules/hardpoints/countermeasures.json @@ -1,8 +1,8 @@ { "cm": [ - { "id": "00", "edID": 128049513, "eddbID": 884, "grp": "cm", "name": "Chaff Launcher", "class": 0, "rating": "I", "cost": 8500, "mass": 1.3, "power": 0.2, "passive": 1, "thermload": 2, "clip": 1, "ammo": 10, "ammocost": 30 }, - { "id": "01", "edID": 128049516, "eddbID": 885, "grp": "cm", "name": "Electronic Countermeasure", "class": 0, "rating": "F", "cost": 12500, "mass": 1.3, "power": 0.2, "range": 3000, "chargeup": 4, "activepower": 4, "cooldown": 10 }, - { "id": "02", "edID": 128049519, "eddbID": 886, "grp": "cm", "name": "Heat Sink Launcher", "class": 0, "rating": "I", "cost": 3500, "mass": 1.3, "power": 0.2, "passive": 1, "thermload": 0, "clip": 1, "ammo": 2, "ammocost": 25 }, - { "id": "03", "edID": 128049522, "eddbID": 887, "grp": "cm", "name": "Point Defence", "class": 0, "rating": "I", "cost": 18550, "mass": 0.5, "power": 0.2, "passive": 1, "thermload": 1, "clip": 50, "ammo": 10000, "ammocost": 1 } + { "id": "00", "edID": 128049513, "eddbID": 884, "grp": "cm", "name": "Chaff Launcher", "class": 0, "rating": "I", "cost": 8500, "mass": 1.3, "integrity": 20, "power": 0.2, "passive": 1, "eps": 4, "hps": 4, "clip": 1, "ammo": 10, "reload": 10, "duration": 20 }, + { "id": "01", "edID": 128049516, "eddbID": 885, "grp": "cm", "name": "Electronic Countermeasure", "class": 0, "rating": "F", "cost": 12500, "mass": 1.3, "integrity": 20, "power": 0.2, "range": 3000, "chargeup": 4, "activepower": 4, "cooldown": 10 }, + { "id": "02", "edID": 128049519, "eddbID": 886, "grp": "cm", "name": "Heat Sink Launcher", "class": 0, "rating": "I", "cost": 3500, "mass": 1.3, "integrity": 20, "power": 0.2, "passive": 1, "rof": 0.2, "eps": 0.4, "clip": 1, "ammo": 2, "duration": 10, "reload": 10 }, + { "id": "03", "edID": 128049522, "eddbID": 887, "grp": "cm", "name": "Point Defence", "class": 0, "type": "K", "rating": "I", "cost": 18550, "mass": 0.5, "integrity": 20, "power": 0.2, "passive": 1, "speed": 1000, "rof": 10, "clip": 50, "ammo": 10000, "reload": 0, "burst": 4, "burstrof": 15 , "jitter": 1.5} ] } diff --git a/modules/hardpoints/frame_shift_wake_scanner.json b/modules/hardpoints/frame_shift_wake_scanner.json index 74ecf94..25e1cee 100755 --- a/modules/hardpoints/frame_shift_wake_scanner.json +++ b/modules/hardpoints/frame_shift_wake_scanner.json @@ -1,9 +1,9 @@ { "ws": [ - { "id": "0i", "edID": 128662525, "eddbID": 1232, "grp": "ws", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 }, - { "id": "0h", "edID": 128662526, "eddbID": 1233, "grp": "ws", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 }, - { "id": "0g", "edID": 128662527, "eddbID": 1234, "grp": "ws", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 }, - { "id": "0f", "edID": 128662528, "eddbID": 1235, "grp": "ws", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 }, - { "id": "0e", "edID": 128662529, "eddbID": 1236, "grp": "ws", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 } + { "id": "0i", "edID": 128662525, "eddbID": 1232, "grp": "ws", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "integrity": 32, "power": 0.2, "range": 2000, "time": 10 }, + { "id": "0h", "edID": 128662526, "eddbID": 1233, "grp": "ws", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "integrity": 24, "power": 0.4, "range": 2500, "time": 10 }, + { "id": "0g", "edID": 128662527, "eddbID": 1234, "grp": "ws", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "integrity": 40, "power": 0.8, "range": 3000, "time": 10 }, + { "id": "0f", "edID": 128662528, "eddbID": 1235, "grp": "ws", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "integrity": 56, "power": 1.6, "range": 3500, "time": 10 }, + { "id": "0e", "edID": 128662529, "eddbID": 1236, "grp": "ws", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "integrity": 48, "power": 3.2, "range": 4000, "time": 10 } ] } diff --git a/modules/hardpoints/kill_warrant_scanner.json b/modules/hardpoints/kill_warrant_scanner.json index d50f70e..fec47fa 100755 --- a/modules/hardpoints/kill_warrant_scanner.json +++ b/modules/hardpoints/kill_warrant_scanner.json @@ -1,9 +1,9 @@ { "kw": [ - { "id": "0n", "edID": 128662530, "eddbID": 1237, "grp": "kw", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 }, - { "id": "0m", "edID": 128662531, "eddbID": 1238, "grp": "kw", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 }, - { "id": "0l", "edID": 128662532, "eddbID": 1239, "grp": "kw", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 }, - { "id": "0k", "edID": 128662533, "eddbID": 1240, "grp": "kw", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 }, - { "id": "0j", "edID": 128662534, "eddbID": 1241, "grp": "kw", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 } + { "id": "0n", "edID": 128662530, "eddbID": 1237, "grp": "kw", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "integrity": 32, "power": 0.2, "range": 2000, "time": 10 }, + { "id": "0m", "edID": 128662531, "eddbID": 1238, "grp": "kw", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "integrity": 24, "power": 0.4, "range": 2500, "time": 10 }, + { "id": "0l", "edID": 128662532, "eddbID": 1239, "grp": "kw", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "integrity": 40, "power": 0.8, "range": 3000, "time": 10 }, + { "id": "0k", "edID": 128662533, "eddbID": 1240, "grp": "kw", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "integrity": 56, "power": 1.6, "range": 3500, "time": 10 }, + { "id": "0j", "edID": 128662534, "eddbID": 1241, "grp": "kw", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "integrity": 48, "power": 3.2, "range": 4000, "time": 10 } ] } diff --git a/modules/hardpoints/mine_launcher.json b/modules/hardpoints/mine_launcher.json index 39eb0d8..5a0e248 100755 --- a/modules/hardpoints/mine_launcher.json +++ b/modules/hardpoints/mine_launcher.json @@ -1,7 +1,7 @@ { "nl": [ - { "id": "2j", "edID": 128049500, "eddbID": 880, "grp": "nl", "class": 1, "rating": "I", "cost": 24260, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 }, - { "id": "2k", "edID": 128049501, "eddbID": 881, "grp": "nl", "class": 2, "rating": "I", "cost": 294080, "mass": 4, "integrity": 51, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "hps": 7.5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 }, + { "id": "2j", "edID": 128049500, "eddbID": 880, "grp": "nl", "class": 1, "rating": "I", "cost": 24260, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "eps": 0, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 }, + { "id": "2k", "edID": 128049501, "eddbID": 881, "grp": "nl", "class": 2, "rating": "I", "cost": 294080, "mass": 4, "integrity": 51, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "eps": 0, "hps": 7.5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 }, { "id": "kp", "edID": 128671448, "eddbID": 1523, "grp": "nl", "name":"Shock Mine Launcher", "class": 1, "rating": "I", "cost": 36400, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": "C", "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 32, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 } ] } diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index f9074d2..cb11a42 100755 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -1,6 +1,6 @@ { "mr": [ - { "id": "1z", "grp": "mr", "name": "Rocket Propelled FSD Disruptor", "class": 2, "rating": "B", "cost": 190227, "mass": 4, "power": 1.2, "mount": "F", "type": "?", "damage": 50, "armourpen": "?", "rof": 0.5, "dps": 0, "thermload": 0, "clip": 12, "ammo": 48, "mjdps": 0, "ssdam": 0, "missile": "D", "ammocost": 0 }, + { "id": "1z", "grp": "mr", "name": "Rocket Propelled FSD Disruptor", "class": 2, "rating": "B", "cost": 190227, "mass": 4, "power": 1.2, "integrity": 51, "mount": "F", "type": "E", "armourpen": 60, "rof": 0.5, "dps": 25, "eps": 0.12, "clip": 12, "ammo": 48, "missile": "D", "speed": 750, "breachdps": 0, "breachmin": 0, "breachmax": 0}, { "id": "2f", "edID": 128666725, "eddbID": 1327, "grp": "mr", "class": 2, "rating": "B", "cost": 240400, "mass": 4, "integrity": 51, "power": 1.2, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 25, "eps": 0.12, "hps": 1.8, "clip": 12, "ammo": 48, "speed": 750, "reload": 5, "roundspershot": 1, "missile": "D" }, { "id": "2g", "edID": 128049493, "eddbID": 879, "grp": "mr", "class": 2, "rating": "B", "cost": 512400, "mass": 4, "integrity": 51, "power": 1.2, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 13.3, "eps": 0.07, "hps": 1.08, "clip": 6, "ammo": 18, "speed": 625, "reload": 12, "roundspershot": 1, "missile": "S" }, @@ -8,6 +8,6 @@ { "id": "2d", "edID": 128666724, "eddbID": 1326, "grp": "mr", "class": 1, "rating": "B", "cost": 32180, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 25, "eps": 0.12, "hps": 1.8, "rof": 0.5, "clip": 8, "ammo": 16, "speed": 750, "reload": 5, "roundspershot": 1, "missile": "D" }, { "id": "2e", "edID": 128049492, "eddbID": 878, "grp": "mr", "class": 1, "rating": "B", "cost": 72600, "mass": 2, "integrity": 40, "power": 0.6, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 13.3, "eps": 0.07, "hps": 1.08, "rof": 0.3, "clip": 6, "ammo": 6, "speed": 625, "reload": 12, "roundspershot": 1, "missile": "S" }, - { "id": "Ph", "edID": 128671344, "eddbID": 1480, "grp": "mr", "name": "Pack-Hound", "class": 2, "rating": "B", "cost": 768600, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 3, "armourpen": "F", "rof": 0.5, "dps": 4, "thermload": 3, "clip": 12, "ammo": 120, "missile": "S", "pp": "Li Yong-Rui" } + { "id": "Ph", "edID": 128671344, "eddbID": 1480, "grp": "mr", "name": "Pack-Hound", "class": 2, "rating": "B", "cost": 768600, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 3, "armourpen": "F", "rof": 0.5, "dps": 4, "thermload": 3, "clip": 12, "ammo": 120, "missile": "S", "pp": "Li Yong-Rui", "breachdps": 0, "breachmin": 0, "breachmax": 0 } ] } diff --git a/modules/hardpoints/shield_booster.json b/modules/hardpoints/shield_booster.json index 379f135..d4f4714 100755 --- a/modules/hardpoints/shield_booster.json +++ b/modules/hardpoints/shield_booster.json @@ -1,9 +1,9 @@ { "sb": [ - { "id": "08", "edID": 128668532, "eddbID": 1368, "grp": "sb", "class": 0, "rating": "E", "cost": 10000, "mass": 0.5, "power": 0.2, "passive": 1, "shieldmul": 0.04 }, - { "id": "07", "edID": 128668533, "eddbID": 1369, "grp": "sb", "class": 0, "rating": "D", "cost": 23000, "mass": 1, "power": 0.5, "passive": 1, "shieldmul": 0.08 }, - { "id": "06", "edID": 128668534, "eddbID": 1370, "grp": "sb", "class": 0, "rating": "C", "cost": 53000, "mass": 2, "power": 0.7, "passive": 1, "shieldmul": 0.12 }, - { "id": "05", "edID": 128668535, "eddbID": 1371, "grp": "sb", "class": 0, "rating": "B", "cost": 122000, "mass": 3, "power": 1, "passive": 1, "shieldmul": 0.16 }, - { "id": "04", "edID": 128668536, "eddbID": 1372, "grp": "sb", "class": 0, "rating": "A", "cost": 281000, "mass": 3.5, "power": 1.2, "passive": 1, "shieldmul": 0.2 } + { "id": "08", "edID": 128668532, "eddbID": 1368, "grp": "sb", "class": 0, "rating": "E", "cost": 10000, "mass": 0.5, "integrity": 25, "power": 0.2, "passive": 1, "shieldmul": 0.04 }, + { "id": "07", "edID": 128668533, "eddbID": 1369, "grp": "sb", "class": 0, "rating": "D", "cost": 23000, "mass": 1, "integrity": 35, "power": 0.5, "passive": 1, "shieldmul": 0.08 }, + { "id": "06", "edID": 128668534, "eddbID": 1370, "grp": "sb", "class": 0, "rating": "C", "cost": 53000, "mass": 2, "integrity": 40, "power": 0.7, "passive": 1, "shieldmul": 0.12 }, + { "id": "05", "edID": 128668535, "eddbID": 1371, "grp": "sb", "class": 0, "rating": "B", "cost": 122000, "mass": 3, "integrity": 45, "power": 1, "passive": 1, "shieldmul": 0.16 }, + { "id": "04", "edID": 128668536, "eddbID": 1372, "grp": "sb", "class": 0, "rating": "A", "cost": 281000, "mass": 3.5, "integrity": 48, "power": 1.2, "passive": 1, "shieldmul": 0.2 } ] -} \ No newline at end of file +} diff --git a/spec/data-spec.js b/spec/data-spec.js index 6b7eac1..a795e1c 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -61,6 +61,8 @@ describe('JSON Data', function() { var id = group[i].id; expect(ids[id]).toBeFalsy('ID already exists: ' + id); expect(group[i].grp).toBeDefined('Hardpoint has no group defined, ID:' + id); + expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`); + expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`); expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`); expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`); expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`); @@ -71,6 +73,20 @@ describe('JSON Data', function() { if (group[i].edID) { edIDs[group[i].edID] = true; } + if (group[i].dps) { + expect(group[i].dps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing dps`); + expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`); + expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`); + expect(group[i].breachdps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdps`); + expect(group[i].armourpen).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing armourpen`); + expect(group[i].eps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing eps`); + expect(group[i].hps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing hps`); + } + if (group[i].ammo || group[i].reload || group[i].clip) { + expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`); + expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`); + expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`); + } ids[id] = true; } }