Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-08 23:23:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/fixes' into develop

Browse Source
This commit is contained in:
Cmdr McDonald
2016-10-30 14:42:09 +00:00
parent a3b18f2dca deada17241
commit bfd8770c0a
11 changed files with 159 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
dist/index.js vendored
View File

@@ -246,13 +246,13 @@ module.exports = {
}
},
beluga: {
edID: -1,
edID: 128049345,
eddbID: 30,
properties: {
name: "Beluga Liner",
manufacturer: "Saud Kruger",
class: 3,
hullCost: -1,
hullCost: 79654610,
speed: 195,
boost: 273,
boostEnergy: 20,
@@ -265,31 +265,36 @@ module.exports = {
luxuryCabins: true,
fighterHangars: true
},
retailCost: -1,
retailCost: 84532770,
bulkheads: [ {
id: "cl",
edID: 128049346,
eddbID: 1554,
cost: 0,
mass: 0
}, {
id: "cm",
edID: 128049347,
eddbID: 1555,
cost: -1,
cost: 33813120,
mass: 83
}, {
id: "cn",
edID: 128049348,
eddbID: 1556,
cost: -1,
cost: 76079500,
mass: 165
}, {
id: "co",
edID: 128049349,
eddbID: 1557,
cost: -1,
cost: 179801200,
mass: 165
}, {
id: "cp",
edID: 128049350,
eddbID: 1558,
cost: -1,
cost: 199243730,
mass: 165
} ],
slots: {
@@ -6749,7 +6754,7 @@ module.exports = {
mr: [ {
ammo: 48,
armourpen: 60,
breachdps: 0,
breachdps: 4.8,
breachmax: 0,
breachmin: 0,
class: 2,
@@ -6759,6 +6764,7 @@ module.exports = {
eddbID: 1559,
eps: .12,
grp: "mr",
hps: 1.08,
id: "1z",
integrity: 51,
mass: 4,
@@ -6880,18 +6886,18 @@ module.exports = {
}, {
ammo: 120,
armourpen: 60,
breachdps: 3.6,
breachdps: 6,
breachmax: 0,
breachmin: 0,
class: 2,
clip: 12,
cost: 768600,
dps: 72,
dps: 60,
edID: 128671344,
eddbID: 1480,
eps: .48,
eps: 1.92,
grp: "mr",
hps: 7.2,
hps: 28.8,
id: "Ph",
integrity: 51,
mass: 4,
@@ -7018,6 +7024,7 @@ module.exports = {
clip: 3,
cost: 36400,
dps: 32,
eps: 0,
edID: 128671448,
eddbID: 1523,
grp: "nl",
@@ -7178,7 +7185,8 @@ module.exports = {
passive: 1,
power: .2,
rating: "I",
reload: 10
reload: 10,
rof: 1
}, {
activepower: 4,
chargeup: 4,
@@ -8423,7 +8431,8 @@ module.exports = {
fh: [ {
bays: 2,
class: 7,
cost: -1,
cost: 575660,
edID: 128727930,
eddbID: 1560,
grp: "fh",
id: "fh",
@@ -8434,7 +8443,8 @@ module.exports = {
}, {
bays: 2,
class: 6,
cost: -1,
cost: 1869350,
edID: 128727931,
eddbID: 1561,
grp: "fh",
id: "fm",
@@ -8445,7 +8455,8 @@ module.exports = {
}, {
bays: 1,
class: 5,
cost: -1,
cost: 2369330,
edID: 128727932,
eddbID: 1562,
grp: "fh",
id: "fr",
@@ -10207,7 +10218,8 @@ module.exports = {
} ],
pce: [ {
class: 2,
cost: -1,
cost: 4320,
edID: 128734690,
eddbID: 1563,
grp: "pce",
id: "ma",
@@ -10216,7 +10228,8 @@ module.exports = {
rating: "E"
}, {
class: 3,
cost: -1,
cost: 8670,
edID: 128734691,
eddbID: 1564,
grp: "pce",
id: "mb",
@@ -10225,7 +10238,8 @@ module.exports = {
rating: "E"
}, {
class: 4,
cost: -1,
cost: 18960,
edID: 128727922,
eddbID: 1565,
grp: "pce",
id: "mc",
@@ -10234,7 +10248,8 @@ module.exports = {
rating: "E"
}, {
class: 5,
cost: -1,
cost: 34960,
edID: 128734693,
eddbID: 1566,
grp: "pce",
id: "md",
@@ -10243,7 +10258,8 @@ module.exports = {
rating: "E"
}, {
class: 6,
cost: -1,
cost: 61420,
edID: 12872926,
eddbID: 1567,
grp: "pce",
id: "me",
@@ -10253,7 +10269,8 @@ module.exports = {
} ],
pci: [ {
class: 3,
cost: -1,
cost: 26720,
edID: 128734692,
eddbID: 1568,
grp: "pci",
id: "mf",
@@ -10262,7 +10279,8 @@ module.exports = {
rating: "D"
}, {
class: 4,
cost: -1,
cost: 56870,
edID: 128727923,
eddbID: 1569,
grp: "pci",
id: "mg",
@@ -10271,7 +10289,8 @@ module.exports = {
rating: "D"
}, {
class: 5,
cost: -1,
cost: 92370,
edID: 128734694,
eddbID: 1570,
grp: "pci",
id: "mh",
@@ -10280,7 +10299,8 @@ module.exports = {
rating: "D"
}, {
class: 6,
cost: -1,
cost: 184240,
edID: 128727927,
eddbID: 1571,
grp: "pci",
id: "mi",
@@ -10290,7 +10310,8 @@ module.exports = {
} ],
pcm: [ {
class: 4,
cost: -1,
cost: 170600,
edID: 128727924,
eddbID: 1572,
grp: "pcm",
id: "mj",
@@ -10299,7 +10320,8 @@ module.exports = {
rating: "C"
}, {
class: 5,
cost: -1,
cost: 340540,
edID: 128734695,
eddbID: 1573,
grp: "pcm",
id: "mk",
@@ -10308,7 +10330,8 @@ module.exports = {
rating: "C"
}, {
class: 6,
cost: -1,
cost: 552700,
edID: 128727928,
eddbID: 1574,
grp: "pcm",
id: "ml",
@@ -10318,7 +10341,8 @@ module.exports = {
} ],
pcq: [ {
class: 5,
cost: -1,
cost: 1658100,
edID: 128727095,
eddbID: 1575,
grp: "pcq",
id: "mm",
@@ -10327,7 +10351,8 @@ module.exports = {
rating: "B"
}, {
class: 6,
cost: -1,
cost: 4974300,
edID: 128727929,
eddbID: 1576,
grp: "pcq",
id: "mn",

85
dist/index.json vendored
View File

@@ -480,13 +480,13 @@
}
},
"beluga": {
"edID": -1,
"edID": 128049345,
"eddbID": 30,
"properties": {
"name": "Beluga Liner",
"manufacturer": "Saud Kruger",
"class": 3,
"hullCost": -1,
"hullCost": 79654610,
"speed": 195,
"boost": 273,
"boostEnergy": 20,
@@ -499,36 +499,41 @@
"luxuryCabins": true,
"fighterHangars": true
},
"retailCost": -1,
"retailCost": 84532770,
"bulkheads": [
{
"id": "cl",
"edID": 128049346,
"eddbID": 1554,
"cost": 0,
"mass": 0
},
{
"id": "cm",
"edID": 128049347,
"eddbID": 1555,
"cost": -1,
"cost": 33813120,
"mass": 83
},
{
"id": "cn",
"edID": 128049348,
"eddbID": 1556,
"cost": -1,
"cost": 76079500,
"mass": 165
},
{
"id": "co",
"edID": 128049349,
"eddbID": 1557,
"cost": -1,
"cost": 179801200,
"mass": 165
},
{
"id": "cp",
"edID": 128049350,
"eddbID": 1558,
"cost": -1,
"cost": 199243730,
"mass": 165
}
],
@@ -8725,7 +8730,7 @@
{
"ammo": 48,
"armourpen": 60,
"breachdps": 0,
"breachdps": 4.8,
"breachmax": 0,
"breachmin": 0,
"class": 2,
@@ -8735,6 +8740,7 @@
"eddbID": 1559,
"eps": 0.12,
"grp": "mr",
"hps": 1.08,
"id": "1z",
"integrity": 51,
"mass": 4,
@@ -8861,18 +8867,18 @@
{
"ammo": 120,
"armourpen": 60,
"breachdps": 3.6,
"breachdps": 6,
"breachmax": 0,
"breachmin": 0,
"class": 2,
"clip": 12,
"cost": 768600,
"dps": 72,
"dps": 60,
"edID": 128671344,
"eddbID": 1480,
"eps": 0.48,
"eps": 1.92,
"grp": "mr",
"hps": 7.2,
"hps": 28.8,
"id": "Ph",
"integrity": 51,
"mass": 4,
@@ -9006,6 +9012,7 @@
"clip": 3,
"cost": 36400,
"dps": 32,
"eps": 0,
"edID": 128671448,
"eddbID": 1523,
"grp": "nl",
@@ -9178,7 +9185,8 @@
"passive": 1,
"power": 0.2,
"rating": "I",
"reload": 10
"reload": 10,
"rof": 1
},
{
"activepower": 4,
@@ -10530,7 +10538,8 @@
{
"bays": 2,
"class": 7,
"cost": -1,
"cost": 575660,
"edID": 128727930,
"eddbID": 1560,
"grp": "fh",
"id": "fh",
@@ -10542,7 +10551,8 @@
{
"bays": 2,
"class": 6,
"cost": -1,
"cost": 1869350,
"edID": 128727931,
"eddbID": 1561,
"grp": "fh",
"id": "fm",
@@ -10554,7 +10564,8 @@
{
"bays": 1,
"class": 5,
"cost": -1,
"cost": 2369330,
"edID": 128727932,
"eddbID": 1562,
"grp": "fh",
"id": "fr",
@@ -12479,7 +12490,8 @@
"pce": [
{
"class": 2,
"cost": -1,
"cost": 4320,
"edID": 128734690,
"eddbID": 1563,
"grp": "pce",
"id": "ma",
@@ -12489,7 +12501,8 @@
},
{
"class": 3,
"cost": -1,
"cost": 8670,
"edID": 128734691,
"eddbID": 1564,
"grp": "pce",
"id": "mb",
@@ -12499,7 +12512,8 @@
},
{
"class": 4,
"cost": -1,
"cost": 18960,
"edID": 128727922,
"eddbID": 1565,
"grp": "pce",
"id": "mc",
@@ -12509,7 +12523,8 @@
},
{
"class": 5,
"cost": -1,
"cost": 34960,
"edID": 128734693,
"eddbID": 1566,
"grp": "pce",
"id": "md",
@@ -12519,7 +12534,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 61420,
"edID": 12872926,
"eddbID": 1567,
"grp": "pce",
"id": "me",
@@ -12531,7 +12547,8 @@
"pci": [
{
"class": 3,
"cost": -1,
"cost": 26720,
"edID": 128734692,
"eddbID": 1568,
"grp": "pci",
"id": "mf",
@@ -12541,7 +12558,8 @@
},
{
"class": 4,
"cost": -1,
"cost": 56870,
"edID": 128727923,
"eddbID": 1569,
"grp": "pci",
"id": "mg",
@@ -12551,7 +12569,8 @@
},
{
"class": 5,
"cost": -1,
"cost": 92370,
"edID": 128734694,
"eddbID": 1570,
"grp": "pci",
"id": "mh",
@@ -12561,7 +12580,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 184240,
"edID": 128727927,
"eddbID": 1571,
"grp": "pci",
"id": "mi",
@@ -12573,7 +12593,8 @@
"pcm": [
{
"class": 4,
"cost": -1,
"cost": 170600,
"edID": 128727924,
"eddbID": 1572,
"grp": "pcm",
"id": "mj",
@@ -12583,7 +12604,8 @@
},
{
"class": 5,
"cost": -1,
"cost": 340540,
"edID": 128734695,
"eddbID": 1573,
"grp": "pcm",
"id": "mk",
@@ -12593,7 +12615,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 552700,
"edID": 128727928,
"eddbID": 1574,
"grp": "pcm",
"id": "ml",
@@ -12605,7 +12628,8 @@
"pcq": [
{
"class": 5,
"cost": -1,
"cost": 1658100,
"edID": 128727095,
"eddbID": 1575,
"grp": "pcq",
"id": "mm",
@@ -12615,7 +12639,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 4974300,
"edID": 128727929,
"eddbID": 1576,
"grp": "pcq",
"id": "mn",

3
modules/hardpoints/countermeasures.json
View File

@@ -18,7 +18,8 @@
"passive": 1,
"power": 0.2,
"rating": "I",
"reload": 10
"reload": 10,
"rof": 1
},
{
"activepower": 4,

1
modules/hardpoints/mine_launcher.json
View File

@@ -60,6 +60,7 @@
"clip": 3,
"cost": 36400,
"dps": 32,
"eps": 0,
"edID": 128671448,
"eddbID": 1523,
"grp": "nl",

8
modules/hardpoints/missile_rack.json
View File

@@ -140,18 +140,18 @@
{
"ammo": 120,
"armourpen": 60,
"breachdps": 3.6,
"breachdps": 6,
"breachmax": 0,
"breachmin": 0,
"class": 2,
"clip": 12,
"cost": 768600,
"dps": 72,
"dps": 60,
"edID": 128671344,
"eddbID": 1480,
"eps": 0.48,
"eps": 1.92,
"grp": "mr",
"hps": 7.2,
"hps": 28.8,
"id": "Ph",
"integrity": 51,
"mass": 4,

12
modules/internal/business_passenger_cabin.json
View File

@@ -2,7 +2,8 @@
"pci": [
{
"class": 3,
"cost": -1,
"cost": 26720,
"edID": 128734692,
"eddbID": 1568,
"grp": "pci",
"id": "mf",
@@ -12,7 +13,8 @@
},
{
"class": 4,
"cost": -1,
"cost": 56870,
"edID": 128727923,
"eddbID": 1569,
"grp": "pci",
"id": "mg",
@@ -22,7 +24,8 @@
},
{
"class": 5,
"cost": -1,
"cost": 92370,
"edID": 128734694,
"eddbID": 1570,
"grp": "pci",
"id": "mh",
@@ -32,7 +35,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 184240,
"edID": 128727927,
"eddbID": 1571,
"grp": "pci",
"id": "mi",

15
modules/internal/economy_passenger_cabin.json
View File

@@ -2,7 +2,8 @@
"pce": [
{
"class": 2,
"cost": -1,
"cost": 4320,
"edID": 128734690,
"eddbID": 1563,
"grp": "pce",
"id": "ma",
@@ -12,7 +13,8 @@
},
{
"class": 3,
"cost": -1,
"cost": 8670,
"edID": 128734691,
"eddbID": 1564,
"grp": "pce",
"id": "mb",
@@ -22,7 +24,8 @@
},
{
"class": 4,
"cost": -1,
"cost": 18960,
"edID": 128727922,
"eddbID": 1565,
"grp": "pce",
"id": "mc",
@@ -32,7 +35,8 @@
},
{
"class": 5,
"cost": -1,
"cost": 34960,
"edID": 128734693,
"eddbID": 1566,
"grp": "pce",
"id": "md",
@@ -42,7 +46,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 61420,
"edID": 12872926,
"eddbID": 1567,
"grp": "pce",
"id": "me",

9
modules/internal/fighter_hangar.json
View File

@@ -3,7 +3,8 @@
{
"bays": 2,
"class": 7,
"cost": -1,
"cost": 575660,
"edID": 128727930,
"eddbID": 1560,
"grp": "fh",
"id": "fh",
@@ -15,7 +16,8 @@
{
"bays": 2,
"class": 6,
"cost": -1,
"cost": 1869350,
"edID": 128727931,
"eddbID": 1561,
"grp": "fh",
"id": "fm",
@@ -27,7 +29,8 @@
{
"bays": 1,
"class": 5,
"cost": -1,
"cost": 2369330,
"edID": 128727932,
"eddbID": 1562,
"grp": "fh",
"id": "fr",

9
modules/internal/first_passenger_cabin.json
View File

@@ -2,7 +2,8 @@
"pcm": [
{
"class": 4,
"cost": -1,
"cost": 170600,
"edID": 128727924,
"eddbID": 1572,
"grp": "pcm",
"id": "mj",
@@ -12,7 +13,8 @@
},
{
"class": 5,
"cost": -1,
"cost": 340540,
"edID": 128734695,
"eddbID": 1573,
"grp": "pcm",
"id": "mk",
@@ -22,7 +24,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 552700,
"edID": 128727928,
"eddbID": 1574,
"grp": "pcm",
"id": "ml",

6
modules/internal/luxury_passenger_cabin.json
View File

@@ -2,7 +2,8 @@
"pcq": [
{
"class": 5,
"cost": -1,
"cost": 1658100,
"edID": 128727095,
"eddbID": 1575,
"grp": "pcq",
"id": "mm",
@@ -12,7 +13,8 @@
},
{
"class": 6,
"cost": -1,
"cost": 4974300,
"edID": 128727929,
"eddbID": 1576,
"grp": "pcq",
"id": "mn",

16
ships/beluga.json
View File

@@ -1,12 +1,12 @@
{
"beluga": {
"edID": -1,
"edID": 128049345,
"eddbID": 30,
"properties": {
"name": "Beluga Liner",
"manufacturer": "Saud Kruger",
"class": 3,
"hullCost": -1,
"hullCost": 79654610,
"speed": 195,
"boost": 273,
"boostEnergy": 20,
@@ -19,13 +19,13 @@
"luxuryCabins": true,
"fighterHangars": true
},
"retailCost": -1,
"retailCost": 84532770,
"bulkheads": [
{ "id": "cl", "eddbID": 1554,"cost": 0, "mass": 0 },
{ "id": "cm", "eddbID": 1555,"cost": -1, "mass": 83 },
{ "id": "cn", "eddbID": 1556,"cost": -1, "mass": 165 },
{ "id": "co", "eddbID": 1557,"cost": -1, "mass": 165 },
{ "id": "cp", "eddbID": 1558,"cost": -1, "mass": 165 }
{ "id": "cl", "edID": 128049346, "eddbID": 1554,"cost": 0, "mass": 0 },
{ "id": "cm", "edID": 128049347, "eddbID": 1555,"cost": 33813120, "mass": 83 },
{ "id": "cn", "edID": 128049348, "eddbID": 1556,"cost": 76079500, "mass": 165 },
{ "id": "co", "edID": 128049349, "eddbID": 1557,"cost": 179801200, "mass": 165 },
{ "id": "cp", "edID": 128049350, "eddbID": 1558,"cost": 199243730, "mass": 165 }
],
"slots": {
"standard": [6, 7, 7, 8, 6, 5, 7],