From cf1e49d753227bb97035bb0e5e72f9f6f8cdb47b Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Sun, 30 Oct 2016 14:41:29 +0000
Subject: [PATCH] Update modifiers

---
 dist/index.js                           | 551 +++++++++---------
 dist/index.json                         | 715 ++++++++++++++----------
 modifications/modifiers.json            |  61 +-
 modifications/validity.json             | 175 +++++-
 modules/standard/power_distributor.json | 480 ++++++++--------
 5 files changed, 1097 insertions(+), 885 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 271007e..b2464ee 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -3933,641 +3933,641 @@ module.exports = {
         cost: 697580,
         edID: 128064213,
         eddbID: 1071,
-        enginecapacity: 32,
-        enginerecharge: 3.2,
+        engcap: 32,
+        engrate: 3.2,
         grp: "pd",
         id: "dD",
         mass: 160,
         power: .64,
         rating: "E",
-        systemcapacity: 32,
-        systemrecharge: 3.2,
-        weaponcapacity: 48,
-        weaponrecharge: 4.8
+        syscap: 32,
+        sysrate: 3.2,
+        wepcap: 48,
+        weprate: 4.8
       }, {
         class: 8,
         cost: 1743960,
         edID: 128064214,
         eddbID: 1072,
-        enginecapacity: 36,
-        enginerecharge: 3.6,
+        engcap: 36,
+        engrate: 3.6,
         grp: "pd",
         id: "dC",
         mass: 64,
         power: .72,
         rating: "D",
-        systemcapacity: 36,
-        systemrecharge: 3.6,
-        weaponcapacity: 54,
-        weaponrecharge: 5.4
+        syscap: 36,
+        sysrate: 3.6,
+        wepcap: 54,
+        weprate: 5.4
       }, {
         class: 8,
         cost: 4359900,
         edID: 128064215,
         eddbID: 1073,
-        enginecapacity: 40,
-        enginerecharge: 4,
+        engcap: 40,
+        engrate: 4,
         grp: "pd",
         id: "dB",
         mass: 160,
         power: .8,
         rating: "C",
-        systemcapacity: 40,
-        systemrecharge: 4,
-        weaponcapacity: 60,
-        weaponrecharge: 6
+        syscap: 40,
+        sysrate: 4,
+        wepcap: 60,
+        weprate: 6
       }, {
         class: 8,
         cost: 10899760,
         edID: 128064216,
         eddbID: 1074,
-        enginecapacity: 44,
-        enginerecharge: 4.4,
+        engcap: 44,
+        engrate: 4.4,
         grp: "pd",
         id: "dA",
         mass: 256,
         power: .88,
         rating: "B",
-        systemcapacity: 44,
-        systemrecharge: 4.4,
-        weaponcapacity: 66,
-        weaponrecharge: 6.6
+        syscap: 44,
+        sysrate: 4.4,
+        wepcap: 66,
+        weprate: 6.6
       }, {
         class: 8,
         cost: 27249390,
         edID: 128064217,
         eddbID: 1075,
-        enginecapacity: 48,
-        enginerecharge: 4.8,
+        engcap: 48,
+        engrate: 4.8,
         grp: "pd",
         id: "dz",
         mass: 160,
         power: .96,
         rating: "A",
-        systemcapacity: 48,
-        systemrecharge: 4.8,
-        weaponcapacity: 72,
-        weaponrecharge: 7.2
+        syscap: 48,
+        sysrate: 4.8,
+        wepcap: 72,
+        weprate: 7.2
       }, {
         class: 7,
         cost: 249140,
         edID: 128064208,
         eddbID: 1066,
-        enginecapacity: 27,
-        enginerecharge: 2.6,
+        engcap: 27,
+        engrate: 2.6,
         grp: "pd",
         id: "dy",
         mass: 80,
         power: .59,
         rating: "E",
-        systemcapacity: 27,
-        systemrecharge: 2.6,
-        weaponcapacity: 41,
-        weaponrecharge: 4.1
+        syscap: 27,
+        sysrate: 2.6,
+        wepcap: 41,
+        weprate: 4.1
       }, {
         class: 7,
         cost: 622840,
         edID: 128064209,
         eddbID: 1067,
-        enginecapacity: 31,
-        enginerecharge: 3,
+        engcap: 31,
+        engrate: 3,
         grp: "pd",
         id: "dx",
         mass: 32,
         power: .67,
         rating: "D",
-        systemcapacity: 31,
-        systemrecharge: 3,
-        weaponcapacity: 46,
-        weaponrecharge: 4.6
+        syscap: 31,
+        sysrate: 3,
+        wepcap: 46,
+        weprate: 4.6
       }, {
         class: 7,
         cost: 1557110,
         edID: 128064210,
         eddbID: 1068,
-        enginecapacity: 34,
-        enginerecharge: 3.3,
+        engcap: 34,
+        engrate: 3.3,
         grp: "pd",
         id: "dw",
         mass: 80,
         power: .74,
         rating: "C",
-        systemcapacity: 34,
-        systemrecharge: 3.3,
-        weaponcapacity: 51,
-        weaponrecharge: 5.1
+        syscap: 34,
+        sysrate: 3.3,
+        wepcap: 51,
+        weprate: 5.1
       }, {
         class: 7,
         cost: 3892770,
         edID: 128064211,
         eddbID: 1069,
-        enginecapacity: 37,
-        enginerecharge: 3.6,
+        engcap: 37,
+        engrate: 3.6,
         grp: "pd",
         id: "dv",
         mass: 128,
         power: .81,
         rating: "B",
-        systemcapacity: 37,
-        systemrecharge: 3.6,
-        weaponcapacity: 56,
-        weaponrecharge: 5.6
+        syscap: 37,
+        sysrate: 3.6,
+        wepcap: 56,
+        weprate: 5.6
       }, {
         class: 7,
         cost: 9731930,
         edID: 128064212,
         eddbID: 1070,
-        enginecapacity: 41,
-        enginerecharge: 4,
+        engcap: 41,
+        engrate: 4,
         grp: "pd",
         id: "du",
         mass: 80,
         power: .89,
         rating: "A",
-        systemcapacity: 41,
-        systemrecharge: 4,
-        weaponcapacity: 61,
-        weaponrecharge: 6.1
+        syscap: 41,
+        sysrate: 4,
+        wepcap: 61,
+        weprate: 6.1
       }, {
         class: 6,
         cost: 88980,
         edID: 128064203,
         eddbID: 1061,
-        enginecapacity: 23,
-        enginerecharge: 2.2,
+        engcap: 23,
+        engrate: 2.2,
         grp: "pd",
         id: "dt",
         mass: 40,
         power: .54,
         rating: "E",
-        systemcapacity: 23,
-        systemrecharge: 2.2,
-        weaponcapacity: 34,
-        weaponrecharge: 3.4
+        syscap: 23,
+        sysrate: 2.2,
+        wepcap: 34,
+        weprate: 3.4
       }, {
         class: 6,
         cost: 222440,
         edID: 128064204,
         eddbID: 1062,
-        enginecapacity: 26,
-        enginerecharge: 2.4,
+        engcap: 26,
+        engrate: 2.4,
         grp: "pd",
         id: "ds",
         mass: 16,
         power: .61,
         rating: "D",
-        systemcapacity: 26,
-        systemrecharge: 2.4,
-        weaponcapacity: 38,
-        weaponrecharge: 3.9
+        syscap: 26,
+        sysrate: 2.4,
+        wepcap: 38,
+        weprate: 3.9
       }, {
         class: 6,
         cost: 556110,
         edID: 128064205,
         eddbID: 1063,
-        enginecapacity: 29,
-        enginerecharge: 2.7,
+        engcap: 29,
+        engrate: 2.7,
         grp: "pd",
         id: "dr",
         mass: 40,
         power: .68,
         rating: "C",
-        systemcapacity: 29,
-        systemrecharge: 2.7,
-        weaponcapacity: 42,
-        weaponrecharge: 4.3
+        syscap: 29,
+        sysrate: 2.7,
+        wepcap: 42,
+        weprate: 4.3
       }, {
         class: 6,
         cost: 1390280,
         edID: 128064206,
         eddbID: 1064,
-        enginecapacity: 32,
-        enginerecharge: 3,
+        engcap: 32,
+        engrate: 3,
         grp: "pd",
         id: "dq",
         mass: 64,
         power: .75,
         rating: "B",
-        systemcapacity: 32,
-        systemrecharge: 3,
-        weaponcapacity: 46,
-        weaponrecharge: 4.7
+        syscap: 32,
+        sysrate: 3,
+        wepcap: 46,
+        weprate: 4.7
       }, {
         class: 6,
         cost: 3475690,
         edID: 128064207,
         eddbID: 1065,
-        enginecapacity: 35,
-        enginerecharge: 3.2,
+        engcap: 35,
+        engrate: 3.2,
         grp: "pd",
         id: "dp",
         mass: 40,
         power: .82,
         rating: "A",
-        systemcapacity: 35,
-        systemrecharge: 3.2,
-        weaponcapacity: 50,
-        weaponrecharge: 5.2
+        syscap: 35,
+        sysrate: 3.2,
+        wepcap: 50,
+        weprate: 5.2
       }, {
         class: 5,
         cost: 31780,
         edID: 128064198,
         eddbID: 1056,
-        enginecapacity: 19,
-        enginerecharge: 1.7,
+        engcap: 19,
+        engrate: 1.7,
         grp: "pd",
         id: "do",
         mass: 20,
         power: .5,
         rating: "E",
-        systemcapacity: 19,
-        systemrecharge: 1.7,
-        weaponcapacity: 27,
-        weaponrecharge: 2.9
+        syscap: 19,
+        sysrate: 1.7,
+        wepcap: 27,
+        weprate: 2.9
       }, {
         class: 5,
         cost: 79440,
         edID: 128064199,
         eddbID: 1057,
-        enginecapacity: 22,
-        enginerecharge: 1.9,
+        engcap: 22,
+        engrate: 1.9,
         grp: "pd",
         id: "dn",
         mass: 8,
         power: .56,
         rating: "D",
-        systemcapacity: 22,
-        systemrecharge: 1.9,
-        weaponcapacity: 31,
-        weaponrecharge: 3.2
+        syscap: 22,
+        sysrate: 1.9,
+        wepcap: 31,
+        weprate: 3.2
       }, {
         class: 5,
         cost: 198610,
         edID: 128064200,
         eddbID: 1058,
-        enginecapacity: 24,
-        enginerecharge: 2.1,
+        engcap: 24,
+        engrate: 2.1,
         grp: "pd",
         id: "dm",
         mass: 20,
         power: .62,
         rating: "C",
-        systemcapacity: 24,
-        systemrecharge: 2.1,
-        weaponcapacity: 34,
-        weaponrecharge: 3.6
+        syscap: 24,
+        sysrate: 2.1,
+        wepcap: 34,
+        weprate: 3.6
       }, {
         class: 5,
         cost: 496530,
         edID: 128064201,
         eddbID: 1059,
-        enginecapacity: 26,
-        enginerecharge: 2.3,
+        engcap: 26,
+        engrate: 2.3,
         grp: "pd",
         id: "dl",
         mass: 32,
         power: .68,
         rating: "B",
-        systemcapacity: 26,
-        systemrecharge: 2.3,
-        weaponcapacity: 37,
-        weaponrecharge: 4
+        syscap: 26,
+        sysrate: 2.3,
+        wepcap: 37,
+        weprate: 4
       }, {
         class: 5,
         cost: 1241320,
         edID: 128064202,
         eddbID: 1060,
-        enginecapacity: 29,
-        enginerecharge: 2.5,
+        engcap: 29,
+        engrate: 2.5,
         grp: "pd",
         id: "dk",
         mass: 20,
         power: .74,
         rating: "A",
-        systemcapacity: 29,
-        systemrecharge: 2.5,
-        weaponcapacity: 41,
-        weaponrecharge: 4.3
+        syscap: 29,
+        sysrate: 2.5,
+        wepcap: 41,
+        weprate: 4.3
       }, {
         class: 4,
         cost: 11350,
         edID: 128064193,
         eddbID: 1051,
-        enginecapacity: 15,
-        enginerecharge: 1.3,
+        engcap: 15,
+        engrate: 1.3,
         grp: "pd",
         id: "dj",
         mass: 10,
         power: .45,
         rating: "E",
-        systemcapacity: 15,
-        systemrecharge: 1.3,
-        weaponcapacity: 22,
-        weaponrecharge: 2.3
+        syscap: 15,
+        sysrate: 1.3,
+        wepcap: 22,
+        weprate: 2.3
       }, {
         class: 4,
         cost: 28370,
         edID: 128064194,
         eddbID: 1052,
-        enginecapacity: 17,
-        enginerecharge: 1.4,
+        engcap: 17,
+        engrate: 1.4,
         grp: "pd",
         id: "di",
         mass: 4,
         power: .5,
         rating: "D",
-        systemcapacity: 17,
-        systemrecharge: 1.4,
-        weaponcapacity: 24,
-        weaponrecharge: 2.6
+        syscap: 17,
+        sysrate: 1.4,
+        wepcap: 24,
+        weprate: 2.6
       }, {
         class: 4,
         cost: 70930,
         edID: 128064195,
         eddbID: 1053,
-        enginecapacity: 19,
-        enginerecharge: 1.6,
+        engcap: 19,
+        engrate: 1.6,
         grp: "pd",
         id: "dh",
         mass: 10,
         power: .56,
         rating: "C",
-        systemcapacity: 19,
-        systemrecharge: 1.6,
-        weaponcapacity: 27,
-        weaponrecharge: 2.9
+        syscap: 19,
+        sysrate: 1.6,
+        wepcap: 27,
+        weprate: 2.9
       }, {
         class: 4,
         cost: 177330,
         edID: 128064196,
         eddbID: 1054,
-        enginecapacity: 21,
-        enginerecharge: 1.8,
+        engcap: 21,
+        engrate: 1.8,
         grp: "pd",
         id: "dg",
         mass: 16,
         power: .62,
         rating: "B",
-        systemcapacity: 21,
-        systemrecharge: 1.8,
-        weaponcapacity: 30,
-        weaponrecharge: 3.2
+        syscap: 21,
+        sysrate: 1.8,
+        wepcap: 30,
+        weprate: 3.2
       }, {
         class: 4,
         cost: 443330,
         edID: 128064197,
         eddbID: 1055,
-        enginecapacity: 23,
-        enginerecharge: 1.9,
+        engcap: 23,
+        engrate: 1.9,
         grp: "pd",
         id: "df",
         mass: 10,
         power: .67,
         rating: "A",
-        systemcapacity: 23,
-        systemrecharge: 1.9,
-        weaponcapacity: 32,
-        weaponrecharge: 3.5
+        syscap: 23,
+        sysrate: 1.9,
+        wepcap: 32,
+        weprate: 3.5
       }, {
         class: 3,
         cost: 4050,
         edID: 128064188,
         eddbID: 1046,
-        enginecapacity: 12,
-        enginerecharge: .9,
+        engcap: 12,
+        engrate: .9,
         grp: "pd",
         id: "de",
         mass: 5,
         power: .4,
         rating: "E",
-        systemcapacity: 12,
-        systemrecharge: .9,
-        weaponcapacity: 16,
-        weaponrecharge: 1.8
+        syscap: 12,
+        sysrate: .9,
+        wepcap: 16,
+        weprate: 1.8
       }, {
         class: 3,
         cost: 10130,
         edID: 128064189,
         eddbID: 1047,
-        enginecapacity: 14,
-        enginerecharge: 1,
+        engcap: 14,
+        engrate: 1,
         grp: "pd",
         id: "dd",
         mass: 2,
         power: .45,
         rating: "D",
-        systemcapacity: 14,
-        systemrecharge: 1,
-        weaponcapacity: 18,
-        weaponrecharge: 2.1
+        syscap: 14,
+        sysrate: 1,
+        wepcap: 18,
+        weprate: 2.1
       }, {
         class: 3,
         cost: 25330,
         edID: 128064190,
         eddbID: 1048,
-        enginecapacity: 15,
-        enginerecharge: 1.1,
+        engcap: 15,
+        engrate: 1.1,
         grp: "pd",
         id: "dc",
         mass: 5,
         power: .5,
         rating: "C",
-        systemcapacity: 15,
-        systemrecharge: 1.1,
-        weaponcapacity: 20,
-        weaponrecharge: 2.3
+        syscap: 15,
+        sysrate: 1.1,
+        wepcap: 20,
+        weprate: 2.3
       }, {
         class: 3,
         cost: 63330,
         edID: 128064191,
         eddbID: 1049,
-        enginecapacity: 17,
-        enginerecharge: 1.2,
+        engcap: 17,
+        engrate: 1.2,
         grp: "pd",
         id: "db",
         mass: 8,
         power: .55,
         rating: "B",
-        systemcapacity: 17,
-        systemrecharge: 1.2,
-        weaponcapacity: 22,
-        weaponrecharge: 2.5
+        syscap: 17,
+        sysrate: 1.2,
+        wepcap: 22,
+        weprate: 2.5
       }, {
         class: 3,
         cost: 158330,
         edID: 128064192,
         eddbID: 1050,
-        enginecapacity: 18,
-        enginerecharge: 1.3,
+        engcap: 18,
+        engrate: 1.3,
         grp: "pd",
         id: "da",
         mass: 5,
         power: .6,
         rating: "A",
-        systemcapacity: 18,
-        systemrecharge: 1.3,
-        weaponcapacity: 24,
-        weaponrecharge: 2.8
+        syscap: 18,
+        sysrate: 1.3,
+        wepcap: 24,
+        weprate: 2.8
       }, {
         class: 2,
         cost: 1450,
         edID: 128064183,
         eddbID: 1041,
-        enginecapacity: 10,
-        enginerecharge: .6,
+        engcap: 10,
+        engrate: .6,
         grp: "pd",
         id: "d9",
         mass: 2.5,
         power: .36,
         rating: "E",
-        systemcapacity: 10,
-        systemrecharge: .6,
-        weaponcapacity: 12,
-        weaponrecharge: 1.4
+        syscap: 10,
+        sysrate: .6,
+        wepcap: 12,
+        weprate: 1.4
       }, {
         class: 2,
         cost: 3620,
         edID: 128064184,
         eddbID: 1042,
-        enginecapacity: 11,
-        enginerecharge: .6,
+        engcap: 11,
+        engrate: .6,
         grp: "pd",
         id: "d8",
         mass: 1,
         power: .41,
         rating: "D",
-        systemcapacity: 11,
-        systemrecharge: .6,
-        weaponcapacity: 14,
-        weaponrecharge: 1.6
+        syscap: 11,
+        sysrate: .6,
+        wepcap: 14,
+        weprate: 1.6
       }, {
         class: 2,
         cost: 9050,
         edID: 128064185,
         eddbID: 1043,
-        enginecapacity: 12,
-        enginerecharge: .7,
+        engcap: 12,
+        engrate: .7,
         grp: "pd",
         id: "d7",
         mass: 2.5,
         power: .45,
         rating: "C",
-        systemcapacity: 12,
-        systemrecharge: .7,
-        weaponcapacity: 15,
-        weaponrecharge: 1.8
+        syscap: 12,
+        sysrate: .7,
+        wepcap: 15,
+        weprate: 1.8
       }, {
         class: 2,
         cost: 22620,
         edID: 128064186,
         eddbID: 1044,
-        enginecapacity: 13,
-        enginerecharge: .8,
+        engcap: 13,
+        engrate: .8,
         grp: "pd",
         id: "d6",
         mass: 4,
         power: .5,
         rating: "B",
-        systemcapacity: 13,
-        systemrecharge: .8,
-        weaponcapacity: 17,
-        weaponrecharge: 2
+        syscap: 13,
+        sysrate: .8,
+        wepcap: 17,
+        weprate: 2
       }, {
         class: 2,
         cost: 56550,
         edID: 128064187,
         eddbID: 1045,
-        enginecapacity: 14,
-        enginerecharge: .8,
+        engcap: 14,
+        engrate: .8,
         grp: "pd",
         id: "d5",
         mass: 2.5,
         power: .54,
         rating: "A",
-        systemcapacity: 14,
-        systemrecharge: .8,
-        weaponcapacity: 18,
-        weaponrecharge: 2.2
+        syscap: 14,
+        sysrate: .8,
+        wepcap: 18,
+        weprate: 2.2
       }, {
         class: 1,
         cost: 520,
         edID: 128064178,
         eddbID: 1036,
-        enginecapacity: 8,
-        enginerecharge: .4,
+        engcap: 8,
+        engrate: .4,
         grp: "pd",
         id: "d4",
         mass: 1.3,
         power: .32,
         rating: "E",
-        systemcapacity: 8,
-        systemrecharge: .4,
-        weaponcapacity: 10,
-        weaponrecharge: 1.2
+        syscap: 8,
+        sysrate: .4,
+        wepcap: 10,
+        weprate: 1.2
       }, {
         class: 1,
         cost: 1290,
         edID: 128064179,
         eddbID: 1037,
-        enginecapacity: 9,
-        enginerecharge: .5,
+        engcap: 9,
+        engrate: .5,
         grp: "pd",
         id: "d3",
         mass: .5,
         power: .36,
         rating: "D",
-        systemcapacity: 9,
-        systemrecharge: .5,
-        weaponcapacity: 11,
-        weaponrecharge: 1.4
+        syscap: 9,
+        sysrate: .5,
+        wepcap: 11,
+        weprate: 1.4
       }, {
         class: 1,
         cost: 3230,
         edID: 128064180,
         eddbID: 1038,
-        enginecapacity: 10,
-        enginerecharge: .5,
+        engcap: 10,
+        engrate: .5,
         grp: "pd",
         id: "d2",
         mass: 1.3,
         power: .4,
         rating: "C",
-        systemcapacity: 10,
-        systemrecharge: .5,
-        weaponcapacity: 12,
-        weaponrecharge: 1.5
+        syscap: 10,
+        sysrate: .5,
+        wepcap: 12,
+        weprate: 1.5
       }, {
         class: 1,
         cost: 8080,
         edID: 128064181,
         eddbID: 1039,
-        enginecapacity: 11,
-        enginerecharge: .6,
+        engcap: 11,
+        engrate: .6,
         grp: "pd",
         id: "d1",
         mass: 2,
         power: .44,
         rating: "B",
-        systemcapacity: 11,
-        systemrecharge: .6,
-        weaponcapacity: 13,
-        weaponrecharge: 1.7
+        syscap: 11,
+        sysrate: .6,
+        wepcap: 13,
+        weprate: 1.7
       }, {
         class: 1,
         cost: 20200,
         edID: 128064182,
         eddbID: 1040,
-        enginecapacity: 12,
-        enginerecharge: .6,
+        engcap: 12,
+        engrate: .6,
         grp: "pd",
         id: "d0",
         mass: 1.3,
         power: .48,
         rating: "A",
-        systemcapacity: 12,
-        systemrecharge: .6,
-        weaponcapacity: 14,
-        weaponrecharge: 1.8
+        syscap: 12,
+        sysrate: .6,
+        wepcap: 14,
+        weprate: 1.8
       } ],
       s: [ {
         class: 8,
@@ -11973,51 +11973,36 @@ module.exports = {
     }
   },
   Modifications: {
-    modifiers: {
-      "1": {
-        value: "pGen",
-        name: "Power generation",
-        description: "Modifier for power generation",
-        operator: "multiply",
-        min: -.35,
-        max: .5
-      },
-      "2": {
-        value: "power",
-        name: "Power usage",
-        description: "Modifier for power usage",
-        operator: "multiply"
-      },
-      "3": {
-        value: "integrity",
-        name: "Integrity",
-        description: "Modifier for integrity",
-        operator: "multiply"
-      },
-      "4": {
-        value: "mass",
-        name: "Mass",
-        description: "Modifier for mass",
-        operator: "multiply",
-        min: -1,
-        max: 3.5
-      },
-      "5": {
-        value: "eff",
-        name: "Heat efficiency",
-        description: "Modifier for heat efficiency",
-        operator: "multiply"
-      }
-    },
+    modifiers: [ "mass", "integrity", "power", "hps", "boot", "pGen", "eff", "optmass", "optmult", "maxfuel", "maxsys", "maxeng", "maxwep", "ratesys", "rateeng", "ratewep", "rof", "hps", "eps", "ammo", "clip", "reload", "range" ],
     validity: {
-      pp: [ 1, 3, 4, 5 ],
-      t: [ 2, 3, 4, 5 ],
-      fsd: [ 2, 3, 4, 5 ],
-      ls: [ 2, 3, 4, 5 ],
-      pd: [ 2, 3, 4, 5 ],
-      s: [ 2, 3, 4, 5 ],
+      pp: [ "mass", "integrity", "pGen", "eff" ],
+      t: [ "mass", "integrity", "power", "optmass", "optmult", "hps" ],
+      fsd: [ "mass", "integrity", "power", "boot", "optmass", "hps", "maxfuel" ],
+      ls: [ "mass", "integrity", "power", "boot" ],
+      pd: [ "mass", "integrity", "power", "boot", "syscap", "engcap", "wepcap", "sysrate", "engrate", "weprate" ],
+      s: [ "mass", "integrity", "power", "boot" ],
+      am: [ "integrity", "power", "boot" ],
+      bsg: [ "mass", "integrity", "power", "boot", "eps", "optmass", "optmul", "kinres", "thermres", "regen", "brokenregen" ],
+      pci: [],
+      cr: [],
+      cc: [ "mass", "integrity", "power", "boot" ],
+      dc: [],
+      fh: [],
+      pcm: [],
+      fi: [ "mass", "integrity", "power", "boot", "range", "arc" ],
+      fs: [ "mass", "integrity", "power", "boot" ],
+      fx: [ "mass", "integrity", "power", "boot" ],
+      hb: [ "mass", "integrity", "power", "boot" ],
+      hr: [ "mass", "kinres", "thermres", "explres", "armour", "hullboost" ],
       ft: [],
-      pas: []
+      pcq: [],
+      pv: [],
+      psg: [ "mass", "integrity", "power", "boot", "eps", "optmass", "optmul", "kinres", "thermres", "regen", "brokenregen" ],
+      pc: [ "mass", "integrity", "power", "boot" ],
+      rf: [ "mass", "integrity", "power", "boot" ],
+      sc: [],
+      scb: [ "integrity", "power", "hps", "eps", "delay", "duration", "shield", "boot" ],
+      sg: [ "mass", "integrity", "power", "boot", "eps", "optmass", "optmul", "reskin", "restherm", "regen", "brokenregen" ]
     }
   }
 };
\ No newline at end of file
diff --git a/dist/index.json b/dist/index.json
index 8e0be8b..7896e94 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -5733,680 +5733,680 @@
 					"cost": 697580,
 					"edID": 128064213,
 					"eddbID": 1071,
-					"enginecapacity": 32,
-					"enginerecharge": 3.2,
+					"engcap": 32,
+					"engrate": 3.2,
 					"grp": "pd",
 					"id": "dD",
 					"mass": 160,
 					"power": 0.64,
 					"rating": "E",
-					"systemcapacity": 32,
-					"systemrecharge": 3.2,
-					"weaponcapacity": 48,
-					"weaponrecharge": 4.8
+					"syscap": 32,
+					"sysrate": 3.2,
+					"wepcap": 48,
+					"weprate": 4.8
 				},
 				{
 					"class": 8,
 					"cost": 1743960,
 					"edID": 128064214,
 					"eddbID": 1072,
-					"enginecapacity": 36,
-					"enginerecharge": 3.6,
+					"engcap": 36,
+					"engrate": 3.6,
 					"grp": "pd",
 					"id": "dC",
 					"mass": 64,
 					"power": 0.72,
 					"rating": "D",
-					"systemcapacity": 36,
-					"systemrecharge": 3.6,
-					"weaponcapacity": 54,
-					"weaponrecharge": 5.4
+					"syscap": 36,
+					"sysrate": 3.6,
+					"wepcap": 54,
+					"weprate": 5.4
 				},
 				{
 					"class": 8,
 					"cost": 4359900,
 					"edID": 128064215,
 					"eddbID": 1073,
-					"enginecapacity": 40,
-					"enginerecharge": 4,
+					"engcap": 40,
+					"engrate": 4,
 					"grp": "pd",
 					"id": "dB",
 					"mass": 160,
 					"power": 0.8,
 					"rating": "C",
-					"systemcapacity": 40,
-					"systemrecharge": 4,
-					"weaponcapacity": 60,
-					"weaponrecharge": 6
+					"syscap": 40,
+					"sysrate": 4,
+					"wepcap": 60,
+					"weprate": 6
 				},
 				{
 					"class": 8,
 					"cost": 10899760,
 					"edID": 128064216,
 					"eddbID": 1074,
-					"enginecapacity": 44,
-					"enginerecharge": 4.4,
+					"engcap": 44,
+					"engrate": 4.4,
 					"grp": "pd",
 					"id": "dA",
 					"mass": 256,
 					"power": 0.88,
 					"rating": "B",
-					"systemcapacity": 44,
-					"systemrecharge": 4.4,
-					"weaponcapacity": 66,
-					"weaponrecharge": 6.6
+					"syscap": 44,
+					"sysrate": 4.4,
+					"wepcap": 66,
+					"weprate": 6.6
 				},
 				{
 					"class": 8,
 					"cost": 27249390,
 					"edID": 128064217,
 					"eddbID": 1075,
-					"enginecapacity": 48,
-					"enginerecharge": 4.8,
+					"engcap": 48,
+					"engrate": 4.8,
 					"grp": "pd",
 					"id": "dz",
 					"mass": 160,
 					"power": 0.96,
 					"rating": "A",
-					"systemcapacity": 48,
-					"systemrecharge": 4.8,
-					"weaponcapacity": 72,
-					"weaponrecharge": 7.2
+					"syscap": 48,
+					"sysrate": 4.8,
+					"wepcap": 72,
+					"weprate": 7.2
 				},
 				{
 					"class": 7,
 					"cost": 249140,
 					"edID": 128064208,
 					"eddbID": 1066,
-					"enginecapacity": 27,
-					"enginerecharge": 2.6,
+					"engcap": 27,
+					"engrate": 2.6,
 					"grp": "pd",
 					"id": "dy",
 					"mass": 80,
 					"power": 0.59,
 					"rating": "E",
-					"systemcapacity": 27,
-					"systemrecharge": 2.6,
-					"weaponcapacity": 41,
-					"weaponrecharge": 4.1
+					"syscap": 27,
+					"sysrate": 2.6,
+					"wepcap": 41,
+					"weprate": 4.1
 				},
 				{
 					"class": 7,
 					"cost": 622840,
 					"edID": 128064209,
 					"eddbID": 1067,
-					"enginecapacity": 31,
-					"enginerecharge": 3,
+					"engcap": 31,
+					"engrate": 3,
 					"grp": "pd",
 					"id": "dx",
 					"mass": 32,
 					"power": 0.67,
 					"rating": "D",
-					"systemcapacity": 31,
-					"systemrecharge": 3,
-					"weaponcapacity": 46,
-					"weaponrecharge": 4.6
+					"syscap": 31,
+					"sysrate": 3,
+					"wepcap": 46,
+					"weprate": 4.6
 				},
 				{
 					"class": 7,
 					"cost": 1557110,
 					"edID": 128064210,
 					"eddbID": 1068,
-					"enginecapacity": 34,
-					"enginerecharge": 3.3,
+					"engcap": 34,
+					"engrate": 3.3,
 					"grp": "pd",
 					"id": "dw",
 					"mass": 80,
 					"power": 0.74,
 					"rating": "C",
-					"systemcapacity": 34,
-					"systemrecharge": 3.3,
-					"weaponcapacity": 51,
-					"weaponrecharge": 5.1
+					"syscap": 34,
+					"sysrate": 3.3,
+					"wepcap": 51,
+					"weprate": 5.1
 				},
 				{
 					"class": 7,
 					"cost": 3892770,
 					"edID": 128064211,
 					"eddbID": 1069,
-					"enginecapacity": 37,
-					"enginerecharge": 3.6,
+					"engcap": 37,
+					"engrate": 3.6,
 					"grp": "pd",
 					"id": "dv",
 					"mass": 128,
 					"power": 0.81,
 					"rating": "B",
-					"systemcapacity": 37,
-					"systemrecharge": 3.6,
-					"weaponcapacity": 56,
-					"weaponrecharge": 5.6
+					"syscap": 37,
+					"sysrate": 3.6,
+					"wepcap": 56,
+					"weprate": 5.6
 				},
 				{
 					"class": 7,
 					"cost": 9731930,
 					"edID": 128064212,
 					"eddbID": 1070,
-					"enginecapacity": 41,
-					"enginerecharge": 4,
+					"engcap": 41,
+					"engrate": 4,
 					"grp": "pd",
 					"id": "du",
 					"mass": 80,
 					"power": 0.89,
 					"rating": "A",
-					"systemcapacity": 41,
-					"systemrecharge": 4,
-					"weaponcapacity": 61,
-					"weaponrecharge": 6.1
+					"syscap": 41,
+					"sysrate": 4,
+					"wepcap": 61,
+					"weprate": 6.1
 				},
 				{
 					"class": 6,
 					"cost": 88980,
 					"edID": 128064203,
 					"eddbID": 1061,
-					"enginecapacity": 23,
-					"enginerecharge": 2.2,
+					"engcap": 23,
+					"engrate": 2.2,
 					"grp": "pd",
 					"id": "dt",
 					"mass": 40,
 					"power": 0.54,
 					"rating": "E",
-					"systemcapacity": 23,
-					"systemrecharge": 2.2,
-					"weaponcapacity": 34,
-					"weaponrecharge": 3.4
+					"syscap": 23,
+					"sysrate": 2.2,
+					"wepcap": 34,
+					"weprate": 3.4
 				},
 				{
 					"class": 6,
 					"cost": 222440,
 					"edID": 128064204,
 					"eddbID": 1062,
-					"enginecapacity": 26,
-					"enginerecharge": 2.4,
+					"engcap": 26,
+					"engrate": 2.4,
 					"grp": "pd",
 					"id": "ds",
 					"mass": 16,
 					"power": 0.61,
 					"rating": "D",
-					"systemcapacity": 26,
-					"systemrecharge": 2.4,
-					"weaponcapacity": 38,
-					"weaponrecharge": 3.9
+					"syscap": 26,
+					"sysrate": 2.4,
+					"wepcap": 38,
+					"weprate": 3.9
 				},
 				{
 					"class": 6,
 					"cost": 556110,
 					"edID": 128064205,
 					"eddbID": 1063,
-					"enginecapacity": 29,
-					"enginerecharge": 2.7,
+					"engcap": 29,
+					"engrate": 2.7,
 					"grp": "pd",
 					"id": "dr",
 					"mass": 40,
 					"power": 0.68,
 					"rating": "C",
-					"systemcapacity": 29,
-					"systemrecharge": 2.7,
-					"weaponcapacity": 42,
-					"weaponrecharge": 4.3
+					"syscap": 29,
+					"sysrate": 2.7,
+					"wepcap": 42,
+					"weprate": 4.3
 				},
 				{
 					"class": 6,
 					"cost": 1390280,
 					"edID": 128064206,
 					"eddbID": 1064,
-					"enginecapacity": 32,
-					"enginerecharge": 3,
+					"engcap": 32,
+					"engrate": 3,
 					"grp": "pd",
 					"id": "dq",
 					"mass": 64,
 					"power": 0.75,
 					"rating": "B",
-					"systemcapacity": 32,
-					"systemrecharge": 3,
-					"weaponcapacity": 46,
-					"weaponrecharge": 4.7
+					"syscap": 32,
+					"sysrate": 3,
+					"wepcap": 46,
+					"weprate": 4.7
 				},
 				{
 					"class": 6,
 					"cost": 3475690,
 					"edID": 128064207,
 					"eddbID": 1065,
-					"enginecapacity": 35,
-					"enginerecharge": 3.2,
+					"engcap": 35,
+					"engrate": 3.2,
 					"grp": "pd",
 					"id": "dp",
 					"mass": 40,
 					"power": 0.82,
 					"rating": "A",
-					"systemcapacity": 35,
-					"systemrecharge": 3.2,
-					"weaponcapacity": 50,
-					"weaponrecharge": 5.2
+					"syscap": 35,
+					"sysrate": 3.2,
+					"wepcap": 50,
+					"weprate": 5.2
 				},
 				{
 					"class": 5,
 					"cost": 31780,
 					"edID": 128064198,
 					"eddbID": 1056,
-					"enginecapacity": 19,
-					"enginerecharge": 1.7,
+					"engcap": 19,
+					"engrate": 1.7,
 					"grp": "pd",
 					"id": "do",
 					"mass": 20,
 					"power": 0.5,
 					"rating": "E",
-					"systemcapacity": 19,
-					"systemrecharge": 1.7,
-					"weaponcapacity": 27,
-					"weaponrecharge": 2.9
+					"syscap": 19,
+					"sysrate": 1.7,
+					"wepcap": 27,
+					"weprate": 2.9
 				},
 				{
 					"class": 5,
 					"cost": 79440,
 					"edID": 128064199,
 					"eddbID": 1057,
-					"enginecapacity": 22,
-					"enginerecharge": 1.9,
+					"engcap": 22,
+					"engrate": 1.9,
 					"grp": "pd",
 					"id": "dn",
 					"mass": 8,
 					"power": 0.56,
 					"rating": "D",
-					"systemcapacity": 22,
-					"systemrecharge": 1.9,
-					"weaponcapacity": 31,
-					"weaponrecharge": 3.2
+					"syscap": 22,
+					"sysrate": 1.9,
+					"wepcap": 31,
+					"weprate": 3.2
 				},
 				{
 					"class": 5,
 					"cost": 198610,
 					"edID": 128064200,
 					"eddbID": 1058,
-					"enginecapacity": 24,
-					"enginerecharge": 2.1,
+					"engcap": 24,
+					"engrate": 2.1,
 					"grp": "pd",
 					"id": "dm",
 					"mass": 20,
 					"power": 0.62,
 					"rating": "C",
-					"systemcapacity": 24,
-					"systemrecharge": 2.1,
-					"weaponcapacity": 34,
-					"weaponrecharge": 3.6
+					"syscap": 24,
+					"sysrate": 2.1,
+					"wepcap": 34,
+					"weprate": 3.6
 				},
 				{
 					"class": 5,
 					"cost": 496530,
 					"edID": 128064201,
 					"eddbID": 1059,
-					"enginecapacity": 26,
-					"enginerecharge": 2.3,
+					"engcap": 26,
+					"engrate": 2.3,
 					"grp": "pd",
 					"id": "dl",
 					"mass": 32,
 					"power": 0.68,
 					"rating": "B",
-					"systemcapacity": 26,
-					"systemrecharge": 2.3,
-					"weaponcapacity": 37,
-					"weaponrecharge": 4
+					"syscap": 26,
+					"sysrate": 2.3,
+					"wepcap": 37,
+					"weprate": 4
 				},
 				{
 					"class": 5,
 					"cost": 1241320,
 					"edID": 128064202,
 					"eddbID": 1060,
-					"enginecapacity": 29,
-					"enginerecharge": 2.5,
+					"engcap": 29,
+					"engrate": 2.5,
 					"grp": "pd",
 					"id": "dk",
 					"mass": 20,
 					"power": 0.74,
 					"rating": "A",
-					"systemcapacity": 29,
-					"systemrecharge": 2.5,
-					"weaponcapacity": 41,
-					"weaponrecharge": 4.3
+					"syscap": 29,
+					"sysrate": 2.5,
+					"wepcap": 41,
+					"weprate": 4.3
 				},
 				{
 					"class": 4,
 					"cost": 11350,
 					"edID": 128064193,
 					"eddbID": 1051,
-					"enginecapacity": 15,
-					"enginerecharge": 1.3,
+					"engcap": 15,
+					"engrate": 1.3,
 					"grp": "pd",
 					"id": "dj",
 					"mass": 10,
 					"power": 0.45,
 					"rating": "E",
-					"systemcapacity": 15,
-					"systemrecharge": 1.3,
-					"weaponcapacity": 22,
-					"weaponrecharge": 2.3
+					"syscap": 15,
+					"sysrate": 1.3,
+					"wepcap": 22,
+					"weprate": 2.3
 				},
 				{
 					"class": 4,
 					"cost": 28370,
 					"edID": 128064194,
 					"eddbID": 1052,
-					"enginecapacity": 17,
-					"enginerecharge": 1.4,
+					"engcap": 17,
+					"engrate": 1.4,
 					"grp": "pd",
 					"id": "di",
 					"mass": 4,
 					"power": 0.5,
 					"rating": "D",
-					"systemcapacity": 17,
-					"systemrecharge": 1.4,
-					"weaponcapacity": 24,
-					"weaponrecharge": 2.6
+					"syscap": 17,
+					"sysrate": 1.4,
+					"wepcap": 24,
+					"weprate": 2.6
 				},
 				{
 					"class": 4,
 					"cost": 70930,
 					"edID": 128064195,
 					"eddbID": 1053,
-					"enginecapacity": 19,
-					"enginerecharge": 1.6,
+					"engcap": 19,
+					"engrate": 1.6,
 					"grp": "pd",
 					"id": "dh",
 					"mass": 10,
 					"power": 0.56,
 					"rating": "C",
-					"systemcapacity": 19,
-					"systemrecharge": 1.6,
-					"weaponcapacity": 27,
-					"weaponrecharge": 2.9
+					"syscap": 19,
+					"sysrate": 1.6,
+					"wepcap": 27,
+					"weprate": 2.9
 				},
 				{
 					"class": 4,
 					"cost": 177330,
 					"edID": 128064196,
 					"eddbID": 1054,
-					"enginecapacity": 21,
-					"enginerecharge": 1.8,
+					"engcap": 21,
+					"engrate": 1.8,
 					"grp": "pd",
 					"id": "dg",
 					"mass": 16,
 					"power": 0.62,
 					"rating": "B",
-					"systemcapacity": 21,
-					"systemrecharge": 1.8,
-					"weaponcapacity": 30,
-					"weaponrecharge": 3.2
+					"syscap": 21,
+					"sysrate": 1.8,
+					"wepcap": 30,
+					"weprate": 3.2
 				},
 				{
 					"class": 4,
 					"cost": 443330,
 					"edID": 128064197,
 					"eddbID": 1055,
-					"enginecapacity": 23,
-					"enginerecharge": 1.9,
+					"engcap": 23,
+					"engrate": 1.9,
 					"grp": "pd",
 					"id": "df",
 					"mass": 10,
 					"power": 0.67,
 					"rating": "A",
-					"systemcapacity": 23,
-					"systemrecharge": 1.9,
-					"weaponcapacity": 32,
-					"weaponrecharge": 3.5
+					"syscap": 23,
+					"sysrate": 1.9,
+					"wepcap": 32,
+					"weprate": 3.5
 				},
 				{
 					"class": 3,
 					"cost": 4050,
 					"edID": 128064188,
 					"eddbID": 1046,
-					"enginecapacity": 12,
-					"enginerecharge": 0.9,
+					"engcap": 12,
+					"engrate": 0.9,
 					"grp": "pd",
 					"id": "de",
 					"mass": 5,
 					"power": 0.4,
 					"rating": "E",
-					"systemcapacity": 12,
-					"systemrecharge": 0.9,
-					"weaponcapacity": 16,
-					"weaponrecharge": 1.8
+					"syscap": 12,
+					"sysrate": 0.9,
+					"wepcap": 16,
+					"weprate": 1.8
 				},
 				{
 					"class": 3,
 					"cost": 10130,
 					"edID": 128064189,
 					"eddbID": 1047,
-					"enginecapacity": 14,
-					"enginerecharge": 1,
+					"engcap": 14,
+					"engrate": 1,
 					"grp": "pd",
 					"id": "dd",
 					"mass": 2,
 					"power": 0.45,
 					"rating": "D",
-					"systemcapacity": 14,
-					"systemrecharge": 1,
-					"weaponcapacity": 18,
-					"weaponrecharge": 2.1
+					"syscap": 14,
+					"sysrate": 1,
+					"wepcap": 18,
+					"weprate": 2.1
 				},
 				{
 					"class": 3,
 					"cost": 25330,
 					"edID": 128064190,
 					"eddbID": 1048,
-					"enginecapacity": 15,
-					"enginerecharge": 1.1,
+					"engcap": 15,
+					"engrate": 1.1,
 					"grp": "pd",
 					"id": "dc",
 					"mass": 5,
 					"power": 0.5,
 					"rating": "C",
-					"systemcapacity": 15,
-					"systemrecharge": 1.1,
-					"weaponcapacity": 20,
-					"weaponrecharge": 2.3
+					"syscap": 15,
+					"sysrate": 1.1,
+					"wepcap": 20,
+					"weprate": 2.3
 				},
 				{
 					"class": 3,
 					"cost": 63330,
 					"edID": 128064191,
 					"eddbID": 1049,
-					"enginecapacity": 17,
-					"enginerecharge": 1.2,
+					"engcap": 17,
+					"engrate": 1.2,
 					"grp": "pd",
 					"id": "db",
 					"mass": 8,
 					"power": 0.55,
 					"rating": "B",
-					"systemcapacity": 17,
-					"systemrecharge": 1.2,
-					"weaponcapacity": 22,
-					"weaponrecharge": 2.5
+					"syscap": 17,
+					"sysrate": 1.2,
+					"wepcap": 22,
+					"weprate": 2.5
 				},
 				{
 					"class": 3,
 					"cost": 158330,
 					"edID": 128064192,
 					"eddbID": 1050,
-					"enginecapacity": 18,
-					"enginerecharge": 1.3,
+					"engcap": 18,
+					"engrate": 1.3,
 					"grp": "pd",
 					"id": "da",
 					"mass": 5,
 					"power": 0.6,
 					"rating": "A",
-					"systemcapacity": 18,
-					"systemrecharge": 1.3,
-					"weaponcapacity": 24,
-					"weaponrecharge": 2.8
+					"syscap": 18,
+					"sysrate": 1.3,
+					"wepcap": 24,
+					"weprate": 2.8
 				},
 				{
 					"class": 2,
 					"cost": 1450,
 					"edID": 128064183,
 					"eddbID": 1041,
-					"enginecapacity": 10,
-					"enginerecharge": 0.6,
+					"engcap": 10,
+					"engrate": 0.6,
 					"grp": "pd",
 					"id": "d9",
 					"mass": 2.5,
 					"power": 0.36,
 					"rating": "E",
-					"systemcapacity": 10,
-					"systemrecharge": 0.6,
-					"weaponcapacity": 12,
-					"weaponrecharge": 1.4
+					"syscap": 10,
+					"sysrate": 0.6,
+					"wepcap": 12,
+					"weprate": 1.4
 				},
 				{
 					"class": 2,
 					"cost": 3620,
 					"edID": 128064184,
 					"eddbID": 1042,
-					"enginecapacity": 11,
-					"enginerecharge": 0.6,
+					"engcap": 11,
+					"engrate": 0.6,
 					"grp": "pd",
 					"id": "d8",
 					"mass": 1,
 					"power": 0.41,
 					"rating": "D",
-					"systemcapacity": 11,
-					"systemrecharge": 0.6,
-					"weaponcapacity": 14,
-					"weaponrecharge": 1.6
+					"syscap": 11,
+					"sysrate": 0.6,
+					"wepcap": 14,
+					"weprate": 1.6
 				},
 				{
 					"class": 2,
 					"cost": 9050,
 					"edID": 128064185,
 					"eddbID": 1043,
-					"enginecapacity": 12,
-					"enginerecharge": 0.7,
+					"engcap": 12,
+					"engrate": 0.7,
 					"grp": "pd",
 					"id": "d7",
 					"mass": 2.5,
 					"power": 0.45,
 					"rating": "C",
-					"systemcapacity": 12,
-					"systemrecharge": 0.7,
-					"weaponcapacity": 15,
-					"weaponrecharge": 1.8
+					"syscap": 12,
+					"sysrate": 0.7,
+					"wepcap": 15,
+					"weprate": 1.8
 				},
 				{
 					"class": 2,
 					"cost": 22620,
 					"edID": 128064186,
 					"eddbID": 1044,
-					"enginecapacity": 13,
-					"enginerecharge": 0.8,
+					"engcap": 13,
+					"engrate": 0.8,
 					"grp": "pd",
 					"id": "d6",
 					"mass": 4,
 					"power": 0.5,
 					"rating": "B",
-					"systemcapacity": 13,
-					"systemrecharge": 0.8,
-					"weaponcapacity": 17,
-					"weaponrecharge": 2
+					"syscap": 13,
+					"sysrate": 0.8,
+					"wepcap": 17,
+					"weprate": 2
 				},
 				{
 					"class": 2,
 					"cost": 56550,
 					"edID": 128064187,
 					"eddbID": 1045,
-					"enginecapacity": 14,
-					"enginerecharge": 0.8,
+					"engcap": 14,
+					"engrate": 0.8,
 					"grp": "pd",
 					"id": "d5",
 					"mass": 2.5,
 					"power": 0.54,
 					"rating": "A",
-					"systemcapacity": 14,
-					"systemrecharge": 0.8,
-					"weaponcapacity": 18,
-					"weaponrecharge": 2.2
+					"syscap": 14,
+					"sysrate": 0.8,
+					"wepcap": 18,
+					"weprate": 2.2
 				},
 				{
 					"class": 1,
 					"cost": 520,
 					"edID": 128064178,
 					"eddbID": 1036,
-					"enginecapacity": 8,
-					"enginerecharge": 0.4,
+					"engcap": 8,
+					"engrate": 0.4,
 					"grp": "pd",
 					"id": "d4",
 					"mass": 1.3,
 					"power": 0.32,
 					"rating": "E",
-					"systemcapacity": 8,
-					"systemrecharge": 0.4,
-					"weaponcapacity": 10,
-					"weaponrecharge": 1.2
+					"syscap": 8,
+					"sysrate": 0.4,
+					"wepcap": 10,
+					"weprate": 1.2
 				},
 				{
 					"class": 1,
 					"cost": 1290,
 					"edID": 128064179,
 					"eddbID": 1037,
-					"enginecapacity": 9,
-					"enginerecharge": 0.5,
+					"engcap": 9,
+					"engrate": 0.5,
 					"grp": "pd",
 					"id": "d3",
 					"mass": 0.5,
 					"power": 0.36,
 					"rating": "D",
-					"systemcapacity": 9,
-					"systemrecharge": 0.5,
-					"weaponcapacity": 11,
-					"weaponrecharge": 1.4
+					"syscap": 9,
+					"sysrate": 0.5,
+					"wepcap": 11,
+					"weprate": 1.4
 				},
 				{
 					"class": 1,
 					"cost": 3230,
 					"edID": 128064180,
 					"eddbID": 1038,
-					"enginecapacity": 10,
-					"enginerecharge": 0.5,
+					"engcap": 10,
+					"engrate": 0.5,
 					"grp": "pd",
 					"id": "d2",
 					"mass": 1.3,
 					"power": 0.4,
 					"rating": "C",
-					"systemcapacity": 10,
-					"systemrecharge": 0.5,
-					"weaponcapacity": 12,
-					"weaponrecharge": 1.5
+					"syscap": 10,
+					"sysrate": 0.5,
+					"wepcap": 12,
+					"weprate": 1.5
 				},
 				{
 					"class": 1,
 					"cost": 8080,
 					"edID": 128064181,
 					"eddbID": 1039,
-					"enginecapacity": 11,
-					"enginerecharge": 0.6,
+					"engcap": 11,
+					"engrate": 0.6,
 					"grp": "pd",
 					"id": "d1",
 					"mass": 2,
 					"power": 0.44,
 					"rating": "B",
-					"systemcapacity": 11,
-					"systemrecharge": 0.6,
-					"weaponcapacity": 13,
-					"weaponrecharge": 1.7
+					"syscap": 11,
+					"sysrate": 0.6,
+					"wepcap": 13,
+					"weprate": 1.7
 				},
 				{
 					"class": 1,
 					"cost": 20200,
 					"edID": 128064182,
 					"eddbID": 1040,
-					"enginecapacity": 12,
-					"enginerecharge": 0.6,
+					"engcap": 12,
+					"engrate": 0.6,
 					"grp": "pd",
 					"id": "d0",
 					"mass": 1.3,
 					"power": 0.48,
 					"rating": "A",
-					"systemcapacity": 12,
-					"systemrecharge": 0.6,
-					"weaponcapacity": 14,
-					"weaponrecharge": 1.8
+					"syscap": 12,
+					"sysrate": 0.6,
+					"wepcap": 14,
+					"weprate": 1.8
 				}
 			],
 			"s": [
@@ -14366,81 +14366,194 @@
 		}
 	},
 	"Modifications": {
-		"modifiers": {
-			"1": {
-				"value": "pGen",
-				"name": "Power generation",
-				"description": "Modifier for power generation",
-				"operator": "multiply",
-				"min": -0.35,
-				"max": 0.5
-			},
-			"2": {
-				"value": "power",
-				"name": "Power usage",
-				"description": "Modifier for power usage",
-				"operator": "multiply"
-			},
-			"3": {
-				"value": "integrity",
-				"name": "Integrity",
-				"description": "Modifier for integrity",
-				"operator": "multiply"
-			},
-			"4": {
-				"value": "mass",
-				"name": "Mass",
-				"description": "Modifier for mass",
-				"operator": "multiply",
-				"min": -1,
-				"max": 3.5
-			},
-			"5": {
-				"value": "eff",
-				"name": "Heat efficiency",
-				"description": "Modifier for heat efficiency",
-				"operator": "multiply"
-			}
-		},
+		"modifiers": [
+			"mass",
+			"integrity",
+			"power",
+			"hps",
+			"boot",
+			"pGen",
+			"eff",
+			"optmass",
+			"optmult",
+			"maxfuel",
+			"maxsys",
+			"maxeng",
+			"maxwep",
+			"ratesys",
+			"rateeng",
+			"ratewep",
+			"rof",
+			"hps",
+			"eps",
+			"ammo",
+			"clip",
+			"reload",
+			"range"
+		],
 		"validity": {
 			"pp": [
-				1,
-				3,
-				4,
-				5
+				"mass",
+				"integrity",
+				"pGen",
+				"eff"
 			],
 			"t": [
-				2,
-				3,
-				4,
-				5
+				"mass",
+				"integrity",
+				"power",
+				"optmass",
+				"optmult",
+				"hps"
 			],
 			"fsd": [
-				2,
-				3,
-				4,
-				5
+				"mass",
+				"integrity",
+				"power",
+				"boot",
+				"optmass",
+				"hps",
+				"maxfuel"
 			],
 			"ls": [
-				2,
-				3,
-				4,
-				5
+				"mass",
+				"integrity",
+				"power",
+				"boot"
 			],
 			"pd": [
-				2,
-				3,
-				4,
-				5
+				"mass",
+				"integrity",
+				"power",
+				"boot",
+				"syscap",
+				"engcap",
+				"wepcap",
+				"sysrate",
+				"engrate",
+				"weprate"
 			],
 			"s": [
-				2,
-				3,
-				4,
-				5
+				"mass",
+				"integrity",
+				"power",
+				"boot"
+			],
+			"am": [
+				"integrity",
+				"power",
+				"boot"
+			],
+			"bsg": [
+				"mass",
+				"integrity",
+				"power",
+				"boot",
+				"eps",
+				"optmass",
+				"optmul",
+				"kinres",
+				"thermres",
+				"regen",
+				"brokenregen"
+			],
+			"pci": [],
+			"cr": [],
+			"cc": [
+				"mass",
+				"integrity",
+				"power",
+				"boot"
+			],
+			"dc": [],
+			"fh": [],
+			"pcm": [],
+			"fi": [
+				"mass",
+				"integrity",
+				"power",
+				"boot",
+				"range",
+				"arc"
+			],
+			"fs": [
+				"mass",
+				"integrity",
+				"power",
+				"boot"
+			],
+			"fx": [
+				"mass",
+				"integrity",
+				"power",
+				"boot"
+			],
+			"hb": [
+				"mass",
+				"integrity",
+				"power",
+				"boot"
+			],
+			"hr": [
+				"mass",
+				"kinres",
+				"thermres",
+				"explres",
+				"armour",
+				"hullboost"
 			],
 			"ft": [],
-			"pas": []
+			"pcq": [],
+			"pv": [],
+			"psg": [
+				"mass",
+				"integrity",
+				"power",
+				"boot",
+				"eps",
+				"optmass",
+				"optmul",
+				"kinres",
+				"thermres",
+				"regen",
+				"brokenregen"
+			],
+			"pc": [
+				"mass",
+				"integrity",
+				"power",
+				"boot"
+			],
+			"rf": [
+				"mass",
+				"integrity",
+				"power",
+				"boot"
+			],
+			"sc": [],
+			"scb": [
+				"integrity",
+				"power",
+				"hps",
+				"eps",
+				"delay",
+				"duration",
+				"shield",
+				"boot"
+			],
+			"sg": [
+				"mass",
+				"integrity",
+				"power",
+				"boot",
+				"eps",
+				"optmass",
+				"optmul",
+				"reskin",
+				"restherm",
+				"regen",
+				"brokenregen"
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/modifications/modifiers.json b/modifications/modifiers.json
index 0fd32d6..e91b52d 100644
--- a/modifications/modifiers.json
+++ b/modifications/modifiers.json
@@ -1,36 +1,25 @@
-{
-  "1": {
-    "value": "pGen",
-    "name": "Power generation",
-    "description": "Modifier for power generation",
-    "operator": "multiply",
-    "min": -0.35,
-    "max": 0.50
-  },
-  "2": {
-    "value": "power",
-    "name": "Power usage",
-    "description": "Modifier for power usage",
-    "operator": "multiply"
-  },
-  "3": {
-    "value": "integrity",
-    "name": "Integrity",
-    "description": "Modifier for integrity",
-    "operator": "multiply"
-  },
-  "4": {
-    "value": "mass",
-    "name": "Mass",
-    "description": "Modifier for mass",
-    "operator": "multiply",
-    "min": -1,
-    "max": 3.50
-  },
-  "5": {
-    "value": "eff",
-    "name": "Heat efficiency",
-    "description": "Modifier for heat efficiency",
-    "operator": "multiply"
-  }
-}
+[
+  "mass",
+  "integrity",
+  "power",
+  "hps",
+  "boot",
+  "pGen",
+  "eff",
+  "optmass",
+  "optmult",
+  "maxfuel",
+  "maxsys",
+  "maxeng",
+  "maxwep",
+  "ratesys",
+  "rateeng",
+  "ratewep",
+  "rof",
+  "hps",
+  "eps",
+  "ammo",
+  "clip",
+  "reload",
+  "range"
+]
diff --git a/modifications/validity.json b/modifications/validity.json
index 04e63ee..5ec4e4b 100644
--- a/modifications/validity.json
+++ b/modifications/validity.json
@@ -1,40 +1,165 @@
 {
   "pp": [
-    1,
-    3,
-    4,
-    5
+    "mass",
+    "integrity",
+    "pGen",
+    "eff"
   ],
   "t": [
-    2,
-    3,
-    4,
-    5
+    "mass",
+    "integrity",
+    "power",
+    "optmass",
+    "optmult",
+    "hps"
   ],
   "fsd": [
-    2,
-    3,
-    4,
-    5
+    "mass",
+    "integrity",
+    "power",
+    "boot",
+    "optmass",
+    "hps",
+    "maxfuel"
   ],
   "ls": [
-    2,
-    3,
-    4,
-    5
+    "mass",
+    "integrity",
+    "power",
+    "boot"
   ],
   "pd": [
-    2,
-    3,
-    4,
-    5
+    "mass",
+    "integrity",
+    "power",
+    "boot",
+    "syscap",
+    "engcap",
+    "wepcap",
+    "sysrate",
+    "engrate",
+    "weprate"
   ],
   "s": [
-    2,
-    3,
-    4,
-    5
+    "mass",
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "am": [
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "bsg": [
+    "mass",
+    "integrity",
+    "power",
+    "boot",
+    "eps",
+    "optmass",
+    "optmul",
+    "kinres",
+    "thermres",
+    "regen",
+    "brokenregen"
+  ],
+  "pci": [],
+  "cr": [],
+  "cc": [
+    "mass",
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "dc": [],
+  "pci": [],
+  "fh": [],
+  "pcm": [],
+  "fi": [
+    "mass",
+    "integrity",
+    "power",
+    "boot",
+    "range",
+    "arc"
+  ],
+  "fs": [
+    "mass",
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "fx": [
+    "mass",
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "hb": [
+    "mass",
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "hr": [
+    "mass",
+    "kinres",
+    "thermres",
+    "explres",
+    "armour",
+    "hullboost"
   ],
   "ft": [],
-  "pas": []
+  "pcq": [],
+  "pv": [],
+  "psg": [
+    "mass",
+    "integrity",
+    "power",
+    "boot",
+    "eps",
+    "optmass",
+    "optmul",
+    "kinres",
+    "thermres",
+    "regen",
+    "brokenregen"
+  ],
+  "pc": [
+    "mass",
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "rf": [
+    "mass",
+    "integrity",
+    "power",
+    "boot"
+  ],
+  "sc": [],
+  "scb": [
+    "integrity",
+    "power",
+    "hps",
+    "eps",
+    "delay",
+    "duration",
+    "shield",
+    "boot"
+  ],
+  "sg": [
+    "mass",
+    "integrity",
+    "power",
+    "boot",
+    "eps",
+    "optmass",
+    "optmul",
+    "reskin",
+    "restherm",
+    "regen",
+    "brokenregen"
+  ]
 }
diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json
index 32e2b8a..a27b741 100644
--- a/modules/standard/power_distributor.json
+++ b/modules/standard/power_distributor.json
@@ -5,680 +5,680 @@
       "cost": 697580,
       "edID": 128064213,
       "eddbID": 1071,
-      "enginecapacity": 32,
-      "enginerecharge": 3.2,
+      "engcap": 32,
+      "engrate": 3.2,
       "grp": "pd",
       "id": "dD",
       "mass": 160,
       "power": 0.64,
       "rating": "E",
-      "systemcapacity": 32,
-      "systemrecharge": 3.2,
-      "weaponcapacity": 48,
-      "weaponrecharge": 4.8
+      "syscap": 32,
+      "sysrate": 3.2,
+      "wepcap": 48,
+      "weprate": 4.8
     },
     {
       "class": 8,
       "cost": 1743960,
       "edID": 128064214,
       "eddbID": 1072,
-      "enginecapacity": 36,
-      "enginerecharge": 3.6,
+      "engcap": 36,
+      "engrate": 3.6,
       "grp": "pd",
       "id": "dC",
       "mass": 64,
       "power": 0.72,
       "rating": "D",
-      "systemcapacity": 36,
-      "systemrecharge": 3.6,
-      "weaponcapacity": 54,
-      "weaponrecharge": 5.4
+      "syscap": 36,
+      "sysrate": 3.6,
+      "wepcap": 54,
+      "weprate": 5.4
     },
     {
       "class": 8,
       "cost": 4359900,
       "edID": 128064215,
       "eddbID": 1073,
-      "enginecapacity": 40,
-      "enginerecharge": 4,
+      "engcap": 40,
+      "engrate": 4,
       "grp": "pd",
       "id": "dB",
       "mass": 160,
       "power": 0.8,
       "rating": "C",
-      "systemcapacity": 40,
-      "systemrecharge": 4,
-      "weaponcapacity": 60,
-      "weaponrecharge": 6
+      "syscap": 40,
+      "sysrate": 4,
+      "wepcap": 60,
+      "weprate": 6
     },
     {
       "class": 8,
       "cost": 10899760,
       "edID": 128064216,
       "eddbID": 1074,
-      "enginecapacity": 44,
-      "enginerecharge": 4.4,
+      "engcap": 44,
+      "engrate": 4.4,
       "grp": "pd",
       "id": "dA",
       "mass": 256,
       "power": 0.88,
       "rating": "B",
-      "systemcapacity": 44,
-      "systemrecharge": 4.4,
-      "weaponcapacity": 66,
-      "weaponrecharge": 6.6
+      "syscap": 44,
+      "sysrate": 4.4,
+      "wepcap": 66,
+      "weprate": 6.6
     },
     {
       "class": 8,
       "cost": 27249390,
       "edID": 128064217,
       "eddbID": 1075,
-      "enginecapacity": 48,
-      "enginerecharge": 4.8,
+      "engcap": 48,
+      "engrate": 4.8,
       "grp": "pd",
       "id": "dz",
       "mass": 160,
       "power": 0.96,
       "rating": "A",
-      "systemcapacity": 48,
-      "systemrecharge": 4.8,
-      "weaponcapacity": 72,
-      "weaponrecharge": 7.2
+      "syscap": 48,
+      "sysrate": 4.8,
+      "wepcap": 72,
+      "weprate": 7.2
     },
     {
       "class": 7,
       "cost": 249140,
       "edID": 128064208,
       "eddbID": 1066,
-      "enginecapacity": 27,
-      "enginerecharge": 2.6,
+      "engcap": 27,
+      "engrate": 2.6,
       "grp": "pd",
       "id": "dy",
       "mass": 80,
       "power": 0.59,
       "rating": "E",
-      "systemcapacity": 27,
-      "systemrecharge": 2.6,
-      "weaponcapacity": 41,
-      "weaponrecharge": 4.1
+      "syscap": 27,
+      "sysrate": 2.6,
+      "wepcap": 41,
+      "weprate": 4.1
     },
     {
       "class": 7,
       "cost": 622840,
       "edID": 128064209,
       "eddbID": 1067,
-      "enginecapacity": 31,
-      "enginerecharge": 3,
+      "engcap": 31,
+      "engrate": 3,
       "grp": "pd",
       "id": "dx",
       "mass": 32,
       "power": 0.67,
       "rating": "D",
-      "systemcapacity": 31,
-      "systemrecharge": 3,
-      "weaponcapacity": 46,
-      "weaponrecharge": 4.6
+      "syscap": 31,
+      "sysrate": 3,
+      "wepcap": 46,
+      "weprate": 4.6
     },
     {
       "class": 7,
       "cost": 1557110,
       "edID": 128064210,
       "eddbID": 1068,
-      "enginecapacity": 34,
-      "enginerecharge": 3.3,
+      "engcap": 34,
+      "engrate": 3.3,
       "grp": "pd",
       "id": "dw",
       "mass": 80,
       "power": 0.74,
       "rating": "C",
-      "systemcapacity": 34,
-      "systemrecharge": 3.3,
-      "weaponcapacity": 51,
-      "weaponrecharge": 5.1
+      "syscap": 34,
+      "sysrate": 3.3,
+      "wepcap": 51,
+      "weprate": 5.1
     },
     {
       "class": 7,
       "cost": 3892770,
       "edID": 128064211,
       "eddbID": 1069,
-      "enginecapacity": 37,
-      "enginerecharge": 3.6,
+      "engcap": 37,
+      "engrate": 3.6,
       "grp": "pd",
       "id": "dv",
       "mass": 128,
       "power": 0.81,
       "rating": "B",
-      "systemcapacity": 37,
-      "systemrecharge": 3.6,
-      "weaponcapacity": 56,
-      "weaponrecharge": 5.6
+      "syscap": 37,
+      "sysrate": 3.6,
+      "wepcap": 56,
+      "weprate": 5.6
     },
     {
       "class": 7,
       "cost": 9731930,
       "edID": 128064212,
       "eddbID": 1070,
-      "enginecapacity": 41,
-      "enginerecharge": 4,
+      "engcap": 41,
+      "engrate": 4,
       "grp": "pd",
       "id": "du",
       "mass": 80,
       "power": 0.89,
       "rating": "A",
-      "systemcapacity": 41,
-      "systemrecharge": 4,
-      "weaponcapacity": 61,
-      "weaponrecharge": 6.1
+      "syscap": 41,
+      "sysrate": 4,
+      "wepcap": 61,
+      "weprate": 6.1
     },
     {
       "class": 6,
       "cost": 88980,
       "edID": 128064203,
       "eddbID": 1061,
-      "enginecapacity": 23,
-      "enginerecharge": 2.2,
+      "engcap": 23,
+      "engrate": 2.2,
       "grp": "pd",
       "id": "dt",
       "mass": 40,
       "power": 0.54,
       "rating": "E",
-      "systemcapacity": 23,
-      "systemrecharge": 2.2,
-      "weaponcapacity": 34,
-      "weaponrecharge": 3.4
+      "syscap": 23,
+      "sysrate": 2.2,
+      "wepcap": 34,
+      "weprate": 3.4
     },
     {
       "class": 6,
       "cost": 222440,
       "edID": 128064204,
       "eddbID": 1062,
-      "enginecapacity": 26,
-      "enginerecharge": 2.4,
+      "engcap": 26,
+      "engrate": 2.4,
       "grp": "pd",
       "id": "ds",
       "mass": 16,
       "power": 0.61,
       "rating": "D",
-      "systemcapacity": 26,
-      "systemrecharge": 2.4,
-      "weaponcapacity": 38,
-      "weaponrecharge": 3.9
+      "syscap": 26,
+      "sysrate": 2.4,
+      "wepcap": 38,
+      "weprate": 3.9
     },
     {
       "class": 6,
       "cost": 556110,
       "edID": 128064205,
       "eddbID": 1063,
-      "enginecapacity": 29,
-      "enginerecharge": 2.7,
+      "engcap": 29,
+      "engrate": 2.7,
       "grp": "pd",
       "id": "dr",
       "mass": 40,
       "power": 0.68,
       "rating": "C",
-      "systemcapacity": 29,
-      "systemrecharge": 2.7,
-      "weaponcapacity": 42,
-      "weaponrecharge": 4.3
+      "syscap": 29,
+      "sysrate": 2.7,
+      "wepcap": 42,
+      "weprate": 4.3
     },
     {
       "class": 6,
       "cost": 1390280,
       "edID": 128064206,
       "eddbID": 1064,
-      "enginecapacity": 32,
-      "enginerecharge": 3,
+      "engcap": 32,
+      "engrate": 3,
       "grp": "pd",
       "id": "dq",
       "mass": 64,
       "power": 0.75,
       "rating": "B",
-      "systemcapacity": 32,
-      "systemrecharge": 3,
-      "weaponcapacity": 46,
-      "weaponrecharge": 4.7
+      "syscap": 32,
+      "sysrate": 3,
+      "wepcap": 46,
+      "weprate": 4.7
     },
     {
       "class": 6,
       "cost": 3475690,
       "edID": 128064207,
       "eddbID": 1065,
-      "enginecapacity": 35,
-      "enginerecharge": 3.2,
+      "engcap": 35,
+      "engrate": 3.2,
       "grp": "pd",
       "id": "dp",
       "mass": 40,
       "power": 0.82,
       "rating": "A",
-      "systemcapacity": 35,
-      "systemrecharge": 3.2,
-      "weaponcapacity": 50,
-      "weaponrecharge": 5.2
+      "syscap": 35,
+      "sysrate": 3.2,
+      "wepcap": 50,
+      "weprate": 5.2
     },
     {
       "class": 5,
       "cost": 31780,
       "edID": 128064198,
       "eddbID": 1056,
-      "enginecapacity": 19,
-      "enginerecharge": 1.7,
+      "engcap": 19,
+      "engrate": 1.7,
       "grp": "pd",
       "id": "do",
       "mass": 20,
       "power": 0.5,
       "rating": "E",
-      "systemcapacity": 19,
-      "systemrecharge": 1.7,
-      "weaponcapacity": 27,
-      "weaponrecharge": 2.9
+      "syscap": 19,
+      "sysrate": 1.7,
+      "wepcap": 27,
+      "weprate": 2.9
     },
     {
       "class": 5,
       "cost": 79440,
       "edID": 128064199,
       "eddbID": 1057,
-      "enginecapacity": 22,
-      "enginerecharge": 1.9,
+      "engcap": 22,
+      "engrate": 1.9,
       "grp": "pd",
       "id": "dn",
       "mass": 8,
       "power": 0.56,
       "rating": "D",
-      "systemcapacity": 22,
-      "systemrecharge": 1.9,
-      "weaponcapacity": 31,
-      "weaponrecharge": 3.2
+      "syscap": 22,
+      "sysrate": 1.9,
+      "wepcap": 31,
+      "weprate": 3.2
     },
     {
       "class": 5,
       "cost": 198610,
       "edID": 128064200,
       "eddbID": 1058,
-      "enginecapacity": 24,
-      "enginerecharge": 2.1,
+      "engcap": 24,
+      "engrate": 2.1,
       "grp": "pd",
       "id": "dm",
       "mass": 20,
       "power": 0.62,
       "rating": "C",
-      "systemcapacity": 24,
-      "systemrecharge": 2.1,
-      "weaponcapacity": 34,
-      "weaponrecharge": 3.6
+      "syscap": 24,
+      "sysrate": 2.1,
+      "wepcap": 34,
+      "weprate": 3.6
     },
     {
       "class": 5,
       "cost": 496530,
       "edID": 128064201,
       "eddbID": 1059,
-      "enginecapacity": 26,
-      "enginerecharge": 2.3,
+      "engcap": 26,
+      "engrate": 2.3,
       "grp": "pd",
       "id": "dl",
       "mass": 32,
       "power": 0.68,
       "rating": "B",
-      "systemcapacity": 26,
-      "systemrecharge": 2.3,
-      "weaponcapacity": 37,
-      "weaponrecharge": 4
+      "syscap": 26,
+      "sysrate": 2.3,
+      "wepcap": 37,
+      "weprate": 4
     },
     {
       "class": 5,
       "cost": 1241320,
       "edID": 128064202,
       "eddbID": 1060,
-      "enginecapacity": 29,
-      "enginerecharge": 2.5,
+      "engcap": 29,
+      "engrate": 2.5,
       "grp": "pd",
       "id": "dk",
       "mass": 20,
       "power": 0.74,
       "rating": "A",
-      "systemcapacity": 29,
-      "systemrecharge": 2.5,
-      "weaponcapacity": 41,
-      "weaponrecharge": 4.3
+      "syscap": 29,
+      "sysrate": 2.5,
+      "wepcap": 41,
+      "weprate": 4.3
     },
     {
       "class": 4,
       "cost": 11350,
       "edID": 128064193,
       "eddbID": 1051,
-      "enginecapacity": 15,
-      "enginerecharge": 1.3,
+      "engcap": 15,
+      "engrate": 1.3,
       "grp": "pd",
       "id": "dj",
       "mass": 10,
       "power": 0.45,
       "rating": "E",
-      "systemcapacity": 15,
-      "systemrecharge": 1.3,
-      "weaponcapacity": 22,
-      "weaponrecharge": 2.3
+      "syscap": 15,
+      "sysrate": 1.3,
+      "wepcap": 22,
+      "weprate": 2.3
     },
     {
       "class": 4,
       "cost": 28370,
       "edID": 128064194,
       "eddbID": 1052,
-      "enginecapacity": 17,
-      "enginerecharge": 1.4,
+      "engcap": 17,
+      "engrate": 1.4,
       "grp": "pd",
       "id": "di",
       "mass": 4,
       "power": 0.5,
       "rating": "D",
-      "systemcapacity": 17,
-      "systemrecharge": 1.4,
-      "weaponcapacity": 24,
-      "weaponrecharge": 2.6
+      "syscap": 17,
+      "sysrate": 1.4,
+      "wepcap": 24,
+      "weprate": 2.6
     },
     {
       "class": 4,
       "cost": 70930,
       "edID": 128064195,
       "eddbID": 1053,
-      "enginecapacity": 19,
-      "enginerecharge": 1.6,
+      "engcap": 19,
+      "engrate": 1.6,
       "grp": "pd",
       "id": "dh",
       "mass": 10,
       "power": 0.56,
       "rating": "C",
-      "systemcapacity": 19,
-      "systemrecharge": 1.6,
-      "weaponcapacity": 27,
-      "weaponrecharge": 2.9
+      "syscap": 19,
+      "sysrate": 1.6,
+      "wepcap": 27,
+      "weprate": 2.9
     },
     {
       "class": 4,
       "cost": 177330,
       "edID": 128064196,
       "eddbID": 1054,
-      "enginecapacity": 21,
-      "enginerecharge": 1.8,
+      "engcap": 21,
+      "engrate": 1.8,
       "grp": "pd",
       "id": "dg",
       "mass": 16,
       "power": 0.62,
       "rating": "B",
-      "systemcapacity": 21,
-      "systemrecharge": 1.8,
-      "weaponcapacity": 30,
-      "weaponrecharge": 3.2
+      "syscap": 21,
+      "sysrate": 1.8,
+      "wepcap": 30,
+      "weprate": 3.2
     },
     {
       "class": 4,
       "cost": 443330,
       "edID": 128064197,
       "eddbID": 1055,
-      "enginecapacity": 23,
-      "enginerecharge": 1.9,
+      "engcap": 23,
+      "engrate": 1.9,
       "grp": "pd",
       "id": "df",
       "mass": 10,
       "power": 0.67,
       "rating": "A",
-      "systemcapacity": 23,
-      "systemrecharge": 1.9,
-      "weaponcapacity": 32,
-      "weaponrecharge": 3.5
+      "syscap": 23,
+      "sysrate": 1.9,
+      "wepcap": 32,
+      "weprate": 3.5
     },
     {
       "class": 3,
       "cost": 4050,
       "edID": 128064188,
       "eddbID": 1046,
-      "enginecapacity": 12,
-      "enginerecharge": 0.9,
+      "engcap": 12,
+      "engrate": 0.9,
       "grp": "pd",
       "id": "de",
       "mass": 5,
       "power": 0.4,
       "rating": "E",
-      "systemcapacity": 12,
-      "systemrecharge": 0.9,
-      "weaponcapacity": 16,
-      "weaponrecharge": 1.8
+      "syscap": 12,
+      "sysrate": 0.9,
+      "wepcap": 16,
+      "weprate": 1.8
     },
     {
       "class": 3,
       "cost": 10130,
       "edID": 128064189,
       "eddbID": 1047,
-      "enginecapacity": 14,
-      "enginerecharge": 1,
+      "engcap": 14,
+      "engrate": 1,
       "grp": "pd",
       "id": "dd",
       "mass": 2,
       "power": 0.45,
       "rating": "D",
-      "systemcapacity": 14,
-      "systemrecharge": 1,
-      "weaponcapacity": 18,
-      "weaponrecharge": 2.1
+      "syscap": 14,
+      "sysrate": 1,
+      "wepcap": 18,
+      "weprate": 2.1
     },
     {
       "class": 3,
       "cost": 25330,
       "edID": 128064190,
       "eddbID": 1048,
-      "enginecapacity": 15,
-      "enginerecharge": 1.1,
+      "engcap": 15,
+      "engrate": 1.1,
       "grp": "pd",
       "id": "dc",
       "mass": 5,
       "power": 0.5,
       "rating": "C",
-      "systemcapacity": 15,
-      "systemrecharge": 1.1,
-      "weaponcapacity": 20,
-      "weaponrecharge": 2.3
+      "syscap": 15,
+      "sysrate": 1.1,
+      "wepcap": 20,
+      "weprate": 2.3
     },
     {
       "class": 3,
       "cost": 63330,
       "edID": 128064191,
       "eddbID": 1049,
-      "enginecapacity": 17,
-      "enginerecharge": 1.2,
+      "engcap": 17,
+      "engrate": 1.2,
       "grp": "pd",
       "id": "db",
       "mass": 8,
       "power": 0.55,
       "rating": "B",
-      "systemcapacity": 17,
-      "systemrecharge": 1.2,
-      "weaponcapacity": 22,
-      "weaponrecharge": 2.5
+      "syscap": 17,
+      "sysrate": 1.2,
+      "wepcap": 22,
+      "weprate": 2.5
     },
     {
       "class": 3,
       "cost": 158330,
       "edID": 128064192,
       "eddbID": 1050,
-      "enginecapacity": 18,
-      "enginerecharge": 1.3,
+      "engcap": 18,
+      "engrate": 1.3,
       "grp": "pd",
       "id": "da",
       "mass": 5,
       "power": 0.6,
       "rating": "A",
-      "systemcapacity": 18,
-      "systemrecharge": 1.3,
-      "weaponcapacity": 24,
-      "weaponrecharge": 2.8
+      "syscap": 18,
+      "sysrate": 1.3,
+      "wepcap": 24,
+      "weprate": 2.8
     },
     {
       "class": 2,
       "cost": 1450,
       "edID": 128064183,
       "eddbID": 1041,
-      "enginecapacity": 10,
-      "enginerecharge": 0.6,
+      "engcap": 10,
+      "engrate": 0.6,
       "grp": "pd",
       "id": "d9",
       "mass": 2.5,
       "power": 0.36,
       "rating": "E",
-      "systemcapacity": 10,
-      "systemrecharge": 0.6,
-      "weaponcapacity": 12,
-      "weaponrecharge": 1.4
+      "syscap": 10,
+      "sysrate": 0.6,
+      "wepcap": 12,
+      "weprate": 1.4
     },
     {
       "class": 2,
       "cost": 3620,
       "edID": 128064184,
       "eddbID": 1042,
-      "enginecapacity": 11,
-      "enginerecharge": 0.6,
+      "engcap": 11,
+      "engrate": 0.6,
       "grp": "pd",
       "id": "d8",
       "mass": 1,
       "power": 0.41,
       "rating": "D",
-      "systemcapacity": 11,
-      "systemrecharge": 0.6,
-      "weaponcapacity": 14,
-      "weaponrecharge": 1.6
+      "syscap": 11,
+      "sysrate": 0.6,
+      "wepcap": 14,
+      "weprate": 1.6
     },
     {
       "class": 2,
       "cost": 9050,
       "edID": 128064185,
       "eddbID": 1043,
-      "enginecapacity": 12,
-      "enginerecharge": 0.7,
+      "engcap": 12,
+      "engrate": 0.7,
       "grp": "pd",
       "id": "d7",
       "mass": 2.5,
       "power": 0.45,
       "rating": "C",
-      "systemcapacity": 12,
-      "systemrecharge": 0.7,
-      "weaponcapacity": 15,
-      "weaponrecharge": 1.8
+      "syscap": 12,
+      "sysrate": 0.7,
+      "wepcap": 15,
+      "weprate": 1.8
     },
     {
       "class": 2,
       "cost": 22620,
       "edID": 128064186,
       "eddbID": 1044,
-      "enginecapacity": 13,
-      "enginerecharge": 0.8,
+      "engcap": 13,
+      "engrate": 0.8,
       "grp": "pd",
       "id": "d6",
       "mass": 4,
       "power": 0.5,
       "rating": "B",
-      "systemcapacity": 13,
-      "systemrecharge": 0.8,
-      "weaponcapacity": 17,
-      "weaponrecharge": 2
+      "syscap": 13,
+      "sysrate": 0.8,
+      "wepcap": 17,
+      "weprate": 2
     },
     {
       "class": 2,
       "cost": 56550,
       "edID": 128064187,
       "eddbID": 1045,
-      "enginecapacity": 14,
-      "enginerecharge": 0.8,
+      "engcap": 14,
+      "engrate": 0.8,
       "grp": "pd",
       "id": "d5",
       "mass": 2.5,
       "power": 0.54,
       "rating": "A",
-      "systemcapacity": 14,
-      "systemrecharge": 0.8,
-      "weaponcapacity": 18,
-      "weaponrecharge": 2.2
+      "syscap": 14,
+      "sysrate": 0.8,
+      "wepcap": 18,
+      "weprate": 2.2
     },
     {
       "class": 1,
       "cost": 520,
       "edID": 128064178,
       "eddbID": 1036,
-      "enginecapacity": 8,
-      "enginerecharge": 0.4,
+      "engcap": 8,
+      "engrate": 0.4,
       "grp": "pd",
       "id": "d4",
       "mass": 1.3,
       "power": 0.32,
       "rating": "E",
-      "systemcapacity": 8,
-      "systemrecharge": 0.4,
-      "weaponcapacity": 10,
-      "weaponrecharge": 1.2
+      "syscap": 8,
+      "sysrate": 0.4,
+      "wepcap": 10,
+      "weprate": 1.2
     },
     {
       "class": 1,
       "cost": 1290,
       "edID": 128064179,
       "eddbID": 1037,
-      "enginecapacity": 9,
-      "enginerecharge": 0.5,
+      "engcap": 9,
+      "engrate": 0.5,
       "grp": "pd",
       "id": "d3",
       "mass": 0.5,
       "power": 0.36,
       "rating": "D",
-      "systemcapacity": 9,
-      "systemrecharge": 0.5,
-      "weaponcapacity": 11,
-      "weaponrecharge": 1.4
+      "syscap": 9,
+      "sysrate": 0.5,
+      "wepcap": 11,
+      "weprate": 1.4
     },
     {
       "class": 1,
       "cost": 3230,
       "edID": 128064180,
       "eddbID": 1038,
-      "enginecapacity": 10,
-      "enginerecharge": 0.5,
+      "engcap": 10,
+      "engrate": 0.5,
       "grp": "pd",
       "id": "d2",
       "mass": 1.3,
       "power": 0.4,
       "rating": "C",
-      "systemcapacity": 10,
-      "systemrecharge": 0.5,
-      "weaponcapacity": 12,
-      "weaponrecharge": 1.5
+      "syscap": 10,
+      "sysrate": 0.5,
+      "wepcap": 12,
+      "weprate": 1.5
     },
     {
       "class": 1,
       "cost": 8080,
       "edID": 128064181,
       "eddbID": 1039,
-      "enginecapacity": 11,
-      "enginerecharge": 0.6,
+      "engcap": 11,
+      "engrate": 0.6,
       "grp": "pd",
       "id": "d1",
       "mass": 2,
       "power": 0.44,
       "rating": "B",
-      "systemcapacity": 11,
-      "systemrecharge": 0.6,
-      "weaponcapacity": 13,
-      "weaponrecharge": 1.7
+      "syscap": 11,
+      "sysrate": 0.6,
+      "wepcap": 13,
+      "weprate": 1.7
     },
     {
       "class": 1,
       "cost": 20200,
       "edID": 128064182,
       "eddbID": 1040,
-      "enginecapacity": 12,
-      "enginerecharge": 0.6,
+      "engcap": 12,
+      "engrate": 0.6,
       "grp": "pd",
       "id": "d0",
       "mass": 1.3,
       "power": 0.48,
       "rating": "A",
-      "systemcapacity": 12,
-      "systemrecharge": 0.6,
-      "weaponcapacity": 14,
-      "weaponrecharge": 1.8
+      "syscap": 12,
+      "sysrate": 0.6,
+      "wepcap": 14,
+      "weprate": 1.8
     }
   ]
 }