diff --git a/dist/index.js b/dist/index.js
index b69504c..4101d52 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2662,7 +2662,7 @@ module.exports = {
         id: "py",
         integrity: 135,
         mass: 160,
-        pGen: 24,
+        pgen: 24,
         rating: "E"
       }, {
         class: 8,
@@ -2674,7 +2674,7 @@ module.exports = {
         id: "px",
         integrity: 120,
         mass: 64,
-        pGen: 27,
+        pgen: 27,
         rating: "D"
       }, {
         class: 8,
@@ -2686,7 +2686,7 @@ module.exports = {
         id: "pw",
         integrity: 150,
         mass: 80,
-        pGen: 30,
+        pgen: 30,
         rating: "C"
       }, {
         class: 8,
@@ -2698,7 +2698,7 @@ module.exports = {
         id: "pv",
         integrity: 180,
         mass: 128,
-        pGen: 33,
+        pgen: 33,
         rating: "B"
       }, {
         class: 8,
@@ -2710,7 +2710,7 @@ module.exports = {
         id: "pu",
         integrity: 165,
         mass: 80,
-        pGen: 36,
+        pgen: 36,
         rating: "A"
       }, {
         class: 7,
@@ -2722,7 +2722,7 @@ module.exports = {
         id: "pt",
         integrity: 118,
         mass: 80,
-        pGen: 20,
+        pgen: 20,
         rating: "E"
       }, {
         class: 7,
@@ -2734,7 +2734,7 @@ module.exports = {
         id: "ps",
         integrity: 105,
         mass: 32,
-        pGen: 22.5,
+        pgen: 22.5,
         rating: "D"
       }, {
         class: 7,
@@ -2746,7 +2746,7 @@ module.exports = {
         id: "pr",
         integrity: 131,
         mass: 40,
-        pGen: 25,
+        pgen: 25,
         rating: "C"
       }, {
         class: 7,
@@ -2758,7 +2758,7 @@ module.exports = {
         id: "pq",
         integrity: 157,
         mass: 64,
-        pGen: 27.5,
+        pgen: 27.5,
         rating: "B"
       }, {
         class: 7,
@@ -2770,7 +2770,7 @@ module.exports = {
         id: "pp",
         integrity: 144,
         mass: 40,
-        pGen: 30,
+        pgen: 30,
         rating: "A"
       }, {
         class: 6,
@@ -2782,7 +2782,7 @@ module.exports = {
         id: "po",
         integrity: 90,
         mass: 40,
-        pGen: 16.8,
+        pgen: 16.8,
         rating: "E"
       }, {
         class: 6,
@@ -2794,7 +2794,7 @@ module.exports = {
         id: "pn",
         integrity: 113,
         mass: 16,
-        pGen: 18.9,
+        pgen: 18.9,
         rating: "D"
       }, {
         class: 6,
@@ -2806,7 +2806,7 @@ module.exports = {
         id: "pm",
         integrity: 136,
         mass: 20,
-        pGen: 21,
+        pgen: 21,
         rating: "C"
       }, {
         class: 6,
@@ -2818,7 +2818,7 @@ module.exports = {
         id: "pl",
         integrity: 124,
         mass: 32,
-        pGen: 23.1,
+        pgen: 23.1,
         rating: "B"
       }, {
         class: 6,
@@ -2830,7 +2830,7 @@ module.exports = {
         id: "pk",
         integrity: 118,
         mass: 20,
-        pGen: 25.2,
+        pgen: 25.2,
         rating: "A"
       }, {
         class: 5,
@@ -2842,7 +2842,7 @@ module.exports = {
         id: "pj",
         integrity: 86,
         mass: 20,
-        pGen: 13.6,
+        pgen: 13.6,
         rating: "E"
       }, {
         class: 5,
@@ -2854,7 +2854,7 @@ module.exports = {
         id: "pi",
         integrity: 77,
         mass: 8,
-        pGen: 15.3,
+        pgen: 15.3,
         rating: "D"
       }, {
         class: 5,
@@ -2866,7 +2866,7 @@ module.exports = {
         id: "ph",
         integrity: 96,
         mass: 10,
-        pGen: 17,
+        pgen: 17,
         rating: "C"
       }, {
         class: 5,
@@ -2878,7 +2878,7 @@ module.exports = {
         id: "pg",
         integrity: 114,
         mass: 16,
-        pGen: 18.7,
+        pgen: 18.7,
         rating: "B"
       }, {
         class: 5,
@@ -2890,7 +2890,7 @@ module.exports = {
         id: "pf",
         integrity: 106,
         mass: 10,
-        pGen: 20.4,
+        pgen: 20.4,
         rating: "A"
       }, {
         class: 4,
@@ -2902,7 +2902,7 @@ module.exports = {
         id: "pe",
         integrity: 72,
         mass: 10,
-        pGen: 10.4,
+        pgen: 10.4,
         rating: "E"
       }, {
         class: 4,
@@ -2914,7 +2914,7 @@ module.exports = {
         id: "pd",
         integrity: 64,
         mass: 4,
-        pGen: 11.7,
+        pgen: 11.7,
         rating: "D"
       }, {
         class: 4,
@@ -2926,7 +2926,7 @@ module.exports = {
         id: "pc",
         integrity: 80,
         mass: 5,
-        pGen: 13,
+        pgen: 13,
         rating: "C"
       }, {
         class: 4,
@@ -2938,7 +2938,7 @@ module.exports = {
         id: "pb",
         integrity: 96,
         mass: 8,
-        pGen: 14.3,
+        pgen: 14.3,
         rating: "B"
       }, {
         class: 4,
@@ -2950,7 +2950,7 @@ module.exports = {
         id: "pa",
         integrity: 88,
         mass: 5,
-        pGen: 15.6,
+        pgen: 15.6,
         rating: "A"
       }, {
         class: 3,
@@ -2962,7 +2962,7 @@ module.exports = {
         id: "p9",
         integrity: 58,
         mass: 5,
-        pGen: 8,
+        pgen: 8,
         rating: "E"
       }, {
         class: 3,
@@ -2974,7 +2974,7 @@ module.exports = {
         id: "p8",
         integrity: 51,
         mass: 2,
-        pGen: 9,
+        pgen: 9,
         rating: "D"
       }, {
         class: 3,
@@ -2986,7 +2986,7 @@ module.exports = {
         id: "p7",
         integrity: 64,
         mass: 2.5,
-        pGen: 10,
+        pgen: 10,
         rating: "C"
       }, {
         class: 3,
@@ -2998,7 +2998,7 @@ module.exports = {
         id: "p6",
         integrity: 77,
         mass: 4,
-        pGen: 11,
+        pgen: 11,
         rating: "B"
       }, {
         class: 3,
@@ -3010,7 +3010,7 @@ module.exports = {
         id: "p5",
         integrity: 70,
         mass: 2.5,
-        pGen: 12,
+        pgen: 12,
         rating: "A"
       }, {
         class: 2,
@@ -3022,7 +3022,7 @@ module.exports = {
         id: "p4",
         integrity: 46,
         mass: 2.5,
-        pGen: 6.4,
+        pgen: 6.4,
         rating: "E"
       }, {
         class: 2,
@@ -3034,7 +3034,7 @@ module.exports = {
         id: "p3",
         integrity: 41,
         mass: 1,
-        pGen: 7.2,
+        pgen: 7.2,
         rating: "D"
       }, {
         class: 2,
@@ -3046,7 +3046,7 @@ module.exports = {
         id: "p2",
         integrity: 51,
         mass: 1.3,
-        pGen: 8,
+        pgen: 8,
         rating: "C"
       }, {
         class: 2,
@@ -3058,7 +3058,7 @@ module.exports = {
         id: "p1",
         integrity: 61,
         mass: 2,
-        pGen: 8.8,
+        pgen: 8.8,
         rating: "B"
       }, {
         class: 2,
@@ -3070,7 +3070,7 @@ module.exports = {
         id: "p0",
         integrity: 56,
         mass: 1.3,
-        pGen: 9.6,
+        pgen: 9.6,
         rating: "A"
       } ],
       t: [ {
@@ -6001,7 +6001,6 @@ module.exports = {
     },
     hardpoints: {
       pl: [ {
-        armourpen: 20,
         breachdmg: 2.04,
         breachmax: .8,
         breachmin: .4,
@@ -6016,6 +6015,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 20,
         power: .39,
         range: 3e3,
         rating: "F",
@@ -6023,7 +6023,6 @@ module.exports = {
         thermload: .3,
         type: "T"
       }, {
-        armourpen: 20,
         breachdmg: 1.3,
         breachmax: .8,
         breachmin: .4,
@@ -6038,6 +6037,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "G",
+        piercing: 20,
         power: .39,
         range: 3e3,
         rating: "G",
@@ -6045,7 +6045,6 @@ module.exports = {
         thermload: .3,
         type: "T"
       }, {
-        armourpen: 20,
         breachdmg: 1,
         breachmax: .8,
         breachmin: .4,
@@ -6060,6 +6059,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "T",
+        piercing: 20,
         power: .38,
         range: 3e3,
         rating: "G",
@@ -6067,7 +6067,6 @@ module.exports = {
         thermload: .2,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 3,
         breachmax: .8,
         breachmin: .4,
@@ -6082,6 +6081,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "F",
+        piercing: 35,
         power: .6,
         range: 3e3,
         rating: "F",
@@ -6089,7 +6089,6 @@ module.exports = {
         thermload: .6,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 2.3,
         breachmax: .8,
         breachmin: .4,
@@ -6104,6 +6103,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "G",
+        piercing: 35,
         power: .6,
         range: 3e3,
         rating: "F",
@@ -6111,7 +6111,6 @@ module.exports = {
         thermload: .5,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 1.7,
         breachmax: .8,
         breachmin: .4,
@@ -6126,6 +6125,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "T",
+        piercing: 35,
         power: .58,
         range: 3e3,
         rating: "F",
@@ -6133,7 +6133,6 @@ module.exports = {
         thermload: .3,
         type: "T"
       }, {
-        armourpen: "A",
         breachdmg: 2.4,
         breachmax: .8,
         breachmin: .4,
@@ -6144,9 +6143,11 @@ module.exports = {
         eddbID: 1483,
         grp: "pl",
         id: "PL",
+        integrity: 51,
         mass: 4,
         mount: "F",
         name: "Disruptor",
+        piercing: "A",
         power: .7,
         pp: "Felicia Winters",
         rating: "E",
@@ -6154,7 +6155,6 @@ module.exports = {
         thermload: 1,
         type: "T"
       }, {
-        armourpen: 52,
         breachdmg: 5.1,
         breachmax: .8,
         breachmin: .4,
@@ -6169,6 +6169,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "F",
+        piercing: 52,
         power: .9,
         range: 3e3,
         rating: "D",
@@ -6176,7 +6177,6 @@ module.exports = {
         thermload: 1,
         type: "T"
       }, {
-        armourpen: 52,
         breachdmg: 3.9,
         breachmax: .8,
         breachmin: .4,
@@ -6191,6 +6191,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "G",
+        piercing: 52,
         power: .92,
         range: 3e3,
         rating: "E",
@@ -6198,7 +6199,6 @@ module.exports = {
         thermload: .9,
         type: "T"
       }, {
-        armourpen: 52,
         breachdmg: 3,
         breachmax: .8,
         breachmin: .4,
@@ -6213,6 +6213,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "T",
+        piercing: 52,
         power: .89,
         range: 3e3,
         rating: "F",
@@ -6220,7 +6221,6 @@ module.exports = {
         thermload: .6,
         type: "T"
       }, {
-        armourpen: 65,
         breachdmg: 8.7,
         breachmax: .8,
         breachmin: .4,
@@ -6235,6 +6235,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "F",
+        piercing: 65,
         power: 1.33,
         range: 3e3,
         rating: "A",
@@ -6242,7 +6243,6 @@ module.exports = {
         thermload: 1.6,
         type: "T"
       }, {
-        armourpen: 65,
         breachdmg: 6.6,
         breachmax: .8,
         breachmin: .4,
@@ -6257,6 +6257,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "G",
+        piercing: 65,
         power: 1.37,
         range: 3e3,
         rating: "A",
@@ -6265,7 +6266,6 @@ module.exports = {
         type: "T"
       } ],
       ul: [ {
-        armourpen: 20,
         breachdmg: 7.05,
         breachmax: .8,
         breachmin: .4,
@@ -6282,6 +6282,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 20,
         power: .65,
         range: 3e3,
         rating: "F",
@@ -6289,7 +6290,6 @@ module.exports = {
         thermload: .4,
         type: "T"
       }, {
-        armourpen: 20,
         breachdmg: 5.3,
         breachmax: .8,
         breachmin: .4,
@@ -6306,6 +6306,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "G",
+        piercing: 20,
         power: .64,
         range: 3e3,
         rating: "G",
@@ -6313,7 +6314,6 @@ module.exports = {
         thermload: .3,
         type: "T"
       }, {
-        armourpen: 20,
         breachdmg: 1.92,
         breachmax: .8,
         breachmin: .4,
@@ -6330,6 +6330,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "T",
+        piercing: 20,
         power: .6,
         range: 3e3,
         rating: "G",
@@ -6337,7 +6338,6 @@ module.exports = {
         thermload: .2,
         type: "T"
       }, {
-        armourpen: 1,
         breachdmg: 15.25,
         breachmax: 0,
         breachmin: 0,
@@ -6355,6 +6355,7 @@ module.exports = {
         mass: 2,
         mount: "F",
         name: "Cytoscrambler",
+        piercing: 1,
         power: .8,
         pp: "Archon Delaine",
         range: 600,
@@ -6363,7 +6364,6 @@ module.exports = {
         thermload: .3,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 11.1,
         breachmax: .8,
         breachmin: .4,
@@ -6380,6 +6380,7 @@ module.exports = {
         integrity: 40,
         mass: 4,
         mount: "F",
+        piercing: 35,
         power: 1.05,
         range: 3e3,
         rating: "E",
@@ -6387,7 +6388,6 @@ module.exports = {
         thermload: .8,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 8.82,
         breachmax: .8,
         breachmin: .4,
@@ -6404,6 +6404,7 @@ module.exports = {
         integrity: 40,
         mass: 4,
         mount: "G",
+        piercing: 35,
         power: 1.04,
         range: 3e3,
         rating: "F",
@@ -6411,7 +6412,6 @@ module.exports = {
         thermload: .7,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 3.51,
         breachmax: .8,
         breachmin: .4,
@@ -6428,6 +6428,7 @@ module.exports = {
         integrity: 40,
         mass: 4,
         mount: "T",
+        piercing: 35,
         power: .98,
         range: 3e3,
         rating: "F",
@@ -6435,7 +6436,6 @@ module.exports = {
         thermload: .4,
         type: "T"
       }, {
-        armourpen: 52,
         breachdmg: 10.53,
         breachmax: .8,
         breachmin: .4,
@@ -6452,6 +6452,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "F",
+        piercing: 52,
         power: 1.66,
         range: 3e3,
         rating: "D",
@@ -6459,7 +6460,6 @@ module.exports = {
         thermload: 1.7,
         type: "T"
       }, {
-        armourpen: 52,
         breachdmg: 14.08,
         breachmax: .8,
         breachmin: .4,
@@ -6476,6 +6476,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "G",
+        piercing: 52,
         power: 1.65,
         range: 3e3,
         rating: "E",
@@ -6483,7 +6484,6 @@ module.exports = {
         thermload: 1.4,
         type: "T"
       }, {
-        armourpen: 52,
         breachdmg: 5.58,
         breachmax: .8,
         breachmin: .4,
@@ -6500,6 +6500,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "T",
+        piercing: 52,
         power: 1.57,
         range: 3e3,
         rating: "E",
@@ -6507,7 +6508,6 @@ module.exports = {
         thermload: .8,
         type: "T"
       }, {
-        armourpen: 65,
         breachdmg: 28,
         breachmax: .8,
         breachmin: .4,
@@ -6524,6 +6524,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "F",
+        piercing: 65,
         power: 2.58,
         range: 3e3,
         rating: "E",
@@ -6531,7 +6532,6 @@ module.exports = {
         thermload: 4.5,
         type: "T"
       }, {
-        armourpen: 65,
         breachdmg: 21.63,
         breachmax: .8,
         breachmin: .4,
@@ -6548,6 +6548,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "G",
+        piercing: 65,
         power: 2.59,
         range: 3e3,
         rating: "E",
@@ -6556,7 +6557,6 @@ module.exports = {
         type: "T"
       } ],
       bl: [ {
-        armourpen: 18,
         breachdmg: 7.9,
         breachmax: .8,
         breachmin: .4,
@@ -6571,13 +6571,13 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 18,
         power: .69,
         range: 3e3,
         rating: "E",
         thermload: 3.5,
         type: "T"
       }, {
-        armourpen: 18,
         breachdmg: 6.1,
         breachmax: .8,
         breachmin: .4,
@@ -6592,13 +6592,13 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "G",
+        piercing: 18,
         power: .67,
         range: 3e3,
         rating: "E",
         thermload: 3.6,
         type: "T"
       }, {
-        armourpen: 18,
         breachdmg: 4.3,
         breachmax: .8,
         breachmin: .4,
@@ -6615,13 +6615,13 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "T",
+        piercing: 18,
         power: .63,
         range: 3e3,
         rating: "F",
         thermload: 2.4,
         type: "T"
       }, {
-        armourpen: 18,
         breachdmg: 3.9,
         breachmax: .8,
         breachmin: .4,
@@ -6637,6 +6637,7 @@ module.exports = {
         mass: 2,
         mount: "F",
         name: "Retributor",
+        piercing: 18,
         power: .69,
         pp: "Edmund Mahon",
         range: 3e3,
@@ -6644,7 +6645,6 @@ module.exports = {
         thermload: 2.7,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 12.8,
         breachmax: .8,
         breachmin: .4,
@@ -6659,13 +6659,13 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "F",
+        piercing: 35,
         power: 1.12,
         range: 3e3,
         rating: "D",
         thermload: 5.1,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 10,
         breachmax: .8,
         breachmin: .4,
@@ -6680,13 +6680,13 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "G",
+        piercing: 35,
         power: 1.1,
         range: 3e3,
         rating: "D",
         thermload: 5.3,
         type: "T"
       }, {
-        armourpen: 35,
         breachdmg: 7.1,
         breachmax: .8,
         breachmin: .4,
@@ -6701,13 +6701,13 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "T",
+        piercing: 35,
         power: 1.03,
         range: 3e3,
         rating: "E",
         thermload: 3.5,
         type: "T"
       }, {
-        armourpen: 50,
         breachdmg: 20.6,
         breachmax: .8,
         breachmin: .4,
@@ -6722,13 +6722,13 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "F",
+        piercing: 50,
         power: 1.8,
         range: 3e3,
         rating: "C",
         thermload: 7.2,
         type: "T"
       }, {
-        armourpen: 50,
         breachdmg: 16.2,
         breachmax: .8,
         breachmin: .4,
@@ -6743,13 +6743,13 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "G",
+        piercing: 50,
         power: 1.78,
         range: 3e3,
         rating: "C",
         thermload: 7.6,
         type: "T"
       }, {
-        armourpen: 50,
         breachdmg: 11.5,
         breachmax: .8,
         breachmin: .4,
@@ -6764,13 +6764,13 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "T",
+        piercing: 50,
         power: 1.68,
         range: 3e3,
         rating: "D",
         thermload: 5.1,
         type: "T"
       }, {
-        armourpen: 60,
         breachdmg: 33.1,
         breachmax: .8,
         breachmin: .4,
@@ -6785,13 +6785,13 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "F",
+        piercing: 60,
         power: 2.9,
         range: 3e3,
         rating: "A",
         thermload: 9.9,
         type: "T"
       }, {
-        armourpen: 60,
         breachdmg: 26.1,
         breachmax: .8,
         breachmin: .4,
@@ -6806,6 +6806,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "G",
+        piercing: 60,
         power: 2.86,
         range: 3e3,
         rating: "A",
@@ -6814,7 +6815,6 @@ module.exports = {
       } ],
       mc: [ {
         ammo: 2100,
-        armourpen: 22,
         breachdmg: 1,
         breachmax: .8,
         breachmin: .4,
@@ -6830,6 +6830,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 22,
         power: .28,
         range: 4e3,
         rating: "F",
@@ -6840,7 +6841,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 22,
         breachdmg: .7,
         breachmax: .8,
         breachmin: .4,
@@ -6856,6 +6856,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "G",
+        piercing: 22,
         power: .37,
         range: 4e3,
         rating: "G",
@@ -6866,7 +6867,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 22,
         breachdmg: .5,
         breachmax: .8,
         breachmin: .4,
@@ -6882,6 +6882,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "T",
+        piercing: 22,
         power: .26,
         range: 4e3,
         rating: "G",
@@ -6892,7 +6893,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 1e3,
-        armourpen: "A",
         breachdmg: 2.7,
         breachmax: .8,
         breachmin: .4,
@@ -6904,9 +6904,11 @@ module.exports = {
         eddbID: 1481,
         grp: "mc",
         id: "e0",
+        integrity: 40,
         mass: 2,
         mount: "F",
         name: "Enforcer",
+        piercing: "A",
         power: .28,
         pp: "Pranav Antal",
         range: 4500,
@@ -6918,7 +6920,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 37,
         breachdmg: 2,
         breachmax: .8,
         breachmin: .4,
@@ -6934,6 +6935,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "F",
+        piercing: 37,
         power: .46,
         range: 4e3,
         rating: "E",
@@ -6944,7 +6946,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 37,
         breachdmg: 1.5,
         breachmax: .8,
         breachmin: .4,
@@ -6960,6 +6961,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "G",
+        piercing: 37,
         power: .64,
         range: 4e3,
         rating: "F",
@@ -6970,7 +6972,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 37,
         breachdmg: 1.1,
         breachmax: .8,
         breachmin: .4,
@@ -6986,6 +6987,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "T",
+        piercing: 37,
         power: .5,
         range: 4e3,
         rating: "F",
@@ -6996,7 +6998,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 54,
         breachdmg: 3.5,
         breachmax: .8,
         breachmin: .4,
@@ -7012,6 +7013,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "F",
+        piercing: 54,
         power: .64,
         range: 4e3,
         rating: "C",
@@ -7022,7 +7024,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 54,
         breachdmg: 2.6,
         breachmax: .8,
         breachmin: .4,
@@ -7038,6 +7039,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "G",
+        piercing: 54,
         power: .97,
         range: 4e3,
         rating: "C",
@@ -7048,7 +7050,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 68,
         breachdmg: 4.2,
         breachmax: .8,
         breachmin: .4,
@@ -7064,6 +7065,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "F",
+        piercing: 68,
         power: .73,
         range: 4e3,
         rating: "A",
@@ -7075,7 +7077,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 2100,
-        armourpen: 68,
         breachdmg: 3.1,
         breachmax: .8,
         breachmin: .4,
@@ -7091,6 +7092,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "G",
+        piercing: 68,
         power: 1.22,
         range: 4e3,
         rating: "A",
@@ -7103,7 +7105,6 @@ module.exports = {
       } ],
       c: [ {
         ammo: 100,
-        armourpen: 35,
         breachdmg: 17.1,
         breachmax: .8,
         breachmin: .6,
@@ -7119,6 +7120,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 35,
         power: .34,
         range: 3e3,
         rating: "D",
@@ -7129,7 +7131,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 35,
         breachdmg: 13.2,
         breachmax: .9,
         breachmin: .6,
@@ -7145,6 +7146,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "G",
+        piercing: 35,
         power: .38,
         range: 3e3,
         rating: "E",
@@ -7155,7 +7157,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 10.6,
         breachmax: .8,
         breachmin: .6,
@@ -7171,6 +7172,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "T",
+        piercing: 90,
         power: .32,
         range: 3e3,
         rating: "F",
@@ -7181,7 +7183,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 28,
         breachmax: .8,
         breachmin: .6,
@@ -7197,6 +7198,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "F",
+        piercing: 90,
         power: .49,
         range: 3500,
         rating: "D",
@@ -7207,7 +7209,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 20.3,
         breachmax: .8,
         breachmin: .6,
@@ -7223,6 +7224,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "G",
+        piercing: 90,
         power: .54,
         range: 3500,
         rating: "D",
@@ -7233,7 +7235,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 16.3,
         breachmax: .8,
         breachmin: .6,
@@ -7249,6 +7250,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "T",
+        piercing: 90,
         power: .45,
         range: 3500,
         rating: "E",
@@ -7259,7 +7261,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 42.3,
         breachmax: .8,
         breachmin: .6,
@@ -7275,6 +7276,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "F",
+        piercing: 90,
         power: .67,
         range: 4e3,
         rating: "C",
@@ -7285,7 +7287,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 30.9,
         breachmax: .8,
         breachmin: .6,
@@ -7303,6 +7304,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "G",
+        piercing: 90,
         power: .75,
         range: 4e3,
         rating: "C",
@@ -7313,7 +7315,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 25.14,
         breachmax: .8,
         breachmin: .6,
@@ -7329,6 +7330,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "T",
+        piercing: 90,
         power: .64,
         range: 4e3,
         rating: "D",
@@ -7339,7 +7341,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 63.2,
         breachmax: .8,
         breachmin: .6,
@@ -7357,6 +7358,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "F",
+        piercing: 90,
         power: .92,
         range: 4500,
         rating: "B",
@@ -7367,7 +7369,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 100,
-        armourpen: 90,
         breachdmg: 46.7,
         breachmax: .8,
         breachmin: .6,
@@ -7385,6 +7386,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "G",
+        piercing: 90,
         power: 1.03,
         range: 4500,
         rating: "B",
@@ -7396,7 +7398,6 @@ module.exports = {
       } ],
       fc: [ {
         ammo: 90,
-        armourpen: 20,
         breachdmg: 1.3,
         breachmax: .8,
         breachmin: .4,
@@ -7413,6 +7414,7 @@ module.exports = {
         jitter: .5,
         mass: 2,
         mount: "F",
+        piercing: 20,
         power: .45,
         range: 2e3,
         rating: "E",
@@ -7424,7 +7426,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 20,
         breachdmg: .9,
         breachmax: .8,
         breachmin: .4,
@@ -7441,6 +7442,7 @@ module.exports = {
         jitter: .5,
         mass: 2,
         mount: "G",
+        piercing: 20,
         power: .59,
         range: 2e3,
         rating: "E",
@@ -7452,7 +7454,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 20,
         breachdmg: .5,
         breachmax: .8,
         breachmin: .4,
@@ -7469,6 +7470,7 @@ module.exports = {
         jitter: .5,
         mass: 2,
         mount: "T",
+        piercing: 20,
         power: .42,
         range: 2e3,
         rating: "E",
@@ -7480,7 +7482,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 35,
         breachdmg: 2.3,
         breachmax: .8,
         breachmin: .4,
@@ -7497,6 +7498,7 @@ module.exports = {
         jitter: .5,
         mass: 4,
         mount: "F",
+        piercing: 35,
         power: .74,
         range: 2e3,
         rating: "A",
@@ -7508,7 +7510,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 35,
         breachdmg: 1.8,
         breachmax: .8,
         breachmin: .4,
@@ -7525,6 +7526,7 @@ module.exports = {
         jitter: .5,
         mass: 4,
         mount: "G",
+        piercing: 35,
         power: 1.03,
         range: 2e3,
         rating: "D",
@@ -7536,7 +7538,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 35,
         breachdmg: 1.3,
         breachmax: .8,
         breachmin: .4,
@@ -7553,6 +7554,7 @@ module.exports = {
         jitter: .5,
         mass: 4,
         mount: "T",
+        piercing: 35,
         power: .79,
         range: 2e3,
         rating: "D",
@@ -7564,7 +7566,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 52,
         breachdmg: 3.5,
         breachmax: .8,
         breachmin: .4,
@@ -7581,6 +7582,7 @@ module.exports = {
         jitter: .5,
         mass: 8,
         mount: "F",
+        piercing: 52,
         power: 1.02,
         range: 2e3,
         rating: "C",
@@ -7592,7 +7594,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 52,
         breachdmg: 2.9,
         breachmax: .8,
         breachmin: .4,
@@ -7609,6 +7610,7 @@ module.exports = {
         jitter: .5,
         mass: 8,
         mount: "G",
+        piercing: 52,
         power: 1.55,
         range: 2e3,
         rating: "C",
@@ -7620,7 +7622,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 52,
         breachdmg: 2.3,
         breachmax: .8,
         breachmin: .4,
@@ -7637,6 +7638,7 @@ module.exports = {
         jitter: .5,
         mass: 8,
         mount: "T",
+        piercing: 52,
         power: 1.29,
         range: 2e3,
         rating: "C",
@@ -7648,7 +7650,6 @@ module.exports = {
         type: "K"
       }, {
         ammo: 90,
-        armourpen: 52,
         breachdmg: 3.1,
         breachmax: .8,
         breachmin: .4,
@@ -7665,9 +7666,11 @@ module.exports = {
         mass: 8,
         mount: "F",
         name: "Pacifier",
+        piercing: 52,
         power: 1.02,
         pp: "Zachary Hudson",
         rating: "C",
+        reload: 5,
         rof: 4.5,
         speed: 1e3,
         thermload: 1.1,
@@ -7675,7 +7678,6 @@ module.exports = {
       } ],
       rg: [ {
         ammo: 30,
-        armourpen: 30,
         breachdmg: 22.2,
         breachmax: .8,
         breachmin: .4,
@@ -7691,6 +7693,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 30,
         power: 1.15,
         range: 3e3,
         rating: "D",
@@ -7700,7 +7703,6 @@ module.exports = {
         type: "KT"
       }, {
         ammo: 30,
-        armourpen: 48,
         breachdmg: 39.5,
         breachmax: .8,
         breachmin: .4,
@@ -7716,6 +7718,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "F",
+        piercing: 48,
         power: 1.63,
         range: 3e3,
         rating: "B",
@@ -7725,7 +7728,6 @@ module.exports = {
         type: "KT"
       }, {
         ammo: 90,
-        armourpen: "A",
         breachdmg: 14.3,
         breachmax: .8,
         breachmin: .4,
@@ -7740,19 +7742,21 @@ module.exports = {
         eddbID: 1484,
         grp: "rg",
         id: "ih",
+        integrity: 51,
         mass: 4,
         mount: "F",
         name: "Imperial Hammer",
+        piercing: "A",
         power: 1.63,
         pp: "Arissa Lavigny-Duval",
         rating: "B",
+        reload: 1,
         rof: 4.1,
         thermload: 16,
         type: "KT"
       } ],
       pa: [ {
         ammo: 100,
-        armourpen: 55,
         breachdmg: 44.2,
         breachmax: .8,
         breachmin: .4,
@@ -7768,6 +7772,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "F",
+        piercing: 55,
         power: 1.43,
         range: 3500,
         rating: "C",
@@ -7778,7 +7783,6 @@ module.exports = {
         type: "KT"
       }, {
         ammo: 100,
-        armourpen: 70,
         breachdmg: 68,
         breachmax: .8,
         breachmin: .4,
@@ -7794,6 +7798,7 @@ module.exports = {
         integrity: 64,
         mass: 8,
         mount: "F",
+        piercing: 70,
         power: 1.97,
         range: 3500,
         rating: "B",
@@ -7804,7 +7809,6 @@ module.exports = {
         type: "KT"
       }, {
         ammo: 300,
-        armourpen: 70,
         breachdmg: 28.1,
         breachmax: .8,
         breachmin: .4,
@@ -7821,6 +7825,7 @@ module.exports = {
         mass: 8,
         mount: "F",
         name: "Advanced Plasma Accelerator",
+        piercing: 70,
         power: 1.97,
         pp: "Denton Patreus",
         range: 3500,
@@ -7832,7 +7837,6 @@ module.exports = {
         type: "KT"
       }, {
         ammo: 100,
-        armourpen: 85,
         breachdmg: 102,
         breachmax: .8,
         breachmin: .4,
@@ -7848,6 +7852,7 @@ module.exports = {
         integrity: 80,
         mass: 16,
         mount: "F",
+        piercing: 85,
         power: 2.63,
         range: 3500,
         rating: "A",
@@ -7859,7 +7864,6 @@ module.exports = {
       } ],
       mr: [ {
         ammo: 16,
-        armourpen: 60,
         breachdmg: 20,
         breachmax: 1,
         breachmin: 1,
@@ -7876,6 +7880,7 @@ module.exports = {
         mass: 2,
         missile: "D",
         mount: "F",
+        piercing: 60,
         power: .4,
         rating: "B",
         reload: 5,
@@ -7885,7 +7890,6 @@ module.exports = {
         type: "E"
       }, {
         ammo: 6,
-        armourpen: 60,
         breachdmg: 16,
         breachmax: 0,
         breachmin: 0,
@@ -7902,6 +7906,7 @@ module.exports = {
         mass: 2,
         missile: "S",
         mount: "F",
+        piercing: 60,
         power: .6,
         rating: "B",
         reload: 12,
@@ -7911,7 +7916,6 @@ module.exports = {
         type: "E"
       }, {
         ammo: 48,
-        armourpen: 60,
         breachdmg: 20,
         breachmax: 1,
         breachmin: 1,
@@ -7929,6 +7933,7 @@ module.exports = {
         mass: 4,
         missile: "D",
         mount: "F",
+        piercing: 60,
         power: 1.2,
         rating: "B",
         reload: 5,
@@ -7937,7 +7942,6 @@ module.exports = {
         type: "E"
       }, {
         ammo: 18,
-        armourpen: 60,
         breachdmg: 16,
         breachmax: 0,
         breachmin: 0,
@@ -7956,6 +7960,7 @@ module.exports = {
         mass: 4,
         missile: "S",
         mount: "F",
+        piercing: 60,
         power: 1.2,
         rating: "B",
         reload: 12,
@@ -7965,7 +7970,6 @@ module.exports = {
         type: "E"
       }, {
         ammo: 48,
-        armourpen: 60,
         breachdmg: 16,
         breachmax: 0,
         breachmin: 0,
@@ -7982,6 +7986,7 @@ module.exports = {
         missile: "D",
         mount: "F",
         name: "Rocket Propelled FSD Disruptor",
+        piercing: 60,
         power: 1.2,
         pp: "Yuri Grom",
         rating: "B",
@@ -7992,7 +7997,6 @@ module.exports = {
         type: "E"
       }, {
         ammo: 120,
-        armourpen: 60,
         breachdmg: 6,
         breachmax: 0,
         breachmin: 0,
@@ -8012,6 +8016,7 @@ module.exports = {
         missile: "S",
         mount: "F",
         name: "Pack-Hound",
+        piercing: 60,
         power: 1.2,
         pp: "Li Yong-Rui",
         rating: "B",
@@ -8024,7 +8029,6 @@ module.exports = {
       } ],
       tp: [ {
         ammo: 1,
-        armourpen: 1e4,
         breachdmg: 60,
         breachmax: .8,
         breachmin: .6,
@@ -8032,6 +8036,7 @@ module.exports = {
         clip: 1,
         cost: 11200,
         damage: 120,
+        distdraw: 0,
         edID: 128049509,
         eddbID: 882,
         grp: "tp",
@@ -8040,6 +8045,7 @@ module.exports = {
         mass: 2,
         missile: "S",
         mount: "F",
+        piercing: 1e4,
         power: .4,
         rating: "I",
         reload: 5,
@@ -8049,14 +8055,14 @@ module.exports = {
         type: "E"
       }, {
         ammo: 2,
-        armourpen: 1e4,
         breachdmg: 60,
         breachmax: .8,
         breachmin: .6,
         class: 2,
         clip: 1,
         cost: 44800,
-        dps: 120,
+        damage: 120,
+        distdraw: 0,
         edID: 128049510,
         eddbID: 883,
         grp: "tp",
@@ -8065,6 +8071,7 @@ module.exports = {
         mass: 4,
         missile: "S",
         mount: "F",
+        piercing: 1e4,
         power: .4,
         rating: "I",
         reload: 5,
@@ -8075,7 +8082,6 @@ module.exports = {
       } ],
       nl: [ {
         ammo: 36,
-        armourpen: 60,
         breachdmg: 0,
         breachmax: 0,
         breachmin: 0,
@@ -8091,6 +8097,7 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 60,
         power: .4,
         rating: "I",
         reload: 2,
@@ -8099,7 +8106,6 @@ module.exports = {
         type: "ET"
       }, {
         ammo: 36,
-        armourpen: 60,
         breachdmg: 0,
         breachmax: 0,
         breachmin: 0,
@@ -8116,6 +8122,7 @@ module.exports = {
         mass: 2,
         mount: "F",
         name: "Shock Mine Launcher",
+        piercing: 60,
         power: .4,
         rating: "I",
         reload: 2,
@@ -8124,7 +8131,6 @@ module.exports = {
         type: "ET"
       }, {
         ammo: 36,
-        armourpen: 60,
         breachdmg: 0,
         breachmax: 0,
         breachmin: 0,
@@ -8140,6 +8146,7 @@ module.exports = {
         integrity: 51,
         mass: 4,
         mount: "F",
+        piercing: 60,
         power: .4,
         rating: "I",
         reload: 2,
@@ -8148,7 +8155,6 @@ module.exports = {
         type: "ET"
       } ],
       ml: [ {
-        armourpen: 18,
         breachdmg: .3,
         breachmax: .2,
         breachmin: .1,
@@ -8163,11 +8169,11 @@ module.exports = {
         integrity: 40,
         mass: 2,
         mount: "F",
+        piercing: 18,
         power: .5,
         rating: "D",
         thermload: 2
       }, {
-        armourpen: "D",
         breachdmg: .6,
         breachmax: .2,
         breachmin: .1,
@@ -8178,16 +8184,17 @@ module.exports = {
         eddbID: 1479,
         grp: "ml",
         id: "ml",
+        integrity: 40,
         mass: 2,
         mount: "F",
         name: "Mining Lance",
+        piercing: "D",
         power: .7,
         pp: "Zemina Torval",
         rating: "D",
         thermload: 6,
         type: "T"
       }, {
-        armourpen: 18,
         breachdmg: 1.2,
         breachmax: .2,
         breachmin: .1,
@@ -8202,6 +8209,7 @@ module.exports = {
         integrity: 51,
         mass: 2,
         mount: "F",
+        piercing: 18,
         power: .75,
         rating: "D",
         thermload: 4
@@ -8493,8 +8501,8 @@ module.exports = {
         power: .2,
         rating: "I",
         reload: 10,
-        thermload: 4,
-        rof: 1
+        rof: 1,
+        thermload: 4
       } ],
       ec: [ {
         activepower: 4,
@@ -8511,8 +8519,8 @@ module.exports = {
         name: "Electronic Countermeasure",
         power: .2,
         range: 3e3,
-        reload: 10,
         rating: "F",
+        reload: 10,
         thermload: 4
       } ],
       hs: [ {
diff --git a/dist/index.json b/dist/index.json
index 5b4308c..4850ab2 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -4311,7 +4311,7 @@
 					"id": "py",
 					"integrity": 135,
 					"mass": 160,
-					"pGen": 24,
+					"pgen": 24,
 					"rating": "E"
 				},
 				{
@@ -4324,7 +4324,7 @@
 					"id": "px",
 					"integrity": 120,
 					"mass": 64,
-					"pGen": 27,
+					"pgen": 27,
 					"rating": "D"
 				},
 				{
@@ -4337,7 +4337,7 @@
 					"id": "pw",
 					"integrity": 150,
 					"mass": 80,
-					"pGen": 30,
+					"pgen": 30,
 					"rating": "C"
 				},
 				{
@@ -4350,7 +4350,7 @@
 					"id": "pv",
 					"integrity": 180,
 					"mass": 128,
-					"pGen": 33,
+					"pgen": 33,
 					"rating": "B"
 				},
 				{
@@ -4363,7 +4363,7 @@
 					"id": "pu",
 					"integrity": 165,
 					"mass": 80,
-					"pGen": 36,
+					"pgen": 36,
 					"rating": "A"
 				},
 				{
@@ -4376,7 +4376,7 @@
 					"id": "pt",
 					"integrity": 118,
 					"mass": 80,
-					"pGen": 20,
+					"pgen": 20,
 					"rating": "E"
 				},
 				{
@@ -4389,7 +4389,7 @@
 					"id": "ps",
 					"integrity": 105,
 					"mass": 32,
-					"pGen": 22.5,
+					"pgen": 22.5,
 					"rating": "D"
 				},
 				{
@@ -4402,7 +4402,7 @@
 					"id": "pr",
 					"integrity": 131,
 					"mass": 40,
-					"pGen": 25,
+					"pgen": 25,
 					"rating": "C"
 				},
 				{
@@ -4415,7 +4415,7 @@
 					"id": "pq",
 					"integrity": 157,
 					"mass": 64,
-					"pGen": 27.5,
+					"pgen": 27.5,
 					"rating": "B"
 				},
 				{
@@ -4428,7 +4428,7 @@
 					"id": "pp",
 					"integrity": 144,
 					"mass": 40,
-					"pGen": 30,
+					"pgen": 30,
 					"rating": "A"
 				},
 				{
@@ -4441,7 +4441,7 @@
 					"id": "po",
 					"integrity": 90,
 					"mass": 40,
-					"pGen": 16.8,
+					"pgen": 16.8,
 					"rating": "E"
 				},
 				{
@@ -4454,7 +4454,7 @@
 					"id": "pn",
 					"integrity": 113,
 					"mass": 16,
-					"pGen": 18.9,
+					"pgen": 18.9,
 					"rating": "D"
 				},
 				{
@@ -4467,7 +4467,7 @@
 					"id": "pm",
 					"integrity": 136,
 					"mass": 20,
-					"pGen": 21,
+					"pgen": 21,
 					"rating": "C"
 				},
 				{
@@ -4480,7 +4480,7 @@
 					"id": "pl",
 					"integrity": 124,
 					"mass": 32,
-					"pGen": 23.1,
+					"pgen": 23.1,
 					"rating": "B"
 				},
 				{
@@ -4493,7 +4493,7 @@
 					"id": "pk",
 					"integrity": 118,
 					"mass": 20,
-					"pGen": 25.2,
+					"pgen": 25.2,
 					"rating": "A"
 				},
 				{
@@ -4506,7 +4506,7 @@
 					"id": "pj",
 					"integrity": 86,
 					"mass": 20,
-					"pGen": 13.6,
+					"pgen": 13.6,
 					"rating": "E"
 				},
 				{
@@ -4519,7 +4519,7 @@
 					"id": "pi",
 					"integrity": 77,
 					"mass": 8,
-					"pGen": 15.3,
+					"pgen": 15.3,
 					"rating": "D"
 				},
 				{
@@ -4532,7 +4532,7 @@
 					"id": "ph",
 					"integrity": 96,
 					"mass": 10,
-					"pGen": 17,
+					"pgen": 17,
 					"rating": "C"
 				},
 				{
@@ -4545,7 +4545,7 @@
 					"id": "pg",
 					"integrity": 114,
 					"mass": 16,
-					"pGen": 18.7,
+					"pgen": 18.7,
 					"rating": "B"
 				},
 				{
@@ -4558,7 +4558,7 @@
 					"id": "pf",
 					"integrity": 106,
 					"mass": 10,
-					"pGen": 20.4,
+					"pgen": 20.4,
 					"rating": "A"
 				},
 				{
@@ -4571,7 +4571,7 @@
 					"id": "pe",
 					"integrity": 72,
 					"mass": 10,
-					"pGen": 10.4,
+					"pgen": 10.4,
 					"rating": "E"
 				},
 				{
@@ -4584,7 +4584,7 @@
 					"id": "pd",
 					"integrity": 64,
 					"mass": 4,
-					"pGen": 11.7,
+					"pgen": 11.7,
 					"rating": "D"
 				},
 				{
@@ -4597,7 +4597,7 @@
 					"id": "pc",
 					"integrity": 80,
 					"mass": 5,
-					"pGen": 13,
+					"pgen": 13,
 					"rating": "C"
 				},
 				{
@@ -4610,7 +4610,7 @@
 					"id": "pb",
 					"integrity": 96,
 					"mass": 8,
-					"pGen": 14.3,
+					"pgen": 14.3,
 					"rating": "B"
 				},
 				{
@@ -4623,7 +4623,7 @@
 					"id": "pa",
 					"integrity": 88,
 					"mass": 5,
-					"pGen": 15.6,
+					"pgen": 15.6,
 					"rating": "A"
 				},
 				{
@@ -4636,7 +4636,7 @@
 					"id": "p9",
 					"integrity": 58,
 					"mass": 5,
-					"pGen": 8,
+					"pgen": 8,
 					"rating": "E"
 				},
 				{
@@ -4649,7 +4649,7 @@
 					"id": "p8",
 					"integrity": 51,
 					"mass": 2,
-					"pGen": 9,
+					"pgen": 9,
 					"rating": "D"
 				},
 				{
@@ -4662,7 +4662,7 @@
 					"id": "p7",
 					"integrity": 64,
 					"mass": 2.5,
-					"pGen": 10,
+					"pgen": 10,
 					"rating": "C"
 				},
 				{
@@ -4675,7 +4675,7 @@
 					"id": "p6",
 					"integrity": 77,
 					"mass": 4,
-					"pGen": 11,
+					"pgen": 11,
 					"rating": "B"
 				},
 				{
@@ -4688,7 +4688,7 @@
 					"id": "p5",
 					"integrity": 70,
 					"mass": 2.5,
-					"pGen": 12,
+					"pgen": 12,
 					"rating": "A"
 				},
 				{
@@ -4701,7 +4701,7 @@
 					"id": "p4",
 					"integrity": 46,
 					"mass": 2.5,
-					"pGen": 6.4,
+					"pgen": 6.4,
 					"rating": "E"
 				},
 				{
@@ -4714,7 +4714,7 @@
 					"id": "p3",
 					"integrity": 41,
 					"mass": 1,
-					"pGen": 7.2,
+					"pgen": 7.2,
 					"rating": "D"
 				},
 				{
@@ -4727,7 +4727,7 @@
 					"id": "p2",
 					"integrity": 51,
 					"mass": 1.3,
-					"pGen": 8,
+					"pgen": 8,
 					"rating": "C"
 				},
 				{
@@ -4740,7 +4740,7 @@
 					"id": "p1",
 					"integrity": 61,
 					"mass": 2,
-					"pGen": 8.8,
+					"pgen": 8.8,
 					"rating": "B"
 				},
 				{
@@ -4753,7 +4753,7 @@
 					"id": "p0",
 					"integrity": 56,
 					"mass": 1.3,
-					"pGen": 9.6,
+					"pgen": 9.6,
 					"rating": "A"
 				}
 			],
@@ -7894,7 +7894,6 @@
 		"hardpoints": {
 			"pl": [
 				{
-					"armourpen": 20,
 					"breachdmg": 2.04,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -7909,6 +7908,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 20,
 					"power": 0.39,
 					"range": 3000,
 					"rating": "F",
@@ -7917,7 +7917,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 20,
 					"breachdmg": 1.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -7932,6 +7931,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "G",
+					"piercing": 20,
 					"power": 0.39,
 					"range": 3000,
 					"rating": "G",
@@ -7940,7 +7940,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 20,
 					"breachdmg": 1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -7955,6 +7954,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "T",
+					"piercing": 20,
 					"power": 0.38,
 					"range": 3000,
 					"rating": "G",
@@ -7963,7 +7963,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -7978,6 +7977,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 35,
 					"power": 0.6,
 					"range": 3000,
 					"rating": "F",
@@ -7986,7 +7986,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 2.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8001,6 +8000,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "G",
+					"piercing": 35,
 					"power": 0.6,
 					"range": 3000,
 					"rating": "F",
@@ -8009,7 +8009,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 1.7,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8024,6 +8023,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "T",
+					"piercing": 35,
 					"power": 0.58,
 					"range": 3000,
 					"rating": "F",
@@ -8032,7 +8032,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": "A",
 					"breachdmg": 2.4,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8043,9 +8042,11 @@
 					"eddbID": 1483,
 					"grp": "pl",
 					"id": "PL",
+					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
 					"name": "Disruptor",
+					"piercing": "A",
 					"power": 0.7,
 					"pp": "Felicia Winters",
 					"rating": "E",
@@ -8054,7 +8055,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 52,
 					"breachdmg": 5.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8069,6 +8069,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "F",
+					"piercing": 52,
 					"power": 0.9,
 					"range": 3000,
 					"rating": "D",
@@ -8077,7 +8078,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 52,
 					"breachdmg": 3.9,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8092,6 +8092,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "G",
+					"piercing": 52,
 					"power": 0.92,
 					"range": 3000,
 					"rating": "E",
@@ -8100,7 +8101,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 52,
 					"breachdmg": 3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8115,6 +8115,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "T",
+					"piercing": 52,
 					"power": 0.89,
 					"range": 3000,
 					"rating": "F",
@@ -8123,7 +8124,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 65,
 					"breachdmg": 8.7,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8138,6 +8138,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "F",
+					"piercing": 65,
 					"power": 1.33,
 					"range": 3000,
 					"rating": "A",
@@ -8146,7 +8147,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 65,
 					"breachdmg": 6.6,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8161,6 +8161,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "G",
+					"piercing": 65,
 					"power": 1.37,
 					"range": 3000,
 					"rating": "A",
@@ -8171,7 +8172,6 @@
 			],
 			"ul": [
 				{
-					"armourpen": 20,
 					"breachdmg": 7.05,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8188,6 +8188,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 20,
 					"power": 0.65,
 					"range": 3000,
 					"rating": "F",
@@ -8196,7 +8197,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 20,
 					"breachdmg": 5.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8213,6 +8213,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "G",
+					"piercing": 20,
 					"power": 0.64,
 					"range": 3000,
 					"rating": "G",
@@ -8221,7 +8222,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 20,
 					"breachdmg": 1.92,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8238,6 +8238,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "T",
+					"piercing": 20,
 					"power": 0.6,
 					"range": 3000,
 					"rating": "G",
@@ -8246,7 +8247,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 1,
 					"breachdmg": 15.25,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -8264,6 +8264,7 @@
 					"mass": 2,
 					"mount": "F",
 					"name": "Cytoscrambler",
+					"piercing": 1,
 					"power": 0.8,
 					"pp": "Archon Delaine",
 					"range": 600,
@@ -8273,7 +8274,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 11.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8290,6 +8290,7 @@
 					"integrity": 40,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 35,
 					"power": 1.05,
 					"range": 3000,
 					"rating": "E",
@@ -8298,7 +8299,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 8.82,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8315,6 +8315,7 @@
 					"integrity": 40,
 					"mass": 4,
 					"mount": "G",
+					"piercing": 35,
 					"power": 1.04,
 					"range": 3000,
 					"rating": "F",
@@ -8323,7 +8324,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 3.51,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8340,6 +8340,7 @@
 					"integrity": 40,
 					"mass": 4,
 					"mount": "T",
+					"piercing": 35,
 					"power": 0.98,
 					"range": 3000,
 					"rating": "F",
@@ -8348,7 +8349,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 52,
 					"breachdmg": 10.53,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8365,6 +8365,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "F",
+					"piercing": 52,
 					"power": 1.66,
 					"range": 3000,
 					"rating": "D",
@@ -8373,7 +8374,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 52,
 					"breachdmg": 14.08,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8390,6 +8390,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "G",
+					"piercing": 52,
 					"power": 1.65,
 					"range": 3000,
 					"rating": "E",
@@ -8398,7 +8399,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 52,
 					"breachdmg": 5.58,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8415,6 +8415,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "T",
+					"piercing": 52,
 					"power": 1.57,
 					"range": 3000,
 					"rating": "E",
@@ -8423,7 +8424,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 65,
 					"breachdmg": 28,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8440,6 +8440,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "F",
+					"piercing": 65,
 					"power": 2.58,
 					"range": 3000,
 					"rating": "E",
@@ -8448,7 +8449,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 65,
 					"breachdmg": 21.63,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8465,6 +8465,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "G",
+					"piercing": 65,
 					"power": 2.59,
 					"range": 3000,
 					"rating": "E",
@@ -8475,7 +8476,6 @@
 			],
 			"bl": [
 				{
-					"armourpen": 18,
 					"breachdmg": 7.9,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8490,6 +8490,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 18,
 					"power": 0.69,
 					"range": 3000,
 					"rating": "E",
@@ -8497,7 +8498,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 18,
 					"breachdmg": 6.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8512,6 +8512,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "G",
+					"piercing": 18,
 					"power": 0.67,
 					"range": 3000,
 					"rating": "E",
@@ -8519,7 +8520,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 18,
 					"breachdmg": 4.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8536,6 +8536,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "T",
+					"piercing": 18,
 					"power": 0.63,
 					"range": 3000,
 					"rating": "F",
@@ -8543,7 +8544,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 18,
 					"breachdmg": 3.9,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8559,6 +8559,7 @@
 					"mass": 2,
 					"mount": "F",
 					"name": "Retributor",
+					"piercing": 18,
 					"power": 0.69,
 					"pp": "Edmund Mahon",
 					"range": 3000,
@@ -8567,7 +8568,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 12.8,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8582,6 +8582,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 35,
 					"power": 1.12,
 					"range": 3000,
 					"rating": "D",
@@ -8589,7 +8590,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 10,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8604,6 +8604,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "G",
+					"piercing": 35,
 					"power": 1.1,
 					"range": 3000,
 					"rating": "D",
@@ -8611,7 +8612,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 35,
 					"breachdmg": 7.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8626,6 +8626,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "T",
+					"piercing": 35,
 					"power": 1.03,
 					"range": 3000,
 					"rating": "E",
@@ -8633,7 +8634,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 50,
 					"breachdmg": 20.6,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8648,6 +8648,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "F",
+					"piercing": 50,
 					"power": 1.8,
 					"range": 3000,
 					"rating": "C",
@@ -8655,7 +8656,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 50,
 					"breachdmg": 16.2,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8670,6 +8670,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "G",
+					"piercing": 50,
 					"power": 1.78,
 					"range": 3000,
 					"rating": "C",
@@ -8677,7 +8678,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 50,
 					"breachdmg": 11.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8692,6 +8692,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "T",
+					"piercing": 50,
 					"power": 1.68,
 					"range": 3000,
 					"rating": "D",
@@ -8699,7 +8700,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 60,
 					"breachdmg": 33.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8714,6 +8714,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "F",
+					"piercing": 60,
 					"power": 2.9,
 					"range": 3000,
 					"rating": "A",
@@ -8721,7 +8722,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 60,
 					"breachdmg": 26.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8736,6 +8736,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "G",
+					"piercing": 60,
 					"power": 2.86,
 					"range": 3000,
 					"rating": "A",
@@ -8746,7 +8747,6 @@
 			"mc": [
 				{
 					"ammo": 2100,
-					"armourpen": 22,
 					"breachdmg": 1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8762,6 +8762,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 22,
 					"power": 0.28,
 					"range": 4000,
 					"rating": "F",
@@ -8773,7 +8774,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 22,
 					"breachdmg": 0.7,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8789,6 +8789,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "G",
+					"piercing": 22,
 					"power": 0.37,
 					"range": 4000,
 					"rating": "G",
@@ -8800,7 +8801,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 22,
 					"breachdmg": 0.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8816,6 +8816,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "T",
+					"piercing": 22,
 					"power": 0.26,
 					"range": 4000,
 					"rating": "G",
@@ -8827,7 +8828,6 @@
 				},
 				{
 					"ammo": 1000,
-					"armourpen": "A",
 					"breachdmg": 2.7,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8839,9 +8839,11 @@
 					"eddbID": 1481,
 					"grp": "mc",
 					"id": "e0",
+					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
 					"name": "Enforcer",
+					"piercing": "A",
 					"power": 0.28,
 					"pp": "Pranav Antal",
 					"range": 4500,
@@ -8854,7 +8856,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 37,
 					"breachdmg": 2,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8870,6 +8871,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 37,
 					"power": 0.46,
 					"range": 4000,
 					"rating": "E",
@@ -8881,7 +8883,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 37,
 					"breachdmg": 1.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8897,6 +8898,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "G",
+					"piercing": 37,
 					"power": 0.64,
 					"range": 4000,
 					"rating": "F",
@@ -8908,7 +8910,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 37,
 					"breachdmg": 1.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8924,6 +8925,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "T",
+					"piercing": 37,
 					"power": 0.5,
 					"range": 4000,
 					"rating": "F",
@@ -8935,7 +8937,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 54,
 					"breachdmg": 3.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8951,6 +8952,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "F",
+					"piercing": 54,
 					"power": 0.64,
 					"range": 4000,
 					"rating": "C",
@@ -8962,7 +8964,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 54,
 					"breachdmg": 2.6,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -8978,6 +8979,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "G",
+					"piercing": 54,
 					"power": 0.97,
 					"range": 4000,
 					"rating": "C",
@@ -8989,7 +8991,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 68,
 					"breachdmg": 4.2,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9005,6 +9006,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "F",
+					"piercing": 68,
 					"power": 0.73,
 					"range": 4000,
 					"rating": "A",
@@ -9017,7 +9019,6 @@
 				},
 				{
 					"ammo": 2100,
-					"armourpen": 68,
 					"breachdmg": 3.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9033,6 +9034,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "G",
+					"piercing": 68,
 					"power": 1.22,
 					"range": 4000,
 					"rating": "A",
@@ -9047,7 +9049,6 @@
 			"c": [
 				{
 					"ammo": 100,
-					"armourpen": 35,
 					"breachdmg": 17.1,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9063,6 +9064,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 35,
 					"power": 0.34,
 					"range": 3000,
 					"rating": "D",
@@ -9074,7 +9076,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 35,
 					"breachdmg": 13.2,
 					"breachmax": 0.9,
 					"breachmin": 0.6,
@@ -9090,6 +9091,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "G",
+					"piercing": 35,
 					"power": 0.38,
 					"range": 3000,
 					"rating": "E",
@@ -9101,7 +9103,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 10.6,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9117,6 +9118,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "T",
+					"piercing": 90,
 					"power": 0.32,
 					"range": 3000,
 					"rating": "F",
@@ -9128,7 +9130,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 28,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9144,6 +9145,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 90,
 					"power": 0.49,
 					"range": 3500,
 					"rating": "D",
@@ -9155,7 +9157,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 20.3,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9171,6 +9172,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "G",
+					"piercing": 90,
 					"power": 0.54,
 					"range": 3500,
 					"rating": "D",
@@ -9182,7 +9184,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 16.3,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9198,6 +9199,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "T",
+					"piercing": 90,
 					"power": 0.45,
 					"range": 3500,
 					"rating": "E",
@@ -9209,7 +9211,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 42.3,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9225,6 +9226,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "F",
+					"piercing": 90,
 					"power": 0.67,
 					"range": 4000,
 					"rating": "C",
@@ -9236,7 +9238,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 30.9,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9254,6 +9255,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "G",
+					"piercing": 90,
 					"power": 0.75,
 					"range": 4000,
 					"rating": "C",
@@ -9265,7 +9267,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 25.14,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9281,6 +9282,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "T",
+					"piercing": 90,
 					"power": 0.64,
 					"range": 4000,
 					"rating": "D",
@@ -9292,7 +9294,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 63.2,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9310,6 +9311,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "F",
+					"piercing": 90,
 					"power": 0.92,
 					"range": 4500,
 					"rating": "B",
@@ -9321,7 +9323,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 90,
 					"breachdmg": 46.7,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -9339,6 +9340,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "G",
+					"piercing": 90,
 					"power": 1.03,
 					"range": 4500,
 					"rating": "B",
@@ -9352,7 +9354,6 @@
 			"fc": [
 				{
 					"ammo": 90,
-					"armourpen": 20,
 					"breachdmg": 1.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9369,6 +9370,7 @@
 					"jitter": 0.5,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 20,
 					"power": 0.45,
 					"range": 2000,
 					"rating": "E",
@@ -9381,7 +9383,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 20,
 					"breachdmg": 0.9,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9398,6 +9399,7 @@
 					"jitter": 0.5,
 					"mass": 2,
 					"mount": "G",
+					"piercing": 20,
 					"power": 0.59,
 					"range": 2000,
 					"rating": "E",
@@ -9410,7 +9412,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 20,
 					"breachdmg": 0.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9427,6 +9428,7 @@
 					"jitter": 0.5,
 					"mass": 2,
 					"mount": "T",
+					"piercing": 20,
 					"power": 0.42,
 					"range": 2000,
 					"rating": "E",
@@ -9439,7 +9441,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 35,
 					"breachdmg": 2.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9456,6 +9457,7 @@
 					"jitter": 0.5,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 35,
 					"power": 0.74,
 					"range": 2000,
 					"rating": "A",
@@ -9468,7 +9470,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 35,
 					"breachdmg": 1.8,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9485,6 +9486,7 @@
 					"jitter": 0.5,
 					"mass": 4,
 					"mount": "G",
+					"piercing": 35,
 					"power": 1.03,
 					"range": 2000,
 					"rating": "D",
@@ -9497,7 +9499,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 35,
 					"breachdmg": 1.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9514,6 +9515,7 @@
 					"jitter": 0.5,
 					"mass": 4,
 					"mount": "T",
+					"piercing": 35,
 					"power": 0.79,
 					"range": 2000,
 					"rating": "D",
@@ -9526,7 +9528,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 52,
 					"breachdmg": 3.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9543,6 +9544,7 @@
 					"jitter": 0.5,
 					"mass": 8,
 					"mount": "F",
+					"piercing": 52,
 					"power": 1.02,
 					"range": 2000,
 					"rating": "C",
@@ -9555,7 +9557,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 52,
 					"breachdmg": 2.9,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9572,6 +9573,7 @@
 					"jitter": 0.5,
 					"mass": 8,
 					"mount": "G",
+					"piercing": 52,
 					"power": 1.55,
 					"range": 2000,
 					"rating": "C",
@@ -9584,7 +9586,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 52,
 					"breachdmg": 2.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9601,6 +9602,7 @@
 					"jitter": 0.5,
 					"mass": 8,
 					"mount": "T",
+					"piercing": 52,
 					"power": 1.29,
 					"range": 2000,
 					"rating": "C",
@@ -9613,7 +9615,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": 52,
 					"breachdmg": 3.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9630,9 +9631,11 @@
 					"mass": 8,
 					"mount": "F",
 					"name": "Pacifier",
+					"piercing": 52,
 					"power": 1.02,
 					"pp": "Zachary Hudson",
 					"rating": "C",
+					"reload": 5,
 					"rof": 4.5,
 					"speed": 1000,
 					"thermload": 1.1,
@@ -9642,7 +9645,6 @@
 			"rg": [
 				{
 					"ammo": 30,
-					"armourpen": 30,
 					"breachdmg": 22.2,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9658,6 +9660,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 30,
 					"power": 1.15,
 					"range": 3000,
 					"rating": "D",
@@ -9668,7 +9671,6 @@
 				},
 				{
 					"ammo": 30,
-					"armourpen": 48,
 					"breachdmg": 39.5,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9684,6 +9686,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 48,
 					"power": 1.63,
 					"range": 3000,
 					"rating": "B",
@@ -9694,7 +9697,6 @@
 				},
 				{
 					"ammo": 90,
-					"armourpen": "A",
 					"breachdmg": 14.3,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9709,12 +9711,15 @@
 					"eddbID": 1484,
 					"grp": "rg",
 					"id": "ih",
+					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
 					"name": "Imperial Hammer",
+					"piercing": "A",
 					"power": 1.63,
 					"pp": "Arissa Lavigny-Duval",
 					"rating": "B",
+					"reload": 1,
 					"rof": 4.1,
 					"thermload": 16,
 					"type": "KT"
@@ -9723,7 +9728,6 @@
 			"pa": [
 				{
 					"ammo": 100,
-					"armourpen": 55,
 					"breachdmg": 44.2,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9739,6 +9743,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 55,
 					"power": 1.43,
 					"range": 3500,
 					"rating": "C",
@@ -9750,7 +9755,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 70,
 					"breachdmg": 68,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9766,6 +9770,7 @@
 					"integrity": 64,
 					"mass": 8,
 					"mount": "F",
+					"piercing": 70,
 					"power": 1.97,
 					"range": 3500,
 					"rating": "B",
@@ -9777,7 +9782,6 @@
 				},
 				{
 					"ammo": 300,
-					"armourpen": 70,
 					"breachdmg": 28.1,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9794,6 +9798,7 @@
 					"mass": 8,
 					"mount": "F",
 					"name": "Advanced Plasma Accelerator",
+					"piercing": 70,
 					"power": 1.97,
 					"pp": "Denton Patreus",
 					"range": 3500,
@@ -9806,7 +9811,6 @@
 				},
 				{
 					"ammo": 100,
-					"armourpen": 85,
 					"breachdmg": 102,
 					"breachmax": 0.8,
 					"breachmin": 0.4,
@@ -9822,6 +9826,7 @@
 					"integrity": 80,
 					"mass": 16,
 					"mount": "F",
+					"piercing": 85,
 					"power": 2.63,
 					"range": 3500,
 					"rating": "A",
@@ -9835,7 +9840,6 @@
 			"mr": [
 				{
 					"ammo": 16,
-					"armourpen": 60,
 					"breachdmg": 20,
 					"breachmax": 1,
 					"breachmin": 1,
@@ -9852,6 +9856,7 @@
 					"mass": 2,
 					"missile": "D",
 					"mount": "F",
+					"piercing": 60,
 					"power": 0.4,
 					"rating": "B",
 					"reload": 5,
@@ -9862,7 +9867,6 @@
 				},
 				{
 					"ammo": 6,
-					"armourpen": 60,
 					"breachdmg": 16,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -9879,6 +9883,7 @@
 					"mass": 2,
 					"missile": "S",
 					"mount": "F",
+					"piercing": 60,
 					"power": 0.6,
 					"rating": "B",
 					"reload": 12,
@@ -9889,7 +9894,6 @@
 				},
 				{
 					"ammo": 48,
-					"armourpen": 60,
 					"breachdmg": 20,
 					"breachmax": 1,
 					"breachmin": 1,
@@ -9907,6 +9911,7 @@
 					"mass": 4,
 					"missile": "D",
 					"mount": "F",
+					"piercing": 60,
 					"power": 1.2,
 					"rating": "B",
 					"reload": 5,
@@ -9916,7 +9921,6 @@
 				},
 				{
 					"ammo": 18,
-					"armourpen": 60,
 					"breachdmg": 16,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -9935,6 +9939,7 @@
 					"mass": 4,
 					"missile": "S",
 					"mount": "F",
+					"piercing": 60,
 					"power": 1.2,
 					"rating": "B",
 					"reload": 12,
@@ -9945,7 +9950,6 @@
 				},
 				{
 					"ammo": 48,
-					"armourpen": 60,
 					"breachdmg": 16,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -9962,6 +9966,7 @@
 					"missile": "D",
 					"mount": "F",
 					"name": "Rocket Propelled FSD Disruptor",
+					"piercing": 60,
 					"power": 1.2,
 					"pp": "Yuri Grom",
 					"rating": "B",
@@ -9973,7 +9978,6 @@
 				},
 				{
 					"ammo": 120,
-					"armourpen": 60,
 					"breachdmg": 6,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -9993,6 +9997,7 @@
 					"missile": "S",
 					"mount": "F",
 					"name": "Pack-Hound",
+					"piercing": 60,
 					"power": 1.2,
 					"pp": "Li Yong-Rui",
 					"rating": "B",
@@ -10007,7 +10012,6 @@
 			"tp": [
 				{
 					"ammo": 1,
-					"armourpen": 10000,
 					"breachdmg": 60,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
@@ -10015,6 +10019,7 @@
 					"clip": 1,
 					"cost": 11200,
 					"damage": 120,
+					"distdraw": 0,
 					"edID": 128049509,
 					"eddbID": 882,
 					"grp": "tp",
@@ -10023,6 +10028,7 @@
 					"mass": 2,
 					"missile": "S",
 					"mount": "F",
+					"piercing": 10000,
 					"power": 0.4,
 					"rating": "I",
 					"reload": 5,
@@ -10033,14 +10039,14 @@
 				},
 				{
 					"ammo": 2,
-					"armourpen": 10000,
 					"breachdmg": 60,
 					"breachmax": 0.8,
 					"breachmin": 0.6,
 					"class": 2,
 					"clip": 1,
 					"cost": 44800,
-					"dps": 120,
+					"damage": 120,
+					"distdraw": 0,
 					"edID": 128049510,
 					"eddbID": 883,
 					"grp": "tp",
@@ -10049,6 +10055,7 @@
 					"mass": 4,
 					"missile": "S",
 					"mount": "F",
+					"piercing": 10000,
 					"power": 0.4,
 					"rating": "I",
 					"reload": 5,
@@ -10061,7 +10068,6 @@
 			"nl": [
 				{
 					"ammo": 36,
-					"armourpen": 60,
 					"breachdmg": 0,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -10077,6 +10083,7 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 60,
 					"power": 0.4,
 					"rating": "I",
 					"reload": 2,
@@ -10086,7 +10093,6 @@
 				},
 				{
 					"ammo": 36,
-					"armourpen": 60,
 					"breachdmg": 0,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -10103,6 +10109,7 @@
 					"mass": 2,
 					"mount": "F",
 					"name": "Shock Mine Launcher",
+					"piercing": 60,
 					"power": 0.4,
 					"rating": "I",
 					"reload": 2,
@@ -10112,7 +10119,6 @@
 				},
 				{
 					"ammo": 36,
-					"armourpen": 60,
 					"breachdmg": 0,
 					"breachmax": 0,
 					"breachmin": 0,
@@ -10128,6 +10134,7 @@
 					"integrity": 51,
 					"mass": 4,
 					"mount": "F",
+					"piercing": 60,
 					"power": 0.4,
 					"rating": "I",
 					"reload": 2,
@@ -10138,7 +10145,6 @@
 			],
 			"ml": [
 				{
-					"armourpen": 18,
 					"breachdmg": 0.3,
 					"breachmax": 0.2,
 					"breachmin": 0.1,
@@ -10153,12 +10159,12 @@
 					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 18,
 					"power": 0.5,
 					"rating": "D",
 					"thermload": 2
 				},
 				{
-					"armourpen": "D",
 					"breachdmg": 0.6,
 					"breachmax": 0.2,
 					"breachmin": 0.1,
@@ -10169,9 +10175,11 @@
 					"eddbID": 1479,
 					"grp": "ml",
 					"id": "ml",
+					"integrity": 40,
 					"mass": 2,
 					"mount": "F",
 					"name": "Mining Lance",
+					"piercing": "D",
 					"power": 0.7,
 					"pp": "Zemina Torval",
 					"rating": "D",
@@ -10179,7 +10187,6 @@
 					"type": "T"
 				},
 				{
-					"armourpen": 18,
 					"breachdmg": 1.2,
 					"breachmax": 0.2,
 					"breachmin": 0.1,
@@ -10194,6 +10201,7 @@
 					"integrity": 51,
 					"mass": 2,
 					"mount": "F",
+					"piercing": 18,
 					"power": 0.75,
 					"rating": "D",
 					"thermload": 4
@@ -10511,8 +10519,8 @@
 					"power": 0.2,
 					"rating": "I",
 					"reload": 10,
-					"thermload": 4,
-					"rof": 1
+					"rof": 1,
+					"thermload": 4
 				}
 			],
 			"ec": [
@@ -10531,8 +10539,8 @@
 					"name": "Electronic Countermeasure",
 					"power": 0.2,
 					"range": 3000,
-					"reload": 10,
 					"rating": "F",
+					"reload": 10,
 					"thermload": 4
 				}
 			],
diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json
index c72581d..7428783 100644
--- a/modules/hardpoints/beam_laser.json
+++ b/modules/hardpoints/beam_laser.json
@@ -1,7 +1,6 @@
 {
   "bl": [
     {
-      "armourpen": 18,
       "breachdmg": 7.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -16,6 +15,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 18,
       "power": 0.69,
       "range": 3000,
       "rating": "E",
@@ -23,7 +23,6 @@
       "type": "T"
     },
     {
-      "armourpen": 18,
       "breachdmg": 6.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -38,6 +37,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 18,
       "power": 0.67,
       "range": 3000,
       "rating": "E",
@@ -45,7 +45,6 @@
       "type": "T"
     },
     {
-      "armourpen": 18,
       "breachdmg": 4.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -62,6 +61,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 18,
       "power": 0.63,
       "range": 3000,
       "rating": "F",
@@ -69,14 +69,13 @@
       "type": "T"
     },
     {
-      "armourpen": 18,
       "breachdmg": 3.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
       "cost": 56150,
       "damage": 4.9,
-      "distdraw": 2.80,
+      "distdraw": 2.8,
       "edID": 128671346,
       "eddbID": 1476,
       "grp": "bl",
@@ -85,6 +84,7 @@
       "mass": 2,
       "mount": "F",
       "name": "Retributor",
+      "piercing": 18,
       "power": 0.69,
       "pp": "Edmund Mahon",
       "range": 3000,
@@ -93,7 +93,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 12.8,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -108,6 +107,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 35,
       "power": 1.12,
       "range": 3000,
       "rating": "D",
@@ -115,7 +115,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 10,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -130,6 +129,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "G",
+      "piercing": 35,
       "power": 1.1,
       "range": 3000,
       "rating": "D",
@@ -137,7 +137,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 7.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -152,6 +151,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "T",
+      "piercing": 35,
       "power": 1.03,
       "range": 3000,
       "rating": "E",
@@ -159,7 +159,6 @@
       "type": "T"
     },
     {
-      "armourpen": 50,
       "breachdmg": 20.6,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -174,6 +173,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 50,
       "power": 1.8,
       "range": 3000,
       "rating": "C",
@@ -181,7 +181,6 @@
       "type": "T"
     },
     {
-      "armourpen": 50,
       "breachdmg": 16.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -196,6 +195,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
+      "piercing": 50,
       "power": 1.78,
       "range": 3000,
       "rating": "C",
@@ -203,7 +203,6 @@
       "type": "T"
     },
     {
-      "armourpen": 50,
       "breachdmg": 11.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -218,6 +217,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "T",
+      "piercing": 50,
       "power": 1.68,
       "range": 3000,
       "rating": "D",
@@ -225,14 +225,13 @@
       "type": "T"
     },
     {
-      "armourpen": 60,
       "breachdmg": 33.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 4,
       "cost": 2396160,
       "damage": 41.38,
-      "distdraw": 9.10,
+      "distdraw": 9.1,
       "edID": 128049431,
       "eddbID": 1540,
       "grp": "bl",
@@ -240,6 +239,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "F",
+      "piercing": 60,
       "power": 2.9,
       "range": 3000,
       "rating": "A",
@@ -247,7 +247,6 @@
       "type": "T"
     },
     {
-      "armourpen": 60,
       "breachdmg": 26.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -262,6 +261,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "G",
+      "piercing": 60,
       "power": 2.86,
       "range": 3000,
       "rating": "A",
diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json
index 07ebca0..b8e78e5 100644
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -1,7 +1,6 @@
 {
   "ul": [
     {
-      "armourpen": 20,
       "breachdmg": 7.05,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -18,6 +17,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 20,
       "power": 0.65,
       "range": 3000,
       "rating": "F",
@@ -26,7 +26,6 @@
       "type": "T"
     },
     {
-      "armourpen": 20,
       "breachdmg": 5.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -43,6 +42,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 20,
       "power": 0.64,
       "range": 3000,
       "rating": "G",
@@ -51,7 +51,6 @@
       "type": "T"
     },
     {
-      "armourpen": 20,
       "breachdmg": 1.92,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -68,6 +67,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 20,
       "power": 0.6,
       "range": 3000,
       "rating": "G",
@@ -76,7 +76,6 @@
       "type": "T"
     },
     {
-      "armourpen": 1,
       "breachdmg": 15.25,
       "breachmax": 0,
       "breachmin": 0,
@@ -94,6 +93,7 @@
       "mass": 2,
       "mount": "F",
       "name": "Cytoscrambler",
+      "piercing": 1,
       "power": 0.8,
       "pp": "Archon Delaine",
       "range": 600,
@@ -103,7 +103,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 11.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -120,6 +119,7 @@
       "integrity": 40,
       "mass": 4,
       "mount": "F",
+      "piercing": 35,
       "power": 1.05,
       "range": 3000,
       "rating": "E",
@@ -128,7 +128,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 8.82,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -145,6 +144,7 @@
       "integrity": 40,
       "mass": 4,
       "mount": "G",
+      "piercing": 35,
       "power": 1.04,
       "range": 3000,
       "rating": "F",
@@ -153,7 +153,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 3.51,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -170,6 +169,7 @@
       "integrity": 40,
       "mass": 4,
       "mount": "T",
+      "piercing": 35,
       "power": 0.98,
       "range": 3000,
       "rating": "F",
@@ -178,7 +178,6 @@
       "type": "T"
     },
     {
-      "armourpen": 52,
       "breachdmg": 10.53,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -195,6 +194,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 52,
       "power": 1.66,
       "range": 3000,
       "rating": "D",
@@ -203,7 +203,6 @@
       "type": "T"
     },
     {
-      "armourpen": 52,
       "breachdmg": 14.08,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -220,6 +219,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
+      "piercing": 52,
       "power": 1.65,
       "range": 3000,
       "rating": "E",
@@ -228,7 +228,6 @@
       "type": "T"
     },
     {
-      "armourpen": 52,
       "breachdmg": 5.58,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -245,6 +244,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "T",
+      "piercing": 52,
       "power": 1.57,
       "range": 3000,
       "rating": "E",
@@ -253,7 +253,6 @@
       "type": "T"
     },
     {
-      "armourpen": 65,
       "breachdmg": 28,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -270,6 +269,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "F",
+      "piercing": 65,
       "power": 2.58,
       "range": 3000,
       "rating": "E",
@@ -278,7 +278,6 @@
       "type": "T"
     },
     {
-      "armourpen": 65,
       "breachdmg": 21.63,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -286,7 +285,7 @@
       "burstrof": 5,
       "class": 4,
       "cost": 1245600,
-      "damage": 12.10,
+      "damage": 12.1,
       "distdraw": 2.72,
       "edID": 128727920,
       "eddbID": 1550,
@@ -295,6 +294,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "G",
+      "piercing": 65,
       "power": 2.59,
       "range": 3000,
       "rating": "E",
diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json
index 8772004..450ff13 100644
--- a/modules/hardpoints/cannon.json
+++ b/modules/hardpoints/cannon.json
@@ -2,7 +2,6 @@
   "c": [
     {
       "ammo": 100,
-      "armourpen": 35,
       "breachdmg": 17.1,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -18,6 +17,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 35,
       "power": 0.34,
       "range": 3000,
       "rating": "D",
@@ -29,7 +29,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 35,
       "breachdmg": 13.2,
       "breachmax": 0.9,
       "breachmin": 0.6,
@@ -45,6 +44,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 35,
       "power": 0.38,
       "range": 3000,
       "rating": "E",
@@ -56,7 +56,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 10.6,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -72,6 +71,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 90,
       "power": 0.32,
       "range": 3000,
       "rating": "F",
@@ -83,7 +83,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 28,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -99,6 +98,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 90,
       "power": 0.49,
       "range": 3500,
       "rating": "D",
@@ -110,7 +110,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 20.3,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -126,6 +125,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "G",
+      "piercing": 90,
       "power": 0.54,
       "range": 3500,
       "rating": "D",
@@ -137,7 +137,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 16.3,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -153,6 +152,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "T",
+      "piercing": 90,
       "power": 0.45,
       "range": 3500,
       "rating": "E",
@@ -164,7 +164,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 42.3,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -180,6 +179,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 90,
       "power": 0.67,
       "range": 4000,
       "rating": "C",
@@ -191,7 +191,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 30.9,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -209,6 +208,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
+      "piercing": 90,
       "power": 0.75,
       "range": 4000,
       "rating": "C",
@@ -220,7 +220,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 25.14,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -236,6 +235,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "T",
+      "piercing": 90,
       "power": 0.64,
       "range": 4000,
       "rating": "D",
@@ -247,7 +247,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 63.2,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -265,6 +264,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "F",
+      "piercing": 90,
       "power": 0.92,
       "range": 4500,
       "rating": "B",
@@ -276,7 +276,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 90,
       "breachdmg": 46.7,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -294,6 +293,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "G",
+      "piercing": 90,
       "power": 1.03,
       "range": 4500,
       "rating": "B",
diff --git a/modules/hardpoints/chaff_launcher.json b/modules/hardpoints/chaff_launcher.json
index 3a071c9..4cef54a 100644
--- a/modules/hardpoints/chaff_launcher.json
+++ b/modules/hardpoints/chaff_launcher.json
@@ -18,8 +18,8 @@
       "power": 0.2,
       "rating": "I",
       "reload": 10,
-      "thermload": 4,
-      "rof": 1
+      "rof": 1,
+      "thermload": 4
     }
   ]
 }
diff --git a/modules/hardpoints/electronic_countermeasure.json b/modules/hardpoints/electronic_countermeasure.json
index 585ca85..5aed18c 100644
--- a/modules/hardpoints/electronic_countermeasure.json
+++ b/modules/hardpoints/electronic_countermeasure.json
@@ -15,8 +15,8 @@
       "name": "Electronic Countermeasure",
       "power": 0.2,
       "range": 3000,
-      "reload": 10,
       "rating": "F",
+      "reload": 10,
       "thermload": 4
     }
   ]
diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json
index 30dda4b..ce1ed0b 100644
--- a/modules/hardpoints/fragment_cannon.json
+++ b/modules/hardpoints/fragment_cannon.json
@@ -2,7 +2,6 @@
   "fc": [
     {
       "ammo": 90,
-      "armourpen": 20,
       "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -19,6 +18,7 @@
       "jitter": 0.5,
       "mass": 2,
       "mount": "F",
+      "piercing": 20,
       "power": 0.45,
       "range": 2000,
       "rating": "E",
@@ -31,7 +31,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 20,
       "breachdmg": 0.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -48,6 +47,7 @@
       "jitter": 0.5,
       "mass": 2,
       "mount": "G",
+      "piercing": 20,
       "power": 0.59,
       "range": 2000,
       "rating": "E",
@@ -60,7 +60,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 20,
       "breachdmg": 0.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -77,6 +76,7 @@
       "jitter": 0.5,
       "mass": 2,
       "mount": "T",
+      "piercing": 20,
       "power": 0.42,
       "range": 2000,
       "rating": "E",
@@ -89,7 +89,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 35,
       "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -106,6 +105,7 @@
       "jitter": 0.5,
       "mass": 4,
       "mount": "F",
+      "piercing": 35,
       "power": 0.74,
       "range": 2000,
       "rating": "A",
@@ -118,7 +118,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 35,
       "breachdmg": 1.8,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -135,6 +134,7 @@
       "jitter": 0.5,
       "mass": 4,
       "mount": "G",
+      "piercing": 35,
       "power": 1.03,
       "range": 2000,
       "rating": "D",
@@ -147,7 +147,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 35,
       "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -164,6 +163,7 @@
       "jitter": 0.5,
       "mass": 4,
       "mount": "T",
+      "piercing": 35,
       "power": 0.79,
       "range": 2000,
       "rating": "D",
@@ -176,7 +176,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 52,
       "breachdmg": 3.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -193,6 +192,7 @@
       "jitter": 0.5,
       "mass": 8,
       "mount": "F",
+      "piercing": 52,
       "power": 1.02,
       "range": 2000,
       "rating": "C",
@@ -205,7 +205,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 52,
       "breachdmg": 2.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -222,6 +221,7 @@
       "jitter": 0.5,
       "mass": 8,
       "mount": "G",
+      "piercing": 52,
       "power": 1.55,
       "range": 2000,
       "rating": "C",
@@ -234,7 +234,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 52,
       "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -251,6 +250,7 @@
       "jitter": 0.5,
       "mass": 8,
       "mount": "T",
+      "piercing": 52,
       "power": 1.29,
       "range": 2000,
       "rating": "C",
@@ -263,7 +263,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": 52,
       "breachdmg": 3.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -280,9 +279,11 @@
       "mass": 8,
       "mount": "F",
       "name": "Pacifier",
+      "piercing": 52,
       "power": 1.02,
       "pp": "Zachary Hudson",
       "rating": "C",
+      "reload": 5,
       "rof": 4.5,
       "speed": 1000,
       "thermload": 1.1,
diff --git a/modules/hardpoints/mine_launcher.json b/modules/hardpoints/mine_launcher.json
index 71d199d..c91f106 100644
--- a/modules/hardpoints/mine_launcher.json
+++ b/modules/hardpoints/mine_launcher.json
@@ -2,7 +2,6 @@
   "nl": [
     {
       "ammo": 36,
-      "armourpen": 60,
       "breachdmg": 0,
       "breachmax": 0,
       "breachmin": 0,
@@ -18,6 +17,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 60,
       "power": 0.4,
       "rating": "I",
       "reload": 2,
@@ -27,7 +27,6 @@
     },
     {
       "ammo": 36,
-      "armourpen": 60,
       "breachdmg": 0,
       "breachmax": 0,
       "breachmin": 0,
@@ -44,6 +43,7 @@
       "mass": 2,
       "mount": "F",
       "name": "Shock Mine Launcher",
+      "piercing": 60,
       "power": 0.4,
       "rating": "I",
       "reload": 2,
@@ -53,7 +53,6 @@
     },
     {
       "ammo": 36,
-      "armourpen": 60,
       "breachdmg": 0,
       "breachmax": 0,
       "breachmin": 0,
@@ -69,6 +68,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 60,
       "power": 0.4,
       "rating": "I",
       "reload": 2,
diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json
index d60a8b1..1f66fb8 100644
--- a/modules/hardpoints/mining_laser.json
+++ b/modules/hardpoints/mining_laser.json
@@ -1,7 +1,6 @@
 {
   "ml": [
     {
-      "armourpen": 18,
       "breachdmg": 0.3,
       "breachmax": 0.2,
       "breachmin": 0.1,
@@ -16,12 +15,12 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 18,
       "power": 0.5,
       "rating": "D",
       "thermload": 2
     },
     {
-      "armourpen": "D",
       "breachdmg": 0.6,
       "breachmax": 0.2,
       "breachmin": 0.1,
@@ -32,9 +31,11 @@
       "eddbID": 1479,
       "grp": "ml",
       "id": "ml",
+      "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Mining Lance",
+      "piercing": "D",
       "power": 0.7,
       "pp": "Zemina Torval",
       "rating": "D",
@@ -42,7 +43,6 @@
       "type": "T"
     },
     {
-      "armourpen": 18,
       "breachdmg": 1.2,
       "breachmax": 0.2,
       "breachmin": 0.1,
@@ -57,6 +57,7 @@
       "integrity": 51,
       "mass": 2,
       "mount": "F",
+      "piercing": 18,
       "power": 0.75,
       "rating": "D",
       "thermload": 4
diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json
index a16052c..0e356d9 100644
--- a/modules/hardpoints/missile_rack.json
+++ b/modules/hardpoints/missile_rack.json
@@ -2,7 +2,6 @@
   "mr": [
     {
       "ammo": 16,
-      "armourpen": 60,
       "breachdmg": 20,
       "breachmax": 1,
       "breachmin": 1,
@@ -19,6 +18,7 @@
       "mass": 2,
       "missile": "D",
       "mount": "F",
+      "piercing": 60,
       "power": 0.4,
       "rating": "B",
       "reload": 5,
@@ -29,7 +29,6 @@
     },
     {
       "ammo": 6,
-      "armourpen": 60,
       "breachdmg": 16,
       "breachmax": 0,
       "breachmin": 0,
@@ -46,6 +45,7 @@
       "mass": 2,
       "missile": "S",
       "mount": "F",
+      "piercing": 60,
       "power": 0.6,
       "rating": "B",
       "reload": 12,
@@ -56,7 +56,6 @@
     },
     {
       "ammo": 48,
-      "armourpen": 60,
       "breachdmg": 20,
       "breachmax": 1,
       "breachmin": 1,
@@ -74,6 +73,7 @@
       "mass": 4,
       "missile": "D",
       "mount": "F",
+      "piercing": 60,
       "power": 1.2,
       "rating": "B",
       "reload": 5,
@@ -83,7 +83,6 @@
     },
     {
       "ammo": 18,
-      "armourpen": 60,
       "breachdmg": 16,
       "breachmax": 0,
       "breachmin": 0,
@@ -102,6 +101,7 @@
       "mass": 4,
       "missile": "S",
       "mount": "F",
+      "piercing": 60,
       "power": 1.2,
       "rating": "B",
       "reload": 12,
@@ -112,7 +112,6 @@
     },
     {
       "ammo": 48,
-      "armourpen": 60,
       "breachdmg": 16,
       "breachmax": 0,
       "breachmin": 0,
@@ -129,6 +128,7 @@
       "missile": "D",
       "mount": "F",
       "name": "Rocket Propelled FSD Disruptor",
+      "piercing": 60,
       "power": 1.2,
       "pp": "Yuri Grom",
       "rating": "B",
@@ -140,7 +140,6 @@
     },
     {
       "ammo": 120,
-      "armourpen": 60,
       "breachdmg": 6,
       "breachmax": 0,
       "breachmin": 0,
@@ -160,6 +159,7 @@
       "missile": "S",
       "mount": "F",
       "name": "Pack-Hound",
+      "piercing": 60,
       "power": 1.2,
       "pp": "Li Yong-Rui",
       "rating": "B",
diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json
index f1ec9fc..a2d44bc 100644
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -2,7 +2,6 @@
   "mc": [
     {
       "ammo": 2100,
-      "armourpen": 22,
       "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -18,6 +17,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 22,
       "power": 0.28,
       "range": 4000,
       "rating": "F",
@@ -29,7 +29,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 22,
       "breachdmg": 0.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -45,6 +44,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 22,
       "power": 0.37,
       "range": 4000,
       "rating": "G",
@@ -56,7 +56,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 22,
       "breachdmg": 0.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -72,6 +71,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 22,
       "power": 0.26,
       "range": 4000,
       "rating": "G",
@@ -83,7 +83,6 @@
     },
     {
       "ammo": 1000,
-      "armourpen": "A",
       "breachdmg": 2.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -95,9 +94,11 @@
       "eddbID": 1481,
       "grp": "mc",
       "id": "e0",
+      "integrity": 40,
       "mass": 2,
       "mount": "F",
       "name": "Enforcer",
+      "piercing": "A",
       "power": 0.28,
       "pp": "Pranav Antal",
       "range": 4500,
@@ -110,7 +111,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 37,
       "breachdmg": 2,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -126,6 +126,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 37,
       "power": 0.46,
       "range": 4000,
       "rating": "E",
@@ -137,7 +138,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 37,
       "breachdmg": 1.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -153,6 +153,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "G",
+      "piercing": 37,
       "power": 0.64,
       "range": 4000,
       "rating": "F",
@@ -164,7 +165,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 37,
       "breachdmg": 1.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -180,6 +180,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "T",
+      "piercing": 37,
       "power": 0.5,
       "range": 4000,
       "rating": "F",
@@ -191,7 +192,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 54,
       "breachdmg": 3.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -207,6 +207,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 54,
       "power": 0.64,
       "range": 4000,
       "rating": "C",
@@ -218,7 +219,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 54,
       "breachdmg": 2.6,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -234,6 +234,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
+      "piercing": 54,
       "power": 0.97,
       "range": 4000,
       "rating": "C",
@@ -245,7 +246,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 68,
       "breachdmg": 4.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -261,6 +261,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "F",
+      "piercing": 68,
       "power": 0.73,
       "range": 4000,
       "rating": "A",
@@ -273,7 +274,6 @@
     },
     {
       "ammo": 2100,
-      "armourpen": 68,
       "breachdmg": 3.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -289,6 +289,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "G",
+      "piercing": 68,
       "power": 1.22,
       "range": 4000,
       "rating": "A",
diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json
index 13b5362..a3e361a 100644
--- a/modules/hardpoints/plasma_accelerator.json
+++ b/modules/hardpoints/plasma_accelerator.json
@@ -2,7 +2,6 @@
   "pa": [
     {
       "ammo": 100,
-      "armourpen": 55,
       "breachdmg": 44.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -18,6 +17,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 55,
       "power": 1.43,
       "range": 3500,
       "rating": "C",
@@ -29,7 +29,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 70,
       "breachdmg": 68,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -45,6 +44,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 70,
       "power": 1.97,
       "range": 3500,
       "rating": "B",
@@ -56,7 +56,6 @@
     },
     {
       "ammo": 300,
-      "armourpen": 70,
       "breachdmg": 28.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -73,6 +72,7 @@
       "mass": 8,
       "mount": "F",
       "name": "Advanced Plasma Accelerator",
+      "piercing": 70,
       "power": 1.97,
       "pp": "Denton Patreus",
       "range": 3500,
@@ -85,7 +85,6 @@
     },
     {
       "ammo": 100,
-      "armourpen": 85,
       "breachdmg": 102,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -101,6 +100,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "F",
+      "piercing": 85,
       "power": 2.63,
       "range": 3500,
       "rating": "A",
diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json
index 3fa0701..cea8730 100644
--- a/modules/hardpoints/pulse_laser.json
+++ b/modules/hardpoints/pulse_laser.json
@@ -1,7 +1,6 @@
 {
   "pl": [
     {
-      "armourpen": 20,
       "breachdmg": 2.04,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -16,6 +15,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 20,
       "power": 0.39,
       "range": 3000,
       "rating": "F",
@@ -24,7 +24,6 @@
       "type": "T"
     },
     {
-      "armourpen": 20,
       "breachdmg": 1.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -39,6 +38,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "G",
+      "piercing": 20,
       "power": 0.39,
       "range": 3000,
       "rating": "G",
@@ -47,8 +47,7 @@
       "type": "T"
     },
     {
-      "armourpen": 20,
-      "breachdmg": 1.0,
+      "breachdmg": 1,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 1,
@@ -62,6 +61,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "T",
+      "piercing": 20,
       "power": 0.38,
       "range": 3000,
       "rating": "G",
@@ -70,8 +70,7 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
-      "breachdmg": 3.0,
+      "breachdmg": 3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
@@ -85,6 +84,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 35,
       "power": 0.6,
       "range": 3000,
       "rating": "F",
@@ -93,7 +93,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 2.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -108,6 +107,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "G",
+      "piercing": 35,
       "power": 0.6,
       "range": 3000,
       "rating": "F",
@@ -116,7 +116,6 @@
       "type": "T"
     },
     {
-      "armourpen": 35,
       "breachdmg": 1.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -131,6 +130,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "T",
+      "piercing": 35,
       "power": 0.58,
       "range": 3000,
       "rating": "F",
@@ -139,21 +139,21 @@
       "type": "T"
     },
     {
-      "armourpen": "A",
       "breachdmg": 2.4,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 2,
       "cost": 26400,
-      "damage": 2,
       "damage": 2.8,
       "distdraw": 1,
       "eddbID": 1483,
       "grp": "pl",
       "id": "PL",
+      "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Disruptor",
+      "piercing": "A",
       "power": 0.7,
       "pp": "Felicia Winters",
       "rating": "E",
@@ -162,7 +162,6 @@
       "type": "T"
     },
     {
-      "armourpen": 52,
       "breachdmg": 5.1,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -177,6 +176,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "F",
+      "piercing": 52,
       "power": 0.9,
       "range": 3000,
       "rating": "D",
@@ -185,7 +185,6 @@
       "type": "T"
     },
     {
-      "armourpen": 52,
       "breachdmg": 3.9,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -200,6 +199,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "G",
+      "piercing": 52,
       "power": 0.92,
       "range": 3000,
       "rating": "E",
@@ -208,8 +208,7 @@
       "type": "T"
     },
     {
-      "armourpen": 52,
-      "breachdmg": 3.0,
+      "breachdmg": 3,
       "breachmax": 0.8,
       "breachmin": 0.4,
       "class": 3,
@@ -223,6 +222,7 @@
       "integrity": 64,
       "mass": 8,
       "mount": "T",
+      "piercing": 52,
       "power": 0.89,
       "range": 3000,
       "rating": "F",
@@ -231,7 +231,6 @@
       "type": "T"
     },
     {
-      "armourpen": 65,
       "breachdmg": 8.7,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -246,6 +245,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "F",
+      "piercing": 65,
       "power": 1.33,
       "range": 3000,
       "rating": "A",
@@ -254,7 +254,6 @@
       "type": "T"
     },
     {
-      "armourpen": 65,
       "breachdmg": 6.6,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -269,6 +268,7 @@
       "integrity": 80,
       "mass": 16,
       "mount": "G",
+      "piercing": 65,
       "power": 1.37,
       "range": 3000,
       "rating": "A",
diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json
index 49406ce..3c5120f 100644
--- a/modules/hardpoints/rail_gun.json
+++ b/modules/hardpoints/rail_gun.json
@@ -2,7 +2,6 @@
   "rg": [
     {
       "ammo": 30,
-      "armourpen": 30,
       "breachdmg": 22.2,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -18,6 +17,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
+      "piercing": 30,
       "power": 1.15,
       "range": 3000,
       "rating": "D",
@@ -28,7 +28,6 @@
     },
     {
       "ammo": 30,
-      "armourpen": 48,
       "breachdmg": 39.5,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -44,6 +43,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
+      "piercing": 48,
       "power": 1.63,
       "range": 3000,
       "rating": "B",
@@ -54,7 +54,6 @@
     },
     {
       "ammo": 90,
-      "armourpen": "A",
       "breachdmg": 14.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -69,12 +68,15 @@
       "eddbID": 1484,
       "grp": "rg",
       "id": "ih",
+      "integrity": 51,
       "mass": 4,
       "mount": "F",
       "name": "Imperial Hammer",
+      "piercing": "A",
       "power": 1.63,
       "pp": "Arissa Lavigny-Duval",
       "rating": "B",
+      "reload": 1,
       "rof": 4.1,
       "thermload": 16,
       "type": "KT"
diff --git a/modules/hardpoints/torpedo_pylon.json b/modules/hardpoints/torpedo_pylon.json
index 7bd0029..290716d 100644
--- a/modules/hardpoints/torpedo_pylon.json
+++ b/modules/hardpoints/torpedo_pylon.json
@@ -2,7 +2,6 @@
   "tp": [
     {
       "ammo": 1,
-      "armourpen": 10000,
       "breachdmg": 60,
       "breachmax": 0.8,
       "breachmin": 0.6,
@@ -10,6 +9,7 @@
       "clip": 1,
       "cost": 11200,
       "damage": 120,
+      "distdraw": 0,
       "edID": 128049509,
       "eddbID": 882,
       "grp": "tp",
@@ -18,6 +18,7 @@
       "mass": 2,
       "missile": "S",
       "mount": "F",
+      "piercing": 10000,
       "power": 0.4,
       "rating": "I",
       "reload": 5,
@@ -28,14 +29,14 @@
     },
     {
       "ammo": 2,
-      "armourpen": 10000,
       "breachdmg": 60,
       "breachmax": 0.8,
       "breachmin": 0.6,
       "class": 2,
       "clip": 1,
       "cost": 44800,
-      "dps": 120,
+      "damage": 120,
+      "distdraw": 0,
       "edID": 128049510,
       "eddbID": 883,
       "grp": "tp",
@@ -44,6 +45,7 @@
       "mass": 4,
       "missile": "S",
       "mount": "F",
+      "piercing": 10000,
       "power": 0.4,
       "rating": "I",
       "reload": 5,
diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json
index 6aa0e32..bc267c4 100644
--- a/modules/standard/power_plant.json
+++ b/modules/standard/power_plant.json
@@ -10,7 +10,7 @@
       "id": "py",
       "integrity": 135,
       "mass": 160,
-      "pGen": 24,
+      "pgen": 24,
       "rating": "E"
     },
     {
@@ -23,7 +23,7 @@
       "id": "px",
       "integrity": 120,
       "mass": 64,
-      "pGen": 27,
+      "pgen": 27,
       "rating": "D"
     },
     {
@@ -36,7 +36,7 @@
       "id": "pw",
       "integrity": 150,
       "mass": 80,
-      "pGen": 30,
+      "pgen": 30,
       "rating": "C"
     },
     {
@@ -49,7 +49,7 @@
       "id": "pv",
       "integrity": 180,
       "mass": 128,
-      "pGen": 33,
+      "pgen": 33,
       "rating": "B"
     },
     {
@@ -62,7 +62,7 @@
       "id": "pu",
       "integrity": 165,
       "mass": 80,
-      "pGen": 36,
+      "pgen": 36,
       "rating": "A"
     },
     {
@@ -75,7 +75,7 @@
       "id": "pt",
       "integrity": 118,
       "mass": 80,
-      "pGen": 20,
+      "pgen": 20,
       "rating": "E"
     },
     {
@@ -88,7 +88,7 @@
       "id": "ps",
       "integrity": 105,
       "mass": 32,
-      "pGen": 22.5,
+      "pgen": 22.5,
       "rating": "D"
     },
     {
@@ -101,7 +101,7 @@
       "id": "pr",
       "integrity": 131,
       "mass": 40,
-      "pGen": 25,
+      "pgen": 25,
       "rating": "C"
     },
     {
@@ -114,7 +114,7 @@
       "id": "pq",
       "integrity": 157,
       "mass": 64,
-      "pGen": 27.5,
+      "pgen": 27.5,
       "rating": "B"
     },
     {
@@ -127,7 +127,7 @@
       "id": "pp",
       "integrity": 144,
       "mass": 40,
-      "pGen": 30,
+      "pgen": 30,
       "rating": "A"
     },
     {
@@ -140,7 +140,7 @@
       "id": "po",
       "integrity": 90,
       "mass": 40,
-      "pGen": 16.8,
+      "pgen": 16.8,
       "rating": "E"
     },
     {
@@ -153,7 +153,7 @@
       "id": "pn",
       "integrity": 113,
       "mass": 16,
-      "pGen": 18.9,
+      "pgen": 18.9,
       "rating": "D"
     },
     {
@@ -166,7 +166,7 @@
       "id": "pm",
       "integrity": 136,
       "mass": 20,
-      "pGen": 21,
+      "pgen": 21,
       "rating": "C"
     },
     {
@@ -179,7 +179,7 @@
       "id": "pl",
       "integrity": 124,
       "mass": 32,
-      "pGen": 23.1,
+      "pgen": 23.1,
       "rating": "B"
     },
     {
@@ -192,7 +192,7 @@
       "id": "pk",
       "integrity": 118,
       "mass": 20,
-      "pGen": 25.2,
+      "pgen": 25.2,
       "rating": "A"
     },
     {
@@ -205,7 +205,7 @@
       "id": "pj",
       "integrity": 86,
       "mass": 20,
-      "pGen": 13.6,
+      "pgen": 13.6,
       "rating": "E"
     },
     {
@@ -218,7 +218,7 @@
       "id": "pi",
       "integrity": 77,
       "mass": 8,
-      "pGen": 15.3,
+      "pgen": 15.3,
       "rating": "D"
     },
     {
@@ -231,7 +231,7 @@
       "id": "ph",
       "integrity": 96,
       "mass": 10,
-      "pGen": 17,
+      "pgen": 17,
       "rating": "C"
     },
     {
@@ -244,7 +244,7 @@
       "id": "pg",
       "integrity": 114,
       "mass": 16,
-      "pGen": 18.7,
+      "pgen": 18.7,
       "rating": "B"
     },
     {
@@ -257,7 +257,7 @@
       "id": "pf",
       "integrity": 106,
       "mass": 10,
-      "pGen": 20.4,
+      "pgen": 20.4,
       "rating": "A"
     },
     {
@@ -270,7 +270,7 @@
       "id": "pe",
       "integrity": 72,
       "mass": 10,
-      "pGen": 10.4,
+      "pgen": 10.4,
       "rating": "E"
     },
     {
@@ -283,7 +283,7 @@
       "id": "pd",
       "integrity": 64,
       "mass": 4,
-      "pGen": 11.7,
+      "pgen": 11.7,
       "rating": "D"
     },
     {
@@ -296,7 +296,7 @@
       "id": "pc",
       "integrity": 80,
       "mass": 5,
-      "pGen": 13,
+      "pgen": 13,
       "rating": "C"
     },
     {
@@ -309,7 +309,7 @@
       "id": "pb",
       "integrity": 96,
       "mass": 8,
-      "pGen": 14.3,
+      "pgen": 14.3,
       "rating": "B"
     },
     {
@@ -322,7 +322,7 @@
       "id": "pa",
       "integrity": 88,
       "mass": 5,
-      "pGen": 15.6,
+      "pgen": 15.6,
       "rating": "A"
     },
     {
@@ -335,7 +335,7 @@
       "id": "p9",
       "integrity": 58,
       "mass": 5,
-      "pGen": 8,
+      "pgen": 8,
       "rating": "E"
     },
     {
@@ -348,7 +348,7 @@
       "id": "p8",
       "integrity": 51,
       "mass": 2,
-      "pGen": 9,
+      "pgen": 9,
       "rating": "D"
     },
     {
@@ -361,7 +361,7 @@
       "id": "p7",
       "integrity": 64,
       "mass": 2.5,
-      "pGen": 10,
+      "pgen": 10,
       "rating": "C"
     },
     {
@@ -374,7 +374,7 @@
       "id": "p6",
       "integrity": 77,
       "mass": 4,
-      "pGen": 11,
+      "pgen": 11,
       "rating": "B"
     },
     {
@@ -387,7 +387,7 @@
       "id": "p5",
       "integrity": 70,
       "mass": 2.5,
-      "pGen": 12,
+      "pgen": 12,
       "rating": "A"
     },
     {
@@ -400,7 +400,7 @@
       "id": "p4",
       "integrity": 46,
       "mass": 2.5,
-      "pGen": 6.4,
+      "pgen": 6.4,
       "rating": "E"
     },
     {
@@ -413,7 +413,7 @@
       "id": "p3",
       "integrity": 41,
       "mass": 1,
-      "pGen": 7.2,
+      "pgen": 7.2,
       "rating": "D"
     },
     {
@@ -426,7 +426,7 @@
       "id": "p2",
       "integrity": 51,
       "mass": 1.3,
-      "pGen": 8,
+      "pgen": 8,
       "rating": "C"
     },
     {
@@ -439,7 +439,7 @@
       "id": "p1",
       "integrity": 61,
       "mass": 2,
-      "pGen": 8.8,
+      "pgen": 8.8,
       "rating": "B"
     },
     {
@@ -452,7 +452,7 @@
       "id": "p0",
       "integrity": 56,
       "mass": 1.3,
-      "pGen": 9.6,
+      "pgen": 9.6,
       "rating": "A"
     }
   ]
diff --git a/spec/data-spec.js b/spec/data-spec.js
index 3b65d26..7da38d7 100644
--- a/spec/data-spec.js
+++ b/spec/data-spec.js
@@ -75,14 +75,14 @@ describe('JSON Data', function() {
         if (group[i].edID) {
           edIDs[group[i].edID] = true;
         }
-	if (group[i].dps) {
-            expect(group[i].dps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing dps`);
+	if (group[i].damage) {
+            expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`);
             expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`);
             expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`);
-            expect(group[i].breachdps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdps`);
-            expect(group[i].armourpen).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing armourpen`);
-            expect(group[i].eps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing eps`);
-            expect(group[i].hps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing hps`);
+            expect(group[i].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`);
+            expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`);
+            expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`);
+            expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`);
         }
 	if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') {
             expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`);