Merge branch 'release/release/v2.9.10'

still needs cost

modifications/modules.json

@@ -3427,12 +3427,24 @@
       "special_weapon_lightweight"
     ]
   },
+  "gpc": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "gpl": {
     "blueprints": {
     },
     "modifications": [
     ]
   },
+  "gpp": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "ggc": {
     "blueprints": {
     },

modifications/specials.json

@@ -47,7 +47,7 @@
     "special_feedback_cascade": {
         "id": 9,
         "edname": "special_feedback_cascade",
-        "name": "Feedback cascade"
+        "name": "Feedback cascade (Legacy)"
     },
     "special_force_shell": {
         "id": 10,
@@ -102,7 +102,7 @@
     "special_plasma_slug": {
         "id": 18,
         "edname": "special_plasma_slug",
-        "name": "Plasma slug"
+        "name": "Plasma slug (Legacy)"
     },
     "special_radiant_canister": {
         "id": 19,
@@ -142,7 +142,7 @@
     "special_super_penetrator": {
         "id": 26,
         "edname": "special_super_penetrator",
-        "name": "Super penetrator"
+        "name": "Super penetrator (Legacy)"
     },
     "special_lock_breaker": {
         "id": 27,

modules/hardpoints/guardian_gauss_cannon.json

@@ -0,0 +1,39 @@
+{
+  "ggc": [
+    {
+      "ammo": 80,
+      "breachdmg": 35,
+      "breachmax": 0.4,
+      "breachmin": 0.2,
+      "burst": 1,
+      "burstrof": 0.83,
+      "class": 2,
+      "clip": 1,
+      "cost": 0,
+      "damage": 70,
+      "damagedist": {
+        "T": 1
+      },
+      "distdraw": 7.20,
+      "edID": 128833687,
+      "eddbID": 876,
+      "falloff": 1500,
+      "grp": "ggc",
+      "id": "0H",
+      "integrity": 42,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 140,
+      "power": 2.61,
+      "range": 3000,
+      "rating": "B",
+      "reload": 1,
+      "rof": 1.205,
+      "thermload": 25,
+      "symbol": "Hpt_Guardian_GaussCannon_Fixed_Medium",
+      "requirements": {
+        "horizons": true
+      }
+    }
+  ]
+}

modules/hardpoints/guardian_plasma_charger.json

@@ -0,0 +1,66 @@
+{
+  "gpc": [
+    {
+      "ammo": 200,
+      "breachdmg": 0.7,
+      "breachmax": 0.8,
+      "breachmin": 0.5,
+      "class": 2,
+      "clip": 15,
+      "cost": 3051200,
+      "damage": 5,
+      "damagedist": {
+        "A": 1
+      },
+      "distdraw": 13.6,
+      "edID": 128049466,
+      "eddbID": 874,
+      "falloff": 1000,
+      "grp": "gpc",
+      "id": "0J",
+      "integrity": 42,
+      "mass": 4,
+      "mount": "F",
+      "piercing": 80,
+      "power": 2.13,
+      "range": 3500,
+      "rating": "B",
+      "reload": 3,
+      "rof": 5,
+      "shotspeed": 1200,
+      "thermload": 5.2,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Fixed_Medium"
+    },
+    {
+      "ammo": 200,
+      "breachdmg": 1.0,
+      "breachmax": 0.8,
+      "breachmin": 0.5,
+      "class": 2,
+      "clip": 15,
+      "cost": 3051200,
+      "damage": 4,
+      "damagedist": {
+        "A": 1
+      },
+      "distdraw": 13.6,
+      "edID": 128049466,
+      "eddbID": 874,
+      "falloff": 1000,
+      "grp": "gpc",
+      "id": "0I",
+      "integrity": 42,
+      "mass": 4,
+      "mount": "T",
+      "piercing": 80,
+      "power": 2.01,
+      "range": 3500,
+      "rating": "E",
+      "reload": 3,
+      "rof": 5,
+      "shotspeed": 1200,
+      "thermload": 5.8,
+      "symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Medium"
+    }
+  ]
+}

modules/index.js

@@ -33,6 +33,8 @@ module.exports = {
     ec: require('./hardpoints/electronic_countermeasure').ec,
     hs: require('./hardpoints/heat_sink_launcher').hs,
     po: require('./hardpoints/point_defence').po,
+    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
   },

modules/standard/power_plant.json

@@ -489,6 +489,111 @@
       "pgen": 9.6,
       "rating": "A",
       "symbol": "Int_Powerplant_Size2_Class5"
+    },
+    {
+      "class": 2,
+      "cost": 162000,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0A",
+      "integrity": 56,
+      "mass": 1.5,
+      "pgen": 12.7,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size2"
+    },
+    {
+      "class": 3,
+      "cost": 291600,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0B",
+      "integrity": 70,
+      "mass": 2.9,
+      "pgen": 15.8,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size3"
+    },
+    {
+      "class": 4,
+      "cost": 524880,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0C",
+      "integrity": 88,
+      "mass": 5.9,
+      "pgen": 20.6,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size4"
+    },
+    {
+      "class": 5,
+      "cost": 944790,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0D",
+      "integrity": 106,
+      "mass": 11.7,
+      "pgen": 26.9,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size5"
+    },
+    {
+      "class": 6,
+      "cost": 1700610,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0E",
+      "integrity": 124,
+      "mass": 23.4,
+      "pgen": 33.3,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size6"
+    },
+    {
+      "class": 7,
+      "cost": 3061100,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0F",
+      "integrity": 144,
+      "mass": 46.8,
+      "pgen": 39.6,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size7"
+    },
+    {
+      "class": 8,
+      "cost": 5509980,
+      "edID": 128064037,
+      "eddbID": 895,
+      "eff": 0.5,
+      "grp": "pp",
+      "id": "0G",
+      "integrity": 165,
+      "mass": 93.6,
+      "pgen": 47.5,
+      "rating": "A",
+      "name": "Guardian Hybrid Power Plant",
+      "symbol": "Int_GuardianPowerplant_Size8"
     }
   ]
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.9.4",
+  "version": "2.9.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.9.6",
+  "version": "2.9.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"