Merge branch 'feature/rebalance' into develop

This commit is contained in:
Cmdr McDonald
2016-12-01 10:27:03 +00:00
10 changed files with 257 additions and 184 deletions

View File

@@ -1,5 +1,7 @@
#2.2.4-a
* Fix incorrect ID for emissive munitions special
* Fix rate of fire for burst lasers
* Add fragment cannon modifications
* Fix internal name of dazzle shell
#2.2.4
* Fix incorrect ID for class 5 luxury passenger cabin

140
dist/index.js vendored
View File

@@ -6286,7 +6286,7 @@ module.exports = {
power: .65,
range: 3e3,
rating: "F",
rof: 4.735,
rof: 2,
thermload: .4,
type: "T"
}, {
@@ -6297,7 +6297,7 @@ module.exports = {
burstrof: 17,
class: 1,
cost: 8600,
damage: 1.22,
damage: 1.2,
distdraw: .27,
edID: 128049404,
eddbID: 835,
@@ -6310,7 +6310,7 @@ module.exports = {
power: .64,
range: 3e3,
rating: "G",
rof: 5.28,
rof: 2.23,
thermload: .3,
type: "T"
}, {
@@ -6334,7 +6334,7 @@ module.exports = {
power: .6,
range: 3e3,
rating: "G",
rof: 4.795,
rof: 1.92,
thermload: .2,
type: "T"
}, {
@@ -6360,7 +6360,7 @@ module.exports = {
pp: "Archon Delaine",
range: 600,
rating: "F",
rof: 7.615,
rof: 1.98,
thermload: .3,
type: "T"
}, {
@@ -6371,7 +6371,7 @@ module.exports = {
burstrof: 11,
class: 2,
cost: 23e3,
damage: 3.53,
damage: 3.5,
distdraw: .63,
edID: 128049401,
eddbID: 833,
@@ -6384,7 +6384,7 @@ module.exports = {
power: 1.05,
range: 3e3,
rating: "E",
rof: 3.695,
rof: 1.6,
thermload: .8,
type: "T"
}, {
@@ -6408,7 +6408,7 @@ module.exports = {
power: 1.04,
range: 3e3,
rating: "F",
rof: 4.2,
rof: 1.78,
thermload: .7,
type: "T"
}, {
@@ -6419,7 +6419,7 @@ module.exports = {
burstrof: 15,
class: 2,
cost: 162800,
damage: 1.72,
damage: 1.74,
distdraw: .31,
edID: 128049408,
eddbID: 839,
@@ -6432,7 +6432,7 @@ module.exports = {
power: .98,
range: 3e3,
rating: "F",
rof: 3.93,
rof: 1.57,
thermload: .4,
type: "T"
}, {
@@ -6443,7 +6443,7 @@ module.exports = {
burstrof: 7,
class: 3,
cost: 140400,
damage: 7.74,
damage: 7.75,
distdraw: 1.39,
edID: 128049402,
eddbID: 834,
@@ -6456,7 +6456,7 @@ module.exports = {
power: 1.66,
range: 3e3,
rating: "D",
rof: 2.685,
rof: 1.2,
thermload: 1.7,
type: "T"
}, {
@@ -6467,7 +6467,7 @@ module.exports = {
burstrof: 9,
class: 3,
cost: 281600,
damage: 5.16,
damage: 5.18,
distdraw: 1.16,
edID: 128049406,
eddbID: 837,
@@ -6480,7 +6480,7 @@ module.exports = {
power: 1.65,
range: 3e3,
rating: "E",
rof: 3.215,
rof: 1.4,
thermload: 1.4,
type: "T"
}, {
@@ -6491,7 +6491,7 @@ module.exports = {
burstrof: 11,
class: 3,
cost: 800400,
damage: 3.53,
damage: 3.54,
distdraw: .63,
edID: 128049409,
eddbID: 840,
@@ -6504,7 +6504,7 @@ module.exports = {
power: 1.57,
range: 3e3,
rating: "E",
rof: 3.115,
rof: 1.272,
thermload: .8,
type: "T"
}, {
@@ -6528,7 +6528,7 @@ module.exports = {
power: 2.58,
range: 3e3,
rating: "E",
rof: 1.565,
rof: .8,
thermload: 4.5,
type: "T"
}, {
@@ -6552,7 +6552,7 @@ module.exports = {
power: 2.59,
range: 3e3,
rating: "E",
rof: 2.14,
rof: 1,
thermload: 3.3,
type: "T"
} ],
@@ -13602,7 +13602,7 @@ module.exports = {
name: "Low emissions"
},
ProspectingLimpet_LightWeight: {
id: 63,
id: 65,
name: "Lightweight"
},
ProspectingLimpet_Reinforced: {
@@ -13714,19 +13714,19 @@ module.exports = {
ammo: {
id: 0,
name: "ammo",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
boot: {
id: 1,
name: "boot",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
brokenregen: {
id: 2,
name: "brokenregen",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
burst: {
@@ -13735,76 +13735,82 @@ module.exports = {
type: "numeric",
method: "multiplicative"
},
burstrof: {
id: 41,
name: "burstrof",
type: "percentage",
method: "multiplicative"
},
clip: {
id: 4,
name: "clip",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
damage: {
id: 5,
name: "damage",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
distdraw: {
id: 6,
name: "distdraw",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
duration: {
id: 7,
name: "duration",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
eff: {
id: 8,
name: "eff",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
engcap: {
id: 9,
name: "engcap",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
engrate: {
id: 10,
name: "engrate",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
explres: {
id: 11,
name: "explres",
type: "numeric",
type: "percentage",
method: "additive"
},
facinglimit: {
id: 12,
name: "facinglimit",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
hullboost: {
id: 13,
name: "hullboost",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
hullreinforcement: {
id: 14,
name: "hullreinforcement",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
integrity: {
id: 15,
name: "integrity",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
jitter: {
@@ -13816,139 +13822,139 @@ module.exports = {
kinres: {
id: 17,
name: "kinres",
type: "numeric",
type: "percentage",
method: "additive"
},
mass: {
id: 18,
name: "mass",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
maxfuel: {
id: 19,
name: "maxfuel",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
optmass: {
id: 20,
name: "optmass",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
optmul: {
id: 21,
name: "optmul",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
pgen: {
id: 22,
name: "pgen",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
piercing: {
id: 23,
name: "piercing",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
power: {
id: 24,
name: "power",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
range: {
id: 25,
name: "range",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
ranget: {
id: 26,
name: "ranget",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
regen: {
id: 27,
name: "regen",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
reload: {
id: 28,
name: "reload",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
rof: {
id: 29,
name: "rof",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
shield: {
id: 30,
name: "shield",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
shieldboost: {
id: 31,
name: "shieldboost",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
spinup: {
id: 32,
name: "spinup",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
syscap: {
id: 33,
name: "syscap",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
sysrate: {
id: 34,
name: "sysrate",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
thermload: {
id: 35,
name: "thermload",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
thermres: {
id: 36,
name: "thermres",
type: "numeric",
type: "percentage",
method: "additive"
},
wepcap: {
id: 37,
name: "wepcap",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
weprate: {
id: 38,
name: "weprate",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
shieldreinforcement: {
id: 39,
name: "shieldreinforcement",
type: "numeric",
type: "percentage",
method: "multiplicative"
},
type: {
@@ -14119,11 +14125,18 @@ module.exports = {
mod_weapon_burst_interval: {
rof: 1
},
mod_weapon_burst_rof: {},
mod_weapon_burst_size: {},
mod_weapon_burst_rof: {
burstrof: 1
},
mod_weapon_burst_size: {
burst: 1
},
mod_weapon_clip_size: {
clip: 1
},
mod_weapon_clip_size_override: {
clip: 1
},
mod_weapon_damage: {
damage: 1
},
@@ -14173,6 +14186,9 @@ module.exports = {
special_scramble_spectrum: {
rof: .1111111111111111
},
special_screening_shell: {
reload: -.5
},
special_shiftlock_canister: {
damage: -.2
},
@@ -14288,7 +14304,7 @@ module.exports = {
id: 3,
name: "Corrosive shell"
},
special_dazzle_shell: {
special_blinding_shell: {
id: 4,
name: "Dazzle shell"
},
@@ -14411,7 +14427,7 @@ module.exports = {
ch: [ "ammo", "integrity", "mass", "power", "reload" ],
cs: [ "boot", "integrity", "mass", "power" ],
ec: [ "integrity", "mass", "power" ],
fc: [ "ammo", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload", "type" ],
fc: [ "ammo", "burst", "burstrof", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload", "type" ],
fi: [ "boot", "facinglimit", "integrity", "mass", "power", "ranget" ],
fs: [ "integrity", "power" ],
fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ],
@@ -14438,7 +14454,7 @@ module.exports = {
sg: [ "boot", "brokenregen", "distdraw", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ],
t: [ "integrity", "mass", "optmass", "optmul", "power", "thermload" ],
tp: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
ul: [ "burst", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
ul: [ "burst", "burstrof", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
ws: [ "boot", "integrity", "mass", "power" ]
}
}

138
dist/index.json vendored
View File

@@ -8192,7 +8192,7 @@
"power": 0.65,
"range": 3000,
"rating": "F",
"rof": 4.735,
"rof": 2,
"thermload": 0.4,
"type": "T"
},
@@ -8204,7 +8204,7 @@
"burstrof": 17,
"class": 1,
"cost": 8600,
"damage": 1.22,
"damage": 1.2,
"distdraw": 0.27,
"edID": 128049404,
"eddbID": 835,
@@ -8217,7 +8217,7 @@
"power": 0.64,
"range": 3000,
"rating": "G",
"rof": 5.28,
"rof": 2.23,
"thermload": 0.3,
"type": "T"
},
@@ -8242,7 +8242,7 @@
"power": 0.6,
"range": 3000,
"rating": "G",
"rof": 4.795,
"rof": 1.92,
"thermload": 0.2,
"type": "T"
},
@@ -8269,7 +8269,7 @@
"pp": "Archon Delaine",
"range": 600,
"rating": "F",
"rof": 7.615,
"rof": 1.98,
"thermload": 0.3,
"type": "T"
},
@@ -8281,7 +8281,7 @@
"burstrof": 11,
"class": 2,
"cost": 23000,
"damage": 3.53,
"damage": 3.5,
"distdraw": 0.63,
"edID": 128049401,
"eddbID": 833,
@@ -8294,7 +8294,7 @@
"power": 1.05,
"range": 3000,
"rating": "E",
"rof": 3.695,
"rof": 1.6,
"thermload": 0.8,
"type": "T"
},
@@ -8319,7 +8319,7 @@
"power": 1.04,
"range": 3000,
"rating": "F",
"rof": 4.2,
"rof": 1.78,
"thermload": 0.7,
"type": "T"
},
@@ -8331,7 +8331,7 @@
"burstrof": 15,
"class": 2,
"cost": 162800,
"damage": 1.72,
"damage": 1.74,
"distdraw": 0.31,
"edID": 128049408,
"eddbID": 839,
@@ -8344,7 +8344,7 @@
"power": 0.98,
"range": 3000,
"rating": "F",
"rof": 3.93,
"rof": 1.57,
"thermload": 0.4,
"type": "T"
},
@@ -8356,7 +8356,7 @@
"burstrof": 7,
"class": 3,
"cost": 140400,
"damage": 7.74,
"damage": 7.75,
"distdraw": 1.39,
"edID": 128049402,
"eddbID": 834,
@@ -8369,7 +8369,7 @@
"power": 1.66,
"range": 3000,
"rating": "D",
"rof": 2.685,
"rof": 1.2,
"thermload": 1.7,
"type": "T"
},
@@ -8381,7 +8381,7 @@
"burstrof": 9,
"class": 3,
"cost": 281600,
"damage": 5.16,
"damage": 5.18,
"distdraw": 1.16,
"edID": 128049406,
"eddbID": 837,
@@ -8394,7 +8394,7 @@
"power": 1.65,
"range": 3000,
"rating": "E",
"rof": 3.215,
"rof": 1.4,
"thermload": 1.4,
"type": "T"
},
@@ -8406,7 +8406,7 @@
"burstrof": 11,
"class": 3,
"cost": 800400,
"damage": 3.53,
"damage": 3.54,
"distdraw": 0.63,
"edID": 128049409,
"eddbID": 840,
@@ -8419,7 +8419,7 @@
"power": 1.57,
"range": 3000,
"rating": "E",
"rof": 3.115,
"rof": 1.272,
"thermload": 0.8,
"type": "T"
},
@@ -8444,7 +8444,7 @@
"power": 2.58,
"range": 3000,
"rating": "E",
"rof": 1.565,
"rof": 0.8,
"thermload": 4.5,
"type": "T"
},
@@ -8469,7 +8469,7 @@
"power": 2.59,
"range": 3000,
"rating": "E",
"rof": 2.14,
"rof": 1,
"thermload": 3.3,
"type": "T"
}
@@ -15998,7 +15998,7 @@
"name": "Low emissions"
},
"ProspectingLimpet_LightWeight": {
"id": 63,
"id": 65,
"name": "Lightweight"
},
"ProspectingLimpet_Reinforced": {
@@ -16110,19 +16110,19 @@
"ammo": {
"id": 0,
"name": "ammo",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"boot": {
"id": 1,
"name": "boot",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"brokenregen": {
"id": 2,
"name": "brokenregen",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"burst": {
@@ -16131,76 +16131,82 @@
"type": "numeric",
"method": "multiplicative"
},
"burstrof": {
"id": 41,
"name": "burstrof",
"type": "percentage",
"method": "multiplicative"
},
"clip": {
"id": 4,
"name": "clip",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"damage": {
"id": 5,
"name": "damage",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"distdraw": {
"id": 6,
"name": "distdraw",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"duration": {
"id": 7,
"name": "duration",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"eff": {
"id": 8,
"name": "eff",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"engcap": {
"id": 9,
"name": "engcap",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"engrate": {
"id": 10,
"name": "engrate",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"explres": {
"id": 11,
"name": "explres",
"type": "numeric",
"type": "percentage",
"method": "additive"
},
"facinglimit": {
"id": 12,
"name": "facinglimit",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"hullboost": {
"id": 13,
"name": "hullboost",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"hullreinforcement": {
"id": 14,
"name": "hullreinforcement",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"integrity": {
"id": 15,
"name": "integrity",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"jitter": {
@@ -16212,139 +16218,139 @@
"kinres": {
"id": 17,
"name": "kinres",
"type": "numeric",
"type": "percentage",
"method": "additive"
},
"mass": {
"id": 18,
"name": "mass",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"maxfuel": {
"id": 19,
"name": "maxfuel",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"optmass": {
"id": 20,
"name": "optmass",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"optmul": {
"id": 21,
"name": "optmul",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"pgen": {
"id": 22,
"name": "pgen",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"piercing": {
"id": 23,
"name": "piercing",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"power": {
"id": 24,
"name": "power",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"range": {
"id": 25,
"name": "range",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"ranget": {
"id": 26,
"name": "ranget",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"regen": {
"id": 27,
"name": "regen",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"reload": {
"id": 28,
"name": "reload",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"rof": {
"id": 29,
"name": "rof",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"shield": {
"id": 30,
"name": "shield",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"shieldboost": {
"id": 31,
"name": "shieldboost",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"spinup": {
"id": 32,
"name": "spinup",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"syscap": {
"id": 33,
"name": "syscap",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"sysrate": {
"id": 34,
"name": "sysrate",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"thermload": {
"id": 35,
"name": "thermload",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"thermres": {
"id": 36,
"name": "thermres",
"type": "numeric",
"type": "percentage",
"method": "additive"
},
"wepcap": {
"id": 37,
"name": "wepcap",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"weprate": {
"id": 38,
"name": "weprate",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"shieldreinforcement": {
"id": 39,
"name": "shieldreinforcement",
"type": "numeric",
"type": "percentage",
"method": "multiplicative"
},
"type": {
@@ -16515,11 +16521,18 @@
"mod_weapon_burst_interval": {
"rof": 1
},
"mod_weapon_burst_rof": {},
"mod_weapon_burst_size": {},
"mod_weapon_burst_rof": {
"burstrof": 1
},
"mod_weapon_burst_size": {
"burst": 1
},
"mod_weapon_clip_size": {
"clip": 1
},
"mod_weapon_clip_size_override": {
"clip": 1
},
"mod_weapon_damage": {
"damage": 1
},
@@ -16569,6 +16582,9 @@
"special_scramble_spectrum": {
"rof": 0.1111111111111111
},
"special_screening_shell": {
"reload": -0.5
},
"special_shiftlock_canister": {
"damage": -0.2
},
@@ -16684,7 +16700,7 @@
"id": 3,
"name": "Corrosive shell"
},
"special_dazzle_shell": {
"special_blinding_shell": {
"id": 4,
"name": "Dazzle shell"
},
@@ -16875,6 +16891,7 @@
"fc": [
"ammo",
"burst",
"burstrof",
"clip",
"damage",
"distdraw",
@@ -17137,6 +17154,7 @@
],
"ul": [
"burst",
"burstrof",
"damage",
"distdraw",
"integrity",

View File

@@ -63,7 +63,7 @@
"PowerPlant_Armoured": { "id": 62, "name": "Armoured" },
"PowerPlant_Boosted": { "id": 63, "name": "Overcharged" },
"PowerPlant_Stealth": { "id": 64, "name": "Low emissions" },
"ProspectingLimpet_LightWeight": { "id": 63, "name": "Lightweight" },
"ProspectingLimpet_LightWeight": { "id": 65, "name": "Lightweight" },
"ProspectingLimpet_Reinforced": { "id": 66, "name": "Reinforced" },
"ProspectingLimpet_Shielded": { "id": 67, "name": "Shielded" },
"ShieldBooster_Explosive": { "id": 68, "name": "Blast resistant" },

View File

@@ -1,43 +1,44 @@
{
"ammo": {"id": 0, "name": "ammo", "type": "numeric", "method": "multiplicative"},
"boot": {"id": 1, "name": "boot", "type": "numeric", "method": "multiplicative"},
"brokenregen": {"id": 2, "name": "brokenregen", "type": "numeric", "method": "multiplicative"},
"ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative"},
"boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative"},
"brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative"},
"burst": {"id": 3, "name": "burst", "type": "numeric", "method": "multiplicative"},
"clip": {"id": 4, "name": "clip", "type": "numeric", "method": "multiplicative"},
"damage": {"id": 5, "name": "damage", "type": "numeric", "method": "multiplicative"},
"distdraw": {"id": 6, "name": "distdraw", "type": "numeric", "method": "multiplicative"},
"duration": {"id": 7, "name": "duration", "type": "numeric", "method": "multiplicative"},
"eff": {"id": 8, "name": "eff", "type": "numeric", "method": "multiplicative"},
"engcap": {"id": 9, "name": "engcap", "type": "numeric", "method": "multiplicative"},
"engrate": {"id": 10, "name": "engrate", "type": "numeric", "method": "multiplicative"},
"explres": {"id": 11, "name": "explres", "type": "numeric", "method": "additive"},
"facinglimit": {"id": 12, "name": "facinglimit", "type": "numeric", "method": "multiplicative"},
"hullboost": {"id": 13, "name": "hullboost", "type": "numeric", "method": "multiplicative"},
"hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "numeric", "method": "multiplicative"},
"integrity": {"id": 15, "name": "integrity", "type": "numeric", "method": "multiplicative"},
"burstrof": {"id": 41, "name": "burstrof", "type": "percentage", "method": "multiplicative"},
"clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative"},
"damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
"distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative"},
"duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative"},
"eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative"},
"engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative"},
"engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
"explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
"facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
"hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
"hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
"integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative"},
"jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative"},
"kinres": {"id": 17, "name": "kinres", "type": "numeric", "method": "additive"},
"mass": {"id": 18, "name": "mass", "type": "numeric", "method": "multiplicative"},
"maxfuel": {"id": 19, "name": "maxfuel", "type": "numeric", "method": "multiplicative"},
"optmass": {"id": 20, "name": "optmass", "type": "numeric", "method": "multiplicative"},
"optmul": {"id": 21, "name": "optmul", "type": "numeric", "method": "multiplicative"},
"pgen": {"id": 22, "name": "pgen", "type": "numeric", "method": "multiplicative"},
"piercing": {"id": 23, "name": "piercing", "type": "numeric", "method": "multiplicative"},
"power": {"id": 24, "name": "power", "type": "numeric", "method": "multiplicative"},
"range": {"id": 25, "name": "range", "type": "numeric", "method": "multiplicative"},
"ranget": {"id": 26, "name": "ranget", "type": "numeric", "method": "multiplicative"},
"regen": {"id": 27, "name": "regen", "type": "numeric", "method": "multiplicative"},
"reload": {"id": 28, "name": "reload", "type": "numeric", "method": "multiplicative"},
"rof": {"id": 29, "name": "rof", "type": "numeric", "method": "multiplicative"},
"shield": {"id": 30, "name": "shield", "type": "numeric", "method": "multiplicative"},
"shieldboost": {"id": 31, "name": "shieldboost", "type": "numeric", "method": "multiplicative"},
"spinup": {"id": 32, "name": "spinup", "type": "numeric", "method": "multiplicative"},
"syscap": {"id": 33, "name": "syscap", "type": "numeric", "method": "multiplicative"},
"sysrate": {"id": 34, "name": "sysrate", "type": "numeric", "method": "multiplicative"},
"thermload": {"id": 35, "name": "thermload", "type": "numeric", "method": "multiplicative"},
"thermres": {"id": 36, "name": "thermres", "type": "numeric", "method": "additive"},
"wepcap": {"id": 37, "name": "wepcap", "type": "numeric", "method": "multiplicative"},
"weprate": {"id": 38, "name": "weprate", "type": "numeric", "method": "multiplicative"},
"shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "numeric", "method": "multiplicative"},
"kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive"},
"mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative"},
"maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative"},
"optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative"},
"optmul": {"id": 21, "name": "optmul", "type": "percentage", "method": "multiplicative"},
"pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
"piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
"power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
"range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
"ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
"regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},
"reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative"},
"rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"},
"shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"},
"shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"},
"spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"},
"syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"},
"sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"},
"thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative"},
"thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive"},
"wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative"},
"weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative"},
"shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative"},
"type": {"id": 40, "name": "type", "type": "alphabetic", "method": "overwrite"}
}

View File

@@ -159,11 +159,18 @@
"mod_weapon_burst_interval": {
"rof": 1
},
"mod_weapon_burst_rof": {},
"mod_weapon_burst_size": {},
"mod_weapon_burst_rof": {
"burstrof": 1
},
"mod_weapon_burst_size": {
"burst": 1
},
"mod_weapon_clip_size": {
"clip": 1
},
"mod_weapon_clip_size_override": {
"clip": 1
},
"mod_weapon_damage": {
"damage": 1
},
@@ -213,6 +220,9 @@
"special_scramble_spectrum": {
"rof": 0.1111111111111111
},
"special_screening_shell": {
"reload": -0.5
},
"special_shiftlock_canister": {
"damage": -0.2
},

View File

@@ -3,7 +3,7 @@
"special_choke_canister": {"id": 1, "name": "Choke canister"},
"special_concordant_sequence": {"id": 2, "name": "Concordant sequence"},
"special_corrosive_shell": {"id": 3, "name": "Corrosive shell"},
"special_dazzle_shell": {"id": 4, "name": "Dazzle shell"},
"special_blinding_shell": {"id": 4, "name": "Dazzle shell"},
"special_dispersal_field": {"id": 5, "name": "Dispersal field"},
"special_distortion_field": {"id": 6, "name": "Distortion field"},
"special_drag_munitions": {"id": 7, "name": "Drag munitions"},

View File

@@ -76,6 +76,7 @@
"fc": [
"ammo",
"burst",
"burstrof",
"clip",
"damage",
"distdraw",
@@ -338,6 +339,7 @@
],
"ul": [
"burst",
"burstrof",
"damage",
"distdraw",
"integrity",

View File

@@ -21,7 +21,7 @@
"power": 0.65,
"range": 3000,
"rating": "F",
"rof": 4.735,
"rof": 2,
"thermload": 0.4,
"type": "T"
},
@@ -33,7 +33,7 @@
"burstrof": 17,
"class": 1,
"cost": 8600,
"damage": 1.22,
"damage": 1.2,
"distdraw": 0.27,
"edID": 128049404,
"eddbID": 835,
@@ -46,7 +46,7 @@
"power": 0.64,
"range": 3000,
"rating": "G",
"rof": 5.28,
"rof": 2.23,
"thermload": 0.3,
"type": "T"
},
@@ -71,7 +71,7 @@
"power": 0.6,
"range": 3000,
"rating": "G",
"rof": 4.795,
"rof": 1.92,
"thermload": 0.2,
"type": "T"
},
@@ -98,7 +98,7 @@
"pp": "Archon Delaine",
"range": 600,
"rating": "F",
"rof": 7.615,
"rof": 1.98,
"thermload": 0.3,
"type": "T"
},
@@ -110,7 +110,7 @@
"burstrof": 11,
"class": 2,
"cost": 23000,
"damage": 3.53,
"damage": 3.5,
"distdraw": 0.63,
"edID": 128049401,
"eddbID": 833,
@@ -123,7 +123,7 @@
"power": 1.05,
"range": 3000,
"rating": "E",
"rof": 3.695,
"rof": 1.6,
"thermload": 0.8,
"type": "T"
},
@@ -148,7 +148,7 @@
"power": 1.04,
"range": 3000,
"rating": "F",
"rof": 4.2,
"rof": 1.78,
"thermload": 0.7,
"type": "T"
},
@@ -160,7 +160,7 @@
"burstrof": 15,
"class": 2,
"cost": 162800,
"damage": 1.72,
"damage": 1.74,
"distdraw": 0.31,
"edID": 128049408,
"eddbID": 839,
@@ -173,7 +173,7 @@
"power": 0.98,
"range": 3000,
"rating": "F",
"rof": 3.93,
"rof": 1.57,
"thermload": 0.4,
"type": "T"
},
@@ -185,7 +185,7 @@
"burstrof": 7,
"class": 3,
"cost": 140400,
"damage": 7.74,
"damage": 7.75,
"distdraw": 1.39,
"edID": 128049402,
"eddbID": 834,
@@ -198,7 +198,7 @@
"power": 1.66,
"range": 3000,
"rating": "D",
"rof": 2.685,
"rof": 1.2,
"thermload": 1.7,
"type": "T"
},
@@ -210,7 +210,7 @@
"burstrof": 9,
"class": 3,
"cost": 281600,
"damage": 5.16,
"damage": 5.18,
"distdraw": 1.16,
"edID": 128049406,
"eddbID": 837,
@@ -223,7 +223,7 @@
"power": 1.65,
"range": 3000,
"rating": "E",
"rof": 3.215,
"rof": 1.4,
"thermload": 1.4,
"type": "T"
},
@@ -235,7 +235,7 @@
"burstrof": 11,
"class": 3,
"cost": 800400,
"damage": 3.53,
"damage": 3.54,
"distdraw": 0.63,
"edID": 128049409,
"eddbID": 840,
@@ -248,7 +248,7 @@
"power": 1.57,
"range": 3000,
"rating": "E",
"rof": 3.115,
"rof": 1.272,
"thermload": 0.8,
"type": "T"
},
@@ -273,7 +273,7 @@
"power": 2.58,
"range": 3000,
"rating": "E",
"rof": 1.565,
"rof": 0.8,
"thermload": 4.5,
"type": "T"
},
@@ -298,7 +298,7 @@
"power": 2.59,
"range": 3000,
"rating": "E",
"rof": 2.14,
"rof": 1,
"thermload": 3.3,
"type": "T"
}

View File

@@ -168,7 +168,31 @@ describe('JSON Data', function() {
const blueprint = Modifications.blueprints[k];
expect(ids[blueprint.id]).toBeFalsy('ID already exists: ' + blueprint.id);
expect(blueprint.name).toBeDefined('Blueprint has no name, ID:' + blueprint.id);
ids[blueprint.idid] = true;
ids[blueprint.id] = true;
}
});
it('has valid modifications', function() {
var ids = {};
for (var k in Modifications.modifications) {
const modification = Modifications.modifications[k];
expect(ids[modification.id]).toBeFalsy('ID already exists: ' + modification.id);
expect(modification.name).toBeDefined('Modification has no name, ID:' + modification.id);
expect(modification.type).toBeDefined('Modification has no type, ID:' + modification.id);
expect(modification.method).toBeDefined('Modification has no method, ID:' + modification.id);
ids[modification.id] = true;
}
});
it('has valid specials', function() {
var ids = {};
for (var k in Modifications.specials) {
const special = Modifications.specials[k];
expect(ids[special.id]).toBeFalsy('ID already exists: ' + special.id);
expect(special.name).toBeDefined('Special has no name, ID:' + special.id);
ids[special.id] = true;
}
});