Merge branch 'develop'

2025-12-09 15:35:35 +00:00 · 2018-12-04 12:02:29 +11:00
parent 48f1971217 c5a508087b
commit f95f68f180
56 changed files with 1947 additions and 1083 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+root = true
+
+
+[*]
+
+# change these settings to your own preference
+indent_style = space
+indent_size = 2
+
+# we recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[{package,bower}.json]
+indent_style = space
+indent_size = 2
--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.json
+++ b/dist/index.json
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -89,7 +89,7 @@
        "features": {
          "explres": [
            0,
-            0.042
+            0.03
          ],
          "hullboost": [
            -0.01,
@@ -97,7 +97,7 @@
          ],
          "kinres": [
            0,
-            0.036
+            0.03
          ],
          "mass": [
            0,
@@ -117,16 +117,16 @@
        },
        "features": {
          "explres": [
-            0.042,
-            0.084
+            0.03,
+            0.06
          ],
          "hullboost": [
            -0.02,
            -0.02
          ],
          "kinres": [
-            0.036,
-            0.072
+            0.03,
+            0.06
          ],
          "mass": [
            -0.15,
@@ -147,16 +147,16 @@
        },
        "features": {
          "explres": [
-            0.084,
-            0.126
+            0.06,
+            0.09
          ],
          "hullboost": [
            -0.03,
            -0.03
          ],
          "kinres": [
-            0.072,
-            0.108
+            0.06,
+            0.09
          ],
          "mass": [
            -0.25,
@@ -177,16 +177,16 @@
        },
        "features": {
          "explres": [
-            0.126,
-            0.168
+            0.09,
+            0.12
          ],
          "hullboost": [
            -0.04,
            -0.04
          ],
          "kinres": [
-            0.108,
-            0.144
+            0.09,
+            0.12
          ],
          "mass": [
            -0.35,
@@ -207,16 +207,16 @@
        },
        "features": {
          "explres": [
-            0.168,
-            0.21
+            0.12,
+            0.15
          ],
          "hullboost": [
            -0.05,
            -0.05
          ],
          "kinres": [
-            0.144,
-            0.18
+            0.12,
+            0.15
          ],
          "mass": [
            -0.45,
@@ -247,11 +247,11 @@
        "features": {
          "explres": [
            0,
-            0.168
+            0.12
          ],
          "kinres": [
-            -0.05,
-            -0.05
+            -0.04,
+            -0.04
          ],
          "thermres": [
            -0.04,
@@ -267,12 +267,12 @@
        },
        "features": {
          "explres": [
-            0.168,
-            0.266
+            0.12,
+            0.19
          ],
          "kinres": [
-            -0.07,
-            -0.07
+            -0.06,
+            -0.06
          ],
          "thermres": [
            -0.06,
@@ -288,12 +288,12 @@
        },
        "features": {
          "explres": [
-            0.366,
-            0.364
+            0.19,
+            0.26
          ],
          "kinres": [
-            -0.1,
-            -0.1
+            -0.08,
+            -0.08
          ],
          "thermres": [
            -0.08,
@@ -310,12 +310,12 @@
        },
        "features": {
          "explres": [
-            0.364,
-            0.462
+            0.26,
+            0.33
          ],
          "kinres": [
-            -0.12,
-            -0.12
+            -0.1,
+            -0.1
          ],
          "thermres": [
            -0.1,
@@ -332,12 +332,12 @@
        },
        "features": {
          "explres": [
-            0.462,
-            0.56
+            0.33,
+            0.40
          ],
          "kinres": [
-            -0.14,
-            -0.14
+            -0.12,
+            -0.12
          ],
          "thermres": [
            -0.12,
@@ -364,7 +364,7 @@
        "features": {
          "explres": [
            0,
-            0.014
+            0.01
          ],
          "hullboost": [
            0,
@@ -372,7 +372,7 @@
          ],
          "kinres": [
            0,
-            0.012
+            0.01
          ],
          "mass": [
            0.1,
@@ -392,16 +392,16 @@
        },
        "features": {
          "explres": [
-            0.014,
-            0.028
+            0.01,
+            0.02
          ],
          "hullboost": [
            0.12,
            0.17
          ],
          "kinres": [
-            0.012,
-            0.024
+            0.01,
+            0.02
          ],
          "mass": [
            0.15,
@@ -422,16 +422,16 @@
        },
        "features": {
          "explres": [
-            0.028,
-            0.042
+            0.02,
+            0.03
          ],
          "hullboost": [
            0.17,
            0.22
          ],
          "kinres": [
-            0.024,
-            0.036
+            0.02,
+            0.03
          ],
          "mass": [
            0.2,
@@ -452,16 +452,16 @@
        },
        "features": {
          "explres": [
-            0.042,
-            0.056
+            0.03,
+            0.04
          ],
          "hullboost": [
            0.22,
            0.27
          ],
          "kinres": [
-            0.036,
-            0.048
+            0.03,
+            0.04
          ],
          "mass": [
            0.25,
@@ -482,16 +482,16 @@
        },
        "features": {
          "explres": [
-            0.056,
-            0.07
+            0.04,
+            0.05
          ],
          "hullboost": [
            0.27,
            0.32
          ],
          "kinres": [
-            0.048,
-            0.06
+            0.04,
+            0.05
          ],
          "mass": [
            0.3,
@@ -521,12 +521,12 @@
        },
        "features": {
          "explres": [
-            -0.06,
-            -0.06
+            -0.04,
+            -0.04
          ],
          "kinres": [
            0,
-            0.144
+            0.12
          ],
          "thermres": [
            -0.04,
@@ -542,12 +542,12 @@
        },
        "features": {
          "explres": [
-            -0.08,
-            -0.08
+            -0.06,
+            -0.06
          ],
          "kinres": [
-            0.144,
-            0.228
+            0.12,
+            0.19
          ],
          "thermres": [
            -0.06,
@@ -564,12 +564,12 @@
        },
        "features": {
          "explres": [
-            -0.11,
-            -0.11
+            -0.08,
+            -0.08
          ],
          "kinres": [
-            0.228,
-            0.312
+            0.19,
+            0.26
          ],
          "thermres": [
            -0.08,
@@ -586,12 +586,12 @@
        },
        "features": {
          "explres": [
-            -0.14,
-            -0.14
+            -0.1,
+            -0.1
          ],
          "kinres": [
-            0.312,
-            0.396
+            0.26,
+            0.33
          ],
          "thermres": [
            -0.1,
@@ -608,12 +608,12 @@
        },
        "features": {
          "explres": [
-            -0.17,
-            -0.17
+            -0.12,
+            -0.12
          ],
          "kinres": [
-            0.396,
-            0.48
+            0.33,
+            0.40
          ],
          "thermres": [
            -0.12,
@@ -639,12 +639,12 @@
        },
        "features": {
          "explres": [
-            -0.06,
-            -0.06
+            -0.04,
+            -0.04
          ],
          "kinres": [
-            -0.05,
-            -0.05
+            -0.04,
+            -0.04
          ],
          "thermres": [
            0,
@@ -660,12 +660,12 @@
        },
        "features": {
          "explres": [
-            -0.08,
-            -0.08
+            -0.06,
+            -0.06
          ],
          "kinres": [
-            -0.07,
-            -0.07
+            -0.06,
+            -0.06
          ],
          "thermres": [
            0.12,
@@ -682,12 +682,12 @@
        },
        "features": {
          "explres": [
-            -0.11,
-            -0.11
+            -0.08,
+            -0.08
          ],
          "kinres": [
-            -0.1,
-            -0.1
+            -0.08,
+            -0.08
          ],
          "thermres": [
            0.19,
@@ -704,12 +704,12 @@
        },
        "features": {
          "explres": [
-            -0.14,
-            -0.14
+            -0.1,
+            -0.1
          ],
          "kinres": [
-            -0.12,
-            -0.12
+            -0.1,
+            -0.1
          ],
          "thermres": [
            0.26,
@@ -726,12 +726,12 @@
        },
        "features": {
          "explres": [
-            -0.17,
-            -0.17
+            -0.12,
+            -0.12
          ],
          "kinres": [
-            -0.14,
-            -0.14
+            -0.12,
+            -0.12
          ],
          "thermres": [
            0.33,
@@ -4111,7 +4111,7 @@
        "features": {
          "explres": [
            0,
-            0.117
+            0.12
          ],
          "hullreinforcement": [
            0,
@@ -4135,8 +4135,8 @@
        },
        "features": {
          "explres": [
-            0.117,
-            0.185
+            0.12,
+            0.19
          ],
          "hullreinforcement": [
            0.03,
@@ -4161,8 +4161,8 @@
        },
        "features": {
          "explres": [
-            0.185,
-            0.254
+            0.19,
+            0.26
          ],
          "hullreinforcement": [
            0.06,
@@ -4187,8 +4187,8 @@
        },
        "features": {
          "explres": [
-            0.254,
-            0.322
+            0.26,
+            0.33
          ],
          "hullreinforcement": [
            0.09,
@@ -4213,8 +4213,8 @@
        },
        "features": {
          "explres": [
-            0.322,
-            0.39
+            0.33,
+            0.40
          ],
          "hullreinforcement": [
            0.12,
@@ -4417,7 +4417,7 @@
          ],
          "kinres": [
            0,
-            0.117
+            0.12
          ],
          "thermres": [
            -0.02,
@@ -4441,8 +4441,8 @@
            0.06
          ],
          "kinres": [
-            0.117,
-            0.185
+            0.12,
+            0.19
          ],
          "thermres": [
            -0.04,
@@ -4467,8 +4467,8 @@
            0.09
          ],
          "kinres": [
-            0.185,
-            0.254
+            0.19,
+            0.26
          ],
          "thermres": [
            -0.06,
@@ -4493,8 +4493,8 @@
            0.12
          ],
          "kinres": [
-            0.254,
-            0.322
+            0.26,
+            0.33
          ],
          "thermres": [
            -0.08,
@@ -4519,8 +4519,8 @@
            0.15
          ],
          "kinres": [
-            0.322,
-            0.29
+            0.33,
+            0.4
          ],
          "thermres": [
            -0.1,
@@ -4560,7 +4560,7 @@
          ],
          "thermres": [
            0,
-            0.117
+            0.12
          ]
        },
        "uuid": "cc3d62d5-9769-480d-9e37-620c61a276ab"
@@ -4584,8 +4584,8 @@
            -0.04
          ],
          "thermres": [
-            0.117,
-            0.185
+            0.12,
+            0.19
          ]
        },
        "uuid": "e4aa2331-7dc5-479c-9959-d90f0e473da9"
@@ -4610,8 +4610,8 @@
            -0.06
          ],
          "thermres": [
-            0.185,
-            0.254
+            0.19,
+            0.26
          ]
        },
        "uuid": "29f49ae9-e241-4791-a9e3-bfdccd6cdfbb"
@@ -4636,8 +4636,8 @@
            -0.08
          ],
          "thermres": [
-            0.254,
-            0.322
+            0.26,
+            0.33
          ]
        },
        "uuid": "19e30f32-a789-4acf-8f69-f97677ace963"
@@ -4662,8 +4662,8 @@
            -0.1
          ],
          "thermres": [
-            0.322,
-            0.39
+            0.33,
+            0.4
          ]
        },
        "uuid": "e6151657-1317-4aec-9e49-2d7e7a093d74"
@@ -9868,11 +9868,11 @@
          ],
          "kinres": [
            0,
-            0.06
+            0.1
          ],
          "thermres": [
-            -0.04,
-            -0.04
+            -0.03,
+            -0.03
          ]
        },
        "uuid": "df87f0c1-bd60-4e18-8a03-76063d635235"
@@ -9888,12 +9888,12 @@
            0.25
          ],
          "kinres": [
-            0.06,
-            0.12
+            0.1,
+            0.2
          ],
          "thermres": [
-            -0.07,
-            -0.07
+            -0.06,
+            -0.06
          ]
        },
        "uuid": "b67f86a0-866c-4233-9cd3-f5ea87a572eb"
@@ -9910,12 +9910,12 @@
            0.3
          ],
          "kinres": [
-            0.12,
-            0.18
+            0.2,
+            0.3
          ],
          "thermres": [
-            -0.11,
-            -0.11
+            -0.09,
+            -0.09
          ]
        },
        "uuid": "93979fd6-d135-4221-9a60-c9354e02619f"
@@ -9932,12 +9932,12 @@
            0.35
          ],
          "kinres": [
-            0.18,
-            0.24
+            0.3,
+            0.4
          ],
          "thermres": [
-            -0.14,
-            -0.14
+            -0.12,
+            -0.12
          ]
        },
        "uuid": "0e14c801-fd35-4bca-b97b-24da20d8c716"
@@ -9954,12 +9954,12 @@
            0.4
          ],
          "kinres": [
-            0.18,
-            0.3
+            0.4,
+            0.5
          ],
          "thermres": [
-            -0.18,
-            -0.18
+            -0.15,
+            -0.15
          ]
        },
        "uuid": "dfdb4767-78e1-4e5f-ae1a-aeb6ae2748c9"
@@ -10148,11 +10148,11 @@
          ],
          "explres": [
            0,
-            0.0225
+            0.045
          ],
          "kinres": [
            0,
-            0.027
+            0.045
          ],
          "optmul": [
            0,
@@ -10160,7 +10160,7 @@
          ],
          "thermres": [
            0,
-            0.054
+            0.045
          ]
        },
        "uuid": "47ad77c0-e49b-44e5-9824-4074b63db369"
@@ -10180,20 +10180,20 @@
            0.06
          ],
          "explres": [
-            0.0225,
-            0.0375
+            0.045,
+            0.075
          ],
          "kinres": [
-            0.027,
-            0.045
+            0.045,
+            0.075
          ],
          "optmul": [
            0.14,
            0.2
          ],
          "thermres": [
-            0.054,
-            0.09
+            0.045,
+            0.075
          ]
        },
        "uuid": "823f8f82-745d-4051-8f35-4e38a561932e"
@@ -10214,20 +10214,20 @@
            0.08
          ],
          "explres": [
-            0.0375,
-            0.0525
+            0.075,
+            0.105
          ],
          "kinres": [
-            0.045,
-            0.063
+            0.075,
+            0.105
          ],
          "optmul": [
            0.2,
            0.26
          ],
          "thermres": [
-            0.09,
-            0.126
+            0.075,
+            0.105
          ]
        },
        "uuid": "a1a29713-f2e5-4e15-a913-e01dc065f99f"
@@ -10248,20 +10248,20 @@
            0.1
          ],
          "explres": [
-            0.0525,
-            0.0675
+            0.105,
+            0.135
          ],
          "kinres": [
-            0.063,
-            0.081
+            0.105,
+            0.135
          ],
          "optmul": [
            0.26,
            0.32
          ],
          "thermres": [
-            0.126,
-            0.162
+            0.105,
+            0.135
          ]
        },
        "uuid": "87ac1315-7904-48f6-a5fe-f044be546490"
@@ -10282,20 +10282,20 @@
            0.12
          ],
          "explres": [
-            0.0675,
-            0.0825
+            0.135,
+            0.165
          ],
          "kinres": [
-            0.081,
-            0.099
+            0.135,
+            0.165
          ],
          "optmul": [
            0.32,
            0.38
          ],
          "thermres": [
-            0.162,
-            0.198
+            0.135,
+            0.165
          ]
        },
        "uuid": "1d9af376-c7c9-4b1a-9bc9-e77b4025e328"
@@ -10321,12 +10321,12 @@
            0.2
          ],
          "kinres": [
-            -0.02,
-            -0.02
+            -0.04,
+            -0.04
          ],
          "thermres": [
            0,
-            0.12
+            0.1
          ]
        },
        "uuid": "ef5a3026-0777-4715-a1f4-5c65eff85b12"
@@ -10342,12 +10342,12 @@
            0.25
          ],
          "kinres": [
-            -0.05,
-            -0.05
+            -0.08,
+            -0.08
          ],
          "thermres": [
-            0.12,
-            0.24
+            0.1,
+            0.2
          ]
        },
        "uuid": "54e6e07a-3281-41aa-afa0-bbf292131c0f"
@@ -10364,12 +10364,12 @@
            0.3
          ],
          "kinres": [
-            -0.07,
-            -0.07
+            -0.12,
+            -0.12
          ],
          "thermres": [
-            0.24,
-            0.36
+            0.2,
+            0.3
          ]
        },
        "uuid": "307935bf-60d3-4887-b449-24d712518154"
@@ -10386,12 +10386,12 @@
            0.35
          ],
          "kinres": [
-            -0.1,
-            -0.1
+            -0.16,
+            -0.16
          ],
          "thermres": [
-            0.36,
-            0.48
+            0.3,
+            0.4
          ]
        },
        "uuid": "ef6a4d70-9996-4db8-ae22-7c61c3dcaf74"
@@ -10408,12 +10408,12 @@
            0.4
          ],
          "kinres": [
-            -0.12,
-            -0.12
+            -0.20,
+            -0.20
          ],
          "thermres": [
-            0.48,
-            0.6
+            0.4,
+            0.5
          ]
        },
        "uuid": "f14e779f-d09a-47e4-8f4e-89c85b730f6b"
@@ -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"
  }
-}
+}
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -249,9 +249,7 @@
    "reload": 0.5
  },
  "special_thermal_cascade": {},
-  "special_thermal_conduit": {
-    "damage": -0.2
-  },
+  "special_thermal_conduit": {},
  "special_thermal_vent": {},
  "special_thermalshock": {
    "damage": -0.2
@@ -265,9 +263,9 @@
  "special_shield_regenerative": {
    "brokenregen": 0.15,
    "regen": 0.15,
-    "thermres": -1,
-    "kinres": -1,
-    "explres": -1
+    "thermres": -1.5,
+    "kinres": -1.5,
+    "explres": -1.5
  },
  "special_shield_resistive": {
    "thermres": 3,
@@ -398,7 +396,7 @@
  },
  "special_weapon_rateoffire": {
    "power": 0.05,
-    "rof": -0.03
+    "rof": 0.03
  },
  "special_weapon_efficient": {
    "power": -0.1
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -3617,7 +3617,7 @@
          }
        }
      },
-      "Weapon_Overcharged": {
+      "PA_Overcharged": {
        "grades": {
          "1": {
            "engineers": [
--- a/modules/hardpoints/ax_missile_rack.json
+++ b/modules/hardpoints/ax_missile_rack.json
@@ -10,7 +10,8 @@
      "cost": 540900,
      "damage": 64,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "E": 1
      },
      "distdraw": 0.14,
      "edID": 128788699,
@@ -41,7 +42,8 @@
      "cost": 2022700,
      "damage": 50,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "E": 1
      },
      "distdraw": 0.08,
      "edID": 128788704,
@@ -72,7 +74,8 @@
      "cost": 1352250,
      "damage": 64,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "E": 1
      },
      "distdraw": 0.24,
      "edID": 128788700,
@@ -103,7 +106,8 @@
      "cost": 4056750,
      "damage": 64,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "E": 1
      },
      "distdraw": 0.14,
      "edID": 128788705,
@@ -125,4 +129,4 @@
      "symbol": "Hpt_ATDumbfireMissile_Turret_Large"
    }
  ]
-}
+}
--- a/modules/hardpoints/ax_multi_cannon.json
+++ b/modules/hardpoints/ax_multi_cannon.json
@@ -10,7 +10,8 @@
      "cost": 379000,
      "damage": 3.3,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "K": 1
      },
      "distdraw": 0.11,
      "edID": 128788701,
@@ -41,7 +42,8 @@
      "cost": 1826500,
      "damage": 1.7,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "K": 1
      },
      "distdraw": 0.06,
      "edID": 128793059,
@@ -72,7 +74,8 @@
      "cost": 1181500,
      "damage": 6.1,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "K": 1
      },
      "distdraw": 0.18,
      "edID": 128788702,
@@ -103,7 +106,8 @@
      "cost": 3821600,
      "damage": 3.3,
      "damagedist": {
-        "X": 1
+        "X": 1,
+        "K": 1
      },
      "distdraw": 0.06,
      "edID": 128793060,
@@ -125,4 +129,4 @@
      "symbol": "Hpt_ATMultiCannon_Turret_Large"
    }
  ]
-}
+}
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -106,14 +106,14 @@
      "grp": "ul",
      "id": "cy",
      "integrity": 40,
-      "jitter": 3.5,
+      "jitter": 1.7,
      "mass": 2,
      "mount": "F",
      "name": "Cytoscrambler",
      "piercing": 1,
      "power": 0.8,
      "pp": "Archon Delaine",
-      "range": 3000,
+      "range": 1000,
      "rating": "F",
      "rof": 7.6,
      "thermload": 0.3,
@@ -352,4 +352,4 @@
      "symbol": "Hpt_PulseLaserBurst_Gimbal_Huge"
    }
  ]
-}
+}
--- a/modules/hardpoints/guardian_plasma_charger.json
+++ b/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,
--- a/modules/hardpoints/missile_rack.json
+++ b/modules/hardpoints/missile_rack.json
@@ -3,8 +3,8 @@
    {
      "ammo": 16,
      "breachdmg": 20,
-      "breachmax": 0,
-      "breachmin": 0,
+      "breachmax": 1,
+      "breachmin": 1,
      "class": 1,
      "clip": 8,
      "cost": 32180,
@@ -63,8 +63,8 @@
    {
      "ammo": 48,
      "breachdmg": 20,
-      "breachmax": 0,
-      "breachmin": 0,
+      "breachmax": 1,
+      "breachmin": 1,
      "class": 2,
      "clip": 12,
      "cost": 240400,
@@ -127,8 +127,8 @@
    {
      "ammo": 48,
      "breachdmg": 16,
-      "breachmax": 0,
-      "breachmin": 0,
+      "breachmax": 1,
+      "breachmin": 1,
      "class": 2,
      "clip": 12,
      "cost": 1951040,
@@ -205,7 +205,7 @@
      },
      "distdraw": 0.24,
      "edID": 0,
-      "eddbID": 0,
+      "eddbID": 1657,
      "grp": "mr",
      "id": "yI",
      "integrity": 64,
@@ -234,8 +234,8 @@
        "E": 1
      },
      "distdraw": 0.24,
-      "edID": 0,
-      "eddbID": 0,
+      "edID": 128049494,
+      "eddbID": 1656,
      "grp": "mr",
      "id": "yJ",
      "integrity": 64,
@@ -252,4 +252,4 @@
      "symbol": "Hpt_BasicMissileRack_Fixed_Large"
    }
  ]
-}
+}
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -294,8 +294,8 @@
        "K": 1
      },
      "distdraw": 0.16,
-      "edID": 0,
-      "eddbID": 0,
+      "edID": 128049464,
+      "eddbID": 1658,
      "falloff": 2000,
      "grp": "mc",
      "id": "yH",
--- a/modules/hardpoints/torpedo_pylon.json
+++ b/modules/hardpoints/torpedo_pylon.json
@@ -73,8 +73,8 @@
        "E": 1
      },
      "distdraw": 0,
-      "edID": 0,
-      "eddbID": 0,
+      "edID": 128049511,
+      "eddbID": 1655,
      "grp": "tp",
      "id": "yK",
      "integrity": 64,
@@ -91,4 +91,4 @@
      "symbol": "Hpt_AdvancedTorpPylon_Fixed_Large"
    }
  ]
-}
+}
--- a/modules/index.js
+++ b/modules/index.js
@@ -66,7 +66,6 @@ module.exports = {
    pcm: require('./internal/first_passenger_cabin').pcm,
    pcq: require('./internal/luxury_passenger_cabin').pcq,
    rf: require('./internal/refinery').rf,
-    sc: require('./internal/scanner').sc,
    scb: require('./internal/shield_cell_bank').scb,
    sg: require('./internal/shield_generator').sg,
    ss: require('./internal/surface_scanner').ss,
--- a/modules/internal/decontamination_limpet_controller.json
+++ b/modules/internal/decontamination_limpet_controller.json
@@ -4,7 +4,7 @@
      "class": 1,
      "cost": 3600,
      "edID": 128793941,
-      "eddbID": 0,
+      "eddbID": 1632,
      "grp": "dtl",
      "id": "y1",
      "mass": 1.3,
@@ -18,7 +18,7 @@
      "class": 3,
      "cost": 16201,
      "edID": 128793942,
-      "eddbID": 0,
+      "eddbID": 1633,
      "grp": "dtl",
      "id": "y2",
      "mass": 2,
@@ -32,7 +32,7 @@
      "class": 5,
      "cost": 145801,
      "edID": 128793943,
-      "eddbID": 0,
+      "eddbID": 1634,
      "grp": "dtl",
      "id": "y3",
      "mass": 20,
@@ -46,7 +46,7 @@
      "class": 7,
      "cost": 1312201,
      "edID": 128793944,
-      "eddbID": 0,
+      "eddbID": 1635,
      "grp": "dtl",
      "id": "y4",
      "mass": 128,
--- a/modules/internal/scanner.json
+++ b/modules/internal/scanner.json
@@ -1,49 +0,0 @@
-{
-  "sc": [
-    {
-      "class": 1,
-      "cost": 1545000,
-      "edID": 128663561,
-      "eddbID": 1244,
-      "grp": "sc",
-      "id": "2f",
-      "integrity": 40,
-      "mass": 2,
-      "name": "Advanced Discovery Scanner",
-      "power": 0,
-      "rangeLS": null,
-      "rating": "C",
-      "symbol": "Int_StellarBodyDiscoveryScanner_Advanced"
-    },
-    {
-      "class": 1,
-      "cost": 505000,
-      "edID": 128663560,
-      "eddbID": 1243,
-      "grp": "sc",
-      "id": "2g",
-      "integrity": 40,
-      "mass": 2,
-      "name": "Intermediate Discovery Scanner",
-      "power": 0,
-      "rangeLS": 1000,
-      "rating": "D",
-      "symbol": "Int_StellarBodyDiscoveryScanner_Intermediate"
-    },
-    {
-      "class": 1,
-      "cost": 1000,
-      "edID": 128662535,
-      "eddbID": 1242,
-      "grp": "sc",
-      "id": "2h",
-      "integrity": 40,
-      "mass": 2,
-      "name": "Basic Discovery Scanner",
-      "power": 0,
-      "rangeLS": 500,
-      "rating": "E",
-      "symbol": "Int_StellarBodyDiscoveryScanner_Standard"
-    }
-  ]
-}
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
    "jasmine": "jasmine-node spec",
    "jasmine-no-stack": "jasmine-node --noStack spec",
    "test": "npm run lint && npm run jasmine-no-stack",
-    "start": "node generate_distribution.js"
+    "start": "node generate_distribution.js",
+    "build": "node generate_distribution.js"
  },
  "devDependencies": {
    "eslint": "^2.2.0",
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -10,6 +10,7 @@
      "speed": 220,
      "boost": 320,
      "boostEnergy": 9,
+      "heatCapacity": 170,
      "baseShieldStrength": 60,
      "baseArmour": 90,
      "hardness": 35,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["3E", "3E", "3E", "1E", "2E", "3E", "3C"],
      "hardpoints": [0, 17, 17, 0, 0],
-      "internal": ["01", "44", "00", 0, "2h"]
+      "internal": ["01", "44", "00", 0, ""]
    }
  }
 }
--- a/ships/alliance_challenger.json
+++ b/ships/alliance_challenger.json
@@ -7,9 +7,10 @@
      "manufacturer": "Lakon",
      "class": 2,
      "hullCost": 28041035,
-      "speed": 130,
+      "speed": 204,
      "boost": 310,
      "boostEnergy": 19,
+      "heatCapacity": 316,
      "baseShieldStrength": 220,
      "baseArmour": 300,
      "hardness": 65,
@@ -26,11 +27,11 @@
      "horizons": true
    },
    "bulkheads": [
-      { "id": "0K", "edID": 128816590, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "0P", "edID": 128816591, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "0Q", "edID": 128816592, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "0R", "edID": 128816593, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "0S", "edID": 128816594, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "0K", "edID": 128816590, "eddbID": 1650, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "0P", "edID": 128816591, "eddbID": 1651, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "0Q", "edID": 128816592, "eddbID": 1652, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "0R", "edID": 128816593, "eddbID": 1653, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "0S", "edID": 128816594, "eddbID": 1654, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
    ],
    "slots": {
      "standard": [6, 6, 5, 5, 6, 4, 4],
@@ -44,7 +45,7 @@
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "4h", "01", "01", "2h", "", "", "", ""]
+      "internal": ["04", "4h", "01", "01", "", "", "", "", ""]
    }
  }
 }
--- a/ships/alliance_chieftain.json
+++ b/ships/alliance_chieftain.json
@@ -11,6 +11,7 @@
      "boost": 330,
      "boostEnergy": 19,
      "baseShieldStrength": 200,
+      "heatCapacity": 289,
      "baseArmour": 280,
      "hardness": 65,
      "hullMass": 400,
@@ -44,7 +45,7 @@
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "4e", "02", "", "2h", "", "", ""]
+      "internal": ["04", "4e", "02", "", "", "", "", ""]
    }
  }
 }
--- a/ships/alliance_crusader.json
+++ b/ships/alliance_crusader.json
@@ -1,7 +1,7 @@
 {
  "alliance_crusader": {
    "edID": 128816581,
-    "eddbID": 0,
+    "eddbID": 36,
    "properties": {
      "name": "Alliance Crusader",
      "manufacturer": "Lakon",
@@ -12,6 +12,7 @@
      "boostEnergy": 19,
      "baseShieldStrength": 200,
      "baseArmour": 300,
+      "heatCapacity": 316,
      "hardness": 65,
      "hullMass": 500,
 	  "masslock": 13,
@@ -27,11 +28,11 @@
      "horizons": true
    },
    "bulkheads": [
-      { "id": "CI", "edID": 128816583, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "CJ", "edID": 128816584, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "CK", "edID": 128816585, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "CL", "edID": 128816586, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "CM", "edID": 128816587, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "CI", "edID": 128816583, "eddbID": 1659, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "CJ", "edID": 128816584, "eddbID": 1660, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "CK", "edID": 128816585, "eddbID": 1661, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "CL", "edID": 128816586, "eddbID": 1662, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "CM", "edID": 128816587, "eddbID": 1663, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
    ],
    "slots": {
      "standard": [6, 6, 5, 5, 6, 4, 4],
@@ -45,7 +46,7 @@
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "4e", "02", "", "2h", "", "", ""]
+      "internal": ["04", "4e", "02", "", "", "", "", ""]
    }
  }
 }
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -12,6 +12,7 @@
      "boostEnergy": 27,
      "baseShieldStrength": 350,
      "baseArmour": 525,
+      "heatCapacity": 334,
      "hardness": 65,
      "hullMass": 400,
      "masslock": 23,
@@ -42,7 +43,7 @@
    "defaults": {
      "standard": ["8E", "7E", "6E", "5E", "8E", "8E", "5C"],
      "hardpoints": [0, 0, 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, "2h", "00"]
+      "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, 0, "", "00"]
    }
  }
 }
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -11,6 +11,7 @@
      "boost": 340,
      "boostEnergy": 13,
      "baseShieldStrength": 140,
+      "heatCapacity": 272,
      "baseArmour": 210,
      "hardness": 52,
      "hullMass": 280,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["5E", "5E", "5E", "4E", "4E", "5E", "5C"],
      "hardpoints": [0, 0, 17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "4e", "01", 0, 0, "00", "2h"]
+      "internal": ["04", "4e", "01", 0, 0, "00", ""]
    }
  }
 }
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -11,6 +11,7 @@
      "boost": 300,
      "boostEnergy": 13,
      "baseShieldStrength": 120,
+      "heatCapacity": 210,
      "baseArmour": 180,
      "hardness": 52,
      "hullMass": 150,
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -11,6 +11,7 @@
      "boost": 280,
      "boostEnergy": 19,
      "baseShieldStrength": 280,
+      "heatCapacity": 283,
      "baseArmour": 280,
      "hardness": 60,
      "hullMass": 950,
@@ -38,18 +39,16 @@
      "standard": [6, 7, 7, 8, 6, 5, 7],
      "hardpoints": [2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0],
      "internal": [
-        6, 6,
-        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+		6, 6,
+		6, 6,
+        5, 5,
        4, 3, 3, 3, 3
      ]
    },
    "defaults": {
      "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"],
      "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, "2h"]
+      "internal": ["4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, ""]
    }
  }
 }
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -12,6 +12,7 @@
      "boostEnergy": 10,
      "baseShieldStrength": 80,
      "baseArmour": 120,
+      "heatCapacity": 225,
      "hardness": 35,
      "hullMass": 180,
      "masslock": 8,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["4E", "4E", "4E", "3E", "3E", "3E", "4C"],
      "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["02", "02", "49", "00", 0, "2h"]
+      "internal": ["02", "02", "49", "00", 0, ""]
    }
  }
 }
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -11,6 +11,7 @@
      "boost": 300,
      "boostEnergy": 10,
      "baseShieldStrength": 120,
+      "heatCapacity": 228,
      "baseArmour": 120,
      "hardness": 35,
      "hullMass": 210,
@@ -40,7 +41,7 @@
    "defaults": {
      "standard": ["4E", "4E", "4E", "3E", "3E", "3E", "4C"],
      "hardpoints": [17, 17, 0, 0, 0, 0, 0 ],
-      "internal": ["02", "02", "49", 0, 0, 0, "00", "2h"]
+      "internal": ["02", "02", "49", 0, 0, 0, "00", ""]
    }
  }
 }
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -13,6 +13,7 @@
      "baseShieldStrength": 150,
      "baseArmour": 150,
      "hardness": 42,
+      "heatCapacity": 351,
      "hullMass": 260,
      "masslock": 10,
      "pipSpeed": 0.098214285714286,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["4E", "4E", "5E", "3E", "4E", "3E", "5C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["49", "02", "01", 0, "2h", 0]
+      "internal": ["49", "02", "01", 0, "", 0]
    }
  }
 }
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -13,6 +13,7 @@
      "baseShieldStrength": 120,
      "baseArmour": 120,
      "hardness": 40,
+      "heatCapacity": 346,
      "hullMass": 170,
      "masslock": 8,
      "pipSpeed": 0.096153846153846,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["4E", "4E", "4E", "2E", "3E", "2E", "4C"],
      "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["44", 0, 0, "2h"]
+      "internal": ["44", 0, 0, ""]
    }
  }
 }
--- a/ships/dolphin.json
+++ b/ships/dolphin.json
@@ -14,6 +14,7 @@
      "baseArmour": 110,
      "hardness": 35,
      "hullMass": 140,
+      "heatCapacity": 165,
      "masslock": 9,
      "pipSpeed": 0.13,
      "luxuryCabins": true,
@@ -37,14 +38,13 @@
      "standard": [4, 5, 4, 4, 3, 3, 4],
      "hardpoints": [1, 1, 0, 0, 0],
      "internal": [
-        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        4, 4, 3, 2, 2, 2
+        5, 4, 4, 3, 2, 2, 2
      ]
    },
    "defaults": {
      "standard": ["4E", "5E", "4E", "4E", "3E", "3E", "4C"],
      "hardpoints": [17, 17, 0, 0, 0],
-      "internal": ["md", "02", "49", "01", "00", 0, "2h"]
+      "internal": ["md", "02", "49", "01", "00", 0, ""]
    }
  }
 }
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -14,6 +14,7 @@
      "baseArmour": 40,
      "hardness": 28,
      "hullMass": 50,
+      "heatCapacity": 165,
      "masslock": 6,
      "pipSpeed": 0.0625,
      "pitch": 50,
@@ -33,7 +34,7 @@
      "standard": [2, 3, 3, 1, 2, 2, 2],
      "hardpoints": [1, 1, 1, 0],
      "internal": [
-        3, 2, 
+        3, 2,
        { "class": 2, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
        1, 1
      ]
@@ -41,7 +42,7 @@
    "defaults": {
      "standard": ["2E", "3E", "3E", "1E", "2E", "2E", "2C"],
      "hardpoints": [17, 17, 0, 0],
-      "internal": ["44", "00", 0, "2h", 0]
+      "internal": ["44", "00", 0, "", 0]
    }
  }
 }
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -14,6 +14,7 @@
      "baseArmour": 300,
      "hardness": 60,
      "hullMass": 480,
+      "heatCapacity": 286,
      "masslock": 14,
      "pipSpeed": 0.071428571428571,
      "pitch": 38,
@@ -36,7 +37,7 @@
      "standard": [6, 6, 5, 5, 6, 4, 4],
      "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
      "internal": [
-        5, 5, 4, 
+        5, 5, 4,
        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
        { "class": 4, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
        3, 2, 2
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -15,6 +15,7 @@
      "hardness": 70,
      "hullMass": 900,
      "masslock": 24,
+      "heatCapacity": 333,
      "pipSpeed": 0.125,
      "fighterHangars": true,
      "pitch": 28,
@@ -46,7 +47,7 @@
    "defaults": {
      "standard": ["8E", "7E" ,"6E", "5E", "8E", "8E", "5C"],
      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4o", "05", 0, 0, 0, 0, 0, 0, 0, "02", "01", "2h"]
+      "internal": ["4o", "05", 0, 0, 0, 0, 0, 0, 0, "02", "01", ""]
    }
  }
 }
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -14,6 +14,7 @@
      "baseArmour": 300,
      "hardness": 60,
      "hullMass": 580,
+      "heatCapacity": 331,
      "masslock": 14,
      "pipSpeed": 0.11111111111111,
      "pitch": 30,
@@ -45,7 +46,7 @@
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "03", "4e", "02", 0, 0, 0, 0, "2h"]
+      "internal": ["04", "03", "4e", "02", 0, 0, 0, 0, ""]
    }
  }
 }
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -14,6 +14,7 @@
      "baseArmour": 350,
      "hardness": 60,
      "hullMass": 580,
+      "heatCapacity": 325,
      "masslock": 14,
      "pipSpeed": 0.10294117647059,
      "fighterHangars": true,
@@ -47,7 +48,7 @@
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "7E", "5E", "4C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": [0, "4j", "03", 0, 0, 0, 0, "2h"]
+      "internal": [0, "4j", "03", 0, 0, 0, 0, ""]
    }
  }
 }
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -14,6 +14,7 @@
      "baseArmour": 225,
      "hardness": 70,
      "hullMass": 250,
+      "heatCapacity": 224,
      "masslock": 12,
      "pipSpeed": 0.038461538461538,
      "pitch": 38,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["5E", "5E", "4E", "4E", "6E", "4E", "3C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["03", "49", "02", 0, "2h"]
+      "internal": ["03", "49", "02", 0, ""]
    }
  }
 }
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -13,6 +13,7 @@
      "baseShieldStrength": 50,
      "baseArmour": 100,
      "hardness": 20,
+      "heatCapacity": 123,
      "hullMass": 14,
      "masslock": 6,
      "pipSpeed": 0.1625,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["2E", "2E", "2E", "1E", "1E", "1E", "2C"],
      "hardpoints": [17, 0, 0],
-      "internal": ["01", "01", "3v", "2h"]
+      "internal": ["01", "01", "3v", ""]
    }
  }
 }
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -15,6 +15,7 @@
      "hardness": 60,
      "hullMass": 400,
      "masslock": 12,
+      "heatCapacity": 304,
      "pipSpeed": 0.1,
      "pitch": 40,
      "roll": 80,
@@ -40,7 +41,7 @@
    "defaults": {
      "standard": ["6E", "6E", "5E", "5E", "6E", "5E", "4C"],
      "hardpoints": [0, 0, 17, 17, 0, 0, 0, 0],
-      "internal": ["05", "4j", "02", 0, 0, 0, "00", "2h"]
+      "internal": ["05", "4j", "02", 0, 0, 0, "00", ""]
    }
  }
 }
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -15,6 +15,7 @@
      "hardness": 30,
      "hullMass": 35,
      "masslock": 7,
+      "heatCapacity": 230,
      "pipSpeed": 0.053571428571429,
      "pitch": 38,
      "roll": 90,
@@ -40,7 +41,7 @@
    "defaults": {
      "standard": ["4E", "3E", "3E", "1E", "3E", "2E", "3C"],
      "hardpoints": [17, 17, 0, 0, 0, 0, 0],
-      "internal": ["01", "01", "3v", "00", "00", "2h"]
+      "internal": ["01", "01", "3v", "00", "00", ""]
    }
  }
 }
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -14,6 +14,7 @@
      "baseArmour": 400,
      "hardness": 70,
      "hullMass": 1100,
+      "heatCapacity": 327,
      "masslock": 27,
      "pipSpeed": 0.05,
      "fighterHangars": true,
@@ -46,7 +47,7 @@
    "defaults": {
      "standard": ["8E", "8E", "7E", "7E", "7E", "7E", "6C"],
      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4t", "06", "04", 0, 0, 0, 0, 0, 0, "01", "2h"]
+      "internal": ["4t", "06", "04", 0, 0, 0, 0, 0, 0, "01", ""]
    }
  }
 }
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -13,6 +13,7 @@
      "baseShieldStrength": 80,
      "baseArmour": 60,
      "hardness": 28,
+      "heatCapacity": 163,
      "hullMass": 50,
      "masslock": 6,
      "pipSpeed": 0.075,
@@ -33,7 +34,7 @@
      "standard": [3, 3, 3, 1, 2, 2, 2],
      "hardpoints": [2, 1, 1, 0],
      "internal": [
-        3, 2, 
+        3, 2,
        { "class": 2, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
        1, 1
      ]
@@ -41,7 +42,7 @@
    "defaults": {
      "standard": ["3E", "3E", "3E", "1E", "2E", "2E", "2C"],
      "hardpoints": [0, 17, 17, 0],
-      "internal": ["44", "00", 0, "2h", 0]
+      "internal": ["44", "00", 0, "", 0]
    }
  }
 }
--- a/ships/index.js
+++ b/ships/index.js
@@ -25,7 +25,9 @@ module.exports = {
  imperial_eagle: require('./imperial_eagle').imperial_eagle,
  keelback: require('./keelback').keelback,
  krait_mkii: require('./krait_mkii').krait_mkii,
+  krait_phantom: require('./krait_phantom').krait_phantom,
  orca: require('./orca').orca,
+  mamba: require('./mamba').mamba,
  python: require('./python').python,
  sidewinder: require('./sidewinder').sidewinder,
  type_6_transporter: require('./type_6_transporter').type_6_transporter,
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -13,6 +13,7 @@
      "baseShieldStrength": 135,
      "baseArmour": 270,
      "hardness": 45,
+      "heatCapacity": 215,
      "hullMass": 180,
      "masslock": 8,
      "pipSpeed": 0.1375,
@@ -38,7 +39,7 @@
    "defaults": {
      "standard": ["4E", "4E", "4E", "1E", "3E", "2E", "4C"],
      "hardpoints": [0, 0, 17, 17, 0, 0, 0],
-      "internal": ["03", "03", "02", "44" ,"00", "2h"]
+      "internal": ["03", "03", "02", "44" ,"00", ""]
    }
  }
 }
--- a/ships/krait_mkii.json
+++ b/ships/krait_mkii.json
@@ -11,6 +11,7 @@
      "boost": 330,
      "boostEnergy": 13,
      "baseShieldStrength": 220,
+      "heatCapacity": 300,
      "baseArmour": 220,
      "hardness": 55,
      "hullMass": 320,
@@ -24,11 +25,11 @@
    },
    "retailCost": 45814205,
    "bulkheads": [
-      { "id": "bO", "edID": 128816569, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "bP", "edID": 128816570, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 36, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bQ", "edID": 128816571, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 67, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "bR", "edID": 128816572, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 67, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "bS", "edID": 128816573, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 67, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "2T", "edID": 128816569, "eddbID": 1645, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "2U", "edID": 128816570, "eddbID": 1646, "grp": "bh", "cost": 22791270, "mass": 36, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "2V", "edID": 128816571, "eddbID": 1647, "grp": "bh", "cost": 51280360, "mass": 67, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "2W", "edID": 128816572, "eddbID": 1648, "grp": "bh", "cost": 121192590, "mass": 67, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "2X", "edID": 128816573, "eddbID": 1649, "grp": "bh", "cost": 134297570, "mass": 67, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
    ],
    "slots": {
      "standard": [7, 6, 5, 4, 7, 6, 5],
@@ -38,7 +39,7 @@
    "defaults": {
      "standard": ["7E", "6E", "5E", "4E", "7E", "6E", "5C"],
      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0],
-      "internal": ["4h", "04", "04", "03", 0, "2h", 0, "00"]
+      "internal": ["4h", "04", "04", "03", 0, "", 0, "00"]
    }
  }
 }
--- a/ships/krait_phantom.json
+++ b/ships/krait_phantom.json
@@ -0,0 +1,104 @@
+{
+  "krait_phantom": {
+    "edID": 128839281,
+    "eddbID": 35,
+    "properties": {
+      "name": "Krait Phantom",
+      "manufacturer": "Faulcon DeLacy",
+      "class": 2,
+      "hullCost": 42409425,
+      "speed": 250,
+      "boost": 350,
+      "heatCapacity": 300,
+      "boostEnergy": 13,
+      "baseShieldStrength": 200,
+      "baseArmour": 180,
+      "hardness": 60,
+      "hullMass": 270,
+      "masslock": 17,
+      "pipSpeed": 0.09,
+      "pitch": 26,
+      "roll": 90,
+      "yaw": 10,
+      "crew": 2
+    },
+    "retailCost": 37472254,
+    "bulkheads": [
+      {
+        "id": "2T",
+        "edID": 128839283,
+        "eddbID": 1645,
+        "grp": "bh",
+        "cost": 0,
+        "mass": 0,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 0.8
+      },
+      {
+        "id": "2U",
+        "edID": 128839284,
+        "eddbID": 1646,
+        "grp": "bh",
+        "cost": 22791270,
+        "mass": 36,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 1.52
+      },
+      {
+        "id": "2V",
+        "edID": 128839285,
+        "eddbID": 1647,
+        "grp": "bh",
+        "cost": 51280360,
+        "mass": 67,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 2.5
+      },
+      {
+        "id": "2W",
+        "edID": 128839286,
+        "eddbID": 1648,
+        "grp": "bh",
+        "cost": 121192590,
+        "mass": 67,
+        "causres": 0,
+        "explres": -0.5,
+        "kinres": -0.75,
+        "thermres": 0.5,
+        "hullboost": 2.5
+      },
+      {
+        "id": "2X",
+        "edID": 128839287,
+        "eddbID": 1649,
+        "grp": "bh",
+        "cost": 134297570,
+        "mass": 67,
+        "causres": 0,
+        "explres": 0.2,
+        "kinres": 0.25,
+        "thermres": -0.4,
+        "hullboost": 2.5
+      }
+    ],
+    "slots": {
+      "standard": [7, 6, 5, 4, 7, 6, 5],
+      "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
+      "internal": [6, 5, 5, 5, 3, 3, 3, 2]
+    },
+    "defaults": {
+      "standard": ["7E", "6E", "5E", "4E", "7E", "6E", "5C"],
+      "hardpoints": [0, 0, "17", "17", 0, 0, 0, 0, 0],
+      "internal": ["4j", "04", "04", "04", 0, "", 0, "00"]
+    }
+  }
+}
--- a/ships/mamba.json
+++ b/ships/mamba.json
@@ -0,0 +1,104 @@
+{
+  "mamba": {
+    "edID": 128915979,
+    "eddbID": 11,
+    "properties": {
+      "name": "Mamba",
+      "manufacturer": "Zorgon Peterson",
+      "class": 2,
+      "hullCost": 55866341,
+      "speed": 310,
+      "boost": 380,
+      "boostEnergy": 10,
+      "baseShieldStrength": 270,
+      "heatCapacity": 165,
+      "baseArmour": 230,
+      "hardness": 65,
+      "hullMass": 250,
+      "masslock": 12,
+      "pipSpeed": 0.048387096774194,
+      "pitch": 27,
+      "roll": 80,
+      "yaw": 10,
+      "crew": 2
+    },
+    "retailCost": 55867041,
+    "bulkheads": [
+      {
+        "id": "2T",
+        "edID": 128915981,
+        "eddbID": 813,
+        "grp": "bh",
+        "cost": 0,
+        "mass": 0,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 0.8
+      },
+      {
+        "id": "2U",
+        "edID": 128915982,
+        "eddbID": 814,
+        "grp": "bh",
+        "cost": 20626820,
+        "mass": 19,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 1.52
+      },
+      {
+        "id": "2V",
+        "edID": 128915983,
+        "eddbID": 815,
+        "grp": "bh",
+        "cost": 46410340,
+        "mass": 38,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 2.5
+      },
+      {
+        "id": "2W",
+        "edID": 128915984,
+        "eddbID": 816,
+        "grp": "bh",
+        "cost": 109683090,
+        "mass": 38,
+        "causres": 0,
+        "explres": -0.5,
+        "kinres": -0.75,
+        "thermres": 0.5,
+        "hullboost": 2.5
+      },
+      {
+        "id": "2X",
+        "edID": 128915985,
+        "eddbID": 817,
+        "grp": "bh",
+        "cost": 121543510,
+        "mass": 38,
+        "causres": 0,
+        "explres": 0.2,
+        "kinres": 0.25,
+        "thermres": -0.4,
+        "hullboost": 2.5
+      }
+    ],
+    "slots": {
+      "standard": [6, 5, 4, 4, 6, 4, 3],
+      "hardpoints": [4, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0],
+      "internal": [5, 4, 3, 2, 2]
+    },
+    "defaults": {
+      "standard": ["6E", "5E", "4E", "4E", "6E", "4E", "3C"],
+      "hardpoints": [0, 0, 0, "17", "17", 0, 0, 0, 0, 0, 0],
+      "internal": ["03", "49", "01", 0, 0]
+    }
+  }
+}
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -12,6 +12,7 @@
      "boostEnergy": 16,
      "baseShieldStrength": 220,
      "baseArmour": 220,
+      "heatCapacity": 262,
      "hardness": 55,
      "hullMass": 290,
      "masslock": 16,
@@ -34,15 +35,13 @@
      "standard": [5, 6, 5, 6, 5, 4, 5],
      "hardpoints": [3, 2, 2, 0, 0, 0, 0],
      "internal": [
-        { "class": 6, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        { "class": 5, "name": "Passenger", "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
-        5, 5, 4, 3, 2, 2
+        6, 5, 5, 5, 4, 3, 2, 2
      ]
    },
    "defaults": {
      "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"],
      "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["me", "mc", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["me", "mc", "03", "4e", "02", 0, 0, ""]
    }
  }
 }
--- a/ships/python.json
+++ b/ships/python.json
@@ -12,6 +12,7 @@
      "boostEnergy": 23,
      "baseShieldStrength": 260,
      "baseArmour": 260,
+      "heatCapacity": 300,
      "hardness": 65,
      "hullMass": 350,
      "masslock": 17,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["7E", "6E", "5E", "4E", "7E", "6E", "5C"],
      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0],
-      "internal": ["04", "04", "4j", "03", 0, 0, 0, "00", "2h"]
+      "internal": ["04", "04", "4j", "03", 0, 0, 0, "00", ""]
    }
  }
 }
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -10,6 +10,7 @@
      "speed": 220,
      "boost": 320,
      "boostEnergy": 7,
+      "heatCapacity": 140,
      "baseShieldStrength": 40,
      "baseArmour": 60,
      "hardness": 20,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["2E", "2E", "2E", "1E", "1E", "1E", "1C"],
      "hardpoints": [18, 18, 0, 0],
-      "internal": ["3v", "01", "2h", 0]
+      "internal": ["3v", "01", "", 0]
    }
  }
 }
--- a/ships/type_10_defender.json
+++ b/ships/type_10_defender.json
@@ -14,6 +14,7 @@
        "baseArmour": 580,
        "hardness": 75,
        "hullMass": 1200,
+        "heatCapacity": 335,
        "masslock": 26,
        "pipSpeed": 0.041666666666667,
        "fighterHangars": true,
@@ -25,10 +26,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": "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": "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": "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": "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": 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": 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": 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],
@@ -38,7 +39,7 @@
      "defaults": {
        "standard": ["6E", "7E", "6E", "5E", "7E", "4E", "6C"],
        "hardpoints": [0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-        "internal": ["06", "05", "4j", "03", "02", 0, "01", 0, "2h", 0, 0]
+        "internal": ["06", "05", "4j", "03", "02", 0, "01", 0, "", 0, 0]
      }
    }
  }
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -9,6 +9,7 @@
      "hullCost": 865790,
      "speed": 220,
      "boost": 350,
+      "heatCapacity": 179,
      "boostEnergy": 10,
      "baseShieldStrength": 90,
      "baseArmour": 180,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["3E", "4E", "4E", "2E", "3E", "2E", "4C"],
      "hardpoints": [17, 17, 0, 0, 0],
-      "internal": ["03", "03", "02", "02", "44", "00", "2h"]
+      "internal": ["03", "03", "02", "02", "44", "00", ""]
    }
  }
 }
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -8,6 +8,7 @@
      "class": 3,
      "hullCost": 16780510,
      "speed": 180,
+      "heatCapacity": 226,
      "boost": 300,
      "boostEnergy": 10,
      "baseShieldStrength": 155,
@@ -37,7 +38,7 @@
    "defaults": {
      "standard": ["4E", "5E", "5E", "4E", "3E", "3E", "5C"],
      "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "04", "04", "03", "03", "49", 0, 0, "2h"]
+      "internal": ["04", "04", "04", "03", "03", "49", 0, 0, ""]
    }
  }
 }
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -10,6 +10,7 @@
      "speed": 130,
      "boost": 200,
      "boostEnergy": 19,
+      "heatCapacity": 289,
      "baseShieldStrength": 240,
      "baseArmour": 480,
      "hardness": 65,
@@ -38,7 +39,7 @@
    "defaults": {
      "standard": ["6E", "7E", "6E", "5E", "6E", "4E", "6C"],
      "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["06", "06", "05", "4j", "03", "02", 0, "01", 0, "2h"]
+      "internal": ["06", "06", "05", "4j", "03", "02", 0, "01", 0, ""]
    }
  }
 }
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -14,6 +14,7 @@
      "baseArmour": 70,
      "hardness": 35,
      "hullMass": 50,
+      "heatCapacity": 195,
      "masslock": 7,
      "pipSpeed": 0.09375,
      "pitch": 35,
@@ -41,7 +42,7 @@
    "defaults": {
      "standard": ["3E", "3E", "3E", "2E", "3E", "3E", "2C"],
      "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["01", "44", 0, 0, "2h"]
+      "internal": ["01", "44", 0, 0, ""]
    }
  }
 }
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -14,6 +14,7 @@
      "baseArmour": 150,
      "hardness": 35,
      "hullMass": 190,
+      "heatCapacity": 209,
      "masslock": 7,
      "pipSpeed": 0.087962962962963,
      "pitch": 30,
@@ -41,7 +42,7 @@
    "defaults": {
      "standard": ["4E", "4E", "4E", "2E", "3E", "3E", "4C"],
      "hardpoints": [0, 0, 17, 17, 0, 0],
-      "internal": ["02", "02", "44", 0, "00", 0, "2h"]
+      "internal": ["02", "02", "44", 0, "00", 0, ""]
    }
  }
 }
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -12,6 +12,7 @@
      "boostEnergy": 16,
      "baseShieldStrength": 240,
      "baseArmour": 160,
+      "heatCapacity": 237,
      "hardness": 55,
      "hullMass": 230,
      "masslock": 10,
@@ -33,7 +34,7 @@
      "standard": [4, 5, 4, 3, 5, 4, 3],
      "hardpoints": [3, 3, 0, 0, 0, 0],
      "internal": [
-        5, 
+        5,
        { "class": 5, "name": "Military", "eligible": { "mahr":1, "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
        4, 2, 1, 1
      ]
@@ -41,7 +42,7 @@
    "defaults": {
      "standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"],
      "hardpoints": [17, 17, 0, 0, 0, 0],
-      "internal": ["4e", 0, "02", 0, 0, "2h"]
+      "internal": ["4e", 0, "02", 0, 0, ""]
    }
  }
 }