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 'develop'

Browse Source
This commit is contained in:
willyb321
2018-07-11 12:10:30 +10:00
parent 59c76fe1f1 1182cf1eb0
commit d485f4df02
16 changed files with 124 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
dist/index.js vendored
View File

@@ -181,7 +181,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -189,7 +190,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -197,7 +199,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
} ]
},
@@ -298,7 +301,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -306,7 +310,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -314,7 +319,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
} ]
},
@@ -413,7 +419,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 4, 4, 4, 2 ]
},
@@ -1298,7 +1305,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 1, 1 ]
},
@@ -1399,7 +1407,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -1407,7 +1416,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 3, 2, 2 ]
},
@@ -1509,7 +1519,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 5,
@@ -1517,7 +1528,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 4, 4, 3 ]
},
@@ -1618,7 +1630,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -1626,7 +1639,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 3, 3, 2 ]
},
@@ -1728,7 +1742,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -1736,7 +1751,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 4,
@@ -1744,7 +1760,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 2, 2 ]
},
@@ -2212,7 +2229,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 5,
@@ -2220,7 +2238,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 4, 3 ]
},
@@ -2318,7 +2337,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 1, 1 ]
},
@@ -3163,7 +3183,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, {
class: 5,
@@ -3171,7 +3192,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
} ]
},
@@ -3269,7 +3291,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 2, 1 ]
},
@@ -3367,7 +3390,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 2, 2, 1 ]
},
@@ -3465,7 +3489,8 @@ module.exports = {
eligible: {
hr: 1,
scb: 1,
mrp: 1
mrp: 1,
gsrp: 1
}
}, 4, 2, 1, 1 ]
},

75
dist/index.json vendored
View File

@@ -258,7 +258,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -267,7 +268,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -276,7 +278,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
}
]
@@ -439,7 +442,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -448,7 +452,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -457,7 +462,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
}
]
@@ -625,7 +631,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
4,
@@ -2013,7 +2020,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
1,
@@ -2163,7 +2171,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -2172,7 +2181,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
3,
@@ -2342,7 +2352,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -2351,7 +2362,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
4,
@@ -2522,7 +2534,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -2531,7 +2544,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
3,
@@ -2695,7 +2709,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -2704,7 +2719,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -2713,7 +2729,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
2,
@@ -3459,7 +3476,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -3468,7 +3486,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
4,
@@ -3627,7 +3646,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
1,
@@ -4982,7 +5002,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
{
@@ -4991,7 +5012,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
}
]
@@ -5152,7 +5174,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
2,
@@ -5299,7 +5322,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
2,
@@ -5447,7 +5471,8 @@
"eligible": {
"hr": 1,
"scb": 1,
"mrp": 1
"mrp": 1,
"gsrp": 1
}
},
4,

6
ships/alliance_challenger.json
View File

@@ -36,9 +36,9 @@
"standard": [6, 6, 5, 5, 6, 4, 4],
"hardpoints": [3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0],
"internal": [6, 6, 3, 3, 2, 2,
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } }
]
},
"defaults": {

6
ships/alliance_chieftain.json
View File

@@ -36,9 +36,9 @@
"standard": [6, 6, 5, 5, 6, 4, 4],
"hardpoints": [3, 3, 2, 1, 1, 1, 0, 0, 0, 0],
"internal": [6, 5, 4, 2, 2,
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } }
]
},
"defaults": {

2
ships/anaconda.json
View File

@@ -35,7 +35,7 @@
"hardpoints": [4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
"internal": [
7, 6, 6, 6, 5, 5, 5,
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
4, 4, 4, 2
]
},

2
ships/eagle.json
View File

@@ -34,7 +34,7 @@
"hardpoints": [1, 1, 1, 0],
"internal": [
3, 2,
{ "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
1, 1
]
},

4
ships/federal_assault_ship.json
View File

@@ -37,8 +37,8 @@
"hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
"internal": [
5, 5, 4,
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
3, 2, 2
]
},

4
ships/federal_corvette.json
View File

@@ -38,8 +38,8 @@
"hardpoints": [4, 4, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
"internal": [
7, 7, 7, 6, 6, 5, 5,
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
4, 4, 3
]
},

4
ships/federal_dropship.json
View File

@@ -37,8 +37,8 @@
"hardpoints": [3, 2, 2, 2, 2, 0, 0, 0, 0],
"internal": [
6, 5, 5, 4,
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
3, 3, 2
]
},

6
ships/federal_gunship.json
View File

@@ -38,9 +38,9 @@
"hardpoints": [3, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0],
"internal": [
6, 6, 5,
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
2, 2
]
},

4
ships/imperial_cutter.json
View File

@@ -38,8 +38,8 @@
"hardpoints": [4, 3, 3, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0],
"internal": [
8, 8, 6, 6, 6, 5, 5,
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
4, 3
]
},

2
ships/imperial_eagle.json
View File

@@ -34,7 +34,7 @@
"hardpoints": [2, 1, 1, 0],
"internal": [
3, 2,
{ "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
1, 1
]
},

2
ships/type_10_defender.json
View File

@@ -33,7 +33,7 @@
"slots": {
"standard": [8, 7, 7, 5, 7, 4, 6],
"hardpoints": [3, 3, 3, 3, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
"internal": [8, 7, 6, 5, 4, 4, 3, 3, 2,{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }]
"internal": [8, 7, 6, 5, 4, 4, 3, 3, 2,{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } }]
},
"defaults": {
"standard": ["6E", "7E", "6E", "5E", "7E", "4E", "6C"],

2
ships/viper.json
View File

@@ -34,7 +34,7 @@
"hardpoints": [2, 2, 1, 1, 0, 0],
"internal": [
3, 3,
{ "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
2, 1
]
},

2
ships/viper_mk_iv.json
View File

@@ -34,7 +34,7 @@
"hardpoints": [2, 2, 1, 1, 0, 0],
"internal": [
4, 4, 3,
{ "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
2, 2, 1
]
},

2
ships/vulture.json
View File

@@ -34,7 +34,7 @@
"hardpoints": [3, 3, 0, 0, 0, 0],
"internal": [
5,
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } },
4, 2, 1, 1
]
},