Merge pull request #116 from Brighter-Applications/develop

Develop

modules/hardpoints/guardian_plasma_charger.json

@@ -9,7 +9,7 @@
       "class": 1,
       "clip": 15,
       "cost": 176500,
-      "damage": 1.7,
+      "damage": 3,
       "damagedist": {
         "A": 1
       },
@@ -41,7 +41,7 @@
       "class": 1,
       "clip": 15,
       "cost": 484050,
-      "damage": 1.1,
+      "damage": 2,
       "damagedist": {
         "A": 1
       },
@@ -141,7 +141,7 @@
       "mass": 8,
       "integrity": 51,
       "power": 3.1,
-      "damage": 3.4,
+      "damage": 7,
       "distdraw": 2.42,
       "fireint": 0.2,
       "thermload": 6.2,
@@ -169,7 +169,7 @@
       "class": 3,
       "clip": 15,
       "cost": 5495200,
-      "damage": 3.3,
+      "damage": 6,
       "damagedist": {
         "A": 1
       },

modules/internal/shield_generator.json

@@ -1,5 +1,86 @@
 {
   "sg": [
+    {
+      "brokenregen": 1.6,
+      "class": 1,
+      "cost": 300,
+      "distdraw": 0.6,
+      "edID": 128064258,
+      "eddbID": 1804,
+      "explres": 0.5,
+      "grp": "sg",
+      "id": "4x",
+      "integrity": 32,
+      "kinres": 0.4,
+      "mass": 1.3,
+      "maxmass": 63,
+      "maxmul": 1.3,
+      "minmass": 13,
+      "minmul": 0.3,
+      "optmass": 25,
+      "optmul": 0.8,
+      "power": 0.72,
+      "rating": "E",
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size1_Class1",
+      "ukName": "Shield Generator",
+      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
+    },
+    {
+      "brokenregen": 1.6,
+      "class": 1,
+      "cost": 1240,
+      "distdraw": 0.6,
+      "edID": 128064259,
+      "eddbID": 1805,
+      "explres": 0.5,
+      "grp": "sg",
+      "id": "4z",
+      "integrity": 24,
+      "kinres": 0.4,
+      "mass": 0.50,
+      "maxmass": 63,
+      "maxmul": 1.4,
+      "minmass": 13,
+      "minmul": 0.4,
+      "optmass": 25,
+      "optmul": 0.9,
+      "power": 0.96,
+      "rating": "D",
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size1_Class2",
+      "ukName": "Shield Generator",
+      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
+    },
+    {
+      "brokenregen": 1.6,
+      "class": 1,
+      "cost": 5140,
+      "distdraw": 0.6,
+      "edID": 128064260,
+      "eddbID": 1806,
+      "explres": 0.5,
+      "grp": "sg",
+      "id": "4y",
+      "integrity": 40,
+      "kinres": 0.4,
+      "mass": 1.3,
+      "maxmass": 63,
+      "maxmul": 1.5,
+      "minmass": 13,
+      "minmul": 0.5,
+      "optmass": 25,
+      "optmul": 1.0,
+      "power": 1.20,
+      "rating": "C",
+      "regen": 1,
+      "thermres": -0.2,
+      "symbol": "Int_ShieldGenerator_Size1_Class3",
+      "ukName": "Shield Generator",
+      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
+    },
     {
       "brokenregen": 1.6,
       "class": 1,