From 83c8d17f75c7f741b88691e6df42f621cd017896 Mon Sep 17 00:00:00 2001
From: Sam Pullara <spullara@wavefront.com>
Date: Tue, 2 Jun 2015 19:58:59 -0700
Subject: [PATCH] add actual MJ damage values to all weapons

---
 data/components/hardpoints/beam_laser.json    | 18 ++++++++++++
 data/components/hardpoints/burst_laser.json   | 18 ++++++++++++
 data/components/hardpoints/cannon.json        | 24 ++++++++++++++-
 .../hardpoints/fragment_cannon.json           | 16 +++++++++-
 data/components/hardpoints/missile_rack.json  | 10 ++++++-
 data/components/hardpoints/multi_cannon.json  | 12 ++++++++
 .../hardpoints/plasma_accelerator.json        |  6 ++++
 data/components/hardpoints/pulse_laser.json   | 29 ++++++++++++++++++-
 data/components/hardpoints/rail_gun.json      |  4 +++
 package.json                                  |  1 +
 10 files changed, 134 insertions(+), 4 deletions(-)

diff --git a/data/components/hardpoints/beam_laser.json b/data/components/hardpoints/beam_laser.json
index 93a620e1..64092da0 100755
--- a/data/components/hardpoints/beam_laser.json
+++ b/data/components/hardpoints/beam_laser.json
@@ -14,6 +14,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 5,
+      "mjdps" : 30.33,
+      "mjeps" : 5.65,
       "thermload": 5
     },
     {
@@ -30,6 +32,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 4,
+      "mjdps" : 24.00,
+      "mjeps" : 5.59,
       "thermload": 6
     },
     {
@@ -46,6 +50,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 4,
+      "mjdps" : 14.44,
+      "mjeps" : 3.54,
       "thermload": 4
     },
     {
@@ -62,6 +68,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 4,
+      "mjdps" : 19.38,
+      "mjeps" : 3.42,
       "thermload": 4
     },
     {
@@ -78,6 +86,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 4,
+      "mjdps" : 13.85,
+      "mjeps" : 3.26,
       "thermload": 4
     },
     {
@@ -94,6 +104,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 3,
+      "mjdps" : 8.95,
+      "mjeps" : 2.10,
       "thermload": 3
     },
     {
@@ -110,6 +122,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 3,
+      "mjdps" : 11.61,
+      "mjeps" : 2.16,
       "thermload": 3
     },
     {
@@ -126,6 +140,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 3,
+      "mjdps" : 8.70,
+      "mjeps" : 2.05,
       "thermload": 3
     },
     {
@@ -142,6 +158,8 @@
       "armourpen": "A",
       "rof": null,
       "dps": 3,
+      "mjdps" : 5.49,
+      "mjeps" : 1.29,
       "thermload": 2
     }
   ]
diff --git a/data/components/hardpoints/burst_laser.json b/data/components/hardpoints/burst_laser.json
index 80b7ce68..dbd749c9 100755
--- a/data/components/hardpoints/burst_laser.json
+++ b/data/components/hardpoints/burst_laser.json
@@ -14,6 +14,9 @@
       "armourpen": "B",
       "rof": 1,
       "dps": 4,
+      "mjdps" : 24.97,
+      "mjeps" : 3.52,
+      "ssdam" : 27.85,
       "thermload": 1
     },
     {
@@ -30,6 +33,9 @@
       "armourpen": "A",
       "rof": 1.2,
       "dps": 4,
+      "mjdps" : 18.56,
+      "mjeps" : 3.27,
+      "ssdam" : 18.56,
       "thermload": 1
     },
     {
@@ -46,6 +52,9 @@
       "armourpen": "A",
       "rof": 0.9,
       "dps": 4,
+      "mjdps" : 8.78,
+      "mjeps" : 1.69,
+      "ssdam" : 9.45,
       "thermload": 1
     },
     {
@@ -110,6 +119,9 @@
       "armourpen": "A",
       "rof": 1.6,
       "dps": 3,
+      "mjdps" : 9.94,
+      "mjeps" : 1.40,
+      "ssdam" : 6.45,
       "thermload": 1
     },
     {
@@ -126,6 +138,9 @@
       "armourpen": "A",
       "rof": 1.7,
       "dps": 3,
+      "mjdps" : 7.95,
+      "mjeps" : 1.40,
+      "ssdam" : 4.53,
       "thermload": 1
     },
     {
@@ -142,6 +157,9 @@
       "armourpen": "B",
       "rof": 1.3,
       "dps": 2,
+      "mjdps" : 2.98,
+      "mjeps" : 0.63,
+      "ssdam" : 2.24,
       "thermload": 1
     }
   ]
diff --git a/data/components/hardpoints/cannon.json b/data/components/hardpoints/cannon.json
index c7cb2002..42bb7afb 100755
--- a/data/components/hardpoints/cannon.json
+++ b/data/components/hardpoints/cannon.json
@@ -17,6 +17,8 @@
       "thermload": 2,
       "grp": "c",
       "clip": 5,
+      "mjdps": 8.13,
+      "ssdam" : 37.13,
       "ammo": 100
     },
     {
@@ -36,9 +38,11 @@
       "thermload": 2,
       "grp": "c",
       "clip": 5,
+      "mjdps": 10.97,
+      "ssdam" : 30.94,
       "ammo": 100
     },
-        {
+    {
       "id": "1n",
       "grp": "c",
       "class": 3,
@@ -55,6 +59,8 @@
       "thermload": 2,
       "grp": "c",
       "clip": 5,
+      "mjdps": 8.13,
+      "ssdam" : 22.28,
       "ammo": 100
     },
     {
@@ -74,6 +80,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 7.95,
+      "ssdam" : 21.04,
       "ammo": 100
     },
     {
@@ -93,6 +101,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 3.58,
+      "ssdam" : 12.38,
       "ammo": 100
     },
     {
@@ -112,6 +122,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 6.00,
+      "ssdam" : 15.47,
       "ammo": 100
     },
     {
@@ -131,6 +143,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 6.24,
+      "ssdam" : 15.47,
       "ammo": 100
     },
     {
@@ -150,6 +164,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 2.41,
+      "ssdam" : 7.74,
       "ammo": 100
     },
     {
@@ -169,6 +185,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 4.00,
+      "ssdam" : 9.59,
       "ammo": 100
     },
     {
@@ -188,6 +206,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 3.80,
+      "ssdam" : 8.97,
       "ammo": 100
     },
     {
@@ -207,6 +227,8 @@
       "thermload": 1,
       "grp": "c",
       "clip": 5,
+      "mjdps" : 1.35,
+      "ssdam" : 4.13,
       "ammo": 100
     }
   ]
diff --git a/data/components/hardpoints/fragment_cannon.json b/data/components/hardpoints/fragment_cannon.json
index 6b36cb07..6d3400e8 100755
--- a/data/components/hardpoints/fragment_cannon.json
+++ b/data/components/hardpoints/fragment_cannon.json
@@ -1,6 +1,6 @@
 {
   "Fragment Cannons": [
-      {
+    {
       "id": "1t",
       "grp": "fc",
       "class": 3,
@@ -17,6 +17,8 @@
       "thermload": 1,
       "grp": "fc",
       "clip": 3,
+      "mjdps": 15.19,
+      "ssdam" : 28.36,
       "ammo": 30
     },
     {
@@ -36,6 +38,8 @@
       "thermload": 1,
       "grp": "fc",
       "clip": 3,
+      "mjdps" : 12.77,
+      "ssdam" : 23.21,
       "ammo": 30
     },
     {
@@ -55,6 +59,8 @@
       "thermload": 1,
       "grp": "fc",
       "clip": 3,
+      "mjdps" : 6.85,
+      "ssdam" : 12.89,
       "ammo": 30
     },
     {
@@ -74,6 +80,8 @@
       "thermload": 1,
       "grp": "fc",
       "clip": 3,
+      "mjdps" : 9.50,
+      "ssdam" : 18.05,
       "ammo": 30
     },
 
@@ -132,6 +140,8 @@
       "thermload": 1,
       "grp": "fc",
       "clip": 3,
+      "mjdps" : 5.53,
+      "ssdam" : 10.31,
       "ammo": 30
     },
     {
@@ -151,6 +161,8 @@
       "thermload": 1,
       "grp": "fc",
       "clip": 3,
+      "mjdps" : 3.58,
+      "ssdam" : 6.45,
       "ammo": 30
     },
     {
@@ -170,6 +182,8 @@
       "thermload": 1,
       "grp": "fc",
       "clip": 3,
+      "mjdps" : 2.11,
+      "ssdam" : 3.87,
       "ammo": 30
     }
   ]
diff --git a/data/components/hardpoints/missile_rack.json b/data/components/hardpoints/missile_rack.json
index 9dd5edb0..9e697dc0 100755
--- a/data/components/hardpoints/missile_rack.json
+++ b/data/components/hardpoints/missile_rack.json
@@ -1,6 +1,6 @@
 {
   "Missile Racks": [
-   {
+    {
       "id": "2f",
       "grp": "mr",
       "class": 2,
@@ -18,6 +18,8 @@
       "grp": "mr",
       "clip": 12,
       "ammo": 24,
+      "mjdps": 1.72,
+      "ssdam" : 3.87,
       "missile": "D"
     },
     {
@@ -38,6 +40,8 @@
       "grp": "mr",
       "clip": 6,
       "ammo": 18,
+      "mjdps": 0.57,
+      "ssdam" : 2.58,
       "missile": "S"
     },
     {
@@ -58,6 +62,8 @@
       "grp": "mr",
       "clip": 8,
       "ammo": 16,
+      "mjdps": 1.63,
+      "ssdam" : 3.87,
       "missile": "D"
     },
     {
@@ -78,6 +84,8 @@
       "grp": "mr",
       "clip": 6,
       "ammo": 6,
+      "mjdps": 0.57,
+      "ssdam" : 2.58,
       "missile": "S"
     }
   ]
diff --git a/data/components/hardpoints/multi_cannon.json b/data/components/hardpoints/multi_cannon.json
index c451f34c..5653621d 100755
--- a/data/components/hardpoints/multi_cannon.json
+++ b/data/components/hardpoints/multi_cannon.json
@@ -17,6 +17,8 @@
       "thermload": 1,
       "grp": "mc",
       "clip": 90,
+      "mjdps" : 6.02,
+      "ssdam" : 1.20,
       "ammo": 2100
     },
     {
@@ -36,6 +38,8 @@
       "thermload": 1,
       "grp": "mc",
       "clip": 90,
+      "mjdps" : 5.59,
+      "ssdam" : 1.03,
       "ammo": 2100
     },
     {
@@ -55,6 +59,8 @@
       "thermload": 1,
       "grp": "mc",
       "clip": 90,
+      "mjdps" : 2.15,
+      "ssdam" : 0.52,
       "ammo": 2100
     },
     {
@@ -74,6 +80,8 @@
       "thermload": 1,
       "grp": "mc",
       "clip": 90,
+      "mjdps" : 3.75,
+      "ssdam" : 0.69,
       "ammo": 2100
     },
     {
@@ -93,6 +101,8 @@
       "thermload": 1,
       "grp": "mc",
       "clip": 90,
+      "mjdps" : 2.03,
+      "ssdam" : 0.34,
       "ammo": 2100
     },
     {
@@ -112,6 +122,8 @@
       "thermload": 1,
       "grp": "mc",
       "clip": 90,
+      "mjdps" : 1.54,
+      "ssdam" : 0.34,
       "ammo": 2100
     }
   ]
diff --git a/data/components/hardpoints/plasma_accelerator.json b/data/components/hardpoints/plasma_accelerator.json
index b60b2d20..1bcf5f69 100755
--- a/data/components/hardpoints/plasma_accelerator.json
+++ b/data/components/hardpoints/plasma_accelerator.json
@@ -17,6 +17,8 @@
       "thermload": 10,
       "grp": "pa",
       "clip": 5,
+      "mjdps" : 6.89,
+      "ssdam" : 27.85,
       "ammo": 100
     },
     {
@@ -36,6 +38,8 @@
       "thermload": 8,
       "grp": "pa",
       "clip": 5,
+      "mjdps" : 20.98,
+      "ssdam" : 92.82,
       "ammo": 100
     },
     {
@@ -55,6 +59,8 @@
       "thermload": 10,
       "grp": "pa",
       "clip": 5,
+      "mjdps" : 25.55,
+      "ssdam" : 123.76,
       "ammo": 100
     }
   ]
diff --git a/data/components/hardpoints/pulse_laser.json b/data/components/hardpoints/pulse_laser.json
index 57ef96a3..bf606ed4 100755
--- a/data/components/hardpoints/pulse_laser.json
+++ b/data/components/hardpoints/pulse_laser.json
@@ -1,6 +1,6 @@
 {
   "Pulse Lasers": [
-      {
+    {
       "id": "1d",
       "grp": "pl",
       "class": 3,
@@ -14,6 +14,9 @@
       "armourpen": "A",
       "rof": 3,
       "dps": 4,
+      "mjdps" : 21.62,
+      "mjeps" : 2.86,
+      "ssdam" : 7.07,
       "thermload": 1
     },
     {
@@ -30,6 +33,9 @@
       "armourpen": "A",
       "rof": 3.2,
       "dps": 4,
+      "mjdps" : 18.28,
+      "mjeps" : 2.98,
+      "ssdam" : 5.59,
       "thermload": 1
     },
     {
@@ -46,6 +52,9 @@
       "armourpen": "A",
       "rof": 2.3,
       "dps": 3,
+      "mjdps" : 7.05,
+      "mjeps" : 1.24,
+      "ssdam" : 3.15,
       "thermload": 1
     },
     {
@@ -62,6 +71,9 @@
       "armourpen": "A",
       "rof": 3.4,
       "dps": 3,
+      "mjdps" : 14.29,
+      "mjeps" : 1.89,
+      "ssdam" : 4.20,
       "thermload": 1
     },
     {
@@ -78,6 +90,9 @@
       "armourpen": "A",
       "rof": 3.6,
       "dps": 3,
+      "mjdps" : 11.62,
+      "mjeps" : 1.89,
+      "ssdam" : 3.24,
       "thermload": 1
     },
     {
@@ -94,6 +109,9 @@
       "armourpen": "A",
       "rof": 2.5,
       "dps": 3,
+      "mjdps" : 4.72,
+      "mjeps" : 0.83,
+      "ssdam" : 1.86,
       "thermload": 1
     },
     {
@@ -110,6 +128,9 @@
       "armourpen": "A",
       "rof": 3.8,
       "dps": 3,
+      "mjdps" : 9.35,
+      "mjeps" : 1.24,
+      "ssdam" : 2.48,
       "thermload": 1
     },
     {
@@ -126,6 +147,9 @@
       "armourpen": "A",
       "rof": 4,
       "dps": 3,
+      "mjdps" : 7.30,
+      "mjeps" : 1.19,
+      "ssdam" : 1.88,
       "thermload": 1
     },
     {
@@ -142,6 +166,9 @@
       "armourpen": "A",
       "rof": 2.8,
       "dps": 2,
+      "mjdps" : 2.90,
+      "mjeps" : 0.51,
+      "ssdam" : 1.07,
       "thermload": 1
     }
   ]
diff --git a/data/components/hardpoints/rail_gun.json b/data/components/hardpoints/rail_gun.json
index 8f693293..ffda43eb 100755
--- a/data/components/hardpoints/rail_gun.json
+++ b/data/components/hardpoints/rail_gun.json
@@ -17,6 +17,8 @@
       "thermload": 7,
       "grp": "rg",
       "clip": 1,
+      "mjdps" : 13.75,
+      "ssdam" : 24.75,
       "ammo": 30
     },
     {
@@ -36,6 +38,8 @@
       "thermload": 10,
       "grp": "rg",
       "clip": 1,
+      "mjdps" : 21.66,
+      "ssdam" : 43.32,
       "ammo": 30
     }
   ]
diff --git a/package.json b/package.json
index be54ecd7..8906b0d6 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "gulp-manifest": "0.0.6",
     "gulp-minify-css": "^1.0.0",
     "gulp-rev-all": "^0.8.18",
+    "gulp-scp2": "0.1.3",
     "gulp-sourcemaps": "^1.5.1",
     "gulp-svgmin": "^1.1.2",
     "gulp-svgstore": "^5.0.1",