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 'release/2.2.0' into develop

Browse Source
This commit is contained in:
Cmdr McDonald
2016-10-22 09:30:54 +01:00
parent 5242d8345a 95dc37f94c
commit 9df610b7cd
10 changed files with 81 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dist/index.js vendored
View File

@@ -247,7 +247,7 @@ module.exports = {
},
beluga: {
edID: -1,
eddbID: -1,
eddbID: 30,
properties: {
name: "Beluga Liner",
manufacturer: "Saud Kruger",
@@ -268,22 +268,27 @@ module.exports = {
retailCost: -1,
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
} ],
@@ -6751,6 +6756,7 @@ module.exports = {
clip: 12,
cost: 190227,
dps: 25,
eddbID: 1559,
eps: .12,
grp: "mr",
id: "1z",
@@ -6760,6 +6766,7 @@ module.exports = {
mount: "F",
name: "Rocket Propelled FSD Disruptor",
power: 1.2,
pp: "Yuri Grom",
rating: "B",
rof: .5,
speed: 750,
@@ -8417,6 +8424,7 @@ module.exports = {
bays: 2,
class: 7,
cost: -1,
eddbID: 1560,
grp: "fh",
id: "fh",
mass: 60,
@@ -8427,6 +8435,7 @@ module.exports = {
bays: 2,
class: 6,
cost: -1,
eddbID: 1561,
grp: "fh",
id: "fm",
mass: 40,
@@ -8437,6 +8446,7 @@ module.exports = {
bays: 1,
class: 5,
cost: -1,
eddbID: 1562,
grp: "fh",
id: "fr",
mass: 20,
@@ -10198,6 +10208,7 @@ module.exports = {
pce: [ {
class: 2,
cost: -1,
eddbID: 1563,
grp: "pce",
id: "ma",
mass: 2.5,
@@ -10206,6 +10217,7 @@ module.exports = {
}, {
class: 3,
cost: -1,
eddbID: 1564,
grp: "pce",
id: "mb",
mass: 5,
@@ -10214,6 +10226,7 @@ module.exports = {
}, {
class: 4,
cost: -1,
eddbID: 1565,
grp: "pce",
id: "mc",
mass: 10,
@@ -10222,6 +10235,7 @@ module.exports = {
}, {
class: 5,
cost: -1,
eddbID: 1566,
grp: "pce",
id: "md",
mass: 20,
@@ -10230,6 +10244,7 @@ module.exports = {
}, {
class: 6,
cost: -1,
eddbID: 1567,
grp: "pce",
id: "me",
mass: 40,
@@ -10239,6 +10254,7 @@ module.exports = {
pci: [ {
class: 3,
cost: -1,
eddbID: 1568,
grp: "pci",
id: "mf",
mass: 5,
@@ -10247,6 +10263,7 @@ module.exports = {
}, {
class: 4,
cost: -1,
eddbID: 1569,
grp: "pci",
id: "mg",
mass: 10,
@@ -10255,6 +10272,7 @@ module.exports = {
}, {
class: 5,
cost: -1,
eddbID: 1570,
grp: "pci",
id: "mh",
mass: 20,
@@ -10263,6 +10281,7 @@ module.exports = {
}, {
class: 6,
cost: -1,
eddbID: 1571,
grp: "pci",
id: "mi",
mass: 40,
@@ -10272,6 +10291,7 @@ module.exports = {
pcm: [ {
class: 4,
cost: -1,
eddbID: 1572,
grp: "pcm",
id: "mj",
mass: 10,
@@ -10280,6 +10300,7 @@ module.exports = {
}, {
class: 5,
cost: -1,
eddbID: 1573,
grp: "pcm",
id: "mk",
mass: 20,
@@ -10288,6 +10309,7 @@ module.exports = {
}, {
class: 6,
cost: -1,
eddbID: 1574,
grp: "pcm",
id: "ml",
mass: 40,
@@ -10297,6 +10319,7 @@ module.exports = {
pcq: [ {
class: 5,
cost: -1,
eddbID: 1575,
grp: "pcq",
id: "mm",
mass: 20,
@@ -10305,6 +10328,7 @@ module.exports = {
}, {
class: 6,
cost: -1,
eddbID: 1576,
grp: "pcq",
id: "mn",
mass: 40,

26
dist/index.json vendored
View File

@@ -481,7 +481,7 @@
},
"beluga": {
"edID": -1,
"eddbID": -1,
"eddbID": 30,
"properties": {
"name": "Beluga Liner",
"manufacturer": "Saud Kruger",
@@ -503,26 +503,31 @@
"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
}
@@ -8727,6 +8732,7 @@
"clip": 12,
"cost": 190227,
"dps": 25,
"eddbID": 1559,
"eps": 0.12,
"grp": "mr",
"id": "1z",
@@ -8736,6 +8742,7 @@
"mount": "F",
"name": "Rocket Propelled FSD Disruptor",
"power": 1.2,
"pp": "Yuri Grom",
"rating": "B",
"rof": 0.5,
"speed": 750,
@@ -10524,6 +10531,7 @@
"bays": 2,
"class": 7,
"cost": -1,
"eddbID": 1560,
"grp": "fh",
"id": "fh",
"mass": 60,
@@ -10535,6 +10543,7 @@
"bays": 2,
"class": 6,
"cost": -1,
"eddbID": 1561,
"grp": "fh",
"id": "fm",
"mass": 40,
@@ -10546,6 +10555,7 @@
"bays": 1,
"class": 5,
"cost": -1,
"eddbID": 1562,
"grp": "fh",
"id": "fr",
"mass": 20,
@@ -12470,6 +12480,7 @@
{
"class": 2,
"cost": -1,
"eddbID": 1563,
"grp": "pce",
"id": "ma",
"mass": 2.5,
@@ -12479,6 +12490,7 @@
{
"class": 3,
"cost": -1,
"eddbID": 1564,
"grp": "pce",
"id": "mb",
"mass": 5,
@@ -12488,6 +12500,7 @@
{
"class": 4,
"cost": -1,
"eddbID": 1565,
"grp": "pce",
"id": "mc",
"mass": 10,
@@ -12497,6 +12510,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1566,
"grp": "pce",
"id": "md",
"mass": 20,
@@ -12506,6 +12520,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1567,
"grp": "pce",
"id": "me",
"mass": 40,
@@ -12517,6 +12532,7 @@
{
"class": 3,
"cost": -1,
"eddbID": 1568,
"grp": "pci",
"id": "mf",
"mass": 5,
@@ -12526,6 +12542,7 @@
{
"class": 4,
"cost": -1,
"eddbID": 1569,
"grp": "pci",
"id": "mg",
"mass": 10,
@@ -12535,6 +12552,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1570,
"grp": "pci",
"id": "mh",
"mass": 20,
@@ -12544,6 +12562,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1571,
"grp": "pci",
"id": "mi",
"mass": 40,
@@ -12555,6 +12574,7 @@
{
"class": 4,
"cost": -1,
"eddbID": 1572,
"grp": "pcm",
"id": "mj",
"mass": 10,
@@ -12564,6 +12584,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1573,
"grp": "pcm",
"id": "mk",
"mass": 20,
@@ -12573,6 +12594,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1574,
"grp": "pcm",
"id": "ml",
"mass": 40,
@@ -12584,6 +12606,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1575,
"grp": "pcq",
"id": "mm",
"mass": 20,
@@ -12593,6 +12616,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1576,
"grp": "pcq",
"id": "mn",
"mass": 40,

5
modules/hardpoints/missile_rack.json
View File

@@ -3,15 +3,17 @@
{
"ammo": 48,
"armourpen": 60,
"breachdps": 0,
"breachdps": 4.8,
"breachmax": 0,
"breachmin": 0,
"class": 2,
"clip": 12,
"cost": 190227,
"dps": 25,
"eddbID": 1559,
"eps": 0.12,
"grp": "mr",
"hps": 1.08,
"id": "1z",
"integrity": 51,
"mass": 4,
@@ -19,6 +21,7 @@
"mount": "F",
"name": "Rocket Propelled FSD Disruptor",
"power": 1.2,
"pp": "Yuri Grom",
"rating": "B",
"rof": 0.5,
"speed": 750,

4
modules/internal/business_passenger_cabin.json
View File

@@ -3,6 +3,7 @@
{
"class": 3,
"cost": -1,
"eddbID": 1568,
"grp": "pci",
"id": "mf",
"mass": 5,
@@ -12,6 +13,7 @@
{
"class": 4,
"cost": -1,
"eddbID": 1569,
"grp": "pci",
"id": "mg",
"mass": 10,
@@ -21,6 +23,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1570,
"grp": "pci",
"id": "mh",
"mass": 20,
@@ -30,6 +33,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1571,
"grp": "pci",
"id": "mi",
"mass": 40,

5
modules/internal/economy_passenger_cabin.json
View File

@@ -3,6 +3,7 @@
{
"class": 2,
"cost": -1,
"eddbID": 1563,
"grp": "pce",
"id": "ma",
"mass": 2.5,
@@ -12,6 +13,7 @@
{
"class": 3,
"cost": -1,
"eddbID": 1564,
"grp": "pce",
"id": "mb",
"mass": 5,
@@ -21,6 +23,7 @@
{
"class": 4,
"cost": -1,
"eddbID": 1565,
"grp": "pce",
"id": "mc",
"mass": 10,
@@ -30,6 +33,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1566,
"grp": "pce",
"id": "md",
"mass": 20,
@@ -39,6 +43,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1567,
"grp": "pce",
"id": "me",
"mass": 40,

3
modules/internal/fighter_hangar.json
View File

@@ -4,6 +4,7 @@
"bays": 2,
"class": 7,
"cost": -1,
"eddbID": 1560,
"grp": "fh",
"id": "fh",
"mass": 60,
@@ -15,6 +16,7 @@
"bays": 2,
"class": 6,
"cost": -1,
"eddbID": 1561,
"grp": "fh",
"id": "fm",
"mass": 40,
@@ -26,6 +28,7 @@
"bays": 1,
"class": 5,
"cost": -1,
"eddbID": 1562,
"grp": "fh",
"id": "fr",
"mass": 20,

3
modules/internal/first_passenger_cabin.json
View File

@@ -3,6 +3,7 @@
{
"class": 4,
"cost": -1,
"eddbID": 1572,
"grp": "pcm",
"id": "mj",
"mass": 10,
@@ -12,6 +13,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1573,
"grp": "pcm",
"id": "mk",
"mass": 20,
@@ -21,6 +23,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1574,
"grp": "pcm",
"id": "ml",
"mass": 40,

2
modules/internal/luxury_passenger_cabin.json
View File

@@ -3,6 +3,7 @@
{
"class": 5,
"cost": -1,
"eddbID": 1575,
"grp": "pcq",
"id": "mm",
"mass": 20,
@@ -12,6 +13,7 @@
{
"class": 6,
"cost": -1,
"eddbID": 1576,
"grp": "pcq",
"id": "mn",
"mass": 40,

8
package.json
View File

@@ -1,13 +1,13 @@
{
"name": "coriolis-data",
"version": "2.1.0",
"version": "2.2.0",
"repository": {
"type": "git",
"url": "https://github.com/cmmcleod/coriolis-data"
"url": "https://github.com/EDCD/coriolis-data"
},
"main": "index.js",
"homepage": "http://coriolis.io",
"bugs": "https://github.com/cmmcleod/coriolis/issues",
"homepage": "https://coriolis.edcd.io",
"bugs": "https://github.com/EDCD/coriolis/issues",
"private": true,
"engine": "node >= 0.12.2",
"license": "MIT",

12
ships/beluga.json
View File

@@ -1,7 +1,7 @@
{
"beluga": {
"edID": -1,
"eddbID": -1,
"eddbID": 30,
"properties": {
"name": "Beluga Liner",
"manufacturer": "Saud Kruger",
@@ -21,11 +21,11 @@
},
"retailCost": -1,
"bulkheads": [
{ "id": "cl", "cost": 0, "mass": 0 },
{ "id": "cm", "cost": -1, "mass": 83 },
{ "id": "cn", "cost": -1, "mass": 165 },
{ "id": "co", "cost": -1, "mass": 165 },
{ "id": "cp", "cost": -1, "mass": 165 }
{ "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 }
],
"slots": {
"standard": [6, 7, 7, 8, 6, 5, 7],