From 1182cf1eb08c0315e076a738398e3413f3e5564b Mon Sep 17 00:00:00 2001 From: willyb321 Date: Wed, 11 Jul 2018 12:10:06 +1000 Subject: [PATCH] Add gsrp to military slot eligible Fixes edcd/coriolis#314 --- dist/index.js | 75 ++++++++++++++++++++++----------- dist/index.json | 75 ++++++++++++++++++++++----------- ships/alliance_challenger.json | 6 +-- ships/alliance_chieftain.json | 6 +-- ships/anaconda.json | 2 +- ships/eagle.json | 2 +- ships/federal_assault_ship.json | 4 +- ships/federal_corvette.json | 4 +- ships/federal_dropship.json | 4 +- ships/federal_gunship.json | 6 +-- ships/imperial_cutter.json | 4 +- ships/imperial_eagle.json | 2 +- ships/type_10_defender.json | 2 +- ships/viper.json | 2 +- ships/viper_mk_iv.json | 2 +- ships/vulture.json | 2 +- 16 files changed, 124 insertions(+), 74 deletions(-) diff --git a/dist/index.js b/dist/index.js index f65c463..eb966e2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -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 ] }, diff --git a/dist/index.json b/dist/index.json index 78f74e1..99514e7 100644 --- a/dist/index.json +++ b/dist/index.json @@ -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, diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json index 8a07c1f..0d3c0e8 100644 --- a/ships/alliance_challenger.json +++ b/ships/alliance_challenger.json @@ -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": { diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 39c3533..8035cfa 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -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": { diff --git a/ships/anaconda.json b/ships/anaconda.json index 8bd0e4e..44b3430 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -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 ] }, diff --git a/ships/eagle.json b/ships/eagle.json index 7b3470c..75c27d5 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -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 ] }, diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index e766b45..aee4034 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -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 ] }, diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 8d0a189..c779d99 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -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 ] }, diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 4896f05..0ba1533 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -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 ] }, diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 91f4907..6e611d4 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -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 ] }, diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 8c9a636..f552dc9 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -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 ] }, diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 83fb4fa..53f0a12 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -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 ] }, diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index 142b233..dcade2d 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -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"], diff --git a/ships/viper.json b/ships/viper.json index e7d5626..fcbfaee 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -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 ] }, diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 545d08c..50e13c3 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -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 ] }, diff --git a/ships/vulture.json b/ships/vulture.json index a01fdac..d151b8f 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -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 ] },