From 384931b6941ccabe6cf4843d1f236a6522954eda Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 3 Nov 2016 14:51:50 +0000 Subject: [PATCH] Fix up modifiers --- dist/index.js | 26 ++++++------ dist/index.json | 80 +++++++++++++++++++++--------------- modifications/modifiers.json | 62 +++++++++++++++++----------- modifications/validity.json | 24 +++++------ 4 files changed, 112 insertions(+), 80 deletions(-) diff --git a/dist/index.js b/dist/index.js index 4101d52..1b9203a 100644 --- a/dist/index.js +++ b/dist/index.js @@ -13153,18 +13153,18 @@ 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" ], + modifiers: [ "ammo", "boot", "brokenregen", "burst", "clip", "damage", "distdraw", "duration", "eff", "engcap", "engrate", "explres", "facinglimit", "hullboost", "hullreinforcement", "integrity", "jitter", "kinres", "mass", "maxfuel", "optmass", "optmul", "pgen", "piercing", "power", "range", "ranget", "regen", "reload", "rof", "shield", "shieldmul", "spinup", "syscap", "sysrate", "thermload", "thermres", "wepcap", "weprate" ], validity: { am: [ "integrity", "power" ], bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ], - bl: [ "armourpen", "damage", "distdraw", "integrity", "mass", "power", "range", "thermload" ], + bl: [ "damage", "distdraw", "integrity", "mass", "piercing", "power", "range", "thermload" ], bsg: [ "boot", "brokenregen", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], - c: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], + c: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], cc: [ "integrity", "mass", "power" ], ch: [ "ammo", "integrity", "mass", "power", "reload" ], cs: [ "boot", "integrity", "mass", "power" ], ec: [ "integrity", "mass", "power" ], - fc: [ "ammo", "armourpen", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], + fc: [ "ammo", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], fi: [ "boot", "facinglimit", "integrity", "mass", "power", "ranget" ], fs: [ "integrity", "power" ], fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ], @@ -13174,25 +13174,25 @@ module.exports = { hs: [ "ammo", "integrity", "mass", "power", "reload" ], kw: [ "boot", "integrity", "mass", "power" ], ls: [ "boot", "integrity", "mass", "power" ], - mc: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], - 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" ], + mc: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], + mr: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ], + nl: [ "ammo", "boot", "clip", "damage", "integrity", "jitter", "mass", "piercing", "power", "reload", "rof", "thermload" ], + pa: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], pc: [ "integrity", "mass", "power" ], pd: [ "boot", "engcap", "engrate", "integrity", "mass", "power", "syscap", "sysrate", "wepcap", "weprate" ], - pl: [ "armourpen", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "rof", "thermload" ], + pl: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], po: [ "ammo", "integrity", "mass", "power", "reload" ], - pp: [ "eff", "integrity", "mass", "pGen" ], + pp: [ "eff", "integrity", "mass", "pgen" ], psg: [ "boot", "brokenregen", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], rf: [ "integrity", "power" ], - rg: [ "ammo", "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], + rg: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], s: [ "boot", "integrity", "mass", "power" ], sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldmul", "thermres" ], scb: [ "boot", "duration", "integrity", "power", "shield", "spinup", "thermload" ], sg: [ "boot", "brokenregen", "explres", "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" ], + tp: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], + ul: [ "burst", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], ws: [ "boot", "integrity", "mass", "power" ] } } diff --git a/dist/index.json b/dist/index.json index 4850ab2..00f9100 100644 --- a/dist/index.json +++ b/dist/index.json @@ -15550,29 +15550,45 @@ }, "Modifications": { "modifiers": [ - "mass", - "integrity", - "power", - "hps", - "boot", - "pGen", - "eff", - "optmass", - "optmult", - "maxfuel", - "maxsys", - "maxeng", - "maxwep", - "ratesys", - "rateeng", - "ratewep", - "rof", - "hps", - "eps", "ammo", + "boot", + "brokenregen", + "burst", "clip", + "damage", + "distdraw", + "duration", + "eff", + "engcap", + "engrate", + "explres", + "facinglimit", + "hullboost", + "hullreinforcement", + "integrity", + "jitter", + "kinres", + "mass", + "maxfuel", + "optmass", + "optmul", + "pgen", + "piercing", + "power", + "range", + "ranget", + "regen", "reload", - "range" + "rof", + "shield", + "shieldmul", + "spinup", + "syscap", + "sysrate", + "thermload", + "thermres", + "wepcap", + "weprate" ], "validity": { "am": [ @@ -15587,11 +15603,11 @@ "thermres" ], "bl": [ - "armourpen", "damage", "distdraw", "integrity", "mass", + "piercing", "power", "range", "thermload" @@ -15612,13 +15628,13 @@ ], "c": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -15650,7 +15666,6 @@ ], "fc": [ "ammo", - "armourpen", "burst", "clip", "damage", @@ -15658,6 +15673,7 @@ "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -15724,13 +15740,13 @@ ], "mc": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -15739,13 +15755,13 @@ ], "mr": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "reload", "rof", @@ -15753,13 +15769,13 @@ ], "nl": [ "ammo", - "armourpen", "boot", "clip", "damage", "integrity", "jitter", "mass", + "piercing", "power", "reload", "rof", @@ -15767,13 +15783,13 @@ ], "pa": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -15798,12 +15814,12 @@ "weprate" ], "pl": [ - "armourpen", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "rof", @@ -15820,7 +15836,7 @@ "eff", "integrity", "mass", - "pGen" + "pgen" ], "psg": [ "boot", @@ -15842,13 +15858,13 @@ ], "rg": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -15902,25 +15918,25 @@ "thermload" ], "tp": [ - "armourpen", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "rof", "thermload" ], "ul": [ - "armourpen", "burst", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "rof", diff --git a/modifications/modifiers.json b/modifications/modifiers.json index e91b52d..cd1d60c 100644 --- a/modifications/modifiers.json +++ b/modifications/modifiers.json @@ -1,25 +1,41 @@ [ - "mass", - "integrity", - "power", - "hps", - "boot", - "pGen", - "eff", - "optmass", - "optmult", - "maxfuel", - "maxsys", - "maxeng", - "maxwep", - "ratesys", - "rateeng", - "ratewep", - "rof", - "hps", - "eps", - "ammo", - "clip", - "reload", - "range" + "ammo", + "boot", + "brokenregen", + "burst", + "clip", + "damage", + "distdraw", + "duration", + "eff", + "engcap", + "engrate", + "explres", + "facinglimit", + "hullboost", + "hullreinforcement", + "integrity", + "jitter", + "kinres", + "mass", + "maxfuel", + "optmass", + "optmul", + "pgen", + "piercing", + "power", + "range", + "ranget", + "regen", + "reload", + "rof", + "shield", + "shieldmul", + "spinup", + "syscap", + "sysrate", + "thermload", + "thermres", + "wepcap", + "weprate" ] diff --git a/modifications/validity.json b/modifications/validity.json index d8aa2c8..862d703 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -11,11 +11,11 @@ "thermres" ], "bl": [ - "armourpen", "damage", "distdraw", "integrity", "mass", + "piercing", "power", "range", "thermload" @@ -36,13 +36,13 @@ ], "c": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -74,7 +74,6 @@ ], "fc": [ "ammo", - "armourpen", "burst", "clip", "damage", @@ -82,6 +81,7 @@ "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -148,13 +148,13 @@ ], "mc": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -163,13 +163,13 @@ ], "mr": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "reload", "rof", @@ -177,13 +177,13 @@ ], "nl": [ "ammo", - "armourpen", "boot", "clip", "damage", "integrity", "jitter", "mass", + "piercing", "power", "reload", "rof", @@ -191,13 +191,13 @@ ], "pa": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -222,12 +222,12 @@ "weprate" ], "pl": [ - "armourpen", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "rof", @@ -244,7 +244,7 @@ "eff", "integrity", "mass", - "pGen" + "pgen" ], "psg": [ "boot", @@ -266,13 +266,13 @@ ], "rg": [ "ammo", - "armourpen", "clip", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "reload", @@ -326,25 +326,25 @@ "thermload" ], "tp": [ - "armourpen", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "rof", "thermload" ], "ul": [ - "armourpen", "burst", "damage", "distdraw", "integrity", "jitter", "mass", + "piercing", "power", "range", "rof",