Make test results helpful again

Re-apply 07c76b2.
Add some missing eddbIDs and remove placeholder edID and eddbID values.
Change tests to detect placeholder edID and eddbID values.
This commit is contained in:
Jonathan Harris
2016-10-14 18:34:20 +01:00
parent 777a826f4e
commit d0cc8ffb1c
20 changed files with 206 additions and 206 deletions

135
dist/index.js vendored
View File

@@ -268,32 +268,22 @@ module.exports = {
retailCost: -1, retailCost: -1,
bulkheads: [ { bulkheads: [ {
id: "cl", id: "cl",
edID: -1,
eddbID: -1,
cost: 0, cost: 0,
mass: 0 mass: 0
}, { }, {
id: "cm", id: "cm",
edID: -1,
eddbID: -1,
cost: -1, cost: -1,
mass: 83 mass: 83
}, { }, {
id: "cn", id: "cn",
edID: -1,
eddbID: -1,
cost: -1, cost: -1,
mass: 165 mass: 165
}, { }, {
id: "co", id: "co",
edID: -1,
eddbID: -1,
cost: -1, cost: -1,
mass: 165 mass: 165
}, { }, {
id: "cp", id: "cp",
edID: -1,
eddbID: -1,
cost: -1, cost: -1,
mass: 165 mass: 165
} ], } ],
@@ -2781,7 +2771,7 @@ module.exports = {
}, { }, {
id: "tz", id: "tz",
edID: 128682013, edID: 128682013,
eddbID: 0, eddbID: 1548,
grp: "t", grp: "t",
class: 3, class: 3,
rating: "A", rating: "A",
@@ -2796,7 +2786,7 @@ module.exports = {
}, { }, {
id: "u0", id: "u0",
edID: 128682014, edID: 128682014,
eddbID: 0, eddbID: 1547,
grp: "t", grp: "t",
class: 2, class: 2,
rating: "A", rating: "A",
@@ -4899,7 +4889,7 @@ module.exports = {
pas: [ { pas: [ {
id: "PA", id: "PA",
edID: 128672317, edID: 128672317,
eddbID: null, eddbID: 1538,
grp: "pas", grp: "pas",
class: 1, class: 1,
rating: "I", rating: "I",
@@ -5167,7 +5157,8 @@ module.exports = {
armourpen: "A", armourpen: "A",
rof: 1.6, rof: 1.6,
dps: 2, dps: 2,
thermload: 1 thermload: 1,
pp: "Felicia Winters"
} ], } ],
ul: [ { ul: [ {
id: "7s", id: "7s",
@@ -5450,12 +5441,13 @@ module.exports = {
armourpen: "A", armourpen: "A",
rof: 1.6, rof: 1.6,
dps: 3, dps: 3,
thermload: 1 thermload: 1,
pp: "Archon Delaine"
} ], } ],
bl: [ { bl: [ {
id: "0w", id: "0w",
edID: 128049431, edID: 128049431,
eddbID: 0, eddbID: 1540,
grp: "bl", grp: "bl",
class: 4, class: 4,
rating: "A", rating: "A",
@@ -5475,7 +5467,7 @@ module.exports = {
}, { }, {
id: "0x", id: "0x",
edID: 128681994, edID: 128681994,
eddbID: 0, eddbID: 1544,
grp: "bl", grp: "bl",
class: 4, class: 4,
rating: "A", rating: "A",
@@ -5688,12 +5680,13 @@ module.exports = {
damage: 0, damage: 0,
armourpen: "A", armourpen: "A",
dps: 3, dps: 3,
thermload: 1 thermload: 1,
pp: "Edmund Mahon"
} ], } ],
mc: [ { mc: [ {
id: "7n", id: "7n",
edID: 128049458, edID: 128049458,
eddbID: 0, eddbID: 1542,
grp: "mc", grp: "mc",
class: 4, class: 4,
rating: "A", rating: "A",
@@ -5720,7 +5713,7 @@ module.exports = {
}, { }, {
id: "7o", id: "7o",
edID: 128681996, edID: 128681996,
eddbID: 0, eddbID: 1546,
grp: "mc", grp: "mc",
class: 4, class: 4,
rating: "A", rating: "A",
@@ -5747,7 +5740,7 @@ module.exports = {
}, { }, {
id: "7k", id: "7k",
edID: 128049457, edID: 128049457,
eddbID: 0, eddbID: 1541,
grp: "mc", grp: "mc",
class: 3, class: 3,
rating: "C", rating: "C",
@@ -5774,7 +5767,7 @@ module.exports = {
}, { }, {
id: "7l", id: "7l",
edID: 128049461, edID: 128049461,
eddbID: 0, eddbID: 1543,
grp: "mc", grp: "mc",
class: 3, class: 3,
rating: "C", rating: "C",
@@ -5978,7 +5971,8 @@ module.exports = {
dps: 4, dps: 4,
thermload: 1, thermload: 1,
clip: 60, clip: 60,
ammo: 1e3 ammo: 1e3,
pp: "Pranav Antal"
} ], } ],
c: [ { c: [ {
id: "1q", id: "1q",
@@ -6538,7 +6532,8 @@ module.exports = {
dps: 9, dps: 9,
thermload: 1, thermload: 1,
clip: 3, clip: 3,
ammo: 90 ammo: 90,
pp: "Zachary Hudson"
} ], } ],
rg: [ { rg: [ {
id: "29", id: "29",
@@ -6609,7 +6604,8 @@ module.exports = {
dps: 5, dps: 5,
thermload: 3, thermload: 3,
clip: 3, clip: 3,
ammo: 90 ammo: 90,
pp: "Arissa Lavigny-Duval"
} ], } ],
pa: [ { pa: [ {
id: "2c", id: "2c",
@@ -6712,12 +6708,11 @@ module.exports = {
thermload: 4, thermload: 4,
clip: 20, clip: 20,
ammo: 300, ammo: 300,
ammocost: 67 ammocost: 67,
pp: "Denton Patreus"
} ], } ],
mr: [ { mr: [ {
id: "1z", id: "1z",
edID: 0,
eddbID: 0,
grp: "mr", grp: "mr",
name: "Rocket Propelled FSD Disruptor", name: "Rocket Propelled FSD Disruptor",
class: 2, class: 2,
@@ -6864,7 +6859,8 @@ module.exports = {
thermload: 3, thermload: 3,
clip: 12, clip: 12,
ammo: 120, ammo: 120,
missile: "S" missile: "S",
pp: "Li Yong-Rui"
} ], } ],
tp: [ { tp: [ {
id: "2h", id: "2h",
@@ -7043,7 +7039,8 @@ module.exports = {
damage: 3, damage: 3,
dps: 3, dps: 3,
armourpen: "D", armourpen: "D",
thermload: 3 thermload: 3,
pp: "Zemina Torval"
} ], } ],
cs: [ { cs: [ {
id: "0d", id: "0d",
@@ -8045,6 +8042,26 @@ module.exports = {
rating: "E", rating: "E",
cost: 3829870, cost: 3829870,
cargo: 256 cargo: 256
}, {
id: "1w",
edID: 128681641,
eddbID: 1553,
grp: "cr",
class: 1,
rating: "E",
cost: 6250,
cargo: 1,
name: "Corrosion Resistant"
}, {
id: "1y",
edID: 128681992,
eddbID: 1552,
grp: "cr",
class: 1,
rating: "F",
cost: 12563,
cargo: 2,
name: "Corrosion Resistant"
} ], } ],
cc: [ { cc: [ {
id: "Cf", id: "Cf",
@@ -8320,8 +8337,6 @@ module.exports = {
} ], } ],
fh: [ { fh: [ {
id: "fh", id: "fh",
edID: -1,
eddbID: -1,
grp: "fh", grp: "fh",
class: 7, class: 7,
rating: "D", rating: "D",
@@ -8332,8 +8347,6 @@ module.exports = {
rebuildsperbay: 15 rebuildsperbay: 15
}, { }, {
id: "fm", id: "fm",
edID: -1,
eddbID: -1,
grp: "fh", grp: "fh",
class: 6, class: 6,
rating: "D", rating: "D",
@@ -8344,8 +8357,6 @@ module.exports = {
rebuildsperbay: 8 rebuildsperbay: 8
}, { }, {
id: "fr", id: "fr",
edID: -1,
eddbID: -1,
grp: "fh", grp: "fh",
class: 5, class: 5,
rating: "D", rating: "D",
@@ -9736,7 +9747,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 1.2 recover: 1.2,
pp: "Aisling Duval"
}, { }, {
id: "p5", id: "p5",
edID: 128671324, edID: 128671324,
@@ -9753,7 +9765,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 1.2 recover: 1.2,
pp: "Aisling Duval"
}, { }, {
id: "p4", id: "p4",
edID: 128671325, edID: 128671325,
@@ -9770,7 +9783,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 1.2 recover: 1.2,
pp: "Aisling Duval"
}, { }, {
id: "p3", id: "p3",
edID: 128671326, edID: 128671326,
@@ -9787,7 +9801,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 1.425 recover: 1.425,
pp: "Aisling Duval"
}, { }, {
id: "p2", id: "p2",
edID: 128671327, edID: 128671327,
@@ -9804,7 +9819,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 1.875 recover: 1.875,
pp: "Aisling Duval"
}, { }, {
id: "p1", id: "p1",
edID: 128671328, edID: 128671328,
@@ -9821,7 +9837,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 2.4 recover: 2.4,
pp: "Aisling Duval"
}, { }, {
id: "p0", id: "p0",
edID: 128671329, edID: 128671329,
@@ -9838,7 +9855,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 3 recover: 3,
pp: "Aisling Duval"
}, { }, {
id: "p7", id: "p7",
edID: 128671330, edID: 128671330,
@@ -9855,7 +9873,8 @@ module.exports = {
minmul: 2, minmul: 2,
optmul: 1.5, optmul: 1.5,
maxmul: 1, maxmul: 1,
recover: 3.6 recover: 3.6,
pp: "Aisling Duval"
} ], } ],
pc: [ { pc: [ {
id: "Pf", id: "Pf",
@@ -10100,8 +10119,6 @@ module.exports = {
} ], } ],
pce: [ { pce: [ {
id: "ma", id: "ma",
edID: -1,
eddbID: -1,
grp: "pce", grp: "pce",
class: 2, class: 2,
rating: "E", rating: "E",
@@ -10110,8 +10127,6 @@ module.exports = {
passengers: 2 passengers: 2
}, { }, {
id: "mb", id: "mb",
edID: -1,
eddbID: -1,
grp: "pce", grp: "pce",
class: 3, class: 3,
rating: "E", rating: "E",
@@ -10120,8 +10135,6 @@ module.exports = {
passengers: 4 passengers: 4
}, { }, {
id: "mc", id: "mc",
edID: -1,
eddbID: -1,
grp: "pce", grp: "pce",
class: 4, class: 4,
rating: "E", rating: "E",
@@ -10130,8 +10143,6 @@ module.exports = {
passengers: 8 passengers: 8
}, { }, {
id: "md", id: "md",
edID: -1,
eddbID: -1,
grp: "pce", grp: "pce",
class: 5, class: 5,
rating: "E", rating: "E",
@@ -10140,8 +10151,6 @@ module.exports = {
passengers: 16 passengers: 16
}, { }, {
id: "me", id: "me",
edID: -1,
eddbID: -1,
grp: "pce", grp: "pce",
class: 6, class: 6,
rating: "E", rating: "E",
@@ -10151,8 +10160,6 @@ module.exports = {
} ], } ],
pci: [ { pci: [ {
id: "mf", id: "mf",
edID: -1,
eddbID: -1,
grp: "pci", grp: "pci",
class: 3, class: 3,
rating: "D", rating: "D",
@@ -10161,8 +10168,6 @@ module.exports = {
passengers: 3 passengers: 3
}, { }, {
id: "mg", id: "mg",
edID: -1,
eddbID: -1,
grp: "pci", grp: "pci",
class: 4, class: 4,
rating: "D", rating: "D",
@@ -10171,8 +10176,6 @@ module.exports = {
passengers: 6 passengers: 6
}, { }, {
id: "mh", id: "mh",
edID: -1,
eddbID: -1,
grp: "pci", grp: "pci",
class: 5, class: 5,
rating: "D", rating: "D",
@@ -10181,8 +10184,6 @@ module.exports = {
passengers: 10 passengers: 10
}, { }, {
id: "mi", id: "mi",
edID: -1,
eddbID: -1,
grp: "pci", grp: "pci",
class: 6, class: 6,
rating: "D", rating: "D",
@@ -10192,8 +10193,6 @@ module.exports = {
} ], } ],
pcm: [ { pcm: [ {
id: "mj", id: "mj",
edID: -1,
eddbID: -1,
grp: "pcm", grp: "pcm",
class: 4, class: 4,
rating: "C", rating: "C",
@@ -10202,8 +10201,6 @@ module.exports = {
passengers: 3 passengers: 3
}, { }, {
id: "mk", id: "mk",
edID: -1,
eddbID: -1,
grp: "pcm", grp: "pcm",
class: 5, class: 5,
rating: "C", rating: "C",
@@ -10212,8 +10209,6 @@ module.exports = {
passengers: 6 passengers: 6
}, { }, {
id: "ml", id: "ml",
edID: -1,
eddbID: -1,
grp: "pcm", grp: "pcm",
class: 6, class: 6,
rating: "C", rating: "C",
@@ -10223,8 +10218,6 @@ module.exports = {
} ], } ],
pcq: [ { pcq: [ {
id: "mm", id: "mm",
edID: -1,
eddbID: -1,
grp: "pcq", grp: "pcq",
class: 5, class: 5,
rating: "B", rating: "B",
@@ -10233,8 +10226,6 @@ module.exports = {
passengers: 4 passengers: 4
}, { }, {
id: "mn", id: "mn",
edID: -1,
eddbID: -1,
grp: "pcq", grp: "pcq",
class: 6, class: 6,
rating: "B", rating: "B",

137
dist/index.json vendored
View File

@@ -503,36 +503,26 @@
"bulkheads": [ "bulkheads": [
{ {
"id": "cl", "id": "cl",
"edID": -1,
"eddbID": -1,
"cost": 0, "cost": 0,
"mass": 0 "mass": 0
}, },
{ {
"id": "cm", "id": "cm",
"edID": -1,
"eddbID": -1,
"cost": -1, "cost": -1,
"mass": 83 "mass": 83
}, },
{ {
"id": "cn", "id": "cn",
"edID": -1,
"eddbID": -1,
"cost": -1, "cost": -1,
"mass": 165 "mass": 165
}, },
{ {
"id": "co", "id": "co",
"edID": -1,
"eddbID": -1,
"cost": -1, "cost": -1,
"mass": 165 "mass": 165
}, },
{ {
"id": "cp", "id": "cp",
"edID": -1,
"eddbID": -1,
"cost": -1, "cost": -1,
"mass": 165 "mass": 165
} }
@@ -4501,7 +4491,7 @@
{ {
"id": "tz", "id": "tz",
"edID": 128682013, "edID": 128682013,
"eddbID": 0, "eddbID": 1548,
"grp": "t", "grp": "t",
"class": 3, "class": 3,
"rating": "A", "rating": "A",
@@ -4517,7 +4507,7 @@
{ {
"id": "u0", "id": "u0",
"edID": 128682014, "edID": 128682014,
"eddbID": 0, "eddbID": 1547,
"grp": "t", "grp": "t",
"class": 2, "class": 2,
"rating": "A", "rating": "A",
@@ -6790,7 +6780,7 @@
{ {
"id": "PA", "id": "PA",
"edID": 128672317, "edID": 128672317,
"eddbID": null, "eddbID": 1538,
"grp": "pas", "grp": "pas",
"class": 1, "class": 1,
"rating": "I", "rating": "I",
@@ -7071,7 +7061,8 @@
"armourpen": "A", "armourpen": "A",
"rof": 1.6, "rof": 1.6,
"dps": 2, "dps": 2,
"thermload": 1 "thermload": 1,
"pp": "Felicia Winters"
} }
], ],
"ul": [ "ul": [
@@ -7367,14 +7358,15 @@
"armourpen": "A", "armourpen": "A",
"rof": 1.6, "rof": 1.6,
"dps": 3, "dps": 3,
"thermload": 1 "thermload": 1,
"pp": "Archon Delaine"
} }
], ],
"bl": [ "bl": [
{ {
"id": "0w", "id": "0w",
"edID": 128049431, "edID": 128049431,
"eddbID": 0, "eddbID": 1540,
"grp": "bl", "grp": "bl",
"class": 4, "class": 4,
"rating": "A", "rating": "A",
@@ -7395,7 +7387,7 @@
{ {
"id": "0x", "id": "0x",
"edID": 128681994, "edID": 128681994,
"eddbID": 0, "eddbID": 1544,
"grp": "bl", "grp": "bl",
"class": 4, "class": 4,
"rating": "A", "rating": "A",
@@ -7618,14 +7610,15 @@
"damage": 0, "damage": 0,
"armourpen": "A", "armourpen": "A",
"dps": 3, "dps": 3,
"thermload": 1 "thermload": 1,
"pp": "Edmund Mahon"
} }
], ],
"mc": [ "mc": [
{ {
"id": "7n", "id": "7n",
"edID": 128049458, "edID": 128049458,
"eddbID": 0, "eddbID": 1542,
"grp": "mc", "grp": "mc",
"class": 4, "class": 4,
"rating": "A", "rating": "A",
@@ -7653,7 +7646,7 @@
{ {
"id": "7o", "id": "7o",
"edID": 128681996, "edID": 128681996,
"eddbID": 0, "eddbID": 1546,
"grp": "mc", "grp": "mc",
"class": 4, "class": 4,
"rating": "A", "rating": "A",
@@ -7681,7 +7674,7 @@
{ {
"id": "7k", "id": "7k",
"edID": 128049457, "edID": 128049457,
"eddbID": 0, "eddbID": 1541,
"grp": "mc", "grp": "mc",
"class": 3, "class": 3,
"rating": "C", "rating": "C",
@@ -7709,7 +7702,7 @@
{ {
"id": "7l", "id": "7l",
"edID": 128049461, "edID": 128049461,
"eddbID": 0, "eddbID": 1543,
"grp": "mc", "grp": "mc",
"class": 3, "class": 3,
"rating": "C", "rating": "C",
@@ -7920,7 +7913,8 @@
"dps": 4, "dps": 4,
"thermload": 1, "thermload": 1,
"clip": 60, "clip": 60,
"ammo": 1000 "ammo": 1000,
"pp": "Pranav Antal"
} }
], ],
"c": [ "c": [
@@ -8503,7 +8497,8 @@
"dps": 9, "dps": 9,
"thermload": 1, "thermload": 1,
"clip": 3, "clip": 3,
"ammo": 90 "ammo": 90,
"pp": "Zachary Hudson"
} }
], ],
"rg": [ "rg": [
@@ -8578,7 +8573,8 @@
"dps": 5, "dps": 5,
"thermload": 3, "thermload": 3,
"clip": 3, "clip": 3,
"ammo": 90 "ammo": 90,
"pp": "Arissa Lavigny-Duval"
} }
], ],
"pa": [ "pa": [
@@ -8686,14 +8682,13 @@
"thermload": 4, "thermload": 4,
"clip": 20, "clip": 20,
"ammo": 300, "ammo": 300,
"ammocost": 67 "ammocost": 67,
"pp": "Denton Patreus"
} }
], ],
"mr": [ "mr": [
{ {
"id": "1z", "id": "1z",
"edID": 0,
"eddbID": 0,
"grp": "mr", "grp": "mr",
"name": "Rocket Propelled FSD Disruptor", "name": "Rocket Propelled FSD Disruptor",
"class": 2, "class": 2,
@@ -8845,7 +8840,8 @@
"thermload": 3, "thermload": 3,
"clip": 12, "clip": 12,
"ammo": 120, "ammo": 120,
"missile": "S" "missile": "S",
"pp": "Li Yong-Rui"
} }
], ],
"tp": [ "tp": [
@@ -9035,7 +9031,8 @@
"damage": 3, "damage": 3,
"dps": 3, "dps": 3,
"armourpen": "D", "armourpen": "D",
"thermload": 3 "thermload": 3,
"pp": "Zemina Torval"
} }
], ],
"cs": [ "cs": [
@@ -10125,6 +10122,28 @@
"rating": "E", "rating": "E",
"cost": 3829870, "cost": 3829870,
"cargo": 256 "cargo": 256
},
{
"id": "1w",
"edID": 128681641,
"eddbID": 1553,
"grp": "cr",
"class": 1,
"rating": "E",
"cost": 6250,
"cargo": 1,
"name": "Corrosion Resistant"
},
{
"id": "1y",
"edID": 128681992,
"eddbID": 1552,
"grp": "cr",
"class": 1,
"rating": "F",
"cost": 12563,
"cargo": 2,
"name": "Corrosion Resistant"
} }
], ],
"cc": [ "cc": [
@@ -10425,8 +10444,6 @@
"fh": [ "fh": [
{ {
"id": "fh", "id": "fh",
"edID": -1,
"eddbID": -1,
"grp": "fh", "grp": "fh",
"class": 7, "class": 7,
"rating": "D", "rating": "D",
@@ -10438,8 +10455,6 @@
}, },
{ {
"id": "fm", "id": "fm",
"edID": -1,
"eddbID": -1,
"grp": "fh", "grp": "fh",
"class": 6, "class": 6,
"rating": "D", "rating": "D",
@@ -10451,8 +10466,6 @@
}, },
{ {
"id": "fr", "id": "fr",
"edID": -1,
"eddbID": -1,
"grp": "fh", "grp": "fh",
"class": 5, "class": 5,
"rating": "D", "rating": "D",
@@ -11976,7 +11989,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 1.2 "recover": 1.2,
"pp": "Aisling Duval"
}, },
{ {
"id": "p5", "id": "p5",
@@ -11994,7 +12008,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 1.2 "recover": 1.2,
"pp": "Aisling Duval"
}, },
{ {
"id": "p4", "id": "p4",
@@ -12012,7 +12027,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 1.2 "recover": 1.2,
"pp": "Aisling Duval"
}, },
{ {
"id": "p3", "id": "p3",
@@ -12030,7 +12046,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 1.425 "recover": 1.425,
"pp": "Aisling Duval"
}, },
{ {
"id": "p2", "id": "p2",
@@ -12048,7 +12065,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 1.875 "recover": 1.875,
"pp": "Aisling Duval"
}, },
{ {
"id": "p1", "id": "p1",
@@ -12066,7 +12084,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 2.4 "recover": 2.4,
"pp": "Aisling Duval"
}, },
{ {
"id": "p0", "id": "p0",
@@ -12084,7 +12103,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 3 "recover": 3,
"pp": "Aisling Duval"
}, },
{ {
"id": "p7", "id": "p7",
@@ -12102,7 +12122,8 @@
"minmul": 2, "minmul": 2,
"optmul": 1.5, "optmul": 1.5,
"maxmul": 1, "maxmul": 1,
"recover": 3.6 "recover": 3.6,
"pp": "Aisling Duval"
} }
], ],
"pc": [ "pc": [
@@ -12370,8 +12391,6 @@
"pce": [ "pce": [
{ {
"id": "ma", "id": "ma",
"edID": -1,
"eddbID": -1,
"grp": "pce", "grp": "pce",
"class": 2, "class": 2,
"rating": "E", "rating": "E",
@@ -12381,8 +12400,6 @@
}, },
{ {
"id": "mb", "id": "mb",
"edID": -1,
"eddbID": -1,
"grp": "pce", "grp": "pce",
"class": 3, "class": 3,
"rating": "E", "rating": "E",
@@ -12392,8 +12409,6 @@
}, },
{ {
"id": "mc", "id": "mc",
"edID": -1,
"eddbID": -1,
"grp": "pce", "grp": "pce",
"class": 4, "class": 4,
"rating": "E", "rating": "E",
@@ -12403,8 +12418,6 @@
}, },
{ {
"id": "md", "id": "md",
"edID": -1,
"eddbID": -1,
"grp": "pce", "grp": "pce",
"class": 5, "class": 5,
"rating": "E", "rating": "E",
@@ -12414,8 +12427,6 @@
}, },
{ {
"id": "me", "id": "me",
"edID": -1,
"eddbID": -1,
"grp": "pce", "grp": "pce",
"class": 6, "class": 6,
"rating": "E", "rating": "E",
@@ -12427,8 +12438,6 @@
"pci": [ "pci": [
{ {
"id": "mf", "id": "mf",
"edID": -1,
"eddbID": -1,
"grp": "pci", "grp": "pci",
"class": 3, "class": 3,
"rating": "D", "rating": "D",
@@ -12438,8 +12447,6 @@
}, },
{ {
"id": "mg", "id": "mg",
"edID": -1,
"eddbID": -1,
"grp": "pci", "grp": "pci",
"class": 4, "class": 4,
"rating": "D", "rating": "D",
@@ -12449,8 +12456,6 @@
}, },
{ {
"id": "mh", "id": "mh",
"edID": -1,
"eddbID": -1,
"grp": "pci", "grp": "pci",
"class": 5, "class": 5,
"rating": "D", "rating": "D",
@@ -12460,8 +12465,6 @@
}, },
{ {
"id": "mi", "id": "mi",
"edID": -1,
"eddbID": -1,
"grp": "pci", "grp": "pci",
"class": 6, "class": 6,
"rating": "D", "rating": "D",
@@ -12473,8 +12476,6 @@
"pcm": [ "pcm": [
{ {
"id": "mj", "id": "mj",
"edID": -1,
"eddbID": -1,
"grp": "pcm", "grp": "pcm",
"class": 4, "class": 4,
"rating": "C", "rating": "C",
@@ -12484,8 +12485,6 @@
}, },
{ {
"id": "mk", "id": "mk",
"edID": -1,
"eddbID": -1,
"grp": "pcm", "grp": "pcm",
"class": 5, "class": 5,
"rating": "C", "rating": "C",
@@ -12495,8 +12494,6 @@
}, },
{ {
"id": "ml", "id": "ml",
"edID": -1,
"eddbID": -1,
"grp": "pcm", "grp": "pcm",
"class": 6, "class": 6,
"rating": "C", "rating": "C",
@@ -12508,8 +12505,6 @@
"pcq": [ "pcq": [
{ {
"id": "mm", "id": "mm",
"edID": -1,
"eddbID": -1,
"grp": "pcq", "grp": "pcq",
"class": 5, "class": 5,
"rating": "B", "rating": "B",
@@ -12519,8 +12514,6 @@
}, },
{ {
"id": "mn", "id": "mn",
"edID": -1,
"eddbID": -1,
"grp": "pcq", "grp": "pcq",
"class": 6, "class": 6,
"rating": "B", "rating": "B",

View File

@@ -1,7 +1,7 @@
{ {
"bl": [ "bl": [
{ "id": "0w", "edID": 128049431, "eddbID": 0, "grp": "bl", "class": 4, "rating": "A", "cost": 2396160, "mass": 16, "integrity": 80, "power": 2.9, "mount": "F", "type": "T", "armourpen": 60, "breachdps": 33.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 41.4, "eps": 9.10, "hps": 9.9 }, { "id": "0w", "edID": 128049431, "eddbID": 1540, "grp": "bl", "class": 4, "rating": "A", "cost": 2396160, "mass": 16, "integrity": 80, "power": 2.9, "mount": "F", "type": "T", "armourpen": 60, "breachdps": 33.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 41.4, "eps": 9.10, "hps": 9.9 },
{ "id": "0x", "edID": 128681994, "eddbID": 0, "grp": "bl", "class": 4, "rating": "A", "cost": 8746160, "mass": 16, "integrity": 80, "power": 2.86, "mount": "G", "type": "T", "armourpen": 60, "breachdps": 26.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 32.7, "eps" : 8.99, "hps": 10.6 }, { "id": "0x", "edID": 128681994, "eddbID": 1544, "grp": "bl", "class": 4, "rating": "A", "cost": 8746160, "mass": 16, "integrity": 80, "power": 2.86, "mount": "G", "type": "T", "armourpen": 60, "breachdps": 26.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 32.7, "eps" : 8.99, "hps": 10.6 },
{ "id": "0u", "edID": 128049430, "eddbID": 843, "grp": "bl", "class": 3, "rating": "C", "cost": 1177600, "mass": 8, "integrity": 64, "power": 1.8, "mount": "F", "type": "T", "armourpen": 50, "breachdps": 20.6, "breachmin": 0.4, "breachmax": 0.8, "dps": 25.8, "eps" : 5.67, "hps" : 7.2 }, { "id": "0u", "edID": 128049430, "eddbID": 843, "grp": "bl", "class": 3, "rating": "C", "cost": 1177600, "mass": 8, "integrity": 64, "power": 1.8, "mount": "F", "type": "T", "armourpen": 50, "breachdps": 20.6, "breachmin": 0.4, "breachmax": 0.8, "dps": 25.8, "eps" : 5.67, "hps" : 7.2 },
{ "id": "0v", "edID": 128049434, "eddbID": 846, "grp": "bl", "class": 3, "rating": "C", "cost": 2396160, "mass": 8, "integrity": 64, "power": 1.78, "mount": "G", "type": "T", "armourpen": 50, "breachdps": 16.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 20.3, "eps" : 5.58, "hps": 7.6 }, { "id": "0v", "edID": 128049434, "eddbID": 846, "grp": "bl", "class": 3, "rating": "C", "cost": 2396160, "mass": 8, "integrity": 64, "power": 1.78, "mount": "G", "type": "T", "armourpen": 50, "breachdps": 16.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 20.3, "eps" : 5.58, "hps": 7.6 },
@@ -15,6 +15,6 @@
{ "id": "0p", "edID": 128049432, "eddbID": 844, "grp": "bl", "class": 1, "rating": "E", "cost": 74650, "mass": 2, "integrity": 40, "power": 0.67, "mount": "G", "type": "T", "armourpen": 18, "breachdps": 6.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 7.7, "eps": 2.11, "hps": 3.7, "range": 3000 }, { "id": "0p", "edID": 128049432, "eddbID": 844, "grp": "bl", "class": 1, "rating": "E", "cost": 74650, "mass": 2, "integrity": 40, "power": 0.67, "mount": "G", "type": "T", "armourpen": 18, "breachdps": 6.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 7.7, "eps": 2.11, "hps": 3.7, "range": 3000 },
{ "id": "0q", "edID": 128049435, "eddbID": 847, "grp": "bl", "class": 1, "rating": "F", "cost": 500000, "mass": 2, "integrity": 40, "power": 0.63, "mount": "T", "type": "T", "armourpen": 18, "breachdps": 4.3, "breachmin": 0.4, "breachmax": 0.8, "dps": 5.4, "eps" : 1.32, "hps" : 2.4 }, { "id": "0q", "edID": 128049435, "eddbID": 847, "grp": "bl", "class": 1, "rating": "F", "cost": 500000, "mass": 2, "integrity": 40, "power": 0.63, "mount": "T", "type": "T", "armourpen": 18, "breachdps": 4.3, "breachmin": 0.4, "breachmax": 0.8, "dps": 5.4, "eps" : 1.32, "hps" : 2.4 },
{ "id": "b0", "eddbID": 1476, "grp": "bl", "name": "Retributor", "class": 1, "rating": "E", "cost": 56150, "mass": 2, "power": 0.69, "mount": "F", "type": "T", "damage": 0, "armourpen": "A", "dps": 3, "thermload": 1 } { "id": "b0", "eddbID": 1476, "grp": "bl", "name": "Retributor", "class": 1, "rating": "E", "cost": 56150, "mass": 2, "power": 0.69, "mount": "F", "type": "T", "damage": 0, "armourpen": "A", "dps": 3, "thermload": 1, "pp": "Edmund Mahon" }
] ]
} }

View File

@@ -15,6 +15,6 @@
{ "id": "12", "edID": 128049404, "eddbID": 835, "grp": "ul", "class": 1, "rating": "G", "cost": 8600, "mass": 2, "integrity": 40, "power": 0.64, "mount": "G", "type": "T", "armourpen": 20, "breachdps": 5.3, "breachmin": 0.4, "breachmax": 0.8, "dps":6.4, "eps": 1.4, "hps": 1.6, "range": 3000, "rof": 5.3, "burst": 3, "burstrof": 17 }, { "id": "12", "edID": 128049404, "eddbID": 835, "grp": "ul", "class": 1, "rating": "G", "cost": 8600, "mass": 2, "integrity": 40, "power": 0.64, "mount": "G", "type": "T", "armourpen": 20, "breachdps": 5.3, "breachmin": 0.4, "breachmax": 0.8, "dps":6.4, "eps": 1.4, "hps": 1.6, "range": 3000, "rof": 5.3, "burst": 3, "burstrof": 17 },
{ "id": "13", "edID": 128049407, "eddbID": 838, "grp": "ul", "class": 1, "rating": "G", "cost": 52800, "mass": 2, "integrity": 40, "power": 0.6, "mount": "T", "type": "T", "armourpen": 20, "breachdps": 1.92, "breachmin": 0.4, "breachmax": 0.8, "dps": 4.2, "eps": 0.768, "hps": 0.96, "range": 3000, "rof": 4.8, "burst": 3, "burstrof": 19 }, { "id": "13", "edID": 128049407, "eddbID": 838, "grp": "ul", "class": 1, "rating": "G", "cost": 52800, "mass": 2, "integrity": 40, "power": 0.6, "mount": "T", "type": "T", "armourpen": 20, "breachdps": 1.92, "breachmin": 0.4, "breachmax": 0.8, "dps": 4.2, "eps": 0.768, "hps": 0.96, "range": 3000, "rof": 4.8, "burst": 3, "burstrof": 19 },
{ "id": "cy", "edID": 128671449, "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", "class": 1, "rating": "F", "cost": 8800, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "thermload": 1 } { "id": "cy", "edID": 128671449, "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", "class": 1, "rating": "F", "cost": 8800, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "thermload": 1, "pp": "Archon Delaine" }
] ]
} }

View File

@@ -12,6 +12,6 @@
{ "id": "21", "edID": 128049451, "eddbID": 863, "grp": "fc", "class": 1, "rating": "E", "cost": 54720, "mass": 2, "integrity": 40, "power": 0.59, "mount": "G", "type": "K", "armourpen": 20, "breachdps": 63.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 71.3, "eps": 18.408, "hps": 28.32, "range": 2000, "rof": 5.9, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 }, { "id": "21", "edID": 128049451, "eddbID": 863, "grp": "fc", "class": 1, "rating": "E", "cost": 54720, "mass": 2, "integrity": 40, "power": 0.59, "mount": "G", "type": "K", "armourpen": 20, "breachdps": 63.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 71.3, "eps": 18.408, "hps": 28.32, "range": 2000, "rof": 5.9, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
{ "id": "22", "edID": 128049453, "eddbID": 865, "grp": "fc", "class": 1, "rating": "E", "cost": 182400, "mass": 2, "integrity": 40, "power": 0.42, "mount": "T", "type": "K", "armourpen": 20, "breachdps": 34.56, "breachmin": 0.4, "breachmax": 0.8, "dps": 39.4, "eps": 6.72, "hps": 13.44, "range": 2000, "rof": 4.8, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 }, { "id": "22", "edID": 128049453, "eddbID": 865, "grp": "fc", "class": 1, "rating": "E", "cost": 182400, "mass": 2, "integrity": 40, "power": 0.42, "mount": "T", "type": "K", "armourpen": 20, "breachdps": 34.56, "breachmin": 0.4, "breachmax": 0.8, "dps": 39.4, "eps": 6.72, "hps": 13.44, "range": 2000, "rof": 4.8, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
{ "id": "pa", "edID": 128671343, "eddbID": 1478, "grp": "fc", "name": "Pacifier", "class": 3, "rating": "C", "cost": 1400830, "mass": 8, "power": 1.02, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.5, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90 } { "id": "pa", "edID": 128671343, "eddbID": 1478, "grp": "fc", "name": "Pacifier", "class": 3, "rating": "C", "cost": 1400830, "mass": 8, "power": 1.02, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.5, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90, "pp": "Zachary Hudson" }
] ]
} }

View File

@@ -2,6 +2,6 @@
"ml": [ "ml": [
{ "id": "2l", "edID": 128049525, "eddbID": 888, "grp": "ml", "class": 1, "rating": "D", "cost": 6800, "mass": 2, "integrity": 40, "power": 0.5, "mount": "F", "armourpen": 18, "breachdps": 0.3, "breachmin": 0.1, "breachmax": 0.2, "dps": 2, "eps": 1.5, "hps": 2 }, { "id": "2l", "edID": 128049525, "eddbID": 888, "grp": "ml", "class": 1, "rating": "D", "cost": 6800, "mass": 2, "integrity": 40, "power": 0.5, "mount": "F", "armourpen": 18, "breachdps": 0.3, "breachmin": 0.1, "breachmax": 0.2, "dps": 2, "eps": 1.5, "hps": 2 },
{ "id": "2m", "edID": 128049526, "eddbID": 889, "grp": "ml", "class": 2, "rating": "D", "cost": 22580, "mass": 2, "integrity": 51, "power": 0.75, "mount": "F", "armourpen": 18, "breachdps": 0.6, "breachmin": 0.1, "breachmax": 0.2, "dps": 4, "eps": 3, "hps": 4 }, { "id": "2m", "edID": 128049526, "eddbID": 889, "grp": "ml", "class": 2, "rating": "D", "cost": 22580, "mass": 2, "integrity": 51, "power": 0.75, "mount": "F", "armourpen": 18, "breachdps": 0.6, "breachmin": 0.1, "breachmax": 0.2, "dps": 4, "eps": 3, "hps": 4 },
{ "id": "ml", "eddbID": 1479, "grp": "ml", "name": "Mining Lance", "class": 1, "rating": "D", "cost": 13600, "mass": 2, "power": 0.7, "mount": "F", "type": "T", "damage": 3, "dps": 3, "armourpen": "D", "thermload": 3 } { "id": "ml", "eddbID": 1479, "grp": "ml", "name": "Mining Lance", "class": 1, "rating": "D", "cost": 13600, "mass": 2, "power": 0.7, "mount": "F", "type": "T", "damage": 3, "dps": 3, "armourpen": "D", "thermload": 3, "pp": "Zemina Torval" }
] ]
} }

View File

@@ -1,6 +1,6 @@
{ {
"mr": [ "mr": [
{ "id": "1z", "edID": 0, "eddbID": 0, "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, "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": "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": "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" }, { "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": "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": "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" } { "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" }
] ]
} }

View File

@@ -14,6 +14,6 @@
{ "id": "24", "edID": 128049459, "eddbID": 869, "grp": "mc", "class": 1, "rating": "G", "cost": 14250, "mass": 2, "integrity": 40, "power": 0.37, "mount": "G", "type": "K", "armourpen": 22, "breachdps": 5.8, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.8, "eps": 0.58, "hps": 0.83, "range": 4000, "rof": 8.3, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, { "id": "24", "edID": 128049459, "eddbID": 869, "grp": "mc", "class": 1, "rating": "G", "cost": 14250, "mass": 2, "integrity": 40, "power": 0.37, "mount": "G", "type": "K", "armourpen": 22, "breachdps": 5.8, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.8, "eps": 0.58, "hps": 0.83, "range": 4000, "rof": 8.3, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
{ "id": "25", "edID": 128049462, "eddbID": 871, "grp": "mc", "class": 1, "rating": "G", "cost": 81600, "mass": 2, "integrity": 40, "power": 0.26, "mount": "T", "type": "K", "armourpen": 22, "breachdps": 3.55, "breachmin": 0.4, "breachmax": 0.8, "dps": 4, "eps": 0.213, "hps": 0.00, "range": 4000, "rof": 7.1, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, { "id": "25", "edID": 128049462, "eddbID": 871, "grp": "mc", "class": 1, "rating": "G", "cost": 81600, "mass": 2, "integrity": 40, "power": 0.26, "mount": "T", "type": "K", "armourpen": 22, "breachdps": 3.55, "breachmin": 0.4, "breachmax": 0.8, "dps": 4, "eps": 0.213, "hps": 0.00, "range": 4000, "rof": 7.1, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
{ "id": "e0", "eddbID": 1481, "grp": "mc", "name": "Enforcer", "class": 1, "rating": "F", "cost": 13980, "mass": 2, "power": 0.28, "mount": "F", "type": "K", "damage": 4, "armourpen": "A", "rof": 4.3, "dps": 4, "thermload": 1, "clip": 60, "ammo": 1000 } { "id": "e0", "eddbID": 1481, "grp": "mc", "name": "Enforcer", "class": 1, "rating": "F", "cost": 13980, "mass": 2, "power": 0.28, "mount": "F", "type": "K", "damage": 4, "armourpen": "A", "rof": 4.3, "dps": 4, "thermload": 1, "clip": 60, "ammo": 1000, "pp": "Pranav Antal" }
] ]
} }

View File

@@ -4,6 +4,6 @@
{ "id": "2b", "edID": 128049466, "eddbID": 874, "grp": "pa", "class": 3, "rating": "B", "cost": 3051200, "mass": 8, "integrity": 64, "power": 1.97, "mount": "F", "type": "KT", "armourpen": 70, "breachdps": 20.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.2, "eps": 4.08, "hps": 6.54, "range": 3500, "rof": 0.3, "clip": 5, "ammo": 100, "reload": 8, "speed": 875, "roundspershot": 1 }, { "id": "2b", "edID": 128049466, "eddbID": 874, "grp": "pa", "class": 3, "rating": "B", "cost": 3051200, "mass": 8, "integrity": 64, "power": 1.97, "mount": "F", "type": "KT", "armourpen": 70, "breachdps": 20.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.2, "eps": 4.08, "hps": 6.54, "range": 3500, "rof": 0.3, "clip": 5, "ammo": 100, "reload": 8, "speed": 875, "roundspershot": 1 },
{ "id": "1g", "edID": 128049465, "eddbID": 873, "grp": "pa", "class": 2, "rating": "C", "cost": 834200, "mass": 4, "integrity": 51, "power": 1.43, "mount": "F", "type": "KT", "armourpen": 55, "breachdps": 13.26, "breachmin": 0.4, "breachmax": 0.8, "dps": 17.2, "eps": 2.595, "hps": 4.68, "range": 3500, "rof": 0.3, "clip": 5, "ammo": 100, "reload": 8, "speed": 875, "roundspershot": 1 }, { "id": "1g", "edID": 128049465, "eddbID": 873, "grp": "pa", "class": 2, "rating": "C", "cost": 834200, "mass": 4, "integrity": 51, "power": 1.43, "mount": "F", "type": "KT", "armourpen": 55, "breachdps": 13.26, "breachmin": 0.4, "breachmax": 0.8, "dps": 17.2, "eps": 2.595, "hps": 4.68, "range": 3500, "rof": 0.3, "clip": 5, "ammo": 100, "reload": 8, "speed": 875, "roundspershot": 1 },
{ "id": "Ap", "edID": 128671339, "eddbID": 1482, "grp": "pa", "name": "Advanced Plasma Accelerator", "class": 3, "rating": "B", "cost": 4119120, "mass": 8, "power": 1.97, "mount": "F", "type": "KT", "damage": 8, "armourpen": "A", "rof": 1.67, "dps": 4, "thermload": 4, "clip": 20, "ammo": 300, "ammocost": 67 } { "id": "Ap", "edID": 128671339, "eddbID": 1482, "grp": "pa", "name": "Advanced Plasma Accelerator", "class": 3, "rating": "B", "cost": 4119120, "mass": 8, "power": 1.97, "mount": "F", "type": "KT", "damage": 8, "armourpen": "A", "rof": 1.67, "dps": 4, "thermload": 4, "clip": 20, "ammo": 300, "ammocost": 67, "pp": "Denton Patreus" }
] ]
} }

View File

@@ -15,6 +15,6 @@
{ "id": "18", "edID": 128049385, "eddbID": 826, "grp": "pl", "class": 1, "rating": "G", "cost": 6600, "mass": 2, "integrity": 40, "power": 0.39, "mount": "G", "type": "T", "armourpen": 20, "breachdps": 5.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.2, "eps": 1.24, "hps": 1.2, "range": 3000, "rof": 4 }, { "id": "18", "edID": 128049385, "eddbID": 826, "grp": "pl", "class": 1, "rating": "G", "cost": 6600, "mass": 2, "integrity": 40, "power": 0.39, "mount": "G", "type": "T", "armourpen": 20, "breachdps": 5.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.2, "eps": 1.24, "hps": 1.2, "range": 3000, "rof": 4 },
{ "id": "19", "edID": 128049388, "eddbID": 829, "grp": "pl", "class": 1, "rating": "G", "cost": 26000, "mass": 2, "integrity": 40, "power": 0.38, "mount": "T", "type": "T", "armourpen": 20, "breachdps": 3.3, "breachmin": 0.4, "breachmax": 0.8, "dps": 4, "eps": 0.627, "hps": 6.6, "range": 3000, "rof": 3.3 }, { "id": "19", "edID": 128049388, "eddbID": 829, "grp": "pl", "class": 1, "rating": "G", "cost": 26000, "mass": 2, "integrity": 40, "power": 0.38, "mount": "T", "type": "T", "armourpen": 20, "breachdps": 3.3, "breachmin": 0.4, "breachmax": 0.8, "dps": 4, "eps": 0.627, "hps": 6.6, "range": 3000, "rof": 3.3 },
{ "id": "PL", "eddbID": 1483, "grp": "pl", "name": "Disruptor", "class": 2, "rating": "E", "cost": 26400, "mass": 4, "power": 0.7, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 2, "thermload": 1 } { "id": "PL", "eddbID": 1483, "grp": "pl", "name": "Disruptor", "class": 2, "rating": "E", "cost": 26400, "mass": 4, "power": 0.7, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 2, "thermload": 1, "pp": "Felicia Winters" }
] ]
} }

View File

@@ -2,6 +2,6 @@
"rg": [ "rg": [
{ "id": "29", "edID": 128049488, "eddbID": 876, "grp": "rg", "class": 1, "rating": "D", "cost": 51600, "mass": 2, "integrity": 40, "power": 1.15, "mount": "F", "type": "KT", "armourpen": 30, "breachdps": 35.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 37, "eps": 4.3, "hps": 28.48, "range": 3000, "rof": 1.6, "clip": 1, "ammo": 30, "reload": 1 }, { "id": "29", "edID": 128049488, "eddbID": 876, "grp": "rg", "class": 1, "rating": "D", "cost": 51600, "mass": 2, "integrity": 40, "power": 1.15, "mount": "F", "type": "KT", "armourpen": 30, "breachdps": 35.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 37, "eps": 4.3, "hps": 28.48, "range": 3000, "rof": 1.6, "clip": 1, "ammo": 30, "reload": 1 },
{ "id": "2a", "edID": 128049489, "eddbID": 877, "grp": "rg", "class": 2, "rating": "B", "cost": 412800, "mass": 4, "integrity": 51, "power": 1.63, "mount": "F", "type": "KT", "armourpen": 48, "breachdps": 47.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 50, "eps": 6.132, "hps": 36, "range": 3000, "rof": 1.2, "clip": 1, "ammo": 30, "reload": 1 }, { "id": "2a", "edID": 128049489, "eddbID": 877, "grp": "rg", "class": 2, "rating": "B", "cost": 412800, "mass": 4, "integrity": 51, "power": 1.63, "mount": "F", "type": "KT", "armourpen": 48, "breachdps": 47.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 50, "eps": 6.132, "hps": 36, "range": 3000, "rof": 1.2, "clip": 1, "ammo": 30, "reload": 1 },
{ "id": "ih", "edID": 128671341, "eddbID": 1484, "grp": "rg", "name": "Imperial Hammer", "class": 2, "rating": "B", "cost": 619200, "mass": 4, "power": 1.63, "mount": "F", "type": "KT", "damage": 5, "armourpen": "A", "rof": 0.6, "dps": 5, "thermload": 3, "clip": 3, "ammo": 90 } { "id": "ih", "edID": 128671341, "eddbID": 1484, "grp": "rg", "name": "Imperial Hammer", "class": 2, "rating": "B", "cost": 619200, "mass": 4, "power": 1.63, "mount": "F", "type": "KT", "damage": 5, "armourpen": "A", "rof": 0.6, "dps": 5, "thermload": 3, "clip": 3, "ammo": 90, "pp": "Arissa Lavigny-Duval" }
] ]
} }

View File

@@ -1,8 +1,8 @@
{ {
"pci": [ "pci": [
{ "id": "mf", "edID": -1, "eddbID": -1, "grp": "pci", "class": 3, "rating": "D", "cost": -1, "mass": 5, "passengers": 3 }, { "id": "mf", "grp": "pci", "class": 3, "rating": "D", "cost": -1, "mass": 5, "passengers": 3 },
{ "id": "mg", "edID": -1, "eddbID": -1, "grp": "pci", "class": 4, "rating": "D", "cost": -1, "mass": 10, "passengers": 6 }, { "id": "mg", "grp": "pci", "class": 4, "rating": "D", "cost": -1, "mass": 10, "passengers": 6 },
{ "id": "mh", "edID": -1, "eddbID": -1, "grp": "pci", "class": 5, "rating": "D", "cost": -1, "mass": 20, "passengers": 10 }, { "id": "mh", "grp": "pci", "class": 5, "rating": "D", "cost": -1, "mass": 20, "passengers": 10 },
{ "id": "mi", "edID": -1, "eddbID": -1, "grp": "pci", "class": 6, "rating": "D", "cost": -1, "mass": 40, "passengers": 16 } { "id": "mi", "grp": "pci", "class": 6, "rating": "D", "cost": -1, "mass": 40, "passengers": 16 }
] ]
} }

View File

@@ -1,9 +1,9 @@
{ {
"pce": [ "pce": [
{ "id": "ma", "edID": -1, "eddbID": -1, "grp": "pce", "class": 2, "rating": "E", "cost": -1, "mass": 2.5, "passengers": 2 }, { "id": "ma", "grp": "pce", "class": 2, "rating": "E", "cost": -1, "mass": 2.5, "passengers": 2 },
{ "id": "mb", "edID": -1, "eddbID": -1, "grp": "pce", "class": 3, "rating": "E", "cost": -1, "mass": 5, "passengers": 4 }, { "id": "mb", "grp": "pce", "class": 3, "rating": "E", "cost": -1, "mass": 5, "passengers": 4 },
{ "id": "mc", "edID": -1, "eddbID": -1, "grp": "pce", "class": 4, "rating": "E", "cost": -1, "mass": 10, "passengers": 8 }, { "id": "mc", "grp": "pce", "class": 4, "rating": "E", "cost": -1, "mass": 10, "passengers": 8 },
{ "id": "md", "edID": -1, "eddbID": -1, "grp": "pce", "class": 5, "rating": "E", "cost": -1, "mass": 20, "passengers": 16 }, { "id": "md", "grp": "pce", "class": 5, "rating": "E", "cost": -1, "mass": 20, "passengers": 16 },
{ "id": "me", "edID": -1, "eddbID": -1, "grp": "pce", "class": 6, "rating": "E", "cost": -1, "mass": 40, "passengers": 32 } { "id": "me", "grp": "pce", "class": 6, "rating": "E", "cost": -1, "mass": 40, "passengers": 32 }
] ]
} }

View File

@@ -1,10 +1,10 @@
{ {
"fh": [ "fh": [
{ "id": "fh", "edID": -1, "eddbID": -1, "grp": "fh", "class": 7, "rating": "D", "cost": -1, "power": 0.35, "mass": 60, "bays": 2, "rebuildsperbay": 15 }, { "id": "fh", "grp": "fh", "class": 7, "rating": "D", "cost": -1, "power": 0.35, "mass": 60, "bays": 2, "rebuildsperbay": 15 },
{ "id": "fm", "edID": -1, "eddbID": -1, "grp": "fh", "class": 6, "rating": "D", "cost": -1, "power": 0.35, "mass": 40, "bays": 2, "rebuildsperbay": 8 }, { "id": "fm", "grp": "fh", "class": 6, "rating": "D", "cost": -1, "power": 0.35, "mass": 40, "bays": 2, "rebuildsperbay": 8 },
{ "id": "fr", "edID": -1, "eddbID": -1, "grp": "fh", "class": 5, "rating": "D", "cost": -1, "power": 0.25, "mass": 20, "bays": 1, "rebuildsperbay": 6 } { "id": "fr", "grp": "fh", "class": 5, "rating": "D", "cost": -1, "power": 0.25, "mass": 20, "bays": 1, "rebuildsperbay": 6 }
] ]
} }

View File

@@ -1,7 +1,7 @@
{ {
"pcm": [ "pcm": [
{ "id": "mj", "edID": -1, "eddbID": -1, "grp": "pcm", "class": 4, "rating": "C", "cost": -1, "mass": 10, "passengers": 3 }, { "id": "mj", "grp": "pcm", "class": 4, "rating": "C", "cost": -1, "mass": 10, "passengers": 3 },
{ "id": "mk", "edID": -1, "eddbID": -1, "grp": "pcm", "class": 5, "rating": "C", "cost": -1, "mass": 20, "passengers": 6 }, { "id": "mk", "grp": "pcm", "class": 5, "rating": "C", "cost": -1, "mass": 20, "passengers": 6 },
{ "id": "ml", "edID": -1, "eddbID": -1, "grp": "pcm", "class": 6, "rating": "C", "cost": -1, "mass": 40, "passengers": 12 } { "id": "ml", "grp": "pcm", "class": 6, "rating": "C", "cost": -1, "mass": 40, "passengers": 12 }
] ]
} }

View File

@@ -1,6 +1,6 @@
{ {
"pcq": [ "pcq": [
{ "id": "mm", "edID": -1, "eddbID": -1, "grp": "pcq", "class": 5, "rating": "B", "cost": -1, "mass": 20, "passengers": 4 }, { "id": "mm", "grp": "pcq", "class": 5, "rating": "B", "cost": -1, "mass": 20, "passengers": 4 },
{ "id": "mn", "edID": -1, "eddbID": -1, "grp": "pcq", "class": 6, "rating": "B", "cost": -1, "mass": 40, "passengers": 8 } { "id": "mn", "grp": "pcq", "class": 6, "rating": "B", "cost": -1, "mass": 40, "passengers": 8 }
] ]
} }

View File

@@ -1,12 +1,12 @@
{ {
"psg": [ "psg": [
{ "id": "p6", "edID": 128671323, "eddbID": 1485, "grp": "psg", "class": 1, "rating": "A", "cost": 132200, "mass": 2.5, "power": 2.52, "minmass": 13, "optmass": 25, "maxmass": 63, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 }, { "id": "p6", "edID": 128671323, "eddbID": 1485, "grp": "psg", "class": 1, "rating": "A", "cost": 132200, "mass": 2.5, "power": 2.52, "minmass": 13, "optmass": 25, "maxmass": 63, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2, "pp": "Aisling Duval" },
{ "id": "p5", "edID": 128671324, "eddbID": 1486, "grp": "psg", "class": 2, "rating": "A", "cost": 240340, "mass": 5, "power": 3.15, "minmass": 23, "optmass": 55, "maxmass": 138, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 }, { "id": "p5", "edID": 128671324, "eddbID": 1486, "grp": "psg", "class": 2, "rating": "A", "cost": 240340, "mass": 5, "power": 3.15, "minmass": 23, "optmass": 55, "maxmass": 138, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2, "pp": "Aisling Duval" },
{ "id": "p4", "edID": 128671325, "eddbID": 1487, "grp": "psg", "class": 3, "rating": "A", "cost": 761870, "mass": 10, "power": 3.78, "minmass": 83, "optmass": 165, "maxmass": 413, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 }, { "id": "p4", "edID": 128671325, "eddbID": 1487, "grp": "psg", "class": 3, "rating": "A", "cost": 761870, "mass": 10, "power": 3.78, "minmass": 83, "optmass": 165, "maxmass": 413, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2, "pp": "Aisling Duval" },
{ "id": "p3", "edID": 128671326, "eddbID": 1488, "grp": "psg", "class": 4, "rating": "A", "cost": 2415120, "mass": 20, "power": 4.62, "minmass": 143, "optmass": 285, "maxmass": 713, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.425 }, { "id": "p3", "edID": 128671326, "eddbID": 1488, "grp": "psg", "class": 4, "rating": "A", "cost": 2415120, "mass": 20, "power": 4.62, "minmass": 143, "optmass": 285, "maxmass": 713, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.425, "pp": "Aisling Duval" },
{ "id": "p2", "edID": 128671327, "eddbID": 1489, "grp": "psg", "class": 5, "rating": "A", "cost": 7655930, "mass": 40, "power": 5.46, "minmass": 203, "optmass": 405, "maxmass": 1013, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.875 }, { "id": "p2", "edID": 128671327, "eddbID": 1489, "grp": "psg", "class": 5, "rating": "A", "cost": 7655930, "mass": 40, "power": 5.46, "minmass": 203, "optmass": 405, "maxmass": 1013, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.875, "pp": "Aisling Duval" },
{ "id": "p1", "edID": 128671328, "eddbID": 1490, "grp": "psg", "class": 6, "rating": "A", "cost": 24269300, "mass": 80, "power": 6.51, "minmass": 270, "optmass": 540, "maxmass": 1350, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 2.4 }, { "id": "p1", "edID": 128671328, "eddbID": 1490, "grp": "psg", "class": 6, "rating": "A", "cost": 24269300, "mass": 80, "power": 6.51, "minmass": 270, "optmass": 540, "maxmass": 1350, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 2.4, "pp": "Aisling Duval" },
{ "id": "p0", "edID": 128671329, "eddbID": 1491, "grp": "psg", "class": 7, "rating": "A", "cost": 76933670, "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3 }, { "id": "p0", "edID": 128671329, "eddbID": 1491, "grp": "psg", "class": 7, "rating": "A", "cost": 76933670, "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3, "pp": "Aisling Duval" },
{ "id": "p7", "edID": 128671330, "eddbID": 1492, "grp": "psg", "class": 8, "rating": "A", "cost": 243879730, "mass": 320, "power": 8.4, "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3.6 } { "id": "p7", "edID": 128671330, "eddbID": 1492, "grp": "psg", "class": 8, "rating": "A", "cost": 243879730, "mass": 320, "power": 8.4, "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3.6, "pp": "Aisling Duval" }
] ]
} }

View File

@@ -1,5 +1,5 @@
{ {
"pas": [ "pas": [
{ "id": "PA", "edID": 128672317, "eddbID": null, "grp": "pas", "class": 1, "rating": "I", "cost": 500, "power": 0.0, "mass": 0 } { "id": "PA", "edID": 128672317, "eddbID": 1538, "grp": "pas", "class": 1, "rating": "I", "cost": 500, "power": 0.0, "mass": 0 }
] ]
} }

View File

@@ -21,11 +21,11 @@
}, },
"retailCost": -1, "retailCost": -1,
"bulkheads": [ "bulkheads": [
{ "id": "cl", "edID": -1, "eddbID": -1, "cost": 0, "mass": 0 }, { "id": "cl", "cost": 0, "mass": 0 },
{ "id": "cm", "edID": -1, "eddbID": -1, "cost": -1, "mass": 83 }, { "id": "cm", "cost": -1, "mass": 83 },
{ "id": "cn", "edID": -1, "eddbID": -1, "cost": -1, "mass": 165 }, { "id": "cn", "cost": -1, "mass": 165 },
{ "id": "co", "edID": -1, "eddbID": -1, "cost": -1, "mass": 165 }, { "id": "co", "cost": -1, "mass": 165 },
{ "id": "cp", "edID": -1, "eddbID": -1, "cost": -1, "mass": 165 } { "id": "cp", "cost": -1, "mass": 165 }
], ],
"slots": { "slots": {
"standard": [6, 7, 7, 8, 6, 5, 7], "standard": [6, 7, 7, 8, 6, 5, 7],

View File

@@ -35,13 +35,17 @@ describe('JSON Data', function() {
for (var i = 0; i < group.length; i++) { for (var i = 0; i < group.length; i++) {
var id = group[i].id; var id = group[i].id;
expect(ids[id]).toBeFalsy('ID already exists: ' + id); expect(ids[id]).toBeFalsy('ID already exists: ' + id);
expect(group[i].edID).toBeDefined('Standard module' + id + ' is missing E:D ID'); expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
expect(group[i].eddbID).toBeDefined('Standard module' + id + ' is missing EDDB ID'); expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module' + id + ' is missing EDDB ID');
expect(group[i].grp).toBeDefined(`No group defined, Type: ${s}, ID: ${id}, Index: ${i}`); expect(group[i].grp).toBeDefined(`No group defined, Type: ${s}, ID: ${id}, Index: ${i}`);
expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists for ID: ${id}, Index: ${i}`); expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists for ID: ${id}, Index: ${i}`);
expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists for ID: ${id}, Index: ${i}`); expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists for ID: ${id}, Index: ${i}`);
eddbIDs[group[i].eddbID] = true; if (group[i].eddbID) {
edIDs[group[i].edID] = true; eddbIDs[group[i].eddbID] = true;
}
if (group[i].edID) {
edIDs[group[i].edID] = true;
}
ids[id] = true; ids[id] = true;
} }
} }
@@ -57,11 +61,13 @@ describe('JSON Data', function() {
var id = group[i].id; var id = group[i].id;
expect(ids[id]).toBeFalsy('ID already exists: ' + id); expect(ids[id]).toBeFalsy('ID already exists: ' + id);
expect(group[i].grp).toBeDefined('Hardpoint has no group defined, ID:' + id); expect(group[i].grp).toBeDefined('Hardpoint has no group defined, ID:' + id);
expect(group[i].eddbID).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`); 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 || group[i].pp).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D 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 : ''}`); expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`); expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
eddbIDs[group[i].eddbID] = true; if (group[i].eddbID) {
eddbIDs[group[i].eddbID] = true;
}
if (group[i].edID) { if (group[i].edID) {
edIDs[group[i].edID] = true; edIDs[group[i].edID] = true;
} }
@@ -80,14 +86,18 @@ describe('JSON Data', function() {
var id = group[i].id; var id = group[i].id;
expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`); expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
expect(ids[id]).toBeFalsy('ID already exists: ' + id); expect(ids[id]).toBeFalsy('ID already exists: ' + id);
expect(group[i].eddbID).toBeDefined(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`); expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
expect(group[i].edID).toBeDefined(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`); expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs
expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${id}`); expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${id}`);
expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${id}`); expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${id}`);
} }
eddbIDs[group[i].eddbID] = true; if (group[i].eddbID) {
edIDs[group[i].edID] = true; eddbIDs[group[i].eddbID] = true;
}
if (group[i].edID) {
edIDs[group[i].edID] = true;
}
ids[id] = true; ids[id] = true;
} }
} }
@@ -100,8 +110,8 @@ describe('JSON Data', function() {
for (var p = 0; p < shipProperties.length; p++) { for (var p = 0; p < shipProperties.length; p++) {
expect(Ships[s].properties[shipProperties[p]]).toBeDefined(shipProperties[p] + ' is missing for ' + s); expect(Ships[s].properties[shipProperties[p]]).toBeDefined(shipProperties[p] + ' is missing for ' + s);
} }
expect(Ships[s].eddbID).toBeDefined(s + ' is missing EDDB ID'); expect(Ships[s].eddbID > 0).toBeTruthy(s + ' is missing EDDB ID');
expect(Ships[s].edID).toBeDefined(s + ' is missing E:D ID'); expect(Ships[s].edID > 0).toBeTruthy(s + ' is missing E:D ID');
expect(edIDs[Ships[s].edID]).toBeFalsy(`${s} E:D ID [${Ships[s].edID}] already exists`); expect(edIDs[Ships[s].edID]).toBeFalsy(`${s} E:D ID [${Ships[s].edID}] already exists`);
expect(Ships[s].slots.standard.length).toEqual(7, s + ' is missing standard slots'); expect(Ships[s].slots.standard.length).toEqual(7, s + ' is missing standard slots');
expect(Ships[s].defaults.standard.length).toEqual(7, s + ' is missing standard defaults'); expect(Ships[s].defaults.standard.length).toEqual(7, s + ' is missing standard defaults');
@@ -110,18 +120,24 @@ describe('JSON Data', function() {
expect(Ships[s].retailCost).toBeGreaterThan(Ships[s].properties.hullCost, s + ' has invalid retail cost'); expect(Ships[s].retailCost).toBeGreaterThan(Ships[s].properties.hullCost, s + ' has invalid retail cost');
expect(Ships[s].bulkheads).toBeDefined(s + ' is missing bulkheads'); expect(Ships[s].bulkheads).toBeDefined(s + ' is missing bulkheads');
expect(Ships[s].bulkheads.length).toEqual(5, s + ' is missing bulkheads'); expect(Ships[s].bulkheads.length).toEqual(5, s + ' is missing bulkheads');
edIDs[Ships[s].edID] = true; if (Ships[s].edID) {
edIDs[Ships[s].edID] = true;
}
for (var i = 0; i < Ships[s].bulkheads.length; i++) { for (var i = 0; i < Ships[s].bulkheads.length; i++) {
var b = Ships[s].bulkheads[i]; var b = Ships[s].bulkheads[i];
expect(b.id).toBeDefined(`${s} bulkhead [${i}] is missing an ID`); expect(b.id).toBeDefined(`${s} bulkhead [${i}] is missing an ID`);
expect(bulkheadIds[b.id]).toBeFalsy(`${s} bulkhead [${i} - ${b.id}] ID already exists`); expect(bulkheadIds[b.id]).toBeFalsy(`${s} bulkhead [${i} - ${b.id}] ID already exists`);
expect(b.eddbID).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing EDDB ID`); expect(b.eddbID > 0).toBeTruthy(`${s} bulkhead [${i} - ${b.id}] is missing EDDB ID`);
expect(eddbIDs[b.eddbID]).toBeFalsy(`EDDB ID [${b.eddbID}] already exists: ${s} bulkhead [${i} - ${b.id}]`); expect(eddbIDs[b.eddbID]).toBeFalsy(`EDDB ID [${b.eddbID}] already exists: ${s} bulkhead [${i} - ${b.id}]`);
expect(b.edID).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`); expect(b.edID > 0).toBeTruthy(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`);
expect(edIDs[b.edID]).toBeFalsy(`E:D ID [${b.edID}] already exists: ${s} bulkhead [${i} - ${b.id}]`); expect(edIDs[b.edID]).toBeFalsy(`E:D ID [${b.edID}] already exists: ${s} bulkhead [${i} - ${b.id}]`);
edIDs[b.edID] = true; if (b.eddbID) {
eddbIDs[b.eddbID] = true; eddbIDs[b.eddbID] = true;
}
if (b.edID) {
edIDs[b.edID] = true;
}
bulkheadIds[b.id] = true; bulkheadIds[b.id] = true;
} }
} }