Merge pull request #56 from EDCD/feature/bug-fixes

Various bug fixes

modifications/blueprints.json

@@ -11703,6 +11703,123 @@
     ],
     "name": "Overcharged"
   },
+  "PA_Overcharged": {
+    "fdname": "Weapon_Overcharged",
+    "grades": {
+      "1": {
+        "components": {
+          "Nickel": 1
+        },
+        "features": {
+          "damage": [
+            0,
+            0.3
+          ],
+          "distdraw": [
+            0.15,
+            0.15
+          ],
+          "thermload": [
+            0.03,
+            0.03
+          ]
+        },
+        "uuid": "e917ebe3-d5f1-4016-b8a9-2c759e16a7d4"
+      },
+      "2": {
+        "components": {
+          "Conductive Components": 1,
+          "Nickel": 1
+        },
+        "features": {
+          "damage": [
+            0.3,
+            0.4
+          ],
+          "distdraw": [
+            0.2,
+            0.2
+          ],
+          "thermload": [
+            0.06,
+            0.06
+          ]
+        },
+        "uuid": "f5921fc1-fb10-4d2f-8e0a-cd8d8e9e3a84"
+      },
+      "3": {
+        "components": {
+          "Conductive Components": 1,
+          "Electrochemical Arrays": 1,
+          "Nickel": 1
+        },
+        "features": {
+          "damage": [
+            0.4,
+            0.5
+          ],
+          "distdraw": [
+            0.25,
+            0.25
+          ],
+          "thermload": [
+            0.09,
+            0.09
+          ]
+        },
+        "uuid": "4389883f-c2b3-4487-9b1a-b668a761057a"
+      },
+      "4": {
+        "components": {
+          "Conductive Ceramics": 1,
+          "Polymer Capacitors": 1,
+          "Zinc": 1
+        },
+        "features": {
+          "damage": [
+            0.5,
+            0.6
+          ],
+          "distdraw": [
+            0.3,
+            0.3
+          ],
+          "thermload": [
+            0.12,
+            0.12
+          ]
+        },
+        "uuid": "25ec26dd-63b8-4e83-9a6e-86e5b80c4771"
+      },
+      "5": {
+        "components": {
+          "Conductive Polymers": 1,
+          "Modified Embedded Firmware": 1,
+          "Zirconium": 1
+        },
+        "features": {
+          "damage": [
+            0.6,
+            0.7
+          ],
+          "distdraw": [
+            0.35,
+            0.35
+          ],
+          "thermload": [
+            0.15,
+            0.15
+          ]
+        },
+        "uuid": "4dcf6bdc-bcff-448a-92a0-7612de548db7"
+      }
+    },
+    "id": 103,
+    "modulename": [
+      "Weapon"
+    ],
+    "name": "Overcharged"
+  },
   "Weapon_RapidFire": {
     "fdname": "Weapon_RapidFire",
     "grades": {
@@ -12106,4 +12223,4 @@
     ],
     "name": "Sturdy"
   }
-}
+}

modifications/modifierActions.json

@@ -249,9 +249,7 @@
     "reload": 0.5
   },
   "special_thermal_cascade": {},
-  "special_thermal_conduit": {
+  "special_thermal_conduit": {},
-    "damage": -0.2
-  },
   "special_thermal_vent": {},
   "special_thermalshock": {
     "damage": -0.2
@@ -398,7 +396,7 @@
   },
   "special_weapon_rateoffire": {
     "power": 0.05,
-    "rof": -0.03
+    "rof": 0.03
   },
   "special_weapon_efficient": {
     "power": -0.1

modifications/modules.json

@@ -3617,7 +3617,7 @@
           }
         }
       },
-      "Weapon_Overcharged": {
+      "PA_Overcharged": {
         "grades": {
           "1": {
             "engineers": [

modules/hardpoints/guardian_plasma_charger.json

@@ -74,7 +74,7 @@
       "damagedist": {
         "A": 1
       },
-      "distdraw": 13.6,
+      "distdraw": 1.25,
       "edID": 128833998,
       "eddbID": 874,
       "falloff": 1000,
@@ -105,7 +105,7 @@
       "damagedist": {
         "A": 1
       },
-      "distdraw": 13.6,
+      "distdraw": 1.4,
       "edID": 128833999,
       "eddbID": 874,
       "falloff": 1000,

modules/hardpoints/missile_rack.json

@@ -3,8 +3,8 @@
     {
       "ammo": 16,
       "breachdmg": 20,
-      "breachmax": 0,
+      "breachmax": 1,
-      "breachmin": 0,
+      "breachmin": 1,
       "class": 1,
       "clip": 8,
       "cost": 32180,
@@ -63,8 +63,8 @@
     {
       "ammo": 48,
       "breachdmg": 20,
-      "breachmax": 0,
+      "breachmax": 1,
-      "breachmin": 0,
+      "breachmin": 1,
       "class": 2,
       "clip": 12,
       "cost": 240400,
@@ -127,8 +127,8 @@
     {
       "ammo": 48,
       "breachdmg": 16,
-      "breachmax": 0,
+      "breachmax": 1,
-      "breachmin": 0,
+      "breachmin": 1,
       "class": 2,
       "clip": 12,
       "cost": 1951040,

ships/type_10_defender.json

@@ -25,10 +25,10 @@
       "retailCost": 121454652,
       "bulkheads": [
         { "id": "1Q", "edID": 128785621, "eddbID": 1627, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-        { "id": "1R", "edID": 128785622, "eddbID": 1628, "grp": "bh", "cost": 30622340, "mass": 75, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+        { "id": "1R", "edID": 128785622, "eddbID": 1628, "grp": "bh", "cost": 49902137, "mass": 75, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-        { "id": "1S", "edID": 128785623, "eddbID": 1629, "grp": "bh", "cost": 68900260, "mass": 150, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+        { "id": "1S", "edID": 128785623, "eddbID": 1629, "grp": "bh", "cost": 112279807, "mass": 150, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-        { "id": "1T", "edID": 128785624, "eddbID": 1630, "grp": "bh", "cost": 162834280, "mass": 150, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+        { "id": "1T", "edID": 128785624, "eddbID": 1630, "grp": "bh", "cost": 265354612, "mass": 150, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-        { "id": "1U", "edID": 128785625, "eddbID": 1631, "grp": "bh", "cost": 180442120, "mass": 150, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+        { "id": "1U", "edID": 128785625, "eddbID": 1631, "grp": "bh", "cost": 294048342, "mass": 150, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
       ],
       "slots": {
         "standard": [8, 7, 7, 5, 7, 4, 6],