Merge branch 'master' into develop

This commit is contained in:
willyb321
2018-09-23 11:28:20 +10:00
17 changed files with 85 additions and 31 deletions

27
dist/index.js vendored
View File

@@ -189,6 +189,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -200,6 +201,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -211,6 +213,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -320,6 +323,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -331,6 +335,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -342,6 +347,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -452,6 +458,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -463,6 +470,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -474,6 +482,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -581,6 +590,7 @@ module.exports = {
class: 5,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1514,6 +1524,7 @@ module.exports = {
class: 2,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1623,6 +1634,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1634,6 +1646,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1744,6 +1757,7 @@ module.exports = {
class: 5,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1755,6 +1769,7 @@ module.exports = {
class: 5,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1864,6 +1879,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1875,6 +1891,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1985,6 +2002,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -1996,6 +2014,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -2007,6 +2026,7 @@ module.exports = {
class: 4,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -2503,6 +2523,7 @@ module.exports = {
class: 5,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -2514,6 +2535,7 @@ module.exports = {
class: 5,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -2620,6 +2642,7 @@ module.exports = {
class: 2,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -3513,6 +3536,7 @@ module.exports = {
class: 5,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -3630,6 +3654,7 @@ module.exports = {
class: 3,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -3736,6 +3761,7 @@ module.exports = {
class: 3,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,
@@ -3842,6 +3868,7 @@ module.exports = {
class: 5,
name: "Military",
eligible: {
mahr: 1,
hr: 1,
scb: 1,
mrp: 1,

27
dist/index.json vendored
View File

@@ -266,6 +266,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -278,6 +279,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -290,6 +292,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -461,6 +464,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -473,6 +477,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -485,6 +490,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -657,6 +663,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -669,6 +676,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -681,6 +689,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -856,6 +865,7 @@
"class": 5,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -2292,6 +2302,7 @@
"class": 2,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -2450,6 +2461,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -2462,6 +2474,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -2640,6 +2653,7 @@
"class": 5,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -2652,6 +2666,7 @@
"class": 5,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -2831,6 +2846,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -2843,6 +2859,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -3015,6 +3032,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -3027,6 +3045,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -3039,6 +3058,7 @@
"class": 4,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -3813,6 +3833,7 @@
"class": 5,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -3825,6 +3846,7 @@
"class": 5,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -3992,6 +4014,7 @@
"class": 2,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -5395,6 +5418,7 @@
"class": 5,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -5576,6 +5600,7 @@
"class": 3,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -5731,6 +5756,7 @@
"class": 3,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,
@@ -5887,6 +5913,7 @@
"class": 5,
"name": "Military",
"eligible": {
"mahr": 1,
"hr": 1,
"scb": 1,
"mrp": 1,

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
]
},
"defaults": {

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
]
},
"defaults": {

View File

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

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
4, 4, 4, 2
]
},

View File

@@ -33,8 +33,8 @@
"standard": [2, 3, 3, 1, 2, 2, 2],
"hardpoints": [1, 1, 1, 0],
"internal": [
3, 2,
{ "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
3, 2,
{ "class": 2, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
1, 1
]
},

View File

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

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
4, 4, 3
]
},

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
3, 3, 2
]
},

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
2, 2
]
},

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
4, 3
]
},

View File

@@ -33,8 +33,8 @@
"standard": [3, 3, 3, 1, 2, 2, 2],
"hardpoints": [2, 1, 1, 0],
"internal": [
3, 2,
{ "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
3, 2,
{ "class": 2, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
1, 1
]
},

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }]
"internal": [8, 7, 6, 5, 4, 4, 3, 3, 2,{ "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }]
},
"defaults": {
"standard": ["6E", "7E", "6E", "5E", "7E", "4E", "6C"],

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 3, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
2, 1
]
},

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, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 3, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
2, 2, 1
]
},

View File

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