From f01d75dbb034366ced6cafb982c0ac8878cf99d4 Mon Sep 17 00:00:00 2001
From: willyb321 <wbwilliam7@gmail.com>
Date: Sat, 14 Jul 2018 10:33:19 +1000
Subject: [PATCH 1/3] gimballed shock cannon

---
 dist/index.js                        | 65 ++++++++++++++++++++++++++
 dist/index.json                      | 68 ++++++++++++++++++++++++++++
 modifications/modules.json           |  6 +++
 modules/hardpoints/shock_cannon.json | 66 +++++++++++++++++++++++++++
 modules/index.js                     |  3 +-
 5 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 modules/hardpoints/shock_cannon.json

diff --git a/dist/index.js b/dist/index.js
index e982511..4c35491 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -10851,6 +10851,67 @@ module.exports = {
         scantime: 10,
         angle: 23,
         symbol: "Hpt_XenoScanner_Basic_Tiny"
+      } ],
+      tbsc: [ {
+        rating: "C",
+        class: 3,
+        grp: "tbsc",
+        ammo: 240,
+        mass: 8,
+        eddbID: 0,
+        breachdmg: 10.4,
+        breachmax: .8,
+        breachmin: .4,
+        clip: 16,
+        damage: 14.9,
+        damagedist: {
+          K: 1
+        },
+        distdraw: 1.07,
+        falloff: 2500,
+        integrity: 64,
+        mount: "G",
+        piercing: 95,
+        power: .89,
+        range: 3e3,
+        rof: 10,
+        shotspeed: 1200,
+        thermload: 3.1,
+        cost: 238134781,
+        reload: 6,
+        id: "2N",
+        edID: 128834780,
+        symbol: "Hpt_PlasmaShockCannon_Fixed_Large"
+      }, {
+        rating: "D",
+        class: 2,
+        grp: "tbsc",
+        ammo: 240,
+        mass: 4,
+        eddbID: 0,
+        breachdmg: 7.1,
+        breachmax: .8,
+        breachmin: .4,
+        clip: 16,
+        damage: 14.9,
+        damagedist: {
+          K: 1
+        },
+        distdraw: .58,
+        falloff: 2500,
+        integrity: 51,
+        mount: "G",
+        piercing: 40,
+        power: .89,
+        range: 3e3,
+        rof: 10,
+        reload: 6,
+        shotspeed: 1200,
+        thermload: 2.1,
+        cost: 238134781,
+        id: "2O",
+        edID: 128834003,
+        symbol: "Hpt_PlasmaShockCannon_Gimbal_Medium"
       } ]
     },
     internal: {
@@ -27041,6 +27102,10 @@ module.exports = {
         blueprints: {},
         modifications: []
       },
+      tbsc: {
+        blueprints: {},
+        modifications: []
+      },
       gpp: {
         blueprints: {},
         modifications: []
diff --git a/dist/index.json b/dist/index.json
index 2db744b..d2199cd 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -13276,6 +13276,70 @@
 					"angle": 23,
 					"symbol": "Hpt_XenoScanner_Basic_Tiny"
 				}
+			],
+			"tbsc": [
+				{
+					"rating": "C",
+					"class": 3,
+					"grp": "tbsc",
+					"ammo": 240,
+					"mass": 8,
+					"eddbID": 0,
+					"breachdmg": 10.4,
+					"breachmax": 0.8,
+					"breachmin": 0.4,
+					"clip": 16,
+					"damage": 14.9,
+					"damagedist": {
+						"K": 1
+					},
+					"distdraw": 1.07,
+					"falloff": 2500,
+					"integrity": 64,
+					"mount": "G",
+					"piercing": 95,
+					"power": 0.89,
+					"range": 3000,
+					"rof": 10,
+					"shotspeed": 1200,
+					"thermload": 3.1,
+					"cost": 238134781,
+					"reload": 6,
+					"id": "2N",
+					"edID": 128834780,
+					"symbol": "Hpt_PlasmaShockCannon_Fixed_Large"
+				},
+				{
+					"rating": "D",
+					"class": 2,
+					"grp": "tbsc",
+					"ammo": 240,
+					"mass": 4,
+					"eddbID": 0,
+					"breachdmg": 7.1,
+					"breachmax": 0.8,
+					"breachmin": 0.4,
+					"clip": 16,
+					"damage": 14.9,
+					"damagedist": {
+						"K": 1
+					},
+					"distdraw": 0.58,
+					"falloff": 2500,
+					"integrity": 51,
+					"mount": "G",
+					"piercing": 40,
+					"power": 0.89,
+					"range": 3000,
+					"rof": 10,
+					"reload": 6,
+					"shotspeed": 1200,
+					"thermload": 2.1,
+					"cost": 238134781,
+					"id": "2O",
+					"edID": 128834003,
+					"symbol": "Hpt_PlasmaShockCannon_Gimbal_Medium"
+				}
 			]
 		},
 		"internal": {
@@ -36433,6 +36497,10 @@
 				"blueprints": {},
 				"modifications": []
 			},
+			"tbsc": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"gpp": {
 				"blueprints": {},
 				"modifications": []
diff --git a/modifications/modules.json b/modifications/modules.json
index 93e142b..5cb69d4 100644
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -3468,6 +3468,12 @@
     "modifications": [
     ]
   },
+  "tbsc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "gpp": {
     "blueprints": {
     },
diff --git a/modules/hardpoints/shock_cannon.json b/modules/hardpoints/shock_cannon.json
new file mode 100644
index 0000000..0842c26
--- /dev/null
+++ b/modules/hardpoints/shock_cannon.json
@@ -0,0 +1,66 @@
+{
+  "tbsc": [
+    {
+      "rating": "C",
+      "class": 3,
+      "grp": "tbsc",
+      "ammo": 240,
+      "mass": 8,
+      "eddbID": 0,
+      "breachdmg": 10.4,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "clip": 16,
+      "damage": 14.9,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 1.07,
+      "falloff": 2500,
+      "integrity": 64,
+      "mount": "G",
+      "piercing": 95,
+      "power": 0.89,
+      "range": 3000,
+      "rof": 10,
+      "shotspeed": 1200,
+      "thermload": 3.1,
+      "cost": 238134781,
+      "reload": 6,
+      "id": "2N",
+      "edID": 128834780,
+      "symbol": "Hpt_PlasmaShockCannon_Fixed_Large"
+    },
+    {
+      "rating": "D",
+      "class": 2,
+      "grp": "tbsc",
+      "ammo": 240,
+      "mass": 4,
+      "eddbID": 0,
+      "breachdmg": 7.1,
+      "breachmax": 0.8,
+      "breachmin": 0.4,
+      "clip": 16,
+      "damage": 14.9,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.58,
+      "falloff": 2500,
+      "integrity": 51,
+      "mount": "G",
+      "piercing": 40,
+      "power": 0.89,
+      "range": 3000,
+      "rof": 10,
+      "reload": 6,
+      "shotspeed": 1200,
+      "thermload": 2.1,
+      "cost": 238134781,
+      "id": "2O",
+      "edID": 128834003,
+      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Medium"
+    }
+  ]
+}
diff --git a/modules/index.js b/modules/index.js
index 3731980..5113c3d 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -36,7 +36,8 @@ module.exports = {
     gpc: require('./hardpoints/guardian_plasma_charger').gpc,
     ggc: require('./hardpoints/guardian_gauss_cannon').ggc,
     sfn: require('./hardpoints/shutdown_field_neutraliser').sfn,
-    xs: require('./hardpoints/xeno_scanner').xs
+    xs: require('./hardpoints/xeno_scanner').xs,
+    tbsc: require('./hardpoints/shock_cannon').tbsc
   },
   internal: {
     am: require('./internal/auto_field_maintenance_unit').am,

From 5bb62c9ec3266ada3272aa12008e93bb574f7702 Mon Sep 17 00:00:00 2001
From: willyb321 <wbwilliam7@gmail.com>
Date: Sat, 14 Jul 2018 10:49:12 +1000
Subject: [PATCH 2/3] fixed mount guardian shard cannon

---
 dist/index.js                                 | 67 ++++++++++++++++++
 dist/index.json                               | 70 +++++++++++++++++++
 modifications/modules.json                    |  6 ++
 modules/hardpoints/guardian_shard_cannon.json | 68 ++++++++++++++++++
 modules/index.js                              |  3 +-
 5 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 modules/hardpoints/guardian_shard_cannon.json

diff --git a/dist/index.js b/dist/index.js
index 4c35491..e3a51b4 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -10912,6 +10912,69 @@ module.exports = {
         id: "2O",
         edID: 128834003,
         symbol: "Hpt_PlasmaShockCannon_Gimbal_Medium"
+      } ],
+      gsc: [ {
+        rating: "A",
+        class: 2,
+        grp: "gsc",
+        id: "2P",
+        eddbID: 0,
+        edID: 128834e3,
+        mount: "F",
+        cost: 53762896,
+        mass: 4,
+        integrity: 42,
+        power: 1.21,
+        damage: 3.7,
+        distdraw: .65,
+        thermload: 1.2,
+        piercing: 45,
+        range: 1700,
+        shotspeed: 1133,
+        rof: 1.7,
+        roundspershot: 12,
+        clip: 5,
+        ammo: 180,
+        reload: 5,
+        breachdmg: 3,
+        breachmin: .6,
+        breachmax: .8,
+        jitter: 5,
+        damagedist: {
+          T: 1
+        },
+        falloff: 1700
+      }, {
+        rating: "C",
+        class: 3,
+        grp: "gsc",
+        id: "2Q",
+        eddbID: 0,
+        edID: 128834778,
+        mount: "F",
+        cost: 154731222,
+        mass: 8,
+        integrity: 51,
+        power: 1.68,
+        damage: 5.2,
+        distdraw: 1.4,
+        thermload: 2.2,
+        piercing: 60,
+        range: 1700,
+        shotspeed: 1133,
+        rof: 1.7,
+        clip: 5,
+        ammo: 180,
+        roundspershot: 12,
+        reload: 5,
+        breachdmg: 4.2,
+        breachmin: .6,
+        breachmax: .8,
+        jitter: 5,
+        damagedist: {
+          T: 1
+        },
+        falloff: 1700
       } ]
     },
     internal: {
@@ -27106,6 +27169,10 @@ module.exports = {
         blueprints: {},
         modifications: []
       },
+      gsc: {
+        blueprints: {},
+        modifications: []
+      },
       gpp: {
         blueprints: {},
         modifications: []
diff --git a/dist/index.json b/dist/index.json
index d2199cd..6de522a 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -13340,6 +13340,72 @@
 					"edID": 128834003,
 					"symbol": "Hpt_PlasmaShockCannon_Gimbal_Medium"
 				}
+			],
+			"gsc": [
+				{
+					"rating": "A",
+					"class": 2,
+					"grp": "gsc",
+					"id": "2P",
+					"eddbID": 0,
+					"edID": 128834000,
+					"mount": "F",
+					"cost": 53762896,
+					"mass": 4,
+					"integrity": 42,
+					"power": 1.21,
+					"damage": 3.7,
+					"distdraw": 0.65,
+					"thermload": 1.2,
+					"piercing": 45,
+					"range": 1700,
+					"shotspeed": 1133,
+					"rof": 1.7,
+					"roundspershot": 12,
+					"clip": 5,
+					"ammo": 180,
+					"reload": 5,
+					"breachdmg": 3,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"jitter": 5,
+					"damagedist": {
+						"T": 1
+					},
+					"falloff": 1700
+				},
+				{
+					"rating": "C",
+					"class": 3,
+					"grp": "gsc",
+					"id": "2Q",
+					"eddbID": 0,
+					"edID": 128834778,
+					"mount": "F",
+					"cost": 154731222,
+					"mass": 8,
+					"integrity": 51,
+					"power": 1.68,
+					"damage": 5.2,
+					"distdraw": 1.4,
+					"thermload": 2.2,
+					"piercing": 60,
+					"range": 1700,
+					"shotspeed": 1133,
+					"rof": 1.7,
+					"clip": 5,
+					"ammo": 180,
+					"roundspershot": 12,
+					"reload": 5,
+					"breachdmg": 4.2,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"jitter": 5,
+					"damagedist": {
+						"T": 1
+					},
+					"falloff": 1700
+				}
 			]
 		},
 		"internal": {
@@ -36501,6 +36567,10 @@
 				"blueprints": {},
 				"modifications": []
 			},
+			"gsc": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"gpp": {
 				"blueprints": {},
 				"modifications": []
diff --git a/modifications/modules.json b/modifications/modules.json
index 5cb69d4..064aacb 100644
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -3474,6 +3474,12 @@
     "modifications": [
     ]
   },
+  "gsc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "gpp": {
     "blueprints": {
     },
diff --git a/modules/hardpoints/guardian_shard_cannon.json b/modules/hardpoints/guardian_shard_cannon.json
new file mode 100644
index 0000000..92c5d9a
--- /dev/null
+++ b/modules/hardpoints/guardian_shard_cannon.json
@@ -0,0 +1,68 @@
+{
+  "gsc": [
+    {
+      "rating": "A",
+      "class": 2,
+      "grp": "gsc",
+      "id": "2P",
+      "eddbID": 0,
+      "edID": 128834000,
+      "mount": "F",
+      "cost": 53762896,
+      "mass": 4,
+      "integrity": 42,
+      "power": 1.21,
+      "damage": 3.7,
+      "distdraw": 0.65,
+      "thermload": 1.2,
+      "piercing": 45,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "roundspershot": 12,
+      "clip": 5,
+      "ammo": 180,
+      "reload": 5,
+      "breachdmg": 3,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    },
+    {
+      "rating": "C",
+      "class": 3,
+      "grp": "gsc",
+      "id": "2Q",
+      "eddbID": 0,
+      "edID": 128834778,
+      "mount": "F",
+      "cost": 154731222,
+      "mass": 8,
+      "integrity": 51,
+      "power": 1.68,
+      "damage": 5.2,
+      "distdraw": 1.4,
+      "thermload": 2.2,
+      "piercing": 60,
+      "range": 1700,
+      "shotspeed": 1133,
+      "rof": 1.7,
+      "clip": 5,
+      "ammo": 180,
+      "roundspershot": 12,
+      "reload": 5,
+      "breachdmg": 4.2,
+      "breachmin": 0.6,
+      "breachmax": 0.8,
+      "jitter": 5,
+      "damagedist": {
+        "T": 1
+      },
+      "falloff": 1700
+    }
+  ]
+}
diff --git a/modules/index.js b/modules/index.js
index 5113c3d..5adccd9 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -37,7 +37,8 @@ module.exports = {
     ggc: require('./hardpoints/guardian_gauss_cannon').ggc,
     sfn: require('./hardpoints/shutdown_field_neutraliser').sfn,
     xs: require('./hardpoints/xeno_scanner').xs,
-    tbsc: require('./hardpoints/shock_cannon').tbsc
+    tbsc: require('./hardpoints/shock_cannon').tbsc,
+    gsc: require('./hardpoints/guardian_shard_cannon').gsc
   },
   internal: {
     am: require('./internal/auto_field_maintenance_unit').am,

From ee94bf557c0c97db827ae17ff2dafb1061ad4225 Mon Sep 17 00:00:00 2001
From: willyb321 <wbwilliam7@gmail.com>
Date: Sat, 14 Jul 2018 10:52:07 +1000
Subject: [PATCH 3/3] add gmrp and ghrp to eligible military slots

---
 dist/index.js                   | 100 ++++++++++++++++++++++++--------
 dist/index.json                 | 100 ++++++++++++++++++++++++--------
 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, 174 insertions(+), 74 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index e3a51b4..9af5154 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -182,7 +182,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -191,7 +193,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -200,7 +204,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         } ]
       },
@@ -302,7 +308,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -311,7 +319,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -320,7 +330,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         } ]
       },
@@ -420,7 +432,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 4, 4, 4, 2 ]
       },
@@ -1306,7 +1320,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 1, 1 ]
       },
@@ -1408,7 +1424,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -1417,7 +1435,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 3, 2, 2 ]
       },
@@ -1520,7 +1540,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 5,
@@ -1529,7 +1551,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 4, 4, 3 ]
       },
@@ -1631,7 +1655,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -1640,7 +1666,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 3, 3, 2 ]
       },
@@ -1743,7 +1771,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -1752,7 +1782,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 4,
@@ -1761,7 +1793,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 2, 2 ]
       },
@@ -2230,7 +2264,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 5,
@@ -2239,7 +2275,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 4, 3 ]
       },
@@ -2338,7 +2376,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 1, 1 ]
       },
@@ -3184,7 +3224,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, {
           class: 5,
@@ -3193,7 +3235,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         } ]
       },
@@ -3292,7 +3336,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 2, 1 ]
       },
@@ -3391,7 +3437,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 2, 2, 1 ]
       },
@@ -3490,7 +3538,9 @@ module.exports = {
             hr: 1,
             scb: 1,
             mrp: 1,
-            gsrp: 1
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
           }
         }, 4, 2, 1, 1 ]
       },
diff --git a/dist/index.json b/dist/index.json
index 6de522a..d8a8de7 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -259,7 +259,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -269,7 +271,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -279,7 +283,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					}
 				]
@@ -443,7 +449,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -453,7 +461,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -463,7 +473,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					}
 				]
@@ -632,7 +644,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					4,
@@ -2021,7 +2035,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					1,
@@ -2172,7 +2188,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -2182,7 +2200,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					3,
@@ -2353,7 +2373,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -2363,7 +2385,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					4,
@@ -2535,7 +2559,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -2545,7 +2571,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					3,
@@ -2710,7 +2738,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -2720,7 +2750,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -2730,7 +2762,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					2,
@@ -3477,7 +3511,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -3487,7 +3523,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					4,
@@ -3647,7 +3685,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					1,
@@ -5003,7 +5043,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					{
@@ -5013,7 +5055,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					}
 				]
@@ -5175,7 +5219,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					2,
@@ -5323,7 +5369,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					2,
@@ -5472,7 +5520,9 @@
 							"hr": 1,
 							"scb": 1,
 							"mrp": 1,
-							"gsrp": 1
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
 						}
 					},
 					4,
diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json
index 0d3c0e8..c2712eb 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, "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 } }
+        { "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 } }
       ]
     },
     "defaults": {
diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json
index 8035cfa..5e9f4e0 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, "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 } }
+        { "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 } }
       ]
     },
     "defaults": {
diff --git a/ships/anaconda.json b/ships/anaconda.json
index 44b3430..f82223f 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, "gsrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 4, 4, 2
       ]
     },
diff --git a/ships/eagle.json b/ships/eagle.json
index 75c27d5..43532de 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, "gsrp": 1 } },
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         1, 1
       ]
     },
diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json
index aee4034..1af81b2 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, "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, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         3, 2, 2
       ]
     },
diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json
index c779d99..d971557 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, "gsrp": 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, "gmrp": 1, "ghrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 4, 3
       ]
     },
diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json
index 0ba1533..216e396 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, "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, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         3, 3, 2
       ]
     },
diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json
index 6e611d4..498f331 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, "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 } },
+        { "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 } },
         2, 2
       ]
     },
diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json
index f552dc9..a033539 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, "gsrp": 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, "gmrp": 1, "ghrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 3
       ]
     },
diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json
index 53f0a12..1f541b2 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, "gsrp": 1 } },
+        { "class": 2, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         1, 1
       ]
     },
diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json
index dcade2d..3007940 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, "gsrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1 } }]
+        "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 } }]
       },
       "defaults": {
         "standard": ["6E", "7E", "6E", "5E", "7E", "4E", "6C"],
diff --git a/ships/viper.json b/ships/viper.json
index fcbfaee..be7a91e 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, "gsrp": 1 } },
+        { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         2, 1
       ]
     },
diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json
index 50e13c3..d108770 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, "gsrp": 1 } },
+        { "class": 3, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         2, 2, 1
       ]
     },
diff --git a/ships/vulture.json b/ships/vulture.json
index d151b8f..921b5b4 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, "gsrp": 1 } },
+        { "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
         4, 2, 1, 1
       ]
     },