From 9a1aac8dd01d5c304f761f590bed9e970b6e02c5 Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Sun, 30 Oct 2016 16:48:56 +0000
Subject: [PATCH] Order modification validity

---
 dist/index.js               |  58 +++--
 dist/index.json             | 416 +++++++++++++++++++++++++----------
 modifications/validity.json | 417 +++++++++++++++++++++++++-----------
 3 files changed, 631 insertions(+), 260 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index b2464ee..cb434c7 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -11975,34 +11975,50 @@ module.exports = {
   Modifications: {
     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: [ "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: [],
+      am: [ "boot", "integrity", "power" ],
+      bl: [ "armourpen", "damage", "distdraw", "integrity", "mass", "power", "range", "thermload" ],
+      bsg: [ "boot", "brokenregen", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ],
+      c: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ],
+      cc: [ "boot", "integrity", "mass", "power" ],
       cr: [],
-      cc: [ "mass", "integrity", "power", "boot" ],
+      cs: [ "boot", "integrity", "mass", "power" ],
       dc: [],
+      fc: [ "ammo", "armourpen", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ],
       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" ],
+      fi: [ "arc", "boot", "integrity", "mass", "power", "range" ],
+      fs: [ "boot", "integrity", "mass", "power" ],
+      fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ],
       ft: [],
+      fx: [ "boot", "integrity", "mass", "power" ],
+      hb: [ "boot", "integrity", "mass", "power" ],
+      hr: [ "armour", "explres", "hullboost", "kinres", "mass", "thermres" ],
+      kw: [ "boot", "integrity", "mass", "power" ],
+      ls: [ "boot", "integrity", "mass", "power" ],
+      mc: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ],
+      ml: [],
+      mr: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "reload", "rof", "thermload" ],
+      nl: [ "ammo", "armourpen", "boot", "clip", "damage", "integrity", "jitter", "mass", "power", "reload", "rof", "thermload" ],
+      pa: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ],
+      pc: [ "boot", "integrity", "mass", "power" ],
+      pci: [],
+      pcm: [],
       pcq: [],
+      pd: [ "boot", "engcap", "engrate", "integrity", "mass", "power", "syscap", "sysrate", "wepcap", "weprate" ],
+      pl: [ "armourpen", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "rof", "thermload" ],
+      pp: [ "eff", "integrity", "mass", "pGen" ],
+      psg: [ "boot", "brokenregen", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ],
       pv: [],
-      psg: [ "mass", "integrity", "power", "boot", "eps", "optmass", "optmul", "kinres", "thermres", "regen", "brokenregen" ],
-      pc: [ "mass", "integrity", "power", "boot" ],
-      rf: [ "mass", "integrity", "power", "boot" ],
+      rf: [ "boot", "integrity", "mass", "power" ],
+      rg: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ],
+      s: [ "boot", "integrity", "mass", "power" ],
+      sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "thermres" ],
       sc: [],
-      scb: [ "integrity", "power", "hps", "eps", "delay", "duration", "shield", "boot" ],
-      sg: [ "mass", "integrity", "power", "boot", "eps", "optmass", "optmul", "reskin", "restherm", "regen", "brokenregen" ]
+      scb: [ "boot", "delay", "duration", "integrity", "power", "shield", "thermload" ],
+      sg: [ "boot", "brokenregen", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ],
+      t: [ "integrity", "mass", "optmass", "optmul", "power", "thermload" ],
+      tp: [ "armourpen", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "rof", "thermload" ],
+      ul: [ "armourpen", "burst", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "rof", "thermload" ],
+      ws: [ "boot", "integrity", "mass", "power" ]
     }
   }
 };
\ No newline at end of file
diff --git a/dist/index.json b/dist/index.json
index 7896e94..5248f98 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -14392,167 +14392,345 @@
 			"range"
 		],
 		"validity": {
-			"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": [
+				"boot",
 				"integrity",
+				"power"
+			],
+			"bl": [
+				"armourpen",
+				"damage",
+				"distdraw",
+				"integrity",
+				"mass",
 				"power",
-				"boot"
+				"range",
+				"thermload"
 			],
 			"bsg": [
-				"mass",
-				"integrity",
-				"power",
 				"boot",
-				"eps",
+				"brokenregen",
+				"integrity",
+				"kinres",
+				"mass",
 				"optmass",
 				"optmul",
-				"kinres",
-				"thermres",
-				"regen",
-				"brokenregen"
-			],
-			"pci": [],
-			"cr": [],
-			"cc": [
-				"mass",
-				"integrity",
 				"power",
-				"boot"
+				"regen",
+				"thermload",
+				"thermres"
+			],
+			"c": [
+				"ammo",
+				"armourpen",
+				"clip",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"range",
+				"reload",
+				"rof",
+				"thermload"
+			],
+			"cc": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
+			],
+			"cr": [],
+			"cs": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
 			],
 			"dc": [],
-			"fh": [],
-			"pcm": [],
-			"fi": [
-				"mass",
+			"fc": [
+				"ammo",
+				"armourpen",
+				"burst",
+				"clip",
+				"damage",
+				"distdraw",
 				"integrity",
+				"jitter",
+				"mass",
 				"power",
-				"boot",
 				"range",
-				"arc"
+				"reload",
+				"rof",
+				"thermload"
+			],
+			"fh": [],
+			"fi": [
+				"arc",
+				"boot",
+				"integrity",
+				"mass",
+				"power",
+				"range"
 			],
 			"fs": [
-				"mass",
+				"boot",
 				"integrity",
-				"power",
-				"boot"
-			],
-			"fx": [
 				"mass",
+				"power"
+			],
+			"fsd": [
+				"boot",
 				"integrity",
-				"power",
-				"boot"
-			],
-			"hb": [
 				"mass",
-				"integrity",
+				"maxfuel",
+				"optmass",
 				"power",
-				"boot"
-			],
-			"hr": [
-				"mass",
-				"kinres",
-				"thermres",
-				"explres",
-				"armour",
-				"hullboost"
+				"thermload"
 			],
 			"ft": [],
-			"pcq": [],
-			"pv": [],
-			"psg": [
-				"mass",
-				"integrity",
-				"power",
+			"fx": [
 				"boot",
-				"eps",
-				"optmass",
-				"optmul",
+				"integrity",
+				"mass",
+				"power"
+			],
+			"hb": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
+			],
+			"hr": [
+				"armour",
+				"explres",
+				"hullboost",
 				"kinres",
-				"thermres",
-				"regen",
-				"brokenregen"
+				"mass",
+				"thermres"
+			],
+			"kw": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
+			],
+			"ls": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
+			],
+			"mc": [
+				"ammo",
+				"armourpen",
+				"clip",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"range",
+				"reload",
+				"rof",
+				"thermload"
+			],
+			"ml": [],
+			"mr": [
+				"ammo",
+				"armourpen",
+				"clip",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"reload",
+				"rof",
+				"thermload"
+			],
+			"nl": [
+				"ammo",
+				"armourpen",
+				"boot",
+				"clip",
+				"damage",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"reload",
+				"rof",
+				"thermload"
+			],
+			"pa": [
+				"ammo",
+				"armourpen",
+				"clip",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"range",
+				"reload",
+				"rof",
+				"thermload"
 			],
 			"pc": [
-				"mass",
+				"boot",
 				"integrity",
-				"power",
-				"boot"
+				"mass",
+				"power"
 			],
-			"rf": [
-				"mass",
+			"pci": [],
+			"pcm": [],
+			"pcq": [],
+			"pd": [
+				"boot",
+				"engcap",
+				"engrate",
 				"integrity",
+				"mass",
 				"power",
-				"boot"
+				"syscap",
+				"sysrate",
+				"wepcap",
+				"weprate"
+			],
+			"pl": [
+				"armourpen",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"range",
+				"rof",
+				"thermload"
+			],
+			"pp": [
+				"eff",
+				"integrity",
+				"mass",
+				"pGen"
+			],
+			"psg": [
+				"boot",
+				"brokenregen",
+				"integrity",
+				"kinres",
+				"mass",
+				"optmass",
+				"optmul",
+				"power",
+				"regen",
+				"thermload",
+				"thermres"
+			],
+			"pv": [],
+			"rf": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
+			],
+			"rg": [
+				"ammo",
+				"armourpen",
+				"clip",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"range",
+				"reload",
+				"rof",
+				"thermload"
+			],
+			"s": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
+			],
+			"sb": [
+				"explres",
+				"integrity",
+				"kinres",
+				"mass",
+				"power",
+				"shieldboost",
+				"thermres"
 			],
 			"sc": [],
 			"scb": [
-				"integrity",
-				"power",
-				"hps",
-				"eps",
+				"boot",
 				"delay",
 				"duration",
-				"shield",
-				"boot"
-			],
-			"sg": [
-				"mass",
 				"integrity",
 				"power",
+				"shield",
+				"thermload"
+			],
+			"sg": [
 				"boot",
-				"eps",
+				"brokenregen",
+				"integrity",
+				"kinres",
+				"mass",
 				"optmass",
 				"optmul",
-				"reskin",
-				"restherm",
+				"power",
 				"regen",
-				"brokenregen"
+				"thermload",
+				"thermres"
+			],
+			"t": [
+				"integrity",
+				"mass",
+				"optmass",
+				"optmul",
+				"power",
+				"thermload"
+			],
+			"tp": [
+				"armourpen",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"range",
+				"rof",
+				"thermload"
+			],
+			"ul": [
+				"armourpen",
+				"burst",
+				"damage",
+				"distdraw",
+				"integrity",
+				"jitter",
+				"mass",
+				"power",
+				"range",
+				"rof",
+				"thermload"
+			],
+			"ws": [
+				"boot",
+				"integrity",
+				"mass",
+				"power"
 			]
 		}
 	}
diff --git a/modifications/validity.json b/modifications/validity.json
index 5ec4e4b..5ecd433 100644
--- a/modifications/validity.json
+++ b/modifications/validity.json
@@ -1,165 +1,342 @@
 {
-  "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": [
+    "boot",
     "integrity",
+    "power"
+  ],
+  "bl": [
+    "armourpen",
+    "damage",
+    "distdraw",
+    "integrity",
+    "mass",
     "power",
-    "boot"
+    "range",
+    "thermload"
   ],
   "bsg": [
-    "mass",
-    "integrity",
-    "power",
     "boot",
-    "eps",
+    "brokenregen",
+    "integrity",
+    "kinres",
+    "mass",
     "optmass",
     "optmul",
-    "kinres",
-    "thermres",
-    "regen",
-    "brokenregen"
-  ],
-  "pci": [],
-  "cr": [],
-  "cc": [
-    "mass",
-    "integrity",
     "power",
-    "boot"
+    "regen",
+    "thermload",
+    "thermres"
+  ],
+  "c": [
+    "ammo",
+    "armourpen",
+    "clip",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "range",
+    "reload",
+    "rof",
+    "thermload"
+  ],
+  "cc": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
+  ],
+  "cr": [],
+  "cs": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
   ],
   "dc": [],
-  "pci": [],
-  "fh": [],
-  "pcm": [],
-  "fi": [
-    "mass",
+  "fc": [
+    "ammo",
+    "armourpen",
+    "burst",
+    "clip",
+    "damage",
+    "distdraw",
     "integrity",
+    "jitter",
+    "mass",
     "power",
-    "boot",
     "range",
-    "arc"
+    "reload",
+    "rof",
+    "thermload"
+  ],
+  "fh": [],
+  "fi": [
+    "arc",
+    "boot",
+    "integrity",
+    "mass",
+    "power",
+    "range"
   ],
   "fs": [
-    "mass",
+    "boot",
     "integrity",
-    "power",
-    "boot"
-  ],
-  "fx": [
     "mass",
+    "power"
+  ],
+  "fsd": [
+    "boot",
     "integrity",
-    "power",
-    "boot"
-  ],
-  "hb": [
     "mass",
-    "integrity",
+    "maxfuel",
+    "optmass",
     "power",
-    "boot"
-  ],
-  "hr": [
-    "mass",
-    "kinres",
-    "thermres",
-    "explres",
-    "armour",
-    "hullboost"
+    "thermload"
   ],
   "ft": [],
-  "pcq": [],
-  "pv": [],
-  "psg": [
-    "mass",
-    "integrity",
-    "power",
+  "fx": [
     "boot",
-    "eps",
-    "optmass",
-    "optmul",
+    "integrity",
+    "mass",
+    "power"
+  ],
+  "hb": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
+  ],
+  "hr": [
+    "armour",
+    "explres",
+    "hullboost",
     "kinres",
-    "thermres",
-    "regen",
-    "brokenregen"
+    "mass",
+    "thermres"
+  ],
+  "kw": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
+  ],
+  "ls": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
+  ],
+  "mc": [
+    "ammo",
+    "armourpen",
+    "clip",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "range",
+    "reload",
+    "rof",
+    "thermload"
+  ],
+  "ml": [],
+  "mr": [
+    "ammo",
+    "armourpen",
+    "clip",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "reload",
+    "rof",
+    "thermload"
+  ],
+  "nl": [
+    "ammo",
+    "armourpen",
+    "boot",
+    "clip",
+    "damage",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "reload",
+    "rof",
+    "thermload"
+  ],
+  "pa": [
+    "ammo",
+    "armourpen",
+    "clip",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "range",
+    "reload",
+    "rof",
+    "thermload"
   ],
   "pc": [
-    "mass",
+    "boot",
     "integrity",
-    "power",
-    "boot"
+    "mass",
+    "power"
   ],
-  "rf": [
-    "mass",
+  "pci": [],
+  "pcm": [],
+  "pcq": [],
+  "pd": [
+    "boot",
+    "engcap",
+    "engrate",
     "integrity",
+    "mass",
     "power",
-    "boot"
+    "syscap",
+    "sysrate",
+    "wepcap",
+    "weprate"
+  ],
+  "pl": [
+    "armourpen",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "range",
+    "rof",
+    "thermload"
+  ],
+  "pp": [
+    "eff",
+    "integrity",
+    "mass",
+    "pGen"
+  ],
+  "psg": [
+    "boot",
+    "brokenregen",
+    "integrity",
+    "kinres",
+    "mass",
+    "optmass",
+    "optmul",
+    "power",
+    "regen",
+    "thermload",
+    "thermres"
+  ],
+  "pv": [],
+  "rf": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
+  ],
+  "rg": [
+    "ammo",
+    "armourpen",
+    "clip",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "range",
+    "reload",
+    "rof",
+    "thermload"
+  ],
+  "s": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
+  ],
+  "sb": [
+    "explres",
+    "integrity",
+    "kinres",
+    "mass",
+    "power",
+    "shieldboost",
+    "thermres"
   ],
   "sc": [],
   "scb": [
-    "integrity",
-    "power",
-    "hps",
-    "eps",
+    "boot",
     "delay",
     "duration",
-    "shield",
-    "boot"
-  ],
-  "sg": [
-    "mass",
     "integrity",
     "power",
+    "shield",
+    "thermload"
+  ],
+  "sg": [
     "boot",
-    "eps",
+    "brokenregen",
+    "integrity",
+    "kinres",
+    "mass",
     "optmass",
     "optmul",
-    "reskin",
-    "restherm",
+    "power",
     "regen",
-    "brokenregen"
+    "thermload",
+    "thermres"
+  ],
+  "t": [
+    "integrity",
+    "mass",
+    "optmass",
+    "optmul",
+    "power",
+    "thermload"
+  ],
+  "tp": [
+    "armourpen",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "range",
+    "rof",
+    "thermload"
+  ],
+  "ul": [
+    "armourpen",
+    "burst",
+    "damage",
+    "distdraw",
+    "integrity",
+    "jitter",
+    "mass",
+    "power",
+    "range",
+    "rof",
+    "thermload"
+  ],
+  "ws": [
+    "boot",
+    "integrity",
+    "mass",
+    "power"
   ]
 }