From ef24db2483c5a0ce2d1be02de0a30d4df785174e Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 11:58:33 +0100 Subject: [PATCH 01/49] Update integrity and efficiency numbers for power plants --- dist/index.js | 108 ++++++++++++++++++++---------- dist/index.json | 108 ++++++++++++++++++++---------- modules/standard/power_plant.json | 105 +++++++++++++++++++---------- 3 files changed, 214 insertions(+), 107 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5dd647d..8ec60cc 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1902,9 +1902,10 @@ module.exports = { cost: 2007240, edID: 128064063, eddbID: 921, - eff: "F", + eff: 1, grp: "pp", id: "py", + integrity: 135, mass: 160, pGen: 24, rating: "E" @@ -1913,9 +1914,10 @@ module.exports = { cost: 6021720, edID: 128064064, eddbID: 922, - eff: "D", + eff: .75, grp: "pp", id: "px", + integrity: 120, mass: 64, pGen: 27, rating: "D" @@ -1924,9 +1926,10 @@ module.exports = { cost: 18065170, edID: 128064065, eddbID: 923, - eff: "C", + eff: .5, grp: "pp", id: "pw", + integrity: 150, mass: 80, pGen: 30, rating: "C" @@ -1935,9 +1938,10 @@ module.exports = { cost: 54195500, edID: 128064066, eddbID: 924, - eff: "C", + eff: .45, grp: "pp", id: "pv", + integrity: 180, mass: 128, pGen: 33, rating: "B" @@ -1946,9 +1950,10 @@ module.exports = { cost: 162586490, edID: 128064067, eddbID: 925, - eff: "B", + eff: .4, grp: "pp", id: "pu", + integrity: 165, mass: 80, pGen: 36, rating: "A" @@ -1957,9 +1962,10 @@ module.exports = { cost: 633200, edID: 128064058, eddbID: 916, - eff: "F", + eff: 1, grp: "pp", id: "pt", + integrity: 118, mass: 80, pGen: 20, rating: "E" @@ -1968,9 +1974,10 @@ module.exports = { cost: 1899600, edID: 128064059, eddbID: 917, - eff: "D", + eff: .75, grp: "pp", id: "ps", + integrity: 105, mass: 32, pGen: 22.5, rating: "D" @@ -1979,9 +1986,10 @@ module.exports = { cost: 5698790, edID: 128064060, eddbID: 918, - eff: "C", + eff: .5, grp: "pp", id: "pr", + integrity: 131, mass: 40, pGen: 25, rating: "C" @@ -1990,9 +1998,10 @@ module.exports = { cost: 17096370, edID: 128064061, eddbID: 919, - eff: "C", + eff: .45, grp: "pp", id: "pq", + integrity: 157, mass: 64, pGen: 27.5, rating: "B" @@ -2001,9 +2010,10 @@ module.exports = { cost: 51289110, edID: 128064062, eddbID: 920, - eff: "B", + eff: .4, grp: "pp", id: "pp", + integrity: 144, mass: 40, pGen: 30, rating: "A" @@ -2012,9 +2022,10 @@ module.exports = { cost: 199750, edID: 128064053, eddbID: 911, - eff: "F", + eff: 1, grp: "pp", id: "po", + integrity: 90, mass: 40, pGen: 16.8, rating: "E" @@ -2023,9 +2034,10 @@ module.exports = { cost: 599240, edID: 128064054, eddbID: 912, - eff: "D", + eff: .75, grp: "pp", id: "pn", + integrity: 113, mass: 16, pGen: 18.9, rating: "D" @@ -2034,9 +2046,10 @@ module.exports = { cost: 1797730, edID: 128064055, eddbID: 913, - eff: "C", + eff: .5, grp: "pp", id: "pm", + integrity: 136, mass: 20, pGen: 21, rating: "C" @@ -2045,9 +2058,10 @@ module.exports = { cost: 5393180, edID: 128064056, eddbID: 914, - eff: "C", + eff: .45, grp: "pp", id: "pl", + integrity: 124, mass: 32, pGen: 23.1, rating: "B" @@ -2056,9 +2070,10 @@ module.exports = { cost: 16179530, edID: 128064057, eddbID: 915, - eff: "B", + eff: .4, grp: "pp", id: "pk", + integrity: 118, mass: 20, pGen: 25.2, rating: "A" @@ -2067,9 +2082,10 @@ module.exports = { cost: 63010, edID: 128064048, eddbID: 906, - eff: "F", + eff: 1, grp: "pp", id: "pj", + integrity: 86, mass: 20, pGen: 13.6, rating: "E" @@ -2078,9 +2094,10 @@ module.exports = { cost: 189040, edID: 128064049, eddbID: 907, - eff: "D", + eff: .75, grp: "pp", id: "pi", + integrity: 77, mass: 8, pGen: 15.3, rating: "D" @@ -2089,9 +2106,10 @@ module.exports = { cost: 567110, edID: 128064050, eddbID: 908, - eff: "C", + eff: .5, grp: "pp", id: "ph", + integrity: 96, mass: 10, pGen: 17, rating: "C" @@ -2100,9 +2118,10 @@ module.exports = { cost: 1701320, edID: 128064051, eddbID: 909, - eff: "C", + eff: .45, grp: "pp", id: "pg", + integrity: 114, mass: 16, pGen: 18.7, rating: "B" @@ -2111,9 +2130,10 @@ module.exports = { cost: 5103950, edID: 128064052, eddbID: 910, - eff: "B", + eff: .4, grp: "pp", id: "pf", + integrity: 106, mass: 10, pGen: 20.4, rating: "A" @@ -2122,9 +2142,10 @@ module.exports = { cost: 19880, edID: 128064043, eddbID: 901, - eff: "F", + eff: 1, grp: "pp", id: "pe", + integrity: 72, mass: 10, pGen: 10.4, rating: "E" @@ -2133,9 +2154,10 @@ module.exports = { cost: 59630, edID: 128064044, eddbID: 902, - eff: "D", + eff: .75, grp: "pp", id: "pd", + integrity: 64, mass: 4, pGen: 11.7, rating: "D" @@ -2144,9 +2166,10 @@ module.exports = { cost: 178900, edID: 128064045, eddbID: 903, - eff: "C", + eff: .5, grp: "pp", id: "pc", + integrity: 80, mass: 5, pGen: 13, rating: "C" @@ -2155,9 +2178,10 @@ module.exports = { cost: 536690, edID: 128064046, eddbID: 904, - eff: "C", + eff: .45, grp: "pp", id: "pb", + integrity: 96, mass: 8, pGen: 14.3, rating: "B" @@ -2166,9 +2190,10 @@ module.exports = { cost: 1610080, edID: 128064047, eddbID: 905, - eff: "B", + eff: .4, grp: "pp", id: "pa", + integrity: 88, mass: 5, pGen: 15.6, rating: "A" @@ -2177,9 +2202,10 @@ module.exports = { cost: 6270, edID: 128064038, eddbID: 896, - eff: "F", + eff: 1, grp: "pp", id: "p9", + integrity: 58, mass: 5, pGen: 8, rating: "E" @@ -2188,9 +2214,10 @@ module.exports = { cost: 18810, edID: 128064039, eddbID: 897, - eff: "D", + eff: .75, grp: "pp", id: "p8", + integrity: 51, mass: 2, pGen: 9, rating: "D" @@ -2199,9 +2226,10 @@ module.exports = { cost: 56440, edID: 128064040, eddbID: 898, - eff: "C", + eff: .5, grp: "pp", id: "p7", + integrity: 64, mass: 2.5, pGen: 10, rating: "C" @@ -2210,9 +2238,10 @@ module.exports = { cost: 169300, edID: 128064041, eddbID: 899, - eff: "C", + eff: .45, grp: "pp", id: "p6", + integrity: 77, mass: 4, pGen: 11, rating: "B" @@ -2221,9 +2250,10 @@ module.exports = { cost: 507910, edID: 128064042, eddbID: 900, - eff: "B", + eff: .4, grp: "pp", id: "p5", + integrity: 70, mass: 2.5, pGen: 12, rating: "A" @@ -2232,9 +2262,10 @@ module.exports = { cost: 1980, edID: 128064033, eddbID: 891, - eff: "F", + eff: 1, grp: "pp", id: "p4", + integrity: 46, mass: 2.5, pGen: 6.4, rating: "E" @@ -2243,9 +2274,10 @@ module.exports = { cost: 5930, edID: 128064034, eddbID: 892, - eff: "D", + eff: .75, grp: "pp", id: "p3", + integrity: 41, mass: 1, pGen: 7.2, rating: "D" @@ -2254,9 +2286,10 @@ module.exports = { cost: 17800, edID: 128064035, eddbID: 893, - eff: "C", + eff: .5, grp: "pp", id: "p2", + integrity: 51, mass: 1.3, pGen: 8, rating: "C" @@ -2265,9 +2298,10 @@ module.exports = { cost: 53410, edID: 128064036, eddbID: 894, - eff: "C", + eff: .45, grp: "pp", id: "p1", + integrity: 61, mass: 2, pGen: 8.8, rating: "B" @@ -2276,9 +2310,10 @@ module.exports = { cost: 160220, edID: 128064037, eddbID: 895, - eff: "B", + eff: .4, grp: "pp", id: "p0", + integrity: 56, mass: 1.3, pGen: 9.6, rating: "A" @@ -6749,7 +6784,7 @@ module.exports = { mr: [ { ammo: 48, armourpen: 60, - breachdps: 0, + breachdps: 4.8, breachmax: 0, breachmin: 0, class: 2, @@ -6759,6 +6794,7 @@ module.exports = { eddbID: 1559, eps: .12, grp: "mr", + hps: 1.08, id: "1z", integrity: 51, mass: 4, diff --git a/dist/index.json b/dist/index.json index a0b130b..24e76f3 100644 --- a/dist/index.json +++ b/dist/index.json @@ -3551,9 +3551,10 @@ "cost": 2007240, "edID": 128064063, "eddbID": 921, - "eff": "F", + "eff": 1, "grp": "pp", "id": "py", + "integrity": 135, "mass": 160, "pGen": 24, "rating": "E" @@ -3563,9 +3564,10 @@ "cost": 6021720, "edID": 128064064, "eddbID": 922, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "px", + "integrity": 120, "mass": 64, "pGen": 27, "rating": "D" @@ -3575,9 +3577,10 @@ "cost": 18065170, "edID": 128064065, "eddbID": 923, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pw", + "integrity": 150, "mass": 80, "pGen": 30, "rating": "C" @@ -3587,9 +3590,10 @@ "cost": 54195500, "edID": 128064066, "eddbID": 924, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pv", + "integrity": 180, "mass": 128, "pGen": 33, "rating": "B" @@ -3599,9 +3603,10 @@ "cost": 162586490, "edID": 128064067, "eddbID": 925, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pu", + "integrity": 165, "mass": 80, "pGen": 36, "rating": "A" @@ -3611,9 +3616,10 @@ "cost": 633200, "edID": 128064058, "eddbID": 916, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pt", + "integrity": 118, "mass": 80, "pGen": 20, "rating": "E" @@ -3623,9 +3629,10 @@ "cost": 1899600, "edID": 128064059, "eddbID": 917, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "ps", + "integrity": 105, "mass": 32, "pGen": 22.5, "rating": "D" @@ -3635,9 +3642,10 @@ "cost": 5698790, "edID": 128064060, "eddbID": 918, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pr", + "integrity": 131, "mass": 40, "pGen": 25, "rating": "C" @@ -3647,9 +3655,10 @@ "cost": 17096370, "edID": 128064061, "eddbID": 919, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pq", + "integrity": 157, "mass": 64, "pGen": 27.5, "rating": "B" @@ -3659,9 +3668,10 @@ "cost": 51289110, "edID": 128064062, "eddbID": 920, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pp", + "integrity": 144, "mass": 40, "pGen": 30, "rating": "A" @@ -3671,9 +3681,10 @@ "cost": 199750, "edID": 128064053, "eddbID": 911, - "eff": "F", + "eff": 1, "grp": "pp", "id": "po", + "integrity": 90, "mass": 40, "pGen": 16.8, "rating": "E" @@ -3683,9 +3694,10 @@ "cost": 599240, "edID": 128064054, "eddbID": 912, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pn", + "integrity": 113, "mass": 16, "pGen": 18.9, "rating": "D" @@ -3695,9 +3707,10 @@ "cost": 1797730, "edID": 128064055, "eddbID": 913, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pm", + "integrity": 136, "mass": 20, "pGen": 21, "rating": "C" @@ -3707,9 +3720,10 @@ "cost": 5393180, "edID": 128064056, "eddbID": 914, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pl", + "integrity": 124, "mass": 32, "pGen": 23.1, "rating": "B" @@ -3719,9 +3733,10 @@ "cost": 16179530, "edID": 128064057, "eddbID": 915, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pk", + "integrity": 118, "mass": 20, "pGen": 25.2, "rating": "A" @@ -3731,9 +3746,10 @@ "cost": 63010, "edID": 128064048, "eddbID": 906, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pj", + "integrity": 86, "mass": 20, "pGen": 13.6, "rating": "E" @@ -3743,9 +3759,10 @@ "cost": 189040, "edID": 128064049, "eddbID": 907, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pi", + "integrity": 77, "mass": 8, "pGen": 15.3, "rating": "D" @@ -3755,9 +3772,10 @@ "cost": 567110, "edID": 128064050, "eddbID": 908, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "ph", + "integrity": 96, "mass": 10, "pGen": 17, "rating": "C" @@ -3767,9 +3785,10 @@ "cost": 1701320, "edID": 128064051, "eddbID": 909, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pg", + "integrity": 114, "mass": 16, "pGen": 18.7, "rating": "B" @@ -3779,9 +3798,10 @@ "cost": 5103950, "edID": 128064052, "eddbID": 910, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pf", + "integrity": 106, "mass": 10, "pGen": 20.4, "rating": "A" @@ -3791,9 +3811,10 @@ "cost": 19880, "edID": 128064043, "eddbID": 901, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pe", + "integrity": 72, "mass": 10, "pGen": 10.4, "rating": "E" @@ -3803,9 +3824,10 @@ "cost": 59630, "edID": 128064044, "eddbID": 902, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pd", + "integrity": 64, "mass": 4, "pGen": 11.7, "rating": "D" @@ -3815,9 +3837,10 @@ "cost": 178900, "edID": 128064045, "eddbID": 903, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pc", + "integrity": 80, "mass": 5, "pGen": 13, "rating": "C" @@ -3827,9 +3850,10 @@ "cost": 536690, "edID": 128064046, "eddbID": 904, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pb", + "integrity": 96, "mass": 8, "pGen": 14.3, "rating": "B" @@ -3839,9 +3863,10 @@ "cost": 1610080, "edID": 128064047, "eddbID": 905, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pa", + "integrity": 88, "mass": 5, "pGen": 15.6, "rating": "A" @@ -3851,9 +3876,10 @@ "cost": 6270, "edID": 128064038, "eddbID": 896, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p9", + "integrity": 58, "mass": 5, "pGen": 8, "rating": "E" @@ -3863,9 +3889,10 @@ "cost": 18810, "edID": 128064039, "eddbID": 897, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p8", + "integrity": 51, "mass": 2, "pGen": 9, "rating": "D" @@ -3875,9 +3902,10 @@ "cost": 56440, "edID": 128064040, "eddbID": 898, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p7", + "integrity": 64, "mass": 2.5, "pGen": 10, "rating": "C" @@ -3887,9 +3915,10 @@ "cost": 169300, "edID": 128064041, "eddbID": 899, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p6", + "integrity": 77, "mass": 4, "pGen": 11, "rating": "B" @@ -3899,9 +3928,10 @@ "cost": 507910, "edID": 128064042, "eddbID": 900, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p5", + "integrity": 70, "mass": 2.5, "pGen": 12, "rating": "A" @@ -3911,9 +3941,10 @@ "cost": 1980, "edID": 128064033, "eddbID": 891, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p4", + "integrity": 46, "mass": 2.5, "pGen": 6.4, "rating": "E" @@ -3923,9 +3954,10 @@ "cost": 5930, "edID": 128064034, "eddbID": 892, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p3", + "integrity": 41, "mass": 1, "pGen": 7.2, "rating": "D" @@ -3935,9 +3967,10 @@ "cost": 17800, "edID": 128064035, "eddbID": 893, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p2", + "integrity": 51, "mass": 1.3, "pGen": 8, "rating": "C" @@ -3947,9 +3980,10 @@ "cost": 53410, "edID": 128064036, "eddbID": 894, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p1", + "integrity": 61, "mass": 2, "pGen": 8.8, "rating": "B" @@ -3959,9 +3993,10 @@ "cost": 160220, "edID": 128064037, "eddbID": 895, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p0", + "integrity": 56, "mass": 1.3, "pGen": 9.6, "rating": "A" @@ -8725,7 +8760,7 @@ { "ammo": 48, "armourpen": 60, - "breachdps": 0, + "breachdps": 4.8, "breachmax": 0, "breachmin": 0, "class": 2, @@ -8735,6 +8770,7 @@ "eddbID": 1559, "eps": 0.12, "grp": "mr", + "hps": 1.08, "id": "1z", "integrity": 51, "mass": 4, diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 3ce735e..6aa0e32 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -5,9 +5,10 @@ "cost": 2007240, "edID": 128064063, "eddbID": 921, - "eff": "F", + "eff": 1, "grp": "pp", "id": "py", + "integrity": 135, "mass": 160, "pGen": 24, "rating": "E" @@ -17,9 +18,10 @@ "cost": 6021720, "edID": 128064064, "eddbID": 922, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "px", + "integrity": 120, "mass": 64, "pGen": 27, "rating": "D" @@ -29,9 +31,10 @@ "cost": 18065170, "edID": 128064065, "eddbID": 923, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pw", + "integrity": 150, "mass": 80, "pGen": 30, "rating": "C" @@ -41,9 +44,10 @@ "cost": 54195500, "edID": 128064066, "eddbID": 924, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pv", + "integrity": 180, "mass": 128, "pGen": 33, "rating": "B" @@ -53,9 +57,10 @@ "cost": 162586490, "edID": 128064067, "eddbID": 925, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pu", + "integrity": 165, "mass": 80, "pGen": 36, "rating": "A" @@ -65,9 +70,10 @@ "cost": 633200, "edID": 128064058, "eddbID": 916, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pt", + "integrity": 118, "mass": 80, "pGen": 20, "rating": "E" @@ -77,9 +83,10 @@ "cost": 1899600, "edID": 128064059, "eddbID": 917, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "ps", + "integrity": 105, "mass": 32, "pGen": 22.5, "rating": "D" @@ -89,9 +96,10 @@ "cost": 5698790, "edID": 128064060, "eddbID": 918, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pr", + "integrity": 131, "mass": 40, "pGen": 25, "rating": "C" @@ -101,9 +109,10 @@ "cost": 17096370, "edID": 128064061, "eddbID": 919, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pq", + "integrity": 157, "mass": 64, "pGen": 27.5, "rating": "B" @@ -113,9 +122,10 @@ "cost": 51289110, "edID": 128064062, "eddbID": 920, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pp", + "integrity": 144, "mass": 40, "pGen": 30, "rating": "A" @@ -125,9 +135,10 @@ "cost": 199750, "edID": 128064053, "eddbID": 911, - "eff": "F", + "eff": 1, "grp": "pp", "id": "po", + "integrity": 90, "mass": 40, "pGen": 16.8, "rating": "E" @@ -137,9 +148,10 @@ "cost": 599240, "edID": 128064054, "eddbID": 912, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pn", + "integrity": 113, "mass": 16, "pGen": 18.9, "rating": "D" @@ -149,9 +161,10 @@ "cost": 1797730, "edID": 128064055, "eddbID": 913, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pm", + "integrity": 136, "mass": 20, "pGen": 21, "rating": "C" @@ -161,9 +174,10 @@ "cost": 5393180, "edID": 128064056, "eddbID": 914, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pl", + "integrity": 124, "mass": 32, "pGen": 23.1, "rating": "B" @@ -173,9 +187,10 @@ "cost": 16179530, "edID": 128064057, "eddbID": 915, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pk", + "integrity": 118, "mass": 20, "pGen": 25.2, "rating": "A" @@ -185,9 +200,10 @@ "cost": 63010, "edID": 128064048, "eddbID": 906, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pj", + "integrity": 86, "mass": 20, "pGen": 13.6, "rating": "E" @@ -197,9 +213,10 @@ "cost": 189040, "edID": 128064049, "eddbID": 907, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pi", + "integrity": 77, "mass": 8, "pGen": 15.3, "rating": "D" @@ -209,9 +226,10 @@ "cost": 567110, "edID": 128064050, "eddbID": 908, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "ph", + "integrity": 96, "mass": 10, "pGen": 17, "rating": "C" @@ -221,9 +239,10 @@ "cost": 1701320, "edID": 128064051, "eddbID": 909, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pg", + "integrity": 114, "mass": 16, "pGen": 18.7, "rating": "B" @@ -233,9 +252,10 @@ "cost": 5103950, "edID": 128064052, "eddbID": 910, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pf", + "integrity": 106, "mass": 10, "pGen": 20.4, "rating": "A" @@ -245,9 +265,10 @@ "cost": 19880, "edID": 128064043, "eddbID": 901, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pe", + "integrity": 72, "mass": 10, "pGen": 10.4, "rating": "E" @@ -257,9 +278,10 @@ "cost": 59630, "edID": 128064044, "eddbID": 902, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pd", + "integrity": 64, "mass": 4, "pGen": 11.7, "rating": "D" @@ -269,9 +291,10 @@ "cost": 178900, "edID": 128064045, "eddbID": 903, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pc", + "integrity": 80, "mass": 5, "pGen": 13, "rating": "C" @@ -281,9 +304,10 @@ "cost": 536690, "edID": 128064046, "eddbID": 904, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pb", + "integrity": 96, "mass": 8, "pGen": 14.3, "rating": "B" @@ -293,9 +317,10 @@ "cost": 1610080, "edID": 128064047, "eddbID": 905, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pa", + "integrity": 88, "mass": 5, "pGen": 15.6, "rating": "A" @@ -305,9 +330,10 @@ "cost": 6270, "edID": 128064038, "eddbID": 896, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p9", + "integrity": 58, "mass": 5, "pGen": 8, "rating": "E" @@ -317,9 +343,10 @@ "cost": 18810, "edID": 128064039, "eddbID": 897, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p8", + "integrity": 51, "mass": 2, "pGen": 9, "rating": "D" @@ -329,9 +356,10 @@ "cost": 56440, "edID": 128064040, "eddbID": 898, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p7", + "integrity": 64, "mass": 2.5, "pGen": 10, "rating": "C" @@ -341,9 +369,10 @@ "cost": 169300, "edID": 128064041, "eddbID": 899, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p6", + "integrity": 77, "mass": 4, "pGen": 11, "rating": "B" @@ -353,9 +382,10 @@ "cost": 507910, "edID": 128064042, "eddbID": 900, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p5", + "integrity": 70, "mass": 2.5, "pGen": 12, "rating": "A" @@ -365,9 +395,10 @@ "cost": 1980, "edID": 128064033, "eddbID": 891, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p4", + "integrity": 46, "mass": 2.5, "pGen": 6.4, "rating": "E" @@ -377,9 +408,10 @@ "cost": 5930, "edID": 128064034, "eddbID": 892, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p3", + "integrity": 41, "mass": 1, "pGen": 7.2, "rating": "D" @@ -389,9 +421,10 @@ "cost": 17800, "edID": 128064035, "eddbID": 893, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p2", + "integrity": 51, "mass": 1.3, "pGen": 8, "rating": "C" @@ -401,9 +434,10 @@ "cost": 53410, "edID": 128064036, "eddbID": 894, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p1", + "integrity": 61, "mass": 2, "pGen": 8.8, "rating": "B" @@ -413,9 +447,10 @@ "cost": 160220, "edID": 128064037, "eddbID": 895, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p0", + "integrity": 56, "mass": 1.3, "pGen": 9.6, "rating": "A" From 43ed0c3768d5009118f8b4e020ae51eb6ca6588b Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 12:40:56 +0100 Subject: [PATCH 02/49] Update integrity and optimal mass numbers for FSDs --- dist/index.js | 100 +++++++--------------- dist/index.json | 105 +++++++----------------- modules/standard/frame_shift_drive.json | 37 ++++++++- 3 files changed, 96 insertions(+), 146 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8ec60cc..d07e9d8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2840,76 +2840,6 @@ module.exports = { rating: "A" } ], fsd: [ { - class: 8, - cost: 0, - edID: 128064133, - eddbID: 991, - fuelmul: .011, - fuelpower: 2.9, - grp: "fsd", - id: "Fy", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "E" - }, { - class: 8, - cost: 0, - edID: 128064134, - eddbID: 992, - fuelmul: .01, - fuelpower: 2.9, - grp: "fsd", - id: "Fx", - mass: 64, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "D" - }, { - class: 8, - cost: 0, - edID: 128064135, - eddbID: 993, - fuelmul: .008, - fuelpower: 2.9, - grp: "fsd", - id: "Fw", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "C" - }, { - class: 8, - cost: 0, - edID: 128064136, - eddbID: 994, - fuelmul: .01, - fuelpower: 2.9, - grp: "fsd", - id: "Fv", - mass: 256, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "B" - }, { - class: 8, - cost: 0, - edID: 128064137, - eddbID: 995, - fuelmul: .012, - fuelpower: 2.9, - grp: "fsd", - id: "Fu", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "A" - }, { class: 7, cost: 633200, edID: 128064128, @@ -2918,6 +2848,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Ft", + integrity: 118, mass: 80, maxfuel: 8.5, optmass: 1440, @@ -2932,6 +2863,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fs", + integrity: 105, mass: 32, maxfuel: 8.5, optmass: 1620, @@ -2946,6 +2878,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fr", + integrity: 131, mass: 80, maxfuel: 8.5, optmass: 1800, @@ -2960,6 +2893,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fq", + integrity: 157, mass: 128, maxfuel: 10.6, optmass: 2250, @@ -2974,6 +2908,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fp", + integrity: 144, mass: 80, maxfuel: 12.8, optmass: 2700, @@ -2988,6 +2923,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fo", + integrity: 102, mass: 40, maxfuel: 5.3, optmass: 960, @@ -3002,6 +2938,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fn", + integrity: 90, mass: 16, maxfuel: 5.3, optmass: 1080, @@ -3016,6 +2953,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fm", + integrity: 113, mass: 40, maxfuel: 5.3, optmass: 1200, @@ -3030,6 +2968,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fl", + integrity: 136, mass: 64, maxfuel: 6.6, optmass: 1500, @@ -3044,6 +2983,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fk", + integrity: 124, mass: 40, maxfuel: 8, optmass: 1800, @@ -3058,6 +2998,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fj", + integrity: 86, mass: 20, maxfuel: 3.3, optmass: 560, @@ -3072,6 +3013,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fi", + integrity: 77, mass: 8, maxfuel: 3.3, optmass: 630, @@ -3086,6 +3028,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fh", + integrity: 96, mass: 20, maxfuel: 3.3, optmass: 700, @@ -3100,6 +3043,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fg", + integrity: 115, mass: 32, maxfuel: 4.1, optmass: 875, @@ -3114,6 +3058,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Ff", + integrity: 106, mass: 20, maxfuel: 5, optmass: 1050, @@ -3128,6 +3073,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fe", + integrity: 72, mass: 10, maxfuel: 2, optmass: 280, @@ -3142,6 +3088,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fd", + integrity: 64, mass: 4, maxfuel: 2, optmass: 315, @@ -3156,6 +3103,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fc", + integrity: 80, mass: 10, maxfuel: 2, optmass: 350, @@ -3170,6 +3118,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fb", + integrity: 96, mass: 16, maxfuel: 2.5, optmass: 438, @@ -3184,6 +3133,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fa", + integrity: 88, mass: 10, maxfuel: 3, optmass: 525, @@ -3198,6 +3148,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F9", + integrity: 58, mass: 5, maxfuel: 1.2, optmass: 80, @@ -3212,6 +3163,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F8", + integrity: 51, mass: 2, maxfuel: 1.2, optmass: 90, @@ -3226,6 +3178,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F7", + integrity: 64, mass: 5, maxfuel: 1.2, optmass: 100, @@ -3240,6 +3193,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F6", + integrity: 77, mass: 8, maxfuel: 1.5, optmass: 125, @@ -3254,6 +3208,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F5", + integrity: 70, mass: 5, maxfuel: 1.8, optmass: 150, @@ -3268,6 +3223,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F4", + integrity: 46, mass: 2.5, maxfuel: .6, optmass: 48, @@ -3282,6 +3238,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F3", + integrity: 41, mass: 1, maxfuel: .6, optmass: 54, @@ -3296,6 +3253,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F2", + integrity: 51, mass: 2.5, maxfuel: .6, optmass: 60, @@ -3310,6 +3268,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F1", + integrity: 61, mass: 4, maxfuel: .8, optmass: 75, @@ -3324,6 +3283,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F0", + integrity: 56, mass: 2.5, maxfuel: .9, optmass: 90, diff --git a/dist/index.json b/dist/index.json index 24e76f3..efc38b4 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4562,81 +4562,6 @@ } ], "fsd": [ - { - "class": 8, - "cost": 0, - "edID": 128064133, - "eddbID": 991, - "fuelmul": 0.011, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fy", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "E" - }, - { - "class": 8, - "cost": 0, - "edID": 128064134, - "eddbID": 992, - "fuelmul": 0.01, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fx", - "mass": 64, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "D" - }, - { - "class": 8, - "cost": 0, - "edID": 128064135, - "eddbID": 993, - "fuelmul": 0.008, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fw", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "C" - }, - { - "class": 8, - "cost": 0, - "edID": 128064136, - "eddbID": 994, - "fuelmul": 0.01, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fv", - "mass": 256, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "B" - }, - { - "class": 8, - "cost": 0, - "edID": 128064137, - "eddbID": 995, - "fuelmul": 0.012, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fu", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "A" - }, { "class": 7, "cost": 633200, @@ -4646,6 +4571,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Ft", + "integrity": 118, "mass": 80, "maxfuel": 8.5, "optmass": 1440, @@ -4661,6 +4587,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fs", + "integrity": 105, "mass": 32, "maxfuel": 8.5, "optmass": 1620, @@ -4676,6 +4603,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fr", + "integrity": 131, "mass": 80, "maxfuel": 8.5, "optmass": 1800, @@ -4691,6 +4619,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fq", + "integrity": 157, "mass": 128, "maxfuel": 10.6, "optmass": 2250, @@ -4706,6 +4635,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fp", + "integrity": 144, "mass": 80, "maxfuel": 12.8, "optmass": 2700, @@ -4721,6 +4651,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fo", + "integrity": 102, "mass": 40, "maxfuel": 5.3, "optmass": 960, @@ -4736,6 +4667,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fn", + "integrity": 90, "mass": 16, "maxfuel": 5.3, "optmass": 1080, @@ -4751,6 +4683,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fm", + "integrity": 113, "mass": 40, "maxfuel": 5.3, "optmass": 1200, @@ -4766,6 +4699,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fl", + "integrity": 136, "mass": 64, "maxfuel": 6.6, "optmass": 1500, @@ -4781,6 +4715,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fk", + "integrity": 124, "mass": 40, "maxfuel": 8, "optmass": 1800, @@ -4796,6 +4731,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fj", + "integrity": 86, "mass": 20, "maxfuel": 3.3, "optmass": 560, @@ -4811,6 +4747,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fi", + "integrity": 77, "mass": 8, "maxfuel": 3.3, "optmass": 630, @@ -4826,6 +4763,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fh", + "integrity": 96, "mass": 20, "maxfuel": 3.3, "optmass": 700, @@ -4841,6 +4779,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fg", + "integrity": 115, "mass": 32, "maxfuel": 4.1, "optmass": 875, @@ -4856,6 +4795,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Ff", + "integrity": 106, "mass": 20, "maxfuel": 5, "optmass": 1050, @@ -4871,6 +4811,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fe", + "integrity": 72, "mass": 10, "maxfuel": 2, "optmass": 280, @@ -4886,6 +4827,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fd", + "integrity": 64, "mass": 4, "maxfuel": 2, "optmass": 315, @@ -4901,6 +4843,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fc", + "integrity": 80, "mass": 10, "maxfuel": 2, "optmass": 350, @@ -4916,6 +4859,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fb", + "integrity": 96, "mass": 16, "maxfuel": 2.5, "optmass": 438, @@ -4931,6 +4875,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fa", + "integrity": 88, "mass": 10, "maxfuel": 3, "optmass": 525, @@ -4946,6 +4891,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F9", + "integrity": 58, "mass": 5, "maxfuel": 1.2, "optmass": 80, @@ -4961,6 +4907,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F8", + "integrity": 51, "mass": 2, "maxfuel": 1.2, "optmass": 90, @@ -4976,6 +4923,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F7", + "integrity": 64, "mass": 5, "maxfuel": 1.2, "optmass": 100, @@ -4991,6 +4939,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F6", + "integrity": 77, "mass": 8, "maxfuel": 1.5, "optmass": 125, @@ -5006,6 +4955,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F5", + "integrity": 70, "mass": 5, "maxfuel": 1.8, "optmass": 150, @@ -5021,6 +4971,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F4", + "integrity": 46, "mass": 2.5, "maxfuel": 0.6, "optmass": 48, @@ -5036,6 +4987,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F3", + "integrity": 41, "mass": 1, "maxfuel": 0.6, "optmass": 54, @@ -5051,6 +5003,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F2", + "integrity": 51, "mass": 2.5, "maxfuel": 0.6, "optmass": 60, @@ -5066,6 +5019,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F1", + "integrity": 61, "mass": 4, "maxfuel": 0.8, "optmass": 75, @@ -5081,6 +5035,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F0", + "integrity": 56, "mass": 2.5, "maxfuel": 0.9, "optmass": 90, diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index 84ca5f3..8728422 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -9,6 +9,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fy", + "integrity": 93, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -24,6 +25,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fx", + "integrity": 37, "mass": 64, "maxfuel": 0, "optmass": 0, @@ -39,6 +41,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fw", + "integrity": 46, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -54,6 +57,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fv", + "integrity": 74, "mass": 256, "maxfuel": 0, "optmass": 0, @@ -69,6 +73,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fu", + "integrity": 46, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -84,6 +89,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Ft", + "integrity": 118, "mass": 80, "maxfuel": 8.5, "optmass": 1440, @@ -99,6 +105,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fs", + "integrity": 105, "mass": 32, "maxfuel": 8.5, "optmass": 1620, @@ -114,6 +121,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fr", + "integrity": 131, "mass": 80, "maxfuel": 8.5, "optmass": 1800, @@ -129,6 +137,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fq", + "integrity": 157, "mass": 128, "maxfuel": 10.6, "optmass": 2250, @@ -144,6 +153,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fp", + "integrity": 144, "mass": 80, "maxfuel": 12.8, "optmass": 2700, @@ -159,6 +169,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fo", + "integrity": 102, "mass": 40, "maxfuel": 5.3, "optmass": 960, @@ -174,6 +185,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fn", + "integrity": 90, "mass": 16, "maxfuel": 5.3, "optmass": 1080, @@ -189,6 +201,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fm", + "integrity": 113, "mass": 40, "maxfuel": 5.3, "optmass": 1200, @@ -204,6 +217,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fl", + "integrity": 136, "mass": 64, "maxfuel": 6.6, "optmass": 1500, @@ -219,6 +233,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fk", + "integrity": 124, "mass": 40, "maxfuel": 8, "optmass": 1800, @@ -234,6 +249,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fj", + "integrity": 86, "mass": 20, "maxfuel": 3.3, "optmass": 560, @@ -249,6 +265,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fi", + "integrity": 77, "mass": 8, "maxfuel": 3.3, "optmass": 630, @@ -264,6 +281,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fh", + "integrity": 96, "mass": 20, "maxfuel": 3.3, "optmass": 700, @@ -279,6 +297,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fg", + "integrity": 115, "mass": 32, "maxfuel": 4.1, "optmass": 875, @@ -294,6 +313,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Ff", + "integrity": 106, "mass": 20, "maxfuel": 5, "optmass": 1050, @@ -309,6 +329,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fe", + "integrity": 72, "mass": 10, "maxfuel": 2, "optmass": 280, @@ -324,6 +345,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fd", + "integrity": 64, "mass": 4, "maxfuel": 2, "optmass": 315, @@ -339,6 +361,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fc", + "integrity": 80, "mass": 10, "maxfuel": 2, "optmass": 350, @@ -354,9 +377,10 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fb", + "integrity": 96, "mass": 16, "maxfuel": 2.5, - "optmass": 438, + "optmass": 437.5, "power": 0.38, "rating": "B" }, @@ -369,6 +393,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fa", + "integrity": 88, "mass": 10, "maxfuel": 3, "optmass": 525, @@ -384,6 +409,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F9", + "integrity": 58, "mass": 5, "maxfuel": 1.2, "optmass": 80, @@ -399,6 +425,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F8", + "integrity": 51, "mass": 2, "maxfuel": 1.2, "optmass": 90, @@ -414,6 +441,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F7", + "integrity": 64, "mass": 5, "maxfuel": 1.2, "optmass": 100, @@ -429,6 +457,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F6", + "integrity": 77, "mass": 8, "maxfuel": 1.5, "optmass": 125, @@ -444,6 +473,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F5", + "integrity": 70, "mass": 5, "maxfuel": 1.8, "optmass": 150, @@ -459,6 +489,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F4", + "integrity": 46, "mass": 2.5, "maxfuel": 0.6, "optmass": 48, @@ -474,6 +505,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F3", + "integrity": 41, "mass": 1, "maxfuel": 0.6, "optmass": 54, @@ -489,6 +521,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F2", + "integrity": 51, "mass": 2.5, "maxfuel": 0.6, "optmass": 60, @@ -504,6 +537,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F1", + "integrity": 61, "mass": 4, "maxfuel": 0.8, "optmass": 75, @@ -519,6 +553,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F0", + "integrity": 56, "mass": 2.5, "maxfuel": 0.9, "optmass": 90, From 8118aafa2d1e3297c8f13cc3ef26b512cba1c820 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 12:52:12 +0100 Subject: [PATCH 03/49] Added speculative costs for fighter hangars --- dist/index.js | 83 ++++++++++++++++++++++++-- dist/index.json | 88 ++++++++++++++++++++++++++-- modules/internal/fighter_hangar.json | 6 +- 3 files changed, 166 insertions(+), 11 deletions(-) diff --git a/dist/index.js b/dist/index.js index d07e9d8..6c4f9fa 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2840,6 +2840,81 @@ module.exports = { rating: "A" } ], fsd: [ { + class: 8, + cost: 0, + edID: 128064133, + eddbID: 991, + fuelmul: .011, + fuelpower: 2.9, + grp: "fsd", + id: "Fy", + integrity: 93, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "E" + }, { + class: 8, + cost: 0, + edID: 128064134, + eddbID: 992, + fuelmul: .01, + fuelpower: 2.9, + grp: "fsd", + id: "Fx", + integrity: 37, + mass: 64, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "D" + }, { + class: 8, + cost: 0, + edID: 128064135, + eddbID: 993, + fuelmul: .008, + fuelpower: 2.9, + grp: "fsd", + id: "Fw", + integrity: 46, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "C" + }, { + class: 8, + cost: 0, + edID: 128064136, + eddbID: 994, + fuelmul: .01, + fuelpower: 2.9, + grp: "fsd", + id: "Fv", + integrity: 74, + mass: 256, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "B" + }, { + class: 8, + cost: 0, + edID: 128064137, + eddbID: 995, + fuelmul: .012, + fuelpower: 2.9, + grp: "fsd", + id: "Fu", + integrity: 46, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "A" + }, { class: 7, cost: 633200, edID: 128064128, @@ -3121,7 +3196,7 @@ module.exports = { integrity: 96, mass: 16, maxfuel: 2.5, - optmass: 438, + optmass: 437.5, power: .38, rating: "B" }, { @@ -8419,7 +8494,7 @@ module.exports = { fh: [ { bays: 2, class: 7, - cost: -1, + cost: 2079090, eddbID: 1560, grp: "fh", id: "fh", @@ -8430,7 +8505,7 @@ module.exports = { }, { bays: 2, class: 6, - cost: -1, + cost: 1640350, eddbID: 1561, grp: "fh", id: "fm", @@ -8441,7 +8516,7 @@ module.exports = { }, { bays: 1, class: 5, - cost: -1, + cost: 505130, eddbID: 1562, grp: "fh", id: "fr", diff --git a/dist/index.json b/dist/index.json index efc38b4..9a20747 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4562,6 +4562,86 @@ } ], "fsd": [ + { + "class": 8, + "cost": 0, + "edID": 128064133, + "eddbID": 991, + "fuelmul": 0.011, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fy", + "integrity": 93, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "E" + }, + { + "class": 8, + "cost": 0, + "edID": 128064134, + "eddbID": 992, + "fuelmul": 0.01, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fx", + "integrity": 37, + "mass": 64, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "D" + }, + { + "class": 8, + "cost": 0, + "edID": 128064135, + "eddbID": 993, + "fuelmul": 0.008, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fw", + "integrity": 46, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "C" + }, + { + "class": 8, + "cost": 0, + "edID": 128064136, + "eddbID": 994, + "fuelmul": 0.01, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fv", + "integrity": 74, + "mass": 256, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "B" + }, + { + "class": 8, + "cost": 0, + "edID": 128064137, + "eddbID": 995, + "fuelmul": 0.012, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fu", + "integrity": 46, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "A" + }, { "class": 7, "cost": 633200, @@ -4862,7 +4942,7 @@ "integrity": 96, "mass": 16, "maxfuel": 2.5, - "optmass": 438, + "optmass": 437.5, "power": 0.38, "rating": "B" }, @@ -10521,7 +10601,7 @@ { "bays": 2, "class": 7, - "cost": -1, + "cost": 2079090, "eddbID": 1560, "grp": "fh", "id": "fh", @@ -10533,7 +10613,7 @@ { "bays": 2, "class": 6, - "cost": -1, + "cost": 1640350, "eddbID": 1561, "grp": "fh", "id": "fm", @@ -10545,7 +10625,7 @@ { "bays": 1, "class": 5, - "cost": -1, + "cost": 505130, "eddbID": 1562, "grp": "fh", "id": "fr", diff --git a/modules/internal/fighter_hangar.json b/modules/internal/fighter_hangar.json index 2f14b2c..d546cb9 100644 --- a/modules/internal/fighter_hangar.json +++ b/modules/internal/fighter_hangar.json @@ -3,7 +3,7 @@ { "bays": 2, "class": 7, - "cost": -1, + "cost": 2079090, "eddbID": 1560, "grp": "fh", "id": "fh", @@ -15,7 +15,7 @@ { "bays": 2, "class": 6, - "cost": -1, + "cost": 1640350, "eddbID": 1561, "grp": "fh", "id": "fm", @@ -27,7 +27,7 @@ { "bays": 1, "class": 5, - "cost": -1, + "cost": 505130, "eddbID": 1562, "grp": "fh", "id": "fr", From ea665ffc5a441c75a2dcf920caaf3c5eb0e3960a Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 18:38:07 +0100 Subject: [PATCH 04/49] Update integrity for life support --- dist/index.js | 90 ++++++++++++++++++++++++++++-- dist/index.json | 90 ++++++++++++++++++++++++++++-- modules/standard/life_support.json | 90 ++++++++++++++++++++++++++++-- 3 files changed, 255 insertions(+), 15 deletions(-) diff --git a/dist/index.js b/dist/index.js index 6c4f9fa..d3a415b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -3366,441 +3366,521 @@ module.exports = { rating: "A" } ], ls: [ { + boot: 1, class: 8, cost: 0, edID: 128064173, eddbID: 1031, grp: "ls", id: "lD", + integrity: 120, mass: 160, - power: 0, + power: .8, rating: "E", time: 300 }, { + boot: 1, class: 8, cost: 0, edID: 128064174, eddbID: 1032, grp: "ls", id: "lC", + integrity: 135, mass: 64, - power: 0, + power: .9, rating: "D", time: 450 }, { + boot: 1, class: 8, cost: 0, edID: 128064175, eddbID: 1033, grp: "ls", id: "lB", + integrity: 150, mass: 160, - power: 0, + power: 1, rating: "C", time: 600 }, { + boot: 1, class: 8, cost: 0, edID: 128064176, eddbID: 1034, grp: "ls", id: "lA", + integrity: 165, mass: 256, - power: 0, + power: 1.1, rating: "B", time: 900 }, { + boot: 1, class: 8, cost: 0, edID: 128064177, eddbID: 1035, grp: "ls", id: "lz", + integrity: 180, mass: 160, - power: 0, + power: 1.2, rating: "A", time: 1500 }, { + boot: 1, class: 7, cost: 249140, edID: 128064168, eddbID: 1026, grp: "ls", id: "ly", + integrity: 105, mass: 80, power: .72, rating: "E", time: 300 }, { + boot: 1, class: 7, cost: 622840, edID: 128064169, eddbID: 1027, grp: "ls", id: "lx", + integrity: 118, mass: 32, power: .81, rating: "D", time: 450 }, { + boot: 1, class: 7, cost: 1557110, edID: 128064170, eddbID: 1028, grp: "ls", id: "lw", + integrity: 131, mass: 80, power: .9, rating: "C", time: 600 }, { + boot: 1, class: 7, cost: 3892770, edID: 128064171, eddbID: 1029, grp: "ls", id: "lv", + integrity: 144, mass: 128, power: .99, rating: "B", time: 900 }, { + boot: 1, class: 7, cost: 9731930, edID: 128064172, eddbID: 1030, grp: "ls", id: "lu", + integrity: 157, mass: 80, power: 1.08, rating: "A", time: 1500 }, { + boot: 1, class: 6, cost: 88980, edID: 128064163, eddbID: 1021, grp: "ls", id: "lt", + integrity: 90, mass: 40, power: .64, rating: "E", time: 300 }, { + boot: 1, class: 6, cost: 222440, edID: 128064164, eddbID: 1022, grp: "ls", id: "ls", + integrity: 102, mass: 16, power: .72, rating: "D", time: 450 }, { + boot: 1, class: 6, cost: 556110, edID: 128064165, eddbID: 1023, grp: "ls", id: "lr", + integrity: 113, mass: 40, power: .8, rating: "C", time: 600 }, { + boot: 1, class: 6, cost: 1390280, edID: 128064166, eddbID: 1024, grp: "ls", id: "lq", + integrity: 124, mass: 64, power: .88, rating: "B", time: 900 }, { + boot: 1, class: 6, cost: 3475690, edID: 128064167, eddbID: 1025, grp: "ls", id: "lp", + integrity: 136, mass: 40, power: .96, rating: "A", time: 1500 }, { + boot: 1, class: 5, cost: 31780, edID: 128064158, eddbID: 1016, grp: "ls", id: "lo", + integrity: 77, mass: 20, power: .57, rating: "E", time: 300 }, { + boot: 1, class: 5, cost: 79440, edID: 128064159, eddbID: 1017, grp: "ls", id: "ln", + integrity: 86, mass: 8, power: .64, rating: "D", time: 450 }, { + boot: 1, class: 5, cost: 198610, edID: 128064160, eddbID: 1018, grp: "ls", id: "lm", + integrity: 96, mass: 20, power: .71, rating: "C", time: 600 }, { + boot: 1, class: 5, cost: 496530, edID: 128064161, eddbID: 1019, grp: "ls", id: "ll", + integrity: 106, mass: 32, power: .78, rating: "B", time: 900 }, { + boot: 1, class: 5, cost: 1241320, edID: 128064162, eddbID: 1020, grp: "ls", id: "lk", + integrity: 115, mass: 20, power: .85, rating: "A", time: 1500 }, { + boot: 1, class: 4, cost: 11350, edID: 128064153, eddbID: 1011, grp: "ls", id: "lj", + integrity: 64, mass: 10, power: .5, rating: "E", time: 300 }, { + boot: 1, class: 4, cost: 28370, edID: 128064154, eddbID: 1012, grp: "ls", id: "li", + integrity: 72, mass: 4, power: .56, rating: "D", time: 450 }, { + boot: 1, class: 4, cost: 70930, edID: 128064155, eddbID: 1013, grp: "ls", id: "lh", + integrity: 80, mass: 10, power: .62, rating: "C", time: 600 }, { + boot: 1, class: 4, cost: 177330, edID: 128064156, eddbID: 1014, grp: "ls", id: "lg", + integrity: 88, mass: 16, power: .68, rating: "B", time: 900 }, { + boot: 1, class: 4, cost: 443330, edID: 128064157, eddbID: 1015, grp: "ls", id: "lf", + integrity: 96, mass: 10, power: .74, rating: "A", time: 1500 }, { + boot: 1, class: 3, cost: 4050, edID: 128064148, eddbID: 1006, grp: "ls", id: "le", + integrity: 51, mass: 5, power: .42, rating: "E", time: 300 }, { + boot: 1, class: 3, cost: 10130, edID: 128064149, eddbID: 1007, grp: "ls", id: "ld", + integrity: 58, mass: 2, power: .48, rating: "D", time: 450 }, { + boot: 1, class: 3, cost: 25330, edID: 128064150, eddbID: 1008, grp: "ls", id: "lc", + integrity: 64, mass: 5, power: .53, rating: "C", time: 600 }, { + boot: 1, class: 3, cost: 63330, edID: 128064151, eddbID: 1009, grp: "ls", id: "lb", + integrity: 70, mass: 8, power: .58, rating: "B", time: 900 }, { + boot: 1, class: 3, cost: 158330, edID: 128064152, eddbID: 1010, grp: "ls", id: "la", + integrity: 77, mass: 5, power: .64, rating: "A", time: 1500 }, { + boot: 1, class: 2, cost: 1450, edID: 128064143, eddbID: 1001, grp: "ls", id: "l9", + integrity: 41, mass: 2.5, power: .37, rating: "E", time: 300 }, { + boot: 1, class: 2, cost: 3620, edID: 128064144, eddbID: 1002, grp: "ls", id: "l8", + integrity: 46, mass: 1, power: .41, rating: "D", time: 450 }, { + boot: 1, class: 2, cost: 9050, edID: 128064145, eddbID: 1003, grp: "ls", id: "l7", + integrity: 51, mass: 2.5, power: .46, rating: "C", time: 600 }, { + boot: 1, class: 2, cost: 22620, edID: 128064146, eddbID: 1004, grp: "ls", id: "l6", + integrity: 56, mass: 4, power: .51, rating: "B", time: 900 }, { + boot: 1, class: 2, cost: 56550, edID: 128064147, eddbID: 1005, grp: "ls", id: "l5", + integrity: 61, mass: 2.5, power: .55, rating: "A", time: 1500 }, { + boot: 1, class: 1, cost: 520, edID: 128064138, eddbID: 996, grp: "ls", id: "l4", + integrity: 32, mass: 1.3, power: .32, rating: "E", time: 300 }, { + boot: 1, class: 1, cost: 1290, edID: 128064139, eddbID: 997, grp: "ls", id: "l3", + integrity: 36, mass: .5, power: .36, rating: "D", time: 450 }, { + boot: 1, class: 1, cost: 3230, edID: 128064140, eddbID: 998, grp: "ls", id: "l2", + integrity: 40, mass: 1.3, power: .4, rating: "C", time: 600 }, { + boot: 1, class: 1, cost: 8080, edID: 128064141, eddbID: 999, grp: "ls", id: "l1", + integrity: 44, mass: 2, power: .44, rating: "B", time: 900 }, { + boot: 1, class: 1, cost: 20200, edID: 128064142, eddbID: 1e3, grp: "ls", id: "l0", + integrity: 48, mass: 1.3, power: .48, rating: "A", diff --git a/dist/index.json b/dist/index.json index 9a20747..6534952 100644 --- a/dist/index.json +++ b/dist/index.json @@ -5125,480 +5125,560 @@ ], "ls": [ { + "boot": 1, "class": 8, "cost": 0, "edID": 128064173, "eddbID": 1031, "grp": "ls", "id": "lD", + "integrity": 120, "mass": 160, - "power": 0, + "power": 0.8, "rating": "E", "time": 300 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064174, "eddbID": 1032, "grp": "ls", "id": "lC", + "integrity": 135, "mass": 64, - "power": 0, + "power": 0.9, "rating": "D", "time": 450 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064175, "eddbID": 1033, "grp": "ls", "id": "lB", + "integrity": 150, "mass": 160, - "power": 0, + "power": 1, "rating": "C", "time": 600 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064176, "eddbID": 1034, "grp": "ls", "id": "lA", + "integrity": 165, "mass": 256, - "power": 0, + "power": 1.1, "rating": "B", "time": 900 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064177, "eddbID": 1035, "grp": "ls", "id": "lz", + "integrity": 180, "mass": 160, - "power": 0, + "power": 1.2, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 7, "cost": 249140, "edID": 128064168, "eddbID": 1026, "grp": "ls", "id": "ly", + "integrity": 105, "mass": 80, "power": 0.72, "rating": "E", "time": 300 }, { + "boot": 1, "class": 7, "cost": 622840, "edID": 128064169, "eddbID": 1027, "grp": "ls", "id": "lx", + "integrity": 118, "mass": 32, "power": 0.81, "rating": "D", "time": 450 }, { + "boot": 1, "class": 7, "cost": 1557110, "edID": 128064170, "eddbID": 1028, "grp": "ls", "id": "lw", + "integrity": 131, "mass": 80, "power": 0.9, "rating": "C", "time": 600 }, { + "boot": 1, "class": 7, "cost": 3892770, "edID": 128064171, "eddbID": 1029, "grp": "ls", "id": "lv", + "integrity": 144, "mass": 128, "power": 0.99, "rating": "B", "time": 900 }, { + "boot": 1, "class": 7, "cost": 9731930, "edID": 128064172, "eddbID": 1030, "grp": "ls", "id": "lu", + "integrity": 157, "mass": 80, "power": 1.08, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 6, "cost": 88980, "edID": 128064163, "eddbID": 1021, "grp": "ls", "id": "lt", + "integrity": 90, "mass": 40, "power": 0.64, "rating": "E", "time": 300 }, { + "boot": 1, "class": 6, "cost": 222440, "edID": 128064164, "eddbID": 1022, "grp": "ls", "id": "ls", + "integrity": 102, "mass": 16, "power": 0.72, "rating": "D", "time": 450 }, { + "boot": 1, "class": 6, "cost": 556110, "edID": 128064165, "eddbID": 1023, "grp": "ls", "id": "lr", + "integrity": 113, "mass": 40, "power": 0.8, "rating": "C", "time": 600 }, { + "boot": 1, "class": 6, "cost": 1390280, "edID": 128064166, "eddbID": 1024, "grp": "ls", "id": "lq", + "integrity": 124, "mass": 64, "power": 0.88, "rating": "B", "time": 900 }, { + "boot": 1, "class": 6, "cost": 3475690, "edID": 128064167, "eddbID": 1025, "grp": "ls", "id": "lp", + "integrity": 136, "mass": 40, "power": 0.96, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 5, "cost": 31780, "edID": 128064158, "eddbID": 1016, "grp": "ls", "id": "lo", + "integrity": 77, "mass": 20, "power": 0.57, "rating": "E", "time": 300 }, { + "boot": 1, "class": 5, "cost": 79440, "edID": 128064159, "eddbID": 1017, "grp": "ls", "id": "ln", + "integrity": 86, "mass": 8, "power": 0.64, "rating": "D", "time": 450 }, { + "boot": 1, "class": 5, "cost": 198610, "edID": 128064160, "eddbID": 1018, "grp": "ls", "id": "lm", + "integrity": 96, "mass": 20, "power": 0.71, "rating": "C", "time": 600 }, { + "boot": 1, "class": 5, "cost": 496530, "edID": 128064161, "eddbID": 1019, "grp": "ls", "id": "ll", + "integrity": 106, "mass": 32, "power": 0.78, "rating": "B", "time": 900 }, { + "boot": 1, "class": 5, "cost": 1241320, "edID": 128064162, "eddbID": 1020, "grp": "ls", "id": "lk", + "integrity": 115, "mass": 20, "power": 0.85, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 4, "cost": 11350, "edID": 128064153, "eddbID": 1011, "grp": "ls", "id": "lj", + "integrity": 64, "mass": 10, "power": 0.5, "rating": "E", "time": 300 }, { + "boot": 1, "class": 4, "cost": 28370, "edID": 128064154, "eddbID": 1012, "grp": "ls", "id": "li", + "integrity": 72, "mass": 4, "power": 0.56, "rating": "D", "time": 450 }, { + "boot": 1, "class": 4, "cost": 70930, "edID": 128064155, "eddbID": 1013, "grp": "ls", "id": "lh", + "integrity": 80, "mass": 10, "power": 0.62, "rating": "C", "time": 600 }, { + "boot": 1, "class": 4, "cost": 177330, "edID": 128064156, "eddbID": 1014, "grp": "ls", "id": "lg", + "integrity": 88, "mass": 16, "power": 0.68, "rating": "B", "time": 900 }, { + "boot": 1, "class": 4, "cost": 443330, "edID": 128064157, "eddbID": 1015, "grp": "ls", "id": "lf", + "integrity": 96, "mass": 10, "power": 0.74, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 3, "cost": 4050, "edID": 128064148, "eddbID": 1006, "grp": "ls", "id": "le", + "integrity": 51, "mass": 5, "power": 0.42, "rating": "E", "time": 300 }, { + "boot": 1, "class": 3, "cost": 10130, "edID": 128064149, "eddbID": 1007, "grp": "ls", "id": "ld", + "integrity": 58, "mass": 2, "power": 0.48, "rating": "D", "time": 450 }, { + "boot": 1, "class": 3, "cost": 25330, "edID": 128064150, "eddbID": 1008, "grp": "ls", "id": "lc", + "integrity": 64, "mass": 5, "power": 0.53, "rating": "C", "time": 600 }, { + "boot": 1, "class": 3, "cost": 63330, "edID": 128064151, "eddbID": 1009, "grp": "ls", "id": "lb", + "integrity": 70, "mass": 8, "power": 0.58, "rating": "B", "time": 900 }, { + "boot": 1, "class": 3, "cost": 158330, "edID": 128064152, "eddbID": 1010, "grp": "ls", "id": "la", + "integrity": 77, "mass": 5, "power": 0.64, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 2, "cost": 1450, "edID": 128064143, "eddbID": 1001, "grp": "ls", "id": "l9", + "integrity": 41, "mass": 2.5, "power": 0.37, "rating": "E", "time": 300 }, { + "boot": 1, "class": 2, "cost": 3620, "edID": 128064144, "eddbID": 1002, "grp": "ls", "id": "l8", + "integrity": 46, "mass": 1, "power": 0.41, "rating": "D", "time": 450 }, { + "boot": 1, "class": 2, "cost": 9050, "edID": 128064145, "eddbID": 1003, "grp": "ls", "id": "l7", + "integrity": 51, "mass": 2.5, "power": 0.46, "rating": "C", "time": 600 }, { + "boot": 1, "class": 2, "cost": 22620, "edID": 128064146, "eddbID": 1004, "grp": "ls", "id": "l6", + "integrity": 56, "mass": 4, "power": 0.51, "rating": "B", "time": 900 }, { + "boot": 1, "class": 2, "cost": 56550, "edID": 128064147, "eddbID": 1005, "grp": "ls", "id": "l5", + "integrity": 61, "mass": 2.5, "power": 0.55, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 1, "cost": 520, "edID": 128064138, "eddbID": 996, "grp": "ls", "id": "l4", + "integrity": 32, "mass": 1.3, "power": 0.32, "rating": "E", "time": 300 }, { + "boot": 1, "class": 1, "cost": 1290, "edID": 128064139, "eddbID": 997, "grp": "ls", "id": "l3", + "integrity": 36, "mass": 0.5, "power": 0.36, "rating": "D", "time": 450 }, { + "boot": 1, "class": 1, "cost": 3230, "edID": 128064140, "eddbID": 998, "grp": "ls", "id": "l2", + "integrity": 40, "mass": 1.3, "power": 0.4, "rating": "C", "time": 600 }, { + "boot": 1, "class": 1, "cost": 8080, "edID": 128064141, "eddbID": 999, "grp": "ls", "id": "l1", + "integrity": 44, "mass": 2, "power": 0.44, "rating": "B", "time": 900 }, { + "boot": 1, "class": 1, "cost": 20200, "edID": 128064142, "eddbID": 1000, "grp": "ls", "id": "l0", + "integrity": 48, "mass": 1.3, "power": 0.48, "rating": "A", diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json index 055ba89..d75de9e 100644 --- a/modules/standard/life_support.json +++ b/modules/standard/life_support.json @@ -1,480 +1,560 @@ { "ls": [ { + "boot": 1, "class": 8, "cost": 0, "edID": 128064173, "eddbID": 1031, "grp": "ls", "id": "lD", + "integrity": 120, "mass": 160, - "power": 0, + "power": 0.8, "rating": "E", "time": 300 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064174, "eddbID": 1032, "grp": "ls", "id": "lC", + "integrity": 135, "mass": 64, - "power": 0, + "power": 0.9, "rating": "D", "time": 450 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064175, "eddbID": 1033, "grp": "ls", "id": "lB", + "integrity": 150, "mass": 160, - "power": 0, + "power": 1, "rating": "C", "time": 600 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064176, "eddbID": 1034, "grp": "ls", "id": "lA", + "integrity": 165, "mass": 256, - "power": 0, + "power": 1.1, "rating": "B", "time": 900 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064177, "eddbID": 1035, "grp": "ls", "id": "lz", + "integrity": 180, "mass": 160, - "power": 0, + "power": 1.2, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 7, "cost": 249140, "edID": 128064168, "eddbID": 1026, "grp": "ls", "id": "ly", + "integrity": 105, "mass": 80, "power": 0.72, "rating": "E", "time": 300 }, { + "boot": 1, "class": 7, "cost": 622840, "edID": 128064169, "eddbID": 1027, "grp": "ls", "id": "lx", + "integrity": 118, "mass": 32, "power": 0.81, "rating": "D", "time": 450 }, { + "boot": 1, "class": 7, "cost": 1557110, "edID": 128064170, "eddbID": 1028, "grp": "ls", "id": "lw", + "integrity": 131, "mass": 80, "power": 0.9, "rating": "C", "time": 600 }, { + "boot": 1, "class": 7, "cost": 3892770, "edID": 128064171, "eddbID": 1029, "grp": "ls", "id": "lv", + "integrity": 144, "mass": 128, "power": 0.99, "rating": "B", "time": 900 }, { + "boot": 1, "class": 7, "cost": 9731930, "edID": 128064172, "eddbID": 1030, "grp": "ls", "id": "lu", + "integrity": 157, "mass": 80, "power": 1.08, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 6, "cost": 88980, "edID": 128064163, "eddbID": 1021, "grp": "ls", "id": "lt", + "integrity": 90, "mass": 40, "power": 0.64, "rating": "E", "time": 300 }, { + "boot": 1, "class": 6, "cost": 222440, "edID": 128064164, "eddbID": 1022, "grp": "ls", "id": "ls", + "integrity": 102, "mass": 16, "power": 0.72, "rating": "D", "time": 450 }, { + "boot": 1, "class": 6, "cost": 556110, "edID": 128064165, "eddbID": 1023, "grp": "ls", "id": "lr", + "integrity": 113, "mass": 40, "power": 0.8, "rating": "C", "time": 600 }, { + "boot": 1, "class": 6, "cost": 1390280, "edID": 128064166, "eddbID": 1024, "grp": "ls", "id": "lq", + "integrity": 124, "mass": 64, "power": 0.88, "rating": "B", "time": 900 }, { + "boot": 1, "class": 6, "cost": 3475690, "edID": 128064167, "eddbID": 1025, "grp": "ls", "id": "lp", + "integrity": 136, "mass": 40, "power": 0.96, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 5, "cost": 31780, "edID": 128064158, "eddbID": 1016, "grp": "ls", "id": "lo", + "integrity": 77, "mass": 20, "power": 0.57, "rating": "E", "time": 300 }, { + "boot": 1, "class": 5, "cost": 79440, "edID": 128064159, "eddbID": 1017, "grp": "ls", "id": "ln", + "integrity": 86, "mass": 8, "power": 0.64, "rating": "D", "time": 450 }, { + "boot": 1, "class": 5, "cost": 198610, "edID": 128064160, "eddbID": 1018, "grp": "ls", "id": "lm", + "integrity": 96, "mass": 20, "power": 0.71, "rating": "C", "time": 600 }, { + "boot": 1, "class": 5, "cost": 496530, "edID": 128064161, "eddbID": 1019, "grp": "ls", "id": "ll", + "integrity": 106, "mass": 32, "power": 0.78, "rating": "B", "time": 900 }, { + "boot": 1, "class": 5, "cost": 1241320, "edID": 128064162, "eddbID": 1020, "grp": "ls", "id": "lk", + "integrity": 115, "mass": 20, "power": 0.85, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 4, "cost": 11350, "edID": 128064153, "eddbID": 1011, "grp": "ls", "id": "lj", + "integrity": 64, "mass": 10, "power": 0.5, "rating": "E", "time": 300 }, { + "boot": 1, "class": 4, "cost": 28370, "edID": 128064154, "eddbID": 1012, "grp": "ls", "id": "li", + "integrity": 72, "mass": 4, "power": 0.56, "rating": "D", "time": 450 }, { + "boot": 1, "class": 4, "cost": 70930, "edID": 128064155, "eddbID": 1013, "grp": "ls", "id": "lh", + "integrity": 80, "mass": 10, "power": 0.62, "rating": "C", "time": 600 }, { + "boot": 1, "class": 4, "cost": 177330, "edID": 128064156, "eddbID": 1014, "grp": "ls", "id": "lg", + "integrity": 88, "mass": 16, "power": 0.68, "rating": "B", "time": 900 }, { + "boot": 1, "class": 4, "cost": 443330, "edID": 128064157, "eddbID": 1015, "grp": "ls", "id": "lf", + "integrity": 96, "mass": 10, "power": 0.74, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 3, "cost": 4050, "edID": 128064148, "eddbID": 1006, "grp": "ls", "id": "le", + "integrity": 51, "mass": 5, "power": 0.42, "rating": "E", "time": 300 }, { + "boot": 1, "class": 3, "cost": 10130, "edID": 128064149, "eddbID": 1007, "grp": "ls", "id": "ld", + "integrity": 58, "mass": 2, "power": 0.48, "rating": "D", "time": 450 }, { + "boot": 1, "class": 3, "cost": 25330, "edID": 128064150, "eddbID": 1008, "grp": "ls", "id": "lc", + "integrity": 64, "mass": 5, "power": 0.53, "rating": "C", "time": 600 }, { + "boot": 1, "class": 3, "cost": 63330, "edID": 128064151, "eddbID": 1009, "grp": "ls", "id": "lb", + "integrity": 70, "mass": 8, "power": 0.58, "rating": "B", "time": 900 }, { + "boot": 1, "class": 3, "cost": 158330, "edID": 128064152, "eddbID": 1010, "grp": "ls", "id": "la", + "integrity": 77, "mass": 5, "power": 0.64, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 2, "cost": 1450, "edID": 128064143, "eddbID": 1001, "grp": "ls", "id": "l9", + "integrity": 41, "mass": 2.5, "power": 0.37, "rating": "E", "time": 300 }, { + "boot": 1, "class": 2, "cost": 3620, "edID": 128064144, "eddbID": 1002, "grp": "ls", "id": "l8", + "integrity": 46, "mass": 1, "power": 0.41, "rating": "D", "time": 450 }, { + "boot": 1, "class": 2, "cost": 9050, "edID": 128064145, "eddbID": 1003, "grp": "ls", "id": "l7", + "integrity": 51, "mass": 2.5, "power": 0.46, "rating": "C", "time": 600 }, { + "boot": 1, "class": 2, "cost": 22620, "edID": 128064146, "eddbID": 1004, "grp": "ls", "id": "l6", + "integrity": 56, "mass": 4, "power": 0.51, "rating": "B", "time": 900 }, { + "boot": 1, "class": 2, "cost": 56550, "edID": 128064147, "eddbID": 1005, "grp": "ls", "id": "l5", + "integrity": 61, "mass": 2.5, "power": 0.55, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 1, "cost": 520, "edID": 128064138, "eddbID": 996, "grp": "ls", "id": "l4", + "integrity": 32, "mass": 1.3, "power": 0.32, "rating": "E", "time": 300 }, { + "boot": 1, "class": 1, "cost": 1290, "edID": 128064139, "eddbID": 997, "grp": "ls", "id": "l3", + "integrity": 36, "mass": 0.5, "power": 0.36, "rating": "D", "time": 450 }, { + "boot": 1, "class": 1, "cost": 3230, "edID": 128064140, "eddbID": 998, "grp": "ls", "id": "l2", + "integrity": 40, "mass": 1.3, "power": 0.4, "rating": "C", "time": 600 }, { + "boot": 1, "class": 1, "cost": 8080, "edID": 128064141, "eddbID": 999, "grp": "ls", "id": "l1", + "integrity": 44, "mass": 2, "power": 0.44, "rating": "B", "time": 900 }, { + "boot": 1, "class": 1, "cost": 20200, "edID": 128064142, "eddbID": 1000, "grp": "ls", "id": "l0", + "integrity": 48, "mass": 1.3, "power": 0.48, "rating": "A", From 6b1a92de97326bdd4c5c86cbc395e791ec78d598 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 23 Oct 2016 00:50:11 +0100 Subject: [PATCH 05/49] Added integrity for thrusters --- modules/standard/thrusters.json | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index b15bfb4..76a731b 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -9,6 +9,7 @@ "eddbID": 956, "grp": "t", "id": "ty", + "integrity": 135, "mass": 160, "maxmass": 3360, "optmass": 2240, @@ -24,6 +25,7 @@ "eddbID": 957, "grp": "t", "id": "tx", + "integrity": 120, "mass": 64, "maxmass": 3780, "optmass": 2520, @@ -39,6 +41,7 @@ "eddbID": 958, "grp": "t", "id": "tw", + "integrity": 150, "mass": 160, "maxmass": 4200, "optmass": 2800, @@ -54,6 +57,7 @@ "eddbID": 959, "grp": "t", "id": "tv", + "integrity": 180, "mass": 256, "maxmass": 4620, "optmass": 3080, @@ -69,6 +73,7 @@ "eddbID": 960, "grp": "t", "id": "tu", + "integrity": 165, "mass": 160, "maxmass": 5040, "optmass": 3360, @@ -84,6 +89,7 @@ "eddbID": 951, "grp": "t", "id": "tt", + "integrity": 118, "mass": 80, "maxmass": 2160, "optmass": 1440, @@ -99,6 +105,7 @@ "eddbID": 952, "grp": "t", "id": "ts", + "integrity": 105, "mass": 32, "maxmass": 2430, "optmass": 1620, @@ -114,6 +121,7 @@ "eddbID": 953, "grp": "t", "id": "tr", + "integrity": 131, "mass": 80, "maxmass": 2700, "optmass": 1800, @@ -129,6 +137,7 @@ "eddbID": 954, "grp": "t", "id": "tq", + "integrity": 157, "mass": 128, "maxmass": 2970, "optmass": 1980, @@ -144,6 +153,7 @@ "eddbID": 955, "grp": "t", "id": "tp", + "integrity": 144, "mass": 80, "maxmass": 3240, "optmass": 2160, @@ -159,6 +169,7 @@ "eddbID": 946, "grp": "t", "id": "to", + "integrity": 102, "mass": 40, "maxmass": 1440, "optmass": 960, @@ -174,6 +185,7 @@ "eddbID": 947, "grp": "t", "id": "tn", + "integrity": 90, "mass": 16, "maxmass": 1620, "optmass": 1080, @@ -189,6 +201,7 @@ "eddbID": 948, "grp": "t", "id": "tm", + "integrity": 113, "mass": 40, "maxmass": 1800, "optmass": 1200, @@ -204,6 +217,7 @@ "eddbID": 949, "grp": "t", "id": "tl", + "integrity": 136, "mass": 64, "maxmass": 1980, "optmass": 1320, @@ -219,6 +233,7 @@ "eddbID": 950, "grp": "t", "id": "tk", + "integrity": 124, "mass": 40, "maxmass": 2160, "optmass": 1440, @@ -234,6 +249,7 @@ "eddbID": 941, "grp": "t", "id": "tj", + "integrity": 86, "mass": 20, "maxmass": 840, "optmass": 560, @@ -249,6 +265,7 @@ "eddbID": 942, "grp": "t", "id": "ti", + "integrity": 77, "mass": 8, "maxmass": 945, "optmass": 630, @@ -264,6 +281,7 @@ "eddbID": 943, "grp": "t", "id": "th", + "integrity": 96, "mass": 20, "maxmass": 1050, "optmass": 700, @@ -279,6 +297,7 @@ "eddbID": 944, "grp": "t", "id": "tg", + "integrity": 115, "mass": 32, "maxmass": 1155, "optmass": 770, @@ -294,6 +313,7 @@ "eddbID": 945, "grp": "t", "id": "tf", + "integrity": 106, "mass": 20, "maxmass": 1260, "optmass": 840, @@ -309,6 +329,7 @@ "eddbID": 936, "grp": "t", "id": "te", + "integrity": 72, "mass": 10, "maxmass": 420, "optmass": 280, @@ -324,6 +345,7 @@ "eddbID": 937, "grp": "t", "id": "td", + "integrity": 64, "mass": 4, "maxmass": 473, "optmass": 315, @@ -339,6 +361,7 @@ "eddbID": 938, "grp": "t", "id": "tc", + "integrity": 80, "mass": 10, "maxmass": 525, "optmass": 350, @@ -354,6 +377,7 @@ "eddbID": 939, "grp": "t", "id": "tb", + "integrity": 96, "mass": 16, "maxmass": 578, "optmass": 385, @@ -369,6 +393,7 @@ "eddbID": 940, "grp": "t", "id": "ta", + "integrity": 88, "mass": 10, "maxmass": 630, "optmass": 420, @@ -384,6 +409,7 @@ "eddbID": 931, "grp": "t", "id": "t9", + "integrity": 58, "mass": 5, "maxmass": 120, "optmass": 80, @@ -399,6 +425,7 @@ "eddbID": 932, "grp": "t", "id": "t8", + "integrity": 51, "mass": 2, "maxmass": 135, "optmass": 90, @@ -414,6 +441,7 @@ "eddbID": 933, "grp": "t", "id": "t7", + "integrity": 64, "mass": 5, "maxmass": 150, "optmass": 100, @@ -429,6 +457,7 @@ "eddbID": 934, "grp": "t", "id": "t6", + "integrity": 77, "mass": 8, "maxmass": 165, "optmass": 110, @@ -444,6 +473,7 @@ "eddbID": 935, "grp": "t", "id": "t5", + "integrity": 72, "mass": 5, "maxmass": 180, "optmass": 120, @@ -459,6 +489,7 @@ "eddbID": 926, "grp": "t", "id": "t4", + "integrity": 46, "mass": 2.5, "maxmass": 72, "optmass": 48, @@ -474,6 +505,7 @@ "eddbID": 927, "grp": "t", "id": "t3", + "integrity": 41, "mass": 1, "maxmass": 81, "optmass": 54, @@ -489,6 +521,7 @@ "eddbID": 928, "grp": "t", "id": "t2", + "integrity": 51, "mass": 2.5, "maxmass": 90, "optmass": 60, @@ -504,6 +537,7 @@ "eddbID": 929, "grp": "t", "id": "t1", + "integrity": 61, "mass": 4, "maxmass": 99, "optmass": 66, @@ -519,6 +553,7 @@ "eddbID": 930, "grp": "t", "id": "t0", + "integrity": 56, "mass": 2.5, "maxmass": 108, "optmass": 72, @@ -534,6 +569,7 @@ "eddbID": 1548, "grp": "t", "id": "tz", + "integrity": 70, "mass": 5, "maxmass": 200, "name": "Enhanced Performance", @@ -550,6 +586,7 @@ "eddbID": 1547, "grp": "t", "id": "u0", + "integrity": 56, "mass": 2.5, "maxmass": 120, "name": "Enhanced Performance", From c04326b107ac7c5d1df6b860a1b609cdee73c15e Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 11:58:33 +0100 Subject: [PATCH 06/49] Update integrity and efficiency numbers for power plants --- dist/index.js | 108 ++++++++++++++++++++---------- dist/index.json | 108 ++++++++++++++++++++---------- modules/standard/power_plant.json | 105 +++++++++++++++++++---------- 3 files changed, 214 insertions(+), 107 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5dd647d..8ec60cc 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1902,9 +1902,10 @@ module.exports = { cost: 2007240, edID: 128064063, eddbID: 921, - eff: "F", + eff: 1, grp: "pp", id: "py", + integrity: 135, mass: 160, pGen: 24, rating: "E" @@ -1913,9 +1914,10 @@ module.exports = { cost: 6021720, edID: 128064064, eddbID: 922, - eff: "D", + eff: .75, grp: "pp", id: "px", + integrity: 120, mass: 64, pGen: 27, rating: "D" @@ -1924,9 +1926,10 @@ module.exports = { cost: 18065170, edID: 128064065, eddbID: 923, - eff: "C", + eff: .5, grp: "pp", id: "pw", + integrity: 150, mass: 80, pGen: 30, rating: "C" @@ -1935,9 +1938,10 @@ module.exports = { cost: 54195500, edID: 128064066, eddbID: 924, - eff: "C", + eff: .45, grp: "pp", id: "pv", + integrity: 180, mass: 128, pGen: 33, rating: "B" @@ -1946,9 +1950,10 @@ module.exports = { cost: 162586490, edID: 128064067, eddbID: 925, - eff: "B", + eff: .4, grp: "pp", id: "pu", + integrity: 165, mass: 80, pGen: 36, rating: "A" @@ -1957,9 +1962,10 @@ module.exports = { cost: 633200, edID: 128064058, eddbID: 916, - eff: "F", + eff: 1, grp: "pp", id: "pt", + integrity: 118, mass: 80, pGen: 20, rating: "E" @@ -1968,9 +1974,10 @@ module.exports = { cost: 1899600, edID: 128064059, eddbID: 917, - eff: "D", + eff: .75, grp: "pp", id: "ps", + integrity: 105, mass: 32, pGen: 22.5, rating: "D" @@ -1979,9 +1986,10 @@ module.exports = { cost: 5698790, edID: 128064060, eddbID: 918, - eff: "C", + eff: .5, grp: "pp", id: "pr", + integrity: 131, mass: 40, pGen: 25, rating: "C" @@ -1990,9 +1998,10 @@ module.exports = { cost: 17096370, edID: 128064061, eddbID: 919, - eff: "C", + eff: .45, grp: "pp", id: "pq", + integrity: 157, mass: 64, pGen: 27.5, rating: "B" @@ -2001,9 +2010,10 @@ module.exports = { cost: 51289110, edID: 128064062, eddbID: 920, - eff: "B", + eff: .4, grp: "pp", id: "pp", + integrity: 144, mass: 40, pGen: 30, rating: "A" @@ -2012,9 +2022,10 @@ module.exports = { cost: 199750, edID: 128064053, eddbID: 911, - eff: "F", + eff: 1, grp: "pp", id: "po", + integrity: 90, mass: 40, pGen: 16.8, rating: "E" @@ -2023,9 +2034,10 @@ module.exports = { cost: 599240, edID: 128064054, eddbID: 912, - eff: "D", + eff: .75, grp: "pp", id: "pn", + integrity: 113, mass: 16, pGen: 18.9, rating: "D" @@ -2034,9 +2046,10 @@ module.exports = { cost: 1797730, edID: 128064055, eddbID: 913, - eff: "C", + eff: .5, grp: "pp", id: "pm", + integrity: 136, mass: 20, pGen: 21, rating: "C" @@ -2045,9 +2058,10 @@ module.exports = { cost: 5393180, edID: 128064056, eddbID: 914, - eff: "C", + eff: .45, grp: "pp", id: "pl", + integrity: 124, mass: 32, pGen: 23.1, rating: "B" @@ -2056,9 +2070,10 @@ module.exports = { cost: 16179530, edID: 128064057, eddbID: 915, - eff: "B", + eff: .4, grp: "pp", id: "pk", + integrity: 118, mass: 20, pGen: 25.2, rating: "A" @@ -2067,9 +2082,10 @@ module.exports = { cost: 63010, edID: 128064048, eddbID: 906, - eff: "F", + eff: 1, grp: "pp", id: "pj", + integrity: 86, mass: 20, pGen: 13.6, rating: "E" @@ -2078,9 +2094,10 @@ module.exports = { cost: 189040, edID: 128064049, eddbID: 907, - eff: "D", + eff: .75, grp: "pp", id: "pi", + integrity: 77, mass: 8, pGen: 15.3, rating: "D" @@ -2089,9 +2106,10 @@ module.exports = { cost: 567110, edID: 128064050, eddbID: 908, - eff: "C", + eff: .5, grp: "pp", id: "ph", + integrity: 96, mass: 10, pGen: 17, rating: "C" @@ -2100,9 +2118,10 @@ module.exports = { cost: 1701320, edID: 128064051, eddbID: 909, - eff: "C", + eff: .45, grp: "pp", id: "pg", + integrity: 114, mass: 16, pGen: 18.7, rating: "B" @@ -2111,9 +2130,10 @@ module.exports = { cost: 5103950, edID: 128064052, eddbID: 910, - eff: "B", + eff: .4, grp: "pp", id: "pf", + integrity: 106, mass: 10, pGen: 20.4, rating: "A" @@ -2122,9 +2142,10 @@ module.exports = { cost: 19880, edID: 128064043, eddbID: 901, - eff: "F", + eff: 1, grp: "pp", id: "pe", + integrity: 72, mass: 10, pGen: 10.4, rating: "E" @@ -2133,9 +2154,10 @@ module.exports = { cost: 59630, edID: 128064044, eddbID: 902, - eff: "D", + eff: .75, grp: "pp", id: "pd", + integrity: 64, mass: 4, pGen: 11.7, rating: "D" @@ -2144,9 +2166,10 @@ module.exports = { cost: 178900, edID: 128064045, eddbID: 903, - eff: "C", + eff: .5, grp: "pp", id: "pc", + integrity: 80, mass: 5, pGen: 13, rating: "C" @@ -2155,9 +2178,10 @@ module.exports = { cost: 536690, edID: 128064046, eddbID: 904, - eff: "C", + eff: .45, grp: "pp", id: "pb", + integrity: 96, mass: 8, pGen: 14.3, rating: "B" @@ -2166,9 +2190,10 @@ module.exports = { cost: 1610080, edID: 128064047, eddbID: 905, - eff: "B", + eff: .4, grp: "pp", id: "pa", + integrity: 88, mass: 5, pGen: 15.6, rating: "A" @@ -2177,9 +2202,10 @@ module.exports = { cost: 6270, edID: 128064038, eddbID: 896, - eff: "F", + eff: 1, grp: "pp", id: "p9", + integrity: 58, mass: 5, pGen: 8, rating: "E" @@ -2188,9 +2214,10 @@ module.exports = { cost: 18810, edID: 128064039, eddbID: 897, - eff: "D", + eff: .75, grp: "pp", id: "p8", + integrity: 51, mass: 2, pGen: 9, rating: "D" @@ -2199,9 +2226,10 @@ module.exports = { cost: 56440, edID: 128064040, eddbID: 898, - eff: "C", + eff: .5, grp: "pp", id: "p7", + integrity: 64, mass: 2.5, pGen: 10, rating: "C" @@ -2210,9 +2238,10 @@ module.exports = { cost: 169300, edID: 128064041, eddbID: 899, - eff: "C", + eff: .45, grp: "pp", id: "p6", + integrity: 77, mass: 4, pGen: 11, rating: "B" @@ -2221,9 +2250,10 @@ module.exports = { cost: 507910, edID: 128064042, eddbID: 900, - eff: "B", + eff: .4, grp: "pp", id: "p5", + integrity: 70, mass: 2.5, pGen: 12, rating: "A" @@ -2232,9 +2262,10 @@ module.exports = { cost: 1980, edID: 128064033, eddbID: 891, - eff: "F", + eff: 1, grp: "pp", id: "p4", + integrity: 46, mass: 2.5, pGen: 6.4, rating: "E" @@ -2243,9 +2274,10 @@ module.exports = { cost: 5930, edID: 128064034, eddbID: 892, - eff: "D", + eff: .75, grp: "pp", id: "p3", + integrity: 41, mass: 1, pGen: 7.2, rating: "D" @@ -2254,9 +2286,10 @@ module.exports = { cost: 17800, edID: 128064035, eddbID: 893, - eff: "C", + eff: .5, grp: "pp", id: "p2", + integrity: 51, mass: 1.3, pGen: 8, rating: "C" @@ -2265,9 +2298,10 @@ module.exports = { cost: 53410, edID: 128064036, eddbID: 894, - eff: "C", + eff: .45, grp: "pp", id: "p1", + integrity: 61, mass: 2, pGen: 8.8, rating: "B" @@ -2276,9 +2310,10 @@ module.exports = { cost: 160220, edID: 128064037, eddbID: 895, - eff: "B", + eff: .4, grp: "pp", id: "p0", + integrity: 56, mass: 1.3, pGen: 9.6, rating: "A" @@ -6749,7 +6784,7 @@ module.exports = { mr: [ { ammo: 48, armourpen: 60, - breachdps: 0, + breachdps: 4.8, breachmax: 0, breachmin: 0, class: 2, @@ -6759,6 +6794,7 @@ module.exports = { eddbID: 1559, eps: .12, grp: "mr", + hps: 1.08, id: "1z", integrity: 51, mass: 4, diff --git a/dist/index.json b/dist/index.json index a0b130b..24e76f3 100644 --- a/dist/index.json +++ b/dist/index.json @@ -3551,9 +3551,10 @@ "cost": 2007240, "edID": 128064063, "eddbID": 921, - "eff": "F", + "eff": 1, "grp": "pp", "id": "py", + "integrity": 135, "mass": 160, "pGen": 24, "rating": "E" @@ -3563,9 +3564,10 @@ "cost": 6021720, "edID": 128064064, "eddbID": 922, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "px", + "integrity": 120, "mass": 64, "pGen": 27, "rating": "D" @@ -3575,9 +3577,10 @@ "cost": 18065170, "edID": 128064065, "eddbID": 923, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pw", + "integrity": 150, "mass": 80, "pGen": 30, "rating": "C" @@ -3587,9 +3590,10 @@ "cost": 54195500, "edID": 128064066, "eddbID": 924, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pv", + "integrity": 180, "mass": 128, "pGen": 33, "rating": "B" @@ -3599,9 +3603,10 @@ "cost": 162586490, "edID": 128064067, "eddbID": 925, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pu", + "integrity": 165, "mass": 80, "pGen": 36, "rating": "A" @@ -3611,9 +3616,10 @@ "cost": 633200, "edID": 128064058, "eddbID": 916, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pt", + "integrity": 118, "mass": 80, "pGen": 20, "rating": "E" @@ -3623,9 +3629,10 @@ "cost": 1899600, "edID": 128064059, "eddbID": 917, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "ps", + "integrity": 105, "mass": 32, "pGen": 22.5, "rating": "D" @@ -3635,9 +3642,10 @@ "cost": 5698790, "edID": 128064060, "eddbID": 918, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pr", + "integrity": 131, "mass": 40, "pGen": 25, "rating": "C" @@ -3647,9 +3655,10 @@ "cost": 17096370, "edID": 128064061, "eddbID": 919, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pq", + "integrity": 157, "mass": 64, "pGen": 27.5, "rating": "B" @@ -3659,9 +3668,10 @@ "cost": 51289110, "edID": 128064062, "eddbID": 920, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pp", + "integrity": 144, "mass": 40, "pGen": 30, "rating": "A" @@ -3671,9 +3681,10 @@ "cost": 199750, "edID": 128064053, "eddbID": 911, - "eff": "F", + "eff": 1, "grp": "pp", "id": "po", + "integrity": 90, "mass": 40, "pGen": 16.8, "rating": "E" @@ -3683,9 +3694,10 @@ "cost": 599240, "edID": 128064054, "eddbID": 912, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pn", + "integrity": 113, "mass": 16, "pGen": 18.9, "rating": "D" @@ -3695,9 +3707,10 @@ "cost": 1797730, "edID": 128064055, "eddbID": 913, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pm", + "integrity": 136, "mass": 20, "pGen": 21, "rating": "C" @@ -3707,9 +3720,10 @@ "cost": 5393180, "edID": 128064056, "eddbID": 914, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pl", + "integrity": 124, "mass": 32, "pGen": 23.1, "rating": "B" @@ -3719,9 +3733,10 @@ "cost": 16179530, "edID": 128064057, "eddbID": 915, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pk", + "integrity": 118, "mass": 20, "pGen": 25.2, "rating": "A" @@ -3731,9 +3746,10 @@ "cost": 63010, "edID": 128064048, "eddbID": 906, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pj", + "integrity": 86, "mass": 20, "pGen": 13.6, "rating": "E" @@ -3743,9 +3759,10 @@ "cost": 189040, "edID": 128064049, "eddbID": 907, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pi", + "integrity": 77, "mass": 8, "pGen": 15.3, "rating": "D" @@ -3755,9 +3772,10 @@ "cost": 567110, "edID": 128064050, "eddbID": 908, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "ph", + "integrity": 96, "mass": 10, "pGen": 17, "rating": "C" @@ -3767,9 +3785,10 @@ "cost": 1701320, "edID": 128064051, "eddbID": 909, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pg", + "integrity": 114, "mass": 16, "pGen": 18.7, "rating": "B" @@ -3779,9 +3798,10 @@ "cost": 5103950, "edID": 128064052, "eddbID": 910, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pf", + "integrity": 106, "mass": 10, "pGen": 20.4, "rating": "A" @@ -3791,9 +3811,10 @@ "cost": 19880, "edID": 128064043, "eddbID": 901, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pe", + "integrity": 72, "mass": 10, "pGen": 10.4, "rating": "E" @@ -3803,9 +3824,10 @@ "cost": 59630, "edID": 128064044, "eddbID": 902, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pd", + "integrity": 64, "mass": 4, "pGen": 11.7, "rating": "D" @@ -3815,9 +3837,10 @@ "cost": 178900, "edID": 128064045, "eddbID": 903, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pc", + "integrity": 80, "mass": 5, "pGen": 13, "rating": "C" @@ -3827,9 +3850,10 @@ "cost": 536690, "edID": 128064046, "eddbID": 904, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pb", + "integrity": 96, "mass": 8, "pGen": 14.3, "rating": "B" @@ -3839,9 +3863,10 @@ "cost": 1610080, "edID": 128064047, "eddbID": 905, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pa", + "integrity": 88, "mass": 5, "pGen": 15.6, "rating": "A" @@ -3851,9 +3876,10 @@ "cost": 6270, "edID": 128064038, "eddbID": 896, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p9", + "integrity": 58, "mass": 5, "pGen": 8, "rating": "E" @@ -3863,9 +3889,10 @@ "cost": 18810, "edID": 128064039, "eddbID": 897, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p8", + "integrity": 51, "mass": 2, "pGen": 9, "rating": "D" @@ -3875,9 +3902,10 @@ "cost": 56440, "edID": 128064040, "eddbID": 898, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p7", + "integrity": 64, "mass": 2.5, "pGen": 10, "rating": "C" @@ -3887,9 +3915,10 @@ "cost": 169300, "edID": 128064041, "eddbID": 899, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p6", + "integrity": 77, "mass": 4, "pGen": 11, "rating": "B" @@ -3899,9 +3928,10 @@ "cost": 507910, "edID": 128064042, "eddbID": 900, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p5", + "integrity": 70, "mass": 2.5, "pGen": 12, "rating": "A" @@ -3911,9 +3941,10 @@ "cost": 1980, "edID": 128064033, "eddbID": 891, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p4", + "integrity": 46, "mass": 2.5, "pGen": 6.4, "rating": "E" @@ -3923,9 +3954,10 @@ "cost": 5930, "edID": 128064034, "eddbID": 892, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p3", + "integrity": 41, "mass": 1, "pGen": 7.2, "rating": "D" @@ -3935,9 +3967,10 @@ "cost": 17800, "edID": 128064035, "eddbID": 893, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p2", + "integrity": 51, "mass": 1.3, "pGen": 8, "rating": "C" @@ -3947,9 +3980,10 @@ "cost": 53410, "edID": 128064036, "eddbID": 894, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p1", + "integrity": 61, "mass": 2, "pGen": 8.8, "rating": "B" @@ -3959,9 +3993,10 @@ "cost": 160220, "edID": 128064037, "eddbID": 895, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p0", + "integrity": 56, "mass": 1.3, "pGen": 9.6, "rating": "A" @@ -8725,7 +8760,7 @@ { "ammo": 48, "armourpen": 60, - "breachdps": 0, + "breachdps": 4.8, "breachmax": 0, "breachmin": 0, "class": 2, @@ -8735,6 +8770,7 @@ "eddbID": 1559, "eps": 0.12, "grp": "mr", + "hps": 1.08, "id": "1z", "integrity": 51, "mass": 4, diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 3ce735e..6aa0e32 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -5,9 +5,10 @@ "cost": 2007240, "edID": 128064063, "eddbID": 921, - "eff": "F", + "eff": 1, "grp": "pp", "id": "py", + "integrity": 135, "mass": 160, "pGen": 24, "rating": "E" @@ -17,9 +18,10 @@ "cost": 6021720, "edID": 128064064, "eddbID": 922, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "px", + "integrity": 120, "mass": 64, "pGen": 27, "rating": "D" @@ -29,9 +31,10 @@ "cost": 18065170, "edID": 128064065, "eddbID": 923, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pw", + "integrity": 150, "mass": 80, "pGen": 30, "rating": "C" @@ -41,9 +44,10 @@ "cost": 54195500, "edID": 128064066, "eddbID": 924, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pv", + "integrity": 180, "mass": 128, "pGen": 33, "rating": "B" @@ -53,9 +57,10 @@ "cost": 162586490, "edID": 128064067, "eddbID": 925, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pu", + "integrity": 165, "mass": 80, "pGen": 36, "rating": "A" @@ -65,9 +70,10 @@ "cost": 633200, "edID": 128064058, "eddbID": 916, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pt", + "integrity": 118, "mass": 80, "pGen": 20, "rating": "E" @@ -77,9 +83,10 @@ "cost": 1899600, "edID": 128064059, "eddbID": 917, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "ps", + "integrity": 105, "mass": 32, "pGen": 22.5, "rating": "D" @@ -89,9 +96,10 @@ "cost": 5698790, "edID": 128064060, "eddbID": 918, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pr", + "integrity": 131, "mass": 40, "pGen": 25, "rating": "C" @@ -101,9 +109,10 @@ "cost": 17096370, "edID": 128064061, "eddbID": 919, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pq", + "integrity": 157, "mass": 64, "pGen": 27.5, "rating": "B" @@ -113,9 +122,10 @@ "cost": 51289110, "edID": 128064062, "eddbID": 920, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pp", + "integrity": 144, "mass": 40, "pGen": 30, "rating": "A" @@ -125,9 +135,10 @@ "cost": 199750, "edID": 128064053, "eddbID": 911, - "eff": "F", + "eff": 1, "grp": "pp", "id": "po", + "integrity": 90, "mass": 40, "pGen": 16.8, "rating": "E" @@ -137,9 +148,10 @@ "cost": 599240, "edID": 128064054, "eddbID": 912, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pn", + "integrity": 113, "mass": 16, "pGen": 18.9, "rating": "D" @@ -149,9 +161,10 @@ "cost": 1797730, "edID": 128064055, "eddbID": 913, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pm", + "integrity": 136, "mass": 20, "pGen": 21, "rating": "C" @@ -161,9 +174,10 @@ "cost": 5393180, "edID": 128064056, "eddbID": 914, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pl", + "integrity": 124, "mass": 32, "pGen": 23.1, "rating": "B" @@ -173,9 +187,10 @@ "cost": 16179530, "edID": 128064057, "eddbID": 915, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pk", + "integrity": 118, "mass": 20, "pGen": 25.2, "rating": "A" @@ -185,9 +200,10 @@ "cost": 63010, "edID": 128064048, "eddbID": 906, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pj", + "integrity": 86, "mass": 20, "pGen": 13.6, "rating": "E" @@ -197,9 +213,10 @@ "cost": 189040, "edID": 128064049, "eddbID": 907, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pi", + "integrity": 77, "mass": 8, "pGen": 15.3, "rating": "D" @@ -209,9 +226,10 @@ "cost": 567110, "edID": 128064050, "eddbID": 908, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "ph", + "integrity": 96, "mass": 10, "pGen": 17, "rating": "C" @@ -221,9 +239,10 @@ "cost": 1701320, "edID": 128064051, "eddbID": 909, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pg", + "integrity": 114, "mass": 16, "pGen": 18.7, "rating": "B" @@ -233,9 +252,10 @@ "cost": 5103950, "edID": 128064052, "eddbID": 910, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pf", + "integrity": 106, "mass": 10, "pGen": 20.4, "rating": "A" @@ -245,9 +265,10 @@ "cost": 19880, "edID": 128064043, "eddbID": 901, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pe", + "integrity": 72, "mass": 10, "pGen": 10.4, "rating": "E" @@ -257,9 +278,10 @@ "cost": 59630, "edID": 128064044, "eddbID": 902, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pd", + "integrity": 64, "mass": 4, "pGen": 11.7, "rating": "D" @@ -269,9 +291,10 @@ "cost": 178900, "edID": 128064045, "eddbID": 903, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pc", + "integrity": 80, "mass": 5, "pGen": 13, "rating": "C" @@ -281,9 +304,10 @@ "cost": 536690, "edID": 128064046, "eddbID": 904, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pb", + "integrity": 96, "mass": 8, "pGen": 14.3, "rating": "B" @@ -293,9 +317,10 @@ "cost": 1610080, "edID": 128064047, "eddbID": 905, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pa", + "integrity": 88, "mass": 5, "pGen": 15.6, "rating": "A" @@ -305,9 +330,10 @@ "cost": 6270, "edID": 128064038, "eddbID": 896, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p9", + "integrity": 58, "mass": 5, "pGen": 8, "rating": "E" @@ -317,9 +343,10 @@ "cost": 18810, "edID": 128064039, "eddbID": 897, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p8", + "integrity": 51, "mass": 2, "pGen": 9, "rating": "D" @@ -329,9 +356,10 @@ "cost": 56440, "edID": 128064040, "eddbID": 898, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p7", + "integrity": 64, "mass": 2.5, "pGen": 10, "rating": "C" @@ -341,9 +369,10 @@ "cost": 169300, "edID": 128064041, "eddbID": 899, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p6", + "integrity": 77, "mass": 4, "pGen": 11, "rating": "B" @@ -353,9 +382,10 @@ "cost": 507910, "edID": 128064042, "eddbID": 900, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p5", + "integrity": 70, "mass": 2.5, "pGen": 12, "rating": "A" @@ -365,9 +395,10 @@ "cost": 1980, "edID": 128064033, "eddbID": 891, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p4", + "integrity": 46, "mass": 2.5, "pGen": 6.4, "rating": "E" @@ -377,9 +408,10 @@ "cost": 5930, "edID": 128064034, "eddbID": 892, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p3", + "integrity": 41, "mass": 1, "pGen": 7.2, "rating": "D" @@ -389,9 +421,10 @@ "cost": 17800, "edID": 128064035, "eddbID": 893, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p2", + "integrity": 51, "mass": 1.3, "pGen": 8, "rating": "C" @@ -401,9 +434,10 @@ "cost": 53410, "edID": 128064036, "eddbID": 894, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p1", + "integrity": 61, "mass": 2, "pGen": 8.8, "rating": "B" @@ -413,9 +447,10 @@ "cost": 160220, "edID": 128064037, "eddbID": 895, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p0", + "integrity": 56, "mass": 1.3, "pGen": 9.6, "rating": "A" From 715f3441ce689f819bc63a0d733bec0f27c6b3ce Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 12:40:56 +0100 Subject: [PATCH 07/49] Update integrity and optimal mass numbers for FSDs --- dist/index.js | 100 +++++++--------------- dist/index.json | 105 +++++++----------------- modules/standard/frame_shift_drive.json | 37 ++++++++- 3 files changed, 96 insertions(+), 146 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8ec60cc..d07e9d8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2840,76 +2840,6 @@ module.exports = { rating: "A" } ], fsd: [ { - class: 8, - cost: 0, - edID: 128064133, - eddbID: 991, - fuelmul: .011, - fuelpower: 2.9, - grp: "fsd", - id: "Fy", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "E" - }, { - class: 8, - cost: 0, - edID: 128064134, - eddbID: 992, - fuelmul: .01, - fuelpower: 2.9, - grp: "fsd", - id: "Fx", - mass: 64, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "D" - }, { - class: 8, - cost: 0, - edID: 128064135, - eddbID: 993, - fuelmul: .008, - fuelpower: 2.9, - grp: "fsd", - id: "Fw", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "C" - }, { - class: 8, - cost: 0, - edID: 128064136, - eddbID: 994, - fuelmul: .01, - fuelpower: 2.9, - grp: "fsd", - id: "Fv", - mass: 256, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "B" - }, { - class: 8, - cost: 0, - edID: 128064137, - eddbID: 995, - fuelmul: .012, - fuelpower: 2.9, - grp: "fsd", - id: "Fu", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "A" - }, { class: 7, cost: 633200, edID: 128064128, @@ -2918,6 +2848,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Ft", + integrity: 118, mass: 80, maxfuel: 8.5, optmass: 1440, @@ -2932,6 +2863,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fs", + integrity: 105, mass: 32, maxfuel: 8.5, optmass: 1620, @@ -2946,6 +2878,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fr", + integrity: 131, mass: 80, maxfuel: 8.5, optmass: 1800, @@ -2960,6 +2893,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fq", + integrity: 157, mass: 128, maxfuel: 10.6, optmass: 2250, @@ -2974,6 +2908,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fp", + integrity: 144, mass: 80, maxfuel: 12.8, optmass: 2700, @@ -2988,6 +2923,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fo", + integrity: 102, mass: 40, maxfuel: 5.3, optmass: 960, @@ -3002,6 +2938,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fn", + integrity: 90, mass: 16, maxfuel: 5.3, optmass: 1080, @@ -3016,6 +2953,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fm", + integrity: 113, mass: 40, maxfuel: 5.3, optmass: 1200, @@ -3030,6 +2968,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fl", + integrity: 136, mass: 64, maxfuel: 6.6, optmass: 1500, @@ -3044,6 +2983,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fk", + integrity: 124, mass: 40, maxfuel: 8, optmass: 1800, @@ -3058,6 +2998,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fj", + integrity: 86, mass: 20, maxfuel: 3.3, optmass: 560, @@ -3072,6 +3013,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fi", + integrity: 77, mass: 8, maxfuel: 3.3, optmass: 630, @@ -3086,6 +3028,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fh", + integrity: 96, mass: 20, maxfuel: 3.3, optmass: 700, @@ -3100,6 +3043,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fg", + integrity: 115, mass: 32, maxfuel: 4.1, optmass: 875, @@ -3114,6 +3058,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Ff", + integrity: 106, mass: 20, maxfuel: 5, optmass: 1050, @@ -3128,6 +3073,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fe", + integrity: 72, mass: 10, maxfuel: 2, optmass: 280, @@ -3142,6 +3088,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fd", + integrity: 64, mass: 4, maxfuel: 2, optmass: 315, @@ -3156,6 +3103,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fc", + integrity: 80, mass: 10, maxfuel: 2, optmass: 350, @@ -3170,6 +3118,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fb", + integrity: 96, mass: 16, maxfuel: 2.5, optmass: 438, @@ -3184,6 +3133,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fa", + integrity: 88, mass: 10, maxfuel: 3, optmass: 525, @@ -3198,6 +3148,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F9", + integrity: 58, mass: 5, maxfuel: 1.2, optmass: 80, @@ -3212,6 +3163,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F8", + integrity: 51, mass: 2, maxfuel: 1.2, optmass: 90, @@ -3226,6 +3178,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F7", + integrity: 64, mass: 5, maxfuel: 1.2, optmass: 100, @@ -3240,6 +3193,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F6", + integrity: 77, mass: 8, maxfuel: 1.5, optmass: 125, @@ -3254,6 +3208,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F5", + integrity: 70, mass: 5, maxfuel: 1.8, optmass: 150, @@ -3268,6 +3223,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F4", + integrity: 46, mass: 2.5, maxfuel: .6, optmass: 48, @@ -3282,6 +3238,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F3", + integrity: 41, mass: 1, maxfuel: .6, optmass: 54, @@ -3296,6 +3253,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F2", + integrity: 51, mass: 2.5, maxfuel: .6, optmass: 60, @@ -3310,6 +3268,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F1", + integrity: 61, mass: 4, maxfuel: .8, optmass: 75, @@ -3324,6 +3283,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F0", + integrity: 56, mass: 2.5, maxfuel: .9, optmass: 90, diff --git a/dist/index.json b/dist/index.json index 24e76f3..efc38b4 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4562,81 +4562,6 @@ } ], "fsd": [ - { - "class": 8, - "cost": 0, - "edID": 128064133, - "eddbID": 991, - "fuelmul": 0.011, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fy", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "E" - }, - { - "class": 8, - "cost": 0, - "edID": 128064134, - "eddbID": 992, - "fuelmul": 0.01, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fx", - "mass": 64, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "D" - }, - { - "class": 8, - "cost": 0, - "edID": 128064135, - "eddbID": 993, - "fuelmul": 0.008, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fw", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "C" - }, - { - "class": 8, - "cost": 0, - "edID": 128064136, - "eddbID": 994, - "fuelmul": 0.01, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fv", - "mass": 256, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "B" - }, - { - "class": 8, - "cost": 0, - "edID": 128064137, - "eddbID": 995, - "fuelmul": 0.012, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fu", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "A" - }, { "class": 7, "cost": 633200, @@ -4646,6 +4571,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Ft", + "integrity": 118, "mass": 80, "maxfuel": 8.5, "optmass": 1440, @@ -4661,6 +4587,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fs", + "integrity": 105, "mass": 32, "maxfuel": 8.5, "optmass": 1620, @@ -4676,6 +4603,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fr", + "integrity": 131, "mass": 80, "maxfuel": 8.5, "optmass": 1800, @@ -4691,6 +4619,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fq", + "integrity": 157, "mass": 128, "maxfuel": 10.6, "optmass": 2250, @@ -4706,6 +4635,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fp", + "integrity": 144, "mass": 80, "maxfuel": 12.8, "optmass": 2700, @@ -4721,6 +4651,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fo", + "integrity": 102, "mass": 40, "maxfuel": 5.3, "optmass": 960, @@ -4736,6 +4667,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fn", + "integrity": 90, "mass": 16, "maxfuel": 5.3, "optmass": 1080, @@ -4751,6 +4683,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fm", + "integrity": 113, "mass": 40, "maxfuel": 5.3, "optmass": 1200, @@ -4766,6 +4699,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fl", + "integrity": 136, "mass": 64, "maxfuel": 6.6, "optmass": 1500, @@ -4781,6 +4715,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fk", + "integrity": 124, "mass": 40, "maxfuel": 8, "optmass": 1800, @@ -4796,6 +4731,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fj", + "integrity": 86, "mass": 20, "maxfuel": 3.3, "optmass": 560, @@ -4811,6 +4747,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fi", + "integrity": 77, "mass": 8, "maxfuel": 3.3, "optmass": 630, @@ -4826,6 +4763,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fh", + "integrity": 96, "mass": 20, "maxfuel": 3.3, "optmass": 700, @@ -4841,6 +4779,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fg", + "integrity": 115, "mass": 32, "maxfuel": 4.1, "optmass": 875, @@ -4856,6 +4795,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Ff", + "integrity": 106, "mass": 20, "maxfuel": 5, "optmass": 1050, @@ -4871,6 +4811,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fe", + "integrity": 72, "mass": 10, "maxfuel": 2, "optmass": 280, @@ -4886,6 +4827,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fd", + "integrity": 64, "mass": 4, "maxfuel": 2, "optmass": 315, @@ -4901,6 +4843,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fc", + "integrity": 80, "mass": 10, "maxfuel": 2, "optmass": 350, @@ -4916,6 +4859,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fb", + "integrity": 96, "mass": 16, "maxfuel": 2.5, "optmass": 438, @@ -4931,6 +4875,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fa", + "integrity": 88, "mass": 10, "maxfuel": 3, "optmass": 525, @@ -4946,6 +4891,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F9", + "integrity": 58, "mass": 5, "maxfuel": 1.2, "optmass": 80, @@ -4961,6 +4907,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F8", + "integrity": 51, "mass": 2, "maxfuel": 1.2, "optmass": 90, @@ -4976,6 +4923,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F7", + "integrity": 64, "mass": 5, "maxfuel": 1.2, "optmass": 100, @@ -4991,6 +4939,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F6", + "integrity": 77, "mass": 8, "maxfuel": 1.5, "optmass": 125, @@ -5006,6 +4955,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F5", + "integrity": 70, "mass": 5, "maxfuel": 1.8, "optmass": 150, @@ -5021,6 +4971,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F4", + "integrity": 46, "mass": 2.5, "maxfuel": 0.6, "optmass": 48, @@ -5036,6 +4987,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F3", + "integrity": 41, "mass": 1, "maxfuel": 0.6, "optmass": 54, @@ -5051,6 +5003,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F2", + "integrity": 51, "mass": 2.5, "maxfuel": 0.6, "optmass": 60, @@ -5066,6 +5019,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F1", + "integrity": 61, "mass": 4, "maxfuel": 0.8, "optmass": 75, @@ -5081,6 +5035,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F0", + "integrity": 56, "mass": 2.5, "maxfuel": 0.9, "optmass": 90, diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index 84ca5f3..8728422 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -9,6 +9,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fy", + "integrity": 93, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -24,6 +25,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fx", + "integrity": 37, "mass": 64, "maxfuel": 0, "optmass": 0, @@ -39,6 +41,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fw", + "integrity": 46, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -54,6 +57,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fv", + "integrity": 74, "mass": 256, "maxfuel": 0, "optmass": 0, @@ -69,6 +73,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fu", + "integrity": 46, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -84,6 +89,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Ft", + "integrity": 118, "mass": 80, "maxfuel": 8.5, "optmass": 1440, @@ -99,6 +105,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fs", + "integrity": 105, "mass": 32, "maxfuel": 8.5, "optmass": 1620, @@ -114,6 +121,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fr", + "integrity": 131, "mass": 80, "maxfuel": 8.5, "optmass": 1800, @@ -129,6 +137,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fq", + "integrity": 157, "mass": 128, "maxfuel": 10.6, "optmass": 2250, @@ -144,6 +153,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fp", + "integrity": 144, "mass": 80, "maxfuel": 12.8, "optmass": 2700, @@ -159,6 +169,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fo", + "integrity": 102, "mass": 40, "maxfuel": 5.3, "optmass": 960, @@ -174,6 +185,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fn", + "integrity": 90, "mass": 16, "maxfuel": 5.3, "optmass": 1080, @@ -189,6 +201,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fm", + "integrity": 113, "mass": 40, "maxfuel": 5.3, "optmass": 1200, @@ -204,6 +217,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fl", + "integrity": 136, "mass": 64, "maxfuel": 6.6, "optmass": 1500, @@ -219,6 +233,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fk", + "integrity": 124, "mass": 40, "maxfuel": 8, "optmass": 1800, @@ -234,6 +249,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fj", + "integrity": 86, "mass": 20, "maxfuel": 3.3, "optmass": 560, @@ -249,6 +265,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fi", + "integrity": 77, "mass": 8, "maxfuel": 3.3, "optmass": 630, @@ -264,6 +281,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fh", + "integrity": 96, "mass": 20, "maxfuel": 3.3, "optmass": 700, @@ -279,6 +297,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fg", + "integrity": 115, "mass": 32, "maxfuel": 4.1, "optmass": 875, @@ -294,6 +313,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Ff", + "integrity": 106, "mass": 20, "maxfuel": 5, "optmass": 1050, @@ -309,6 +329,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fe", + "integrity": 72, "mass": 10, "maxfuel": 2, "optmass": 280, @@ -324,6 +345,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fd", + "integrity": 64, "mass": 4, "maxfuel": 2, "optmass": 315, @@ -339,6 +361,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fc", + "integrity": 80, "mass": 10, "maxfuel": 2, "optmass": 350, @@ -354,9 +377,10 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fb", + "integrity": 96, "mass": 16, "maxfuel": 2.5, - "optmass": 438, + "optmass": 437.5, "power": 0.38, "rating": "B" }, @@ -369,6 +393,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fa", + "integrity": 88, "mass": 10, "maxfuel": 3, "optmass": 525, @@ -384,6 +409,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F9", + "integrity": 58, "mass": 5, "maxfuel": 1.2, "optmass": 80, @@ -399,6 +425,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F8", + "integrity": 51, "mass": 2, "maxfuel": 1.2, "optmass": 90, @@ -414,6 +441,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F7", + "integrity": 64, "mass": 5, "maxfuel": 1.2, "optmass": 100, @@ -429,6 +457,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F6", + "integrity": 77, "mass": 8, "maxfuel": 1.5, "optmass": 125, @@ -444,6 +473,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F5", + "integrity": 70, "mass": 5, "maxfuel": 1.8, "optmass": 150, @@ -459,6 +489,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F4", + "integrity": 46, "mass": 2.5, "maxfuel": 0.6, "optmass": 48, @@ -474,6 +505,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F3", + "integrity": 41, "mass": 1, "maxfuel": 0.6, "optmass": 54, @@ -489,6 +521,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F2", + "integrity": 51, "mass": 2.5, "maxfuel": 0.6, "optmass": 60, @@ -504,6 +537,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F1", + "integrity": 61, "mass": 4, "maxfuel": 0.8, "optmass": 75, @@ -519,6 +553,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F0", + "integrity": 56, "mass": 2.5, "maxfuel": 0.9, "optmass": 90, From 8ac61bcef8f865419458b059bf6ccc53d4cd3b9a Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 12:52:12 +0100 Subject: [PATCH 08/49] Added speculative costs for fighter hangars --- dist/index.js | 83 ++++++++++++++++++++++++-- dist/index.json | 88 ++++++++++++++++++++++++++-- modules/internal/fighter_hangar.json | 6 +- 3 files changed, 166 insertions(+), 11 deletions(-) diff --git a/dist/index.js b/dist/index.js index d07e9d8..6c4f9fa 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2840,6 +2840,81 @@ module.exports = { rating: "A" } ], fsd: [ { + class: 8, + cost: 0, + edID: 128064133, + eddbID: 991, + fuelmul: .011, + fuelpower: 2.9, + grp: "fsd", + id: "Fy", + integrity: 93, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "E" + }, { + class: 8, + cost: 0, + edID: 128064134, + eddbID: 992, + fuelmul: .01, + fuelpower: 2.9, + grp: "fsd", + id: "Fx", + integrity: 37, + mass: 64, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "D" + }, { + class: 8, + cost: 0, + edID: 128064135, + eddbID: 993, + fuelmul: .008, + fuelpower: 2.9, + grp: "fsd", + id: "Fw", + integrity: 46, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "C" + }, { + class: 8, + cost: 0, + edID: 128064136, + eddbID: 994, + fuelmul: .01, + fuelpower: 2.9, + grp: "fsd", + id: "Fv", + integrity: 74, + mass: 256, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "B" + }, { + class: 8, + cost: 0, + edID: 128064137, + eddbID: 995, + fuelmul: .012, + fuelpower: 2.9, + grp: "fsd", + id: "Fu", + integrity: 46, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "A" + }, { class: 7, cost: 633200, edID: 128064128, @@ -3121,7 +3196,7 @@ module.exports = { integrity: 96, mass: 16, maxfuel: 2.5, - optmass: 438, + optmass: 437.5, power: .38, rating: "B" }, { @@ -8419,7 +8494,7 @@ module.exports = { fh: [ { bays: 2, class: 7, - cost: -1, + cost: 2079090, eddbID: 1560, grp: "fh", id: "fh", @@ -8430,7 +8505,7 @@ module.exports = { }, { bays: 2, class: 6, - cost: -1, + cost: 1640350, eddbID: 1561, grp: "fh", id: "fm", @@ -8441,7 +8516,7 @@ module.exports = { }, { bays: 1, class: 5, - cost: -1, + cost: 505130, eddbID: 1562, grp: "fh", id: "fr", diff --git a/dist/index.json b/dist/index.json index efc38b4..9a20747 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4562,6 +4562,86 @@ } ], "fsd": [ + { + "class": 8, + "cost": 0, + "edID": 128064133, + "eddbID": 991, + "fuelmul": 0.011, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fy", + "integrity": 93, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "E" + }, + { + "class": 8, + "cost": 0, + "edID": 128064134, + "eddbID": 992, + "fuelmul": 0.01, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fx", + "integrity": 37, + "mass": 64, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "D" + }, + { + "class": 8, + "cost": 0, + "edID": 128064135, + "eddbID": 993, + "fuelmul": 0.008, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fw", + "integrity": 46, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "C" + }, + { + "class": 8, + "cost": 0, + "edID": 128064136, + "eddbID": 994, + "fuelmul": 0.01, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fv", + "integrity": 74, + "mass": 256, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "B" + }, + { + "class": 8, + "cost": 0, + "edID": 128064137, + "eddbID": 995, + "fuelmul": 0.012, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fu", + "integrity": 46, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "A" + }, { "class": 7, "cost": 633200, @@ -4862,7 +4942,7 @@ "integrity": 96, "mass": 16, "maxfuel": 2.5, - "optmass": 438, + "optmass": 437.5, "power": 0.38, "rating": "B" }, @@ -10521,7 +10601,7 @@ { "bays": 2, "class": 7, - "cost": -1, + "cost": 2079090, "eddbID": 1560, "grp": "fh", "id": "fh", @@ -10533,7 +10613,7 @@ { "bays": 2, "class": 6, - "cost": -1, + "cost": 1640350, "eddbID": 1561, "grp": "fh", "id": "fm", @@ -10545,7 +10625,7 @@ { "bays": 1, "class": 5, - "cost": -1, + "cost": 505130, "eddbID": 1562, "grp": "fh", "id": "fr", diff --git a/modules/internal/fighter_hangar.json b/modules/internal/fighter_hangar.json index 2f14b2c..d546cb9 100644 --- a/modules/internal/fighter_hangar.json +++ b/modules/internal/fighter_hangar.json @@ -3,7 +3,7 @@ { "bays": 2, "class": 7, - "cost": -1, + "cost": 2079090, "eddbID": 1560, "grp": "fh", "id": "fh", @@ -15,7 +15,7 @@ { "bays": 2, "class": 6, - "cost": -1, + "cost": 1640350, "eddbID": 1561, "grp": "fh", "id": "fm", @@ -27,7 +27,7 @@ { "bays": 1, "class": 5, - "cost": -1, + "cost": 505130, "eddbID": 1562, "grp": "fh", "id": "fr", From c883d64cd60ab8282c14f29005d7790384e15cb1 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 18:38:07 +0100 Subject: [PATCH 09/49] Update integrity for life support --- dist/index.js | 90 ++++++++++++++++++++++++++++-- dist/index.json | 90 ++++++++++++++++++++++++++++-- modules/standard/life_support.json | 90 ++++++++++++++++++++++++++++-- 3 files changed, 255 insertions(+), 15 deletions(-) diff --git a/dist/index.js b/dist/index.js index 6c4f9fa..d3a415b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -3366,441 +3366,521 @@ module.exports = { rating: "A" } ], ls: [ { + boot: 1, class: 8, cost: 0, edID: 128064173, eddbID: 1031, grp: "ls", id: "lD", + integrity: 120, mass: 160, - power: 0, + power: .8, rating: "E", time: 300 }, { + boot: 1, class: 8, cost: 0, edID: 128064174, eddbID: 1032, grp: "ls", id: "lC", + integrity: 135, mass: 64, - power: 0, + power: .9, rating: "D", time: 450 }, { + boot: 1, class: 8, cost: 0, edID: 128064175, eddbID: 1033, grp: "ls", id: "lB", + integrity: 150, mass: 160, - power: 0, + power: 1, rating: "C", time: 600 }, { + boot: 1, class: 8, cost: 0, edID: 128064176, eddbID: 1034, grp: "ls", id: "lA", + integrity: 165, mass: 256, - power: 0, + power: 1.1, rating: "B", time: 900 }, { + boot: 1, class: 8, cost: 0, edID: 128064177, eddbID: 1035, grp: "ls", id: "lz", + integrity: 180, mass: 160, - power: 0, + power: 1.2, rating: "A", time: 1500 }, { + boot: 1, class: 7, cost: 249140, edID: 128064168, eddbID: 1026, grp: "ls", id: "ly", + integrity: 105, mass: 80, power: .72, rating: "E", time: 300 }, { + boot: 1, class: 7, cost: 622840, edID: 128064169, eddbID: 1027, grp: "ls", id: "lx", + integrity: 118, mass: 32, power: .81, rating: "D", time: 450 }, { + boot: 1, class: 7, cost: 1557110, edID: 128064170, eddbID: 1028, grp: "ls", id: "lw", + integrity: 131, mass: 80, power: .9, rating: "C", time: 600 }, { + boot: 1, class: 7, cost: 3892770, edID: 128064171, eddbID: 1029, grp: "ls", id: "lv", + integrity: 144, mass: 128, power: .99, rating: "B", time: 900 }, { + boot: 1, class: 7, cost: 9731930, edID: 128064172, eddbID: 1030, grp: "ls", id: "lu", + integrity: 157, mass: 80, power: 1.08, rating: "A", time: 1500 }, { + boot: 1, class: 6, cost: 88980, edID: 128064163, eddbID: 1021, grp: "ls", id: "lt", + integrity: 90, mass: 40, power: .64, rating: "E", time: 300 }, { + boot: 1, class: 6, cost: 222440, edID: 128064164, eddbID: 1022, grp: "ls", id: "ls", + integrity: 102, mass: 16, power: .72, rating: "D", time: 450 }, { + boot: 1, class: 6, cost: 556110, edID: 128064165, eddbID: 1023, grp: "ls", id: "lr", + integrity: 113, mass: 40, power: .8, rating: "C", time: 600 }, { + boot: 1, class: 6, cost: 1390280, edID: 128064166, eddbID: 1024, grp: "ls", id: "lq", + integrity: 124, mass: 64, power: .88, rating: "B", time: 900 }, { + boot: 1, class: 6, cost: 3475690, edID: 128064167, eddbID: 1025, grp: "ls", id: "lp", + integrity: 136, mass: 40, power: .96, rating: "A", time: 1500 }, { + boot: 1, class: 5, cost: 31780, edID: 128064158, eddbID: 1016, grp: "ls", id: "lo", + integrity: 77, mass: 20, power: .57, rating: "E", time: 300 }, { + boot: 1, class: 5, cost: 79440, edID: 128064159, eddbID: 1017, grp: "ls", id: "ln", + integrity: 86, mass: 8, power: .64, rating: "D", time: 450 }, { + boot: 1, class: 5, cost: 198610, edID: 128064160, eddbID: 1018, grp: "ls", id: "lm", + integrity: 96, mass: 20, power: .71, rating: "C", time: 600 }, { + boot: 1, class: 5, cost: 496530, edID: 128064161, eddbID: 1019, grp: "ls", id: "ll", + integrity: 106, mass: 32, power: .78, rating: "B", time: 900 }, { + boot: 1, class: 5, cost: 1241320, edID: 128064162, eddbID: 1020, grp: "ls", id: "lk", + integrity: 115, mass: 20, power: .85, rating: "A", time: 1500 }, { + boot: 1, class: 4, cost: 11350, edID: 128064153, eddbID: 1011, grp: "ls", id: "lj", + integrity: 64, mass: 10, power: .5, rating: "E", time: 300 }, { + boot: 1, class: 4, cost: 28370, edID: 128064154, eddbID: 1012, grp: "ls", id: "li", + integrity: 72, mass: 4, power: .56, rating: "D", time: 450 }, { + boot: 1, class: 4, cost: 70930, edID: 128064155, eddbID: 1013, grp: "ls", id: "lh", + integrity: 80, mass: 10, power: .62, rating: "C", time: 600 }, { + boot: 1, class: 4, cost: 177330, edID: 128064156, eddbID: 1014, grp: "ls", id: "lg", + integrity: 88, mass: 16, power: .68, rating: "B", time: 900 }, { + boot: 1, class: 4, cost: 443330, edID: 128064157, eddbID: 1015, grp: "ls", id: "lf", + integrity: 96, mass: 10, power: .74, rating: "A", time: 1500 }, { + boot: 1, class: 3, cost: 4050, edID: 128064148, eddbID: 1006, grp: "ls", id: "le", + integrity: 51, mass: 5, power: .42, rating: "E", time: 300 }, { + boot: 1, class: 3, cost: 10130, edID: 128064149, eddbID: 1007, grp: "ls", id: "ld", + integrity: 58, mass: 2, power: .48, rating: "D", time: 450 }, { + boot: 1, class: 3, cost: 25330, edID: 128064150, eddbID: 1008, grp: "ls", id: "lc", + integrity: 64, mass: 5, power: .53, rating: "C", time: 600 }, { + boot: 1, class: 3, cost: 63330, edID: 128064151, eddbID: 1009, grp: "ls", id: "lb", + integrity: 70, mass: 8, power: .58, rating: "B", time: 900 }, { + boot: 1, class: 3, cost: 158330, edID: 128064152, eddbID: 1010, grp: "ls", id: "la", + integrity: 77, mass: 5, power: .64, rating: "A", time: 1500 }, { + boot: 1, class: 2, cost: 1450, edID: 128064143, eddbID: 1001, grp: "ls", id: "l9", + integrity: 41, mass: 2.5, power: .37, rating: "E", time: 300 }, { + boot: 1, class: 2, cost: 3620, edID: 128064144, eddbID: 1002, grp: "ls", id: "l8", + integrity: 46, mass: 1, power: .41, rating: "D", time: 450 }, { + boot: 1, class: 2, cost: 9050, edID: 128064145, eddbID: 1003, grp: "ls", id: "l7", + integrity: 51, mass: 2.5, power: .46, rating: "C", time: 600 }, { + boot: 1, class: 2, cost: 22620, edID: 128064146, eddbID: 1004, grp: "ls", id: "l6", + integrity: 56, mass: 4, power: .51, rating: "B", time: 900 }, { + boot: 1, class: 2, cost: 56550, edID: 128064147, eddbID: 1005, grp: "ls", id: "l5", + integrity: 61, mass: 2.5, power: .55, rating: "A", time: 1500 }, { + boot: 1, class: 1, cost: 520, edID: 128064138, eddbID: 996, grp: "ls", id: "l4", + integrity: 32, mass: 1.3, power: .32, rating: "E", time: 300 }, { + boot: 1, class: 1, cost: 1290, edID: 128064139, eddbID: 997, grp: "ls", id: "l3", + integrity: 36, mass: .5, power: .36, rating: "D", time: 450 }, { + boot: 1, class: 1, cost: 3230, edID: 128064140, eddbID: 998, grp: "ls", id: "l2", + integrity: 40, mass: 1.3, power: .4, rating: "C", time: 600 }, { + boot: 1, class: 1, cost: 8080, edID: 128064141, eddbID: 999, grp: "ls", id: "l1", + integrity: 44, mass: 2, power: .44, rating: "B", time: 900 }, { + boot: 1, class: 1, cost: 20200, edID: 128064142, eddbID: 1e3, grp: "ls", id: "l0", + integrity: 48, mass: 1.3, power: .48, rating: "A", diff --git a/dist/index.json b/dist/index.json index 9a20747..6534952 100644 --- a/dist/index.json +++ b/dist/index.json @@ -5125,480 +5125,560 @@ ], "ls": [ { + "boot": 1, "class": 8, "cost": 0, "edID": 128064173, "eddbID": 1031, "grp": "ls", "id": "lD", + "integrity": 120, "mass": 160, - "power": 0, + "power": 0.8, "rating": "E", "time": 300 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064174, "eddbID": 1032, "grp": "ls", "id": "lC", + "integrity": 135, "mass": 64, - "power": 0, + "power": 0.9, "rating": "D", "time": 450 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064175, "eddbID": 1033, "grp": "ls", "id": "lB", + "integrity": 150, "mass": 160, - "power": 0, + "power": 1, "rating": "C", "time": 600 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064176, "eddbID": 1034, "grp": "ls", "id": "lA", + "integrity": 165, "mass": 256, - "power": 0, + "power": 1.1, "rating": "B", "time": 900 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064177, "eddbID": 1035, "grp": "ls", "id": "lz", + "integrity": 180, "mass": 160, - "power": 0, + "power": 1.2, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 7, "cost": 249140, "edID": 128064168, "eddbID": 1026, "grp": "ls", "id": "ly", + "integrity": 105, "mass": 80, "power": 0.72, "rating": "E", "time": 300 }, { + "boot": 1, "class": 7, "cost": 622840, "edID": 128064169, "eddbID": 1027, "grp": "ls", "id": "lx", + "integrity": 118, "mass": 32, "power": 0.81, "rating": "D", "time": 450 }, { + "boot": 1, "class": 7, "cost": 1557110, "edID": 128064170, "eddbID": 1028, "grp": "ls", "id": "lw", + "integrity": 131, "mass": 80, "power": 0.9, "rating": "C", "time": 600 }, { + "boot": 1, "class": 7, "cost": 3892770, "edID": 128064171, "eddbID": 1029, "grp": "ls", "id": "lv", + "integrity": 144, "mass": 128, "power": 0.99, "rating": "B", "time": 900 }, { + "boot": 1, "class": 7, "cost": 9731930, "edID": 128064172, "eddbID": 1030, "grp": "ls", "id": "lu", + "integrity": 157, "mass": 80, "power": 1.08, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 6, "cost": 88980, "edID": 128064163, "eddbID": 1021, "grp": "ls", "id": "lt", + "integrity": 90, "mass": 40, "power": 0.64, "rating": "E", "time": 300 }, { + "boot": 1, "class": 6, "cost": 222440, "edID": 128064164, "eddbID": 1022, "grp": "ls", "id": "ls", + "integrity": 102, "mass": 16, "power": 0.72, "rating": "D", "time": 450 }, { + "boot": 1, "class": 6, "cost": 556110, "edID": 128064165, "eddbID": 1023, "grp": "ls", "id": "lr", + "integrity": 113, "mass": 40, "power": 0.8, "rating": "C", "time": 600 }, { + "boot": 1, "class": 6, "cost": 1390280, "edID": 128064166, "eddbID": 1024, "grp": "ls", "id": "lq", + "integrity": 124, "mass": 64, "power": 0.88, "rating": "B", "time": 900 }, { + "boot": 1, "class": 6, "cost": 3475690, "edID": 128064167, "eddbID": 1025, "grp": "ls", "id": "lp", + "integrity": 136, "mass": 40, "power": 0.96, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 5, "cost": 31780, "edID": 128064158, "eddbID": 1016, "grp": "ls", "id": "lo", + "integrity": 77, "mass": 20, "power": 0.57, "rating": "E", "time": 300 }, { + "boot": 1, "class": 5, "cost": 79440, "edID": 128064159, "eddbID": 1017, "grp": "ls", "id": "ln", + "integrity": 86, "mass": 8, "power": 0.64, "rating": "D", "time": 450 }, { + "boot": 1, "class": 5, "cost": 198610, "edID": 128064160, "eddbID": 1018, "grp": "ls", "id": "lm", + "integrity": 96, "mass": 20, "power": 0.71, "rating": "C", "time": 600 }, { + "boot": 1, "class": 5, "cost": 496530, "edID": 128064161, "eddbID": 1019, "grp": "ls", "id": "ll", + "integrity": 106, "mass": 32, "power": 0.78, "rating": "B", "time": 900 }, { + "boot": 1, "class": 5, "cost": 1241320, "edID": 128064162, "eddbID": 1020, "grp": "ls", "id": "lk", + "integrity": 115, "mass": 20, "power": 0.85, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 4, "cost": 11350, "edID": 128064153, "eddbID": 1011, "grp": "ls", "id": "lj", + "integrity": 64, "mass": 10, "power": 0.5, "rating": "E", "time": 300 }, { + "boot": 1, "class": 4, "cost": 28370, "edID": 128064154, "eddbID": 1012, "grp": "ls", "id": "li", + "integrity": 72, "mass": 4, "power": 0.56, "rating": "D", "time": 450 }, { + "boot": 1, "class": 4, "cost": 70930, "edID": 128064155, "eddbID": 1013, "grp": "ls", "id": "lh", + "integrity": 80, "mass": 10, "power": 0.62, "rating": "C", "time": 600 }, { + "boot": 1, "class": 4, "cost": 177330, "edID": 128064156, "eddbID": 1014, "grp": "ls", "id": "lg", + "integrity": 88, "mass": 16, "power": 0.68, "rating": "B", "time": 900 }, { + "boot": 1, "class": 4, "cost": 443330, "edID": 128064157, "eddbID": 1015, "grp": "ls", "id": "lf", + "integrity": 96, "mass": 10, "power": 0.74, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 3, "cost": 4050, "edID": 128064148, "eddbID": 1006, "grp": "ls", "id": "le", + "integrity": 51, "mass": 5, "power": 0.42, "rating": "E", "time": 300 }, { + "boot": 1, "class": 3, "cost": 10130, "edID": 128064149, "eddbID": 1007, "grp": "ls", "id": "ld", + "integrity": 58, "mass": 2, "power": 0.48, "rating": "D", "time": 450 }, { + "boot": 1, "class": 3, "cost": 25330, "edID": 128064150, "eddbID": 1008, "grp": "ls", "id": "lc", + "integrity": 64, "mass": 5, "power": 0.53, "rating": "C", "time": 600 }, { + "boot": 1, "class": 3, "cost": 63330, "edID": 128064151, "eddbID": 1009, "grp": "ls", "id": "lb", + "integrity": 70, "mass": 8, "power": 0.58, "rating": "B", "time": 900 }, { + "boot": 1, "class": 3, "cost": 158330, "edID": 128064152, "eddbID": 1010, "grp": "ls", "id": "la", + "integrity": 77, "mass": 5, "power": 0.64, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 2, "cost": 1450, "edID": 128064143, "eddbID": 1001, "grp": "ls", "id": "l9", + "integrity": 41, "mass": 2.5, "power": 0.37, "rating": "E", "time": 300 }, { + "boot": 1, "class": 2, "cost": 3620, "edID": 128064144, "eddbID": 1002, "grp": "ls", "id": "l8", + "integrity": 46, "mass": 1, "power": 0.41, "rating": "D", "time": 450 }, { + "boot": 1, "class": 2, "cost": 9050, "edID": 128064145, "eddbID": 1003, "grp": "ls", "id": "l7", + "integrity": 51, "mass": 2.5, "power": 0.46, "rating": "C", "time": 600 }, { + "boot": 1, "class": 2, "cost": 22620, "edID": 128064146, "eddbID": 1004, "grp": "ls", "id": "l6", + "integrity": 56, "mass": 4, "power": 0.51, "rating": "B", "time": 900 }, { + "boot": 1, "class": 2, "cost": 56550, "edID": 128064147, "eddbID": 1005, "grp": "ls", "id": "l5", + "integrity": 61, "mass": 2.5, "power": 0.55, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 1, "cost": 520, "edID": 128064138, "eddbID": 996, "grp": "ls", "id": "l4", + "integrity": 32, "mass": 1.3, "power": 0.32, "rating": "E", "time": 300 }, { + "boot": 1, "class": 1, "cost": 1290, "edID": 128064139, "eddbID": 997, "grp": "ls", "id": "l3", + "integrity": 36, "mass": 0.5, "power": 0.36, "rating": "D", "time": 450 }, { + "boot": 1, "class": 1, "cost": 3230, "edID": 128064140, "eddbID": 998, "grp": "ls", "id": "l2", + "integrity": 40, "mass": 1.3, "power": 0.4, "rating": "C", "time": 600 }, { + "boot": 1, "class": 1, "cost": 8080, "edID": 128064141, "eddbID": 999, "grp": "ls", "id": "l1", + "integrity": 44, "mass": 2, "power": 0.44, "rating": "B", "time": 900 }, { + "boot": 1, "class": 1, "cost": 20200, "edID": 128064142, "eddbID": 1000, "grp": "ls", "id": "l0", + "integrity": 48, "mass": 1.3, "power": 0.48, "rating": "A", diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json index 055ba89..d75de9e 100644 --- a/modules/standard/life_support.json +++ b/modules/standard/life_support.json @@ -1,480 +1,560 @@ { "ls": [ { + "boot": 1, "class": 8, "cost": 0, "edID": 128064173, "eddbID": 1031, "grp": "ls", "id": "lD", + "integrity": 120, "mass": 160, - "power": 0, + "power": 0.8, "rating": "E", "time": 300 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064174, "eddbID": 1032, "grp": "ls", "id": "lC", + "integrity": 135, "mass": 64, - "power": 0, + "power": 0.9, "rating": "D", "time": 450 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064175, "eddbID": 1033, "grp": "ls", "id": "lB", + "integrity": 150, "mass": 160, - "power": 0, + "power": 1, "rating": "C", "time": 600 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064176, "eddbID": 1034, "grp": "ls", "id": "lA", + "integrity": 165, "mass": 256, - "power": 0, + "power": 1.1, "rating": "B", "time": 900 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064177, "eddbID": 1035, "grp": "ls", "id": "lz", + "integrity": 180, "mass": 160, - "power": 0, + "power": 1.2, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 7, "cost": 249140, "edID": 128064168, "eddbID": 1026, "grp": "ls", "id": "ly", + "integrity": 105, "mass": 80, "power": 0.72, "rating": "E", "time": 300 }, { + "boot": 1, "class": 7, "cost": 622840, "edID": 128064169, "eddbID": 1027, "grp": "ls", "id": "lx", + "integrity": 118, "mass": 32, "power": 0.81, "rating": "D", "time": 450 }, { + "boot": 1, "class": 7, "cost": 1557110, "edID": 128064170, "eddbID": 1028, "grp": "ls", "id": "lw", + "integrity": 131, "mass": 80, "power": 0.9, "rating": "C", "time": 600 }, { + "boot": 1, "class": 7, "cost": 3892770, "edID": 128064171, "eddbID": 1029, "grp": "ls", "id": "lv", + "integrity": 144, "mass": 128, "power": 0.99, "rating": "B", "time": 900 }, { + "boot": 1, "class": 7, "cost": 9731930, "edID": 128064172, "eddbID": 1030, "grp": "ls", "id": "lu", + "integrity": 157, "mass": 80, "power": 1.08, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 6, "cost": 88980, "edID": 128064163, "eddbID": 1021, "grp": "ls", "id": "lt", + "integrity": 90, "mass": 40, "power": 0.64, "rating": "E", "time": 300 }, { + "boot": 1, "class": 6, "cost": 222440, "edID": 128064164, "eddbID": 1022, "grp": "ls", "id": "ls", + "integrity": 102, "mass": 16, "power": 0.72, "rating": "D", "time": 450 }, { + "boot": 1, "class": 6, "cost": 556110, "edID": 128064165, "eddbID": 1023, "grp": "ls", "id": "lr", + "integrity": 113, "mass": 40, "power": 0.8, "rating": "C", "time": 600 }, { + "boot": 1, "class": 6, "cost": 1390280, "edID": 128064166, "eddbID": 1024, "grp": "ls", "id": "lq", + "integrity": 124, "mass": 64, "power": 0.88, "rating": "B", "time": 900 }, { + "boot": 1, "class": 6, "cost": 3475690, "edID": 128064167, "eddbID": 1025, "grp": "ls", "id": "lp", + "integrity": 136, "mass": 40, "power": 0.96, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 5, "cost": 31780, "edID": 128064158, "eddbID": 1016, "grp": "ls", "id": "lo", + "integrity": 77, "mass": 20, "power": 0.57, "rating": "E", "time": 300 }, { + "boot": 1, "class": 5, "cost": 79440, "edID": 128064159, "eddbID": 1017, "grp": "ls", "id": "ln", + "integrity": 86, "mass": 8, "power": 0.64, "rating": "D", "time": 450 }, { + "boot": 1, "class": 5, "cost": 198610, "edID": 128064160, "eddbID": 1018, "grp": "ls", "id": "lm", + "integrity": 96, "mass": 20, "power": 0.71, "rating": "C", "time": 600 }, { + "boot": 1, "class": 5, "cost": 496530, "edID": 128064161, "eddbID": 1019, "grp": "ls", "id": "ll", + "integrity": 106, "mass": 32, "power": 0.78, "rating": "B", "time": 900 }, { + "boot": 1, "class": 5, "cost": 1241320, "edID": 128064162, "eddbID": 1020, "grp": "ls", "id": "lk", + "integrity": 115, "mass": 20, "power": 0.85, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 4, "cost": 11350, "edID": 128064153, "eddbID": 1011, "grp": "ls", "id": "lj", + "integrity": 64, "mass": 10, "power": 0.5, "rating": "E", "time": 300 }, { + "boot": 1, "class": 4, "cost": 28370, "edID": 128064154, "eddbID": 1012, "grp": "ls", "id": "li", + "integrity": 72, "mass": 4, "power": 0.56, "rating": "D", "time": 450 }, { + "boot": 1, "class": 4, "cost": 70930, "edID": 128064155, "eddbID": 1013, "grp": "ls", "id": "lh", + "integrity": 80, "mass": 10, "power": 0.62, "rating": "C", "time": 600 }, { + "boot": 1, "class": 4, "cost": 177330, "edID": 128064156, "eddbID": 1014, "grp": "ls", "id": "lg", + "integrity": 88, "mass": 16, "power": 0.68, "rating": "B", "time": 900 }, { + "boot": 1, "class": 4, "cost": 443330, "edID": 128064157, "eddbID": 1015, "grp": "ls", "id": "lf", + "integrity": 96, "mass": 10, "power": 0.74, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 3, "cost": 4050, "edID": 128064148, "eddbID": 1006, "grp": "ls", "id": "le", + "integrity": 51, "mass": 5, "power": 0.42, "rating": "E", "time": 300 }, { + "boot": 1, "class": 3, "cost": 10130, "edID": 128064149, "eddbID": 1007, "grp": "ls", "id": "ld", + "integrity": 58, "mass": 2, "power": 0.48, "rating": "D", "time": 450 }, { + "boot": 1, "class": 3, "cost": 25330, "edID": 128064150, "eddbID": 1008, "grp": "ls", "id": "lc", + "integrity": 64, "mass": 5, "power": 0.53, "rating": "C", "time": 600 }, { + "boot": 1, "class": 3, "cost": 63330, "edID": 128064151, "eddbID": 1009, "grp": "ls", "id": "lb", + "integrity": 70, "mass": 8, "power": 0.58, "rating": "B", "time": 900 }, { + "boot": 1, "class": 3, "cost": 158330, "edID": 128064152, "eddbID": 1010, "grp": "ls", "id": "la", + "integrity": 77, "mass": 5, "power": 0.64, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 2, "cost": 1450, "edID": 128064143, "eddbID": 1001, "grp": "ls", "id": "l9", + "integrity": 41, "mass": 2.5, "power": 0.37, "rating": "E", "time": 300 }, { + "boot": 1, "class": 2, "cost": 3620, "edID": 128064144, "eddbID": 1002, "grp": "ls", "id": "l8", + "integrity": 46, "mass": 1, "power": 0.41, "rating": "D", "time": 450 }, { + "boot": 1, "class": 2, "cost": 9050, "edID": 128064145, "eddbID": 1003, "grp": "ls", "id": "l7", + "integrity": 51, "mass": 2.5, "power": 0.46, "rating": "C", "time": 600 }, { + "boot": 1, "class": 2, "cost": 22620, "edID": 128064146, "eddbID": 1004, "grp": "ls", "id": "l6", + "integrity": 56, "mass": 4, "power": 0.51, "rating": "B", "time": 900 }, { + "boot": 1, "class": 2, "cost": 56550, "edID": 128064147, "eddbID": 1005, "grp": "ls", "id": "l5", + "integrity": 61, "mass": 2.5, "power": 0.55, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 1, "cost": 520, "edID": 128064138, "eddbID": 996, "grp": "ls", "id": "l4", + "integrity": 32, "mass": 1.3, "power": 0.32, "rating": "E", "time": 300 }, { + "boot": 1, "class": 1, "cost": 1290, "edID": 128064139, "eddbID": 997, "grp": "ls", "id": "l3", + "integrity": 36, "mass": 0.5, "power": 0.36, "rating": "D", "time": 450 }, { + "boot": 1, "class": 1, "cost": 3230, "edID": 128064140, "eddbID": 998, "grp": "ls", "id": "l2", + "integrity": 40, "mass": 1.3, "power": 0.4, "rating": "C", "time": 600 }, { + "boot": 1, "class": 1, "cost": 8080, "edID": 128064141, "eddbID": 999, "grp": "ls", "id": "l1", + "integrity": 44, "mass": 2, "power": 0.44, "rating": "B", "time": 900 }, { + "boot": 1, "class": 1, "cost": 20200, "edID": 128064142, "eddbID": 1000, "grp": "ls", "id": "l0", + "integrity": 48, "mass": 1.3, "power": 0.48, "rating": "A", From 427c193bf1d8b393a32bf0aa5c755541e2ff35a2 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 23 Oct 2016 00:50:11 +0100 Subject: [PATCH 10/49] Added integrity for thrusters --- modules/standard/thrusters.json | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index b15bfb4..76a731b 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -9,6 +9,7 @@ "eddbID": 956, "grp": "t", "id": "ty", + "integrity": 135, "mass": 160, "maxmass": 3360, "optmass": 2240, @@ -24,6 +25,7 @@ "eddbID": 957, "grp": "t", "id": "tx", + "integrity": 120, "mass": 64, "maxmass": 3780, "optmass": 2520, @@ -39,6 +41,7 @@ "eddbID": 958, "grp": "t", "id": "tw", + "integrity": 150, "mass": 160, "maxmass": 4200, "optmass": 2800, @@ -54,6 +57,7 @@ "eddbID": 959, "grp": "t", "id": "tv", + "integrity": 180, "mass": 256, "maxmass": 4620, "optmass": 3080, @@ -69,6 +73,7 @@ "eddbID": 960, "grp": "t", "id": "tu", + "integrity": 165, "mass": 160, "maxmass": 5040, "optmass": 3360, @@ -84,6 +89,7 @@ "eddbID": 951, "grp": "t", "id": "tt", + "integrity": 118, "mass": 80, "maxmass": 2160, "optmass": 1440, @@ -99,6 +105,7 @@ "eddbID": 952, "grp": "t", "id": "ts", + "integrity": 105, "mass": 32, "maxmass": 2430, "optmass": 1620, @@ -114,6 +121,7 @@ "eddbID": 953, "grp": "t", "id": "tr", + "integrity": 131, "mass": 80, "maxmass": 2700, "optmass": 1800, @@ -129,6 +137,7 @@ "eddbID": 954, "grp": "t", "id": "tq", + "integrity": 157, "mass": 128, "maxmass": 2970, "optmass": 1980, @@ -144,6 +153,7 @@ "eddbID": 955, "grp": "t", "id": "tp", + "integrity": 144, "mass": 80, "maxmass": 3240, "optmass": 2160, @@ -159,6 +169,7 @@ "eddbID": 946, "grp": "t", "id": "to", + "integrity": 102, "mass": 40, "maxmass": 1440, "optmass": 960, @@ -174,6 +185,7 @@ "eddbID": 947, "grp": "t", "id": "tn", + "integrity": 90, "mass": 16, "maxmass": 1620, "optmass": 1080, @@ -189,6 +201,7 @@ "eddbID": 948, "grp": "t", "id": "tm", + "integrity": 113, "mass": 40, "maxmass": 1800, "optmass": 1200, @@ -204,6 +217,7 @@ "eddbID": 949, "grp": "t", "id": "tl", + "integrity": 136, "mass": 64, "maxmass": 1980, "optmass": 1320, @@ -219,6 +233,7 @@ "eddbID": 950, "grp": "t", "id": "tk", + "integrity": 124, "mass": 40, "maxmass": 2160, "optmass": 1440, @@ -234,6 +249,7 @@ "eddbID": 941, "grp": "t", "id": "tj", + "integrity": 86, "mass": 20, "maxmass": 840, "optmass": 560, @@ -249,6 +265,7 @@ "eddbID": 942, "grp": "t", "id": "ti", + "integrity": 77, "mass": 8, "maxmass": 945, "optmass": 630, @@ -264,6 +281,7 @@ "eddbID": 943, "grp": "t", "id": "th", + "integrity": 96, "mass": 20, "maxmass": 1050, "optmass": 700, @@ -279,6 +297,7 @@ "eddbID": 944, "grp": "t", "id": "tg", + "integrity": 115, "mass": 32, "maxmass": 1155, "optmass": 770, @@ -294,6 +313,7 @@ "eddbID": 945, "grp": "t", "id": "tf", + "integrity": 106, "mass": 20, "maxmass": 1260, "optmass": 840, @@ -309,6 +329,7 @@ "eddbID": 936, "grp": "t", "id": "te", + "integrity": 72, "mass": 10, "maxmass": 420, "optmass": 280, @@ -324,6 +345,7 @@ "eddbID": 937, "grp": "t", "id": "td", + "integrity": 64, "mass": 4, "maxmass": 473, "optmass": 315, @@ -339,6 +361,7 @@ "eddbID": 938, "grp": "t", "id": "tc", + "integrity": 80, "mass": 10, "maxmass": 525, "optmass": 350, @@ -354,6 +377,7 @@ "eddbID": 939, "grp": "t", "id": "tb", + "integrity": 96, "mass": 16, "maxmass": 578, "optmass": 385, @@ -369,6 +393,7 @@ "eddbID": 940, "grp": "t", "id": "ta", + "integrity": 88, "mass": 10, "maxmass": 630, "optmass": 420, @@ -384,6 +409,7 @@ "eddbID": 931, "grp": "t", "id": "t9", + "integrity": 58, "mass": 5, "maxmass": 120, "optmass": 80, @@ -399,6 +425,7 @@ "eddbID": 932, "grp": "t", "id": "t8", + "integrity": 51, "mass": 2, "maxmass": 135, "optmass": 90, @@ -414,6 +441,7 @@ "eddbID": 933, "grp": "t", "id": "t7", + "integrity": 64, "mass": 5, "maxmass": 150, "optmass": 100, @@ -429,6 +457,7 @@ "eddbID": 934, "grp": "t", "id": "t6", + "integrity": 77, "mass": 8, "maxmass": 165, "optmass": 110, @@ -444,6 +473,7 @@ "eddbID": 935, "grp": "t", "id": "t5", + "integrity": 72, "mass": 5, "maxmass": 180, "optmass": 120, @@ -459,6 +489,7 @@ "eddbID": 926, "grp": "t", "id": "t4", + "integrity": 46, "mass": 2.5, "maxmass": 72, "optmass": 48, @@ -474,6 +505,7 @@ "eddbID": 927, "grp": "t", "id": "t3", + "integrity": 41, "mass": 1, "maxmass": 81, "optmass": 54, @@ -489,6 +521,7 @@ "eddbID": 928, "grp": "t", "id": "t2", + "integrity": 51, "mass": 2.5, "maxmass": 90, "optmass": 60, @@ -504,6 +537,7 @@ "eddbID": 929, "grp": "t", "id": "t1", + "integrity": 61, "mass": 4, "maxmass": 99, "optmass": 66, @@ -519,6 +553,7 @@ "eddbID": 930, "grp": "t", "id": "t0", + "integrity": 56, "mass": 2.5, "maxmass": 108, "optmass": 72, @@ -534,6 +569,7 @@ "eddbID": 1548, "grp": "t", "id": "tz", + "integrity": 70, "mass": 5, "maxmass": 200, "name": "Enhanced Performance", @@ -550,6 +586,7 @@ "eddbID": 1547, "grp": "t", "id": "u0", + "integrity": 56, "mass": 2.5, "maxmass": 120, "name": "Enhanced Performance", From e44bb14fc219165efaa37a4192d4ba6fc4571106 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Mon, 24 Oct 2016 13:17:11 +0100 Subject: [PATCH 11/49] Add modification information --- dist/index.js | 78 +++++++++++++++++++++++++- dist/index.json | 106 +++++++++++++++++++++++++++++++++++ generate_distribution.js | 5 +- modifications/index.js | 4 ++ modifications/modifiers.json | 27 +++++++++ modifications/validity.json | 40 +++++++++++++ 6 files changed, 257 insertions(+), 3 deletions(-) create mode 100644 modifications/index.js create mode 100644 modifications/modifiers.json create mode 100644 modifications/validity.json diff --git a/dist/index.js b/dist/index.js index d3a415b..e3fc29f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2327,6 +2327,7 @@ module.exports = { eddbID: 956, grp: "t", id: "ty", + integrity: 135, mass: 160, maxmass: 3360, optmass: 2240, @@ -2341,6 +2342,7 @@ module.exports = { eddbID: 957, grp: "t", id: "tx", + integrity: 120, mass: 64, maxmass: 3780, optmass: 2520, @@ -2355,6 +2357,7 @@ module.exports = { eddbID: 958, grp: "t", id: "tw", + integrity: 150, mass: 160, maxmass: 4200, optmass: 2800, @@ -2369,6 +2372,7 @@ module.exports = { eddbID: 959, grp: "t", id: "tv", + integrity: 180, mass: 256, maxmass: 4620, optmass: 3080, @@ -2383,6 +2387,7 @@ module.exports = { eddbID: 960, grp: "t", id: "tu", + integrity: 165, mass: 160, maxmass: 5040, optmass: 3360, @@ -2397,6 +2402,7 @@ module.exports = { eddbID: 951, grp: "t", id: "tt", + integrity: 118, mass: 80, maxmass: 2160, optmass: 1440, @@ -2411,6 +2417,7 @@ module.exports = { eddbID: 952, grp: "t", id: "ts", + integrity: 105, mass: 32, maxmass: 2430, optmass: 1620, @@ -2425,6 +2432,7 @@ module.exports = { eddbID: 953, grp: "t", id: "tr", + integrity: 131, mass: 80, maxmass: 2700, optmass: 1800, @@ -2439,6 +2447,7 @@ module.exports = { eddbID: 954, grp: "t", id: "tq", + integrity: 157, mass: 128, maxmass: 2970, optmass: 1980, @@ -2453,6 +2462,7 @@ module.exports = { eddbID: 955, grp: "t", id: "tp", + integrity: 144, mass: 80, maxmass: 3240, optmass: 2160, @@ -2467,6 +2477,7 @@ module.exports = { eddbID: 946, grp: "t", id: "to", + integrity: 102, mass: 40, maxmass: 1440, optmass: 960, @@ -2481,6 +2492,7 @@ module.exports = { eddbID: 947, grp: "t", id: "tn", + integrity: 90, mass: 16, maxmass: 1620, optmass: 1080, @@ -2495,6 +2507,7 @@ module.exports = { eddbID: 948, grp: "t", id: "tm", + integrity: 113, mass: 40, maxmass: 1800, optmass: 1200, @@ -2509,6 +2522,7 @@ module.exports = { eddbID: 949, grp: "t", id: "tl", + integrity: 136, mass: 64, maxmass: 1980, optmass: 1320, @@ -2523,6 +2537,7 @@ module.exports = { eddbID: 950, grp: "t", id: "tk", + integrity: 124, mass: 40, maxmass: 2160, optmass: 1440, @@ -2537,6 +2552,7 @@ module.exports = { eddbID: 941, grp: "t", id: "tj", + integrity: 86, mass: 20, maxmass: 840, optmass: 560, @@ -2551,6 +2567,7 @@ module.exports = { eddbID: 942, grp: "t", id: "ti", + integrity: 77, mass: 8, maxmass: 945, optmass: 630, @@ -2565,6 +2582,7 @@ module.exports = { eddbID: 943, grp: "t", id: "th", + integrity: 96, mass: 20, maxmass: 1050, optmass: 700, @@ -2579,6 +2597,7 @@ module.exports = { eddbID: 944, grp: "t", id: "tg", + integrity: 115, mass: 32, maxmass: 1155, optmass: 770, @@ -2593,6 +2612,7 @@ module.exports = { eddbID: 945, grp: "t", id: "tf", + integrity: 106, mass: 20, maxmass: 1260, optmass: 840, @@ -2607,6 +2627,7 @@ module.exports = { eddbID: 936, grp: "t", id: "te", + integrity: 72, mass: 10, maxmass: 420, optmass: 280, @@ -2621,6 +2642,7 @@ module.exports = { eddbID: 937, grp: "t", id: "td", + integrity: 64, mass: 4, maxmass: 473, optmass: 315, @@ -2635,6 +2657,7 @@ module.exports = { eddbID: 938, grp: "t", id: "tc", + integrity: 80, mass: 10, maxmass: 525, optmass: 350, @@ -2649,6 +2672,7 @@ module.exports = { eddbID: 939, grp: "t", id: "tb", + integrity: 96, mass: 16, maxmass: 578, optmass: 385, @@ -2663,6 +2687,7 @@ module.exports = { eddbID: 940, grp: "t", id: "ta", + integrity: 88, mass: 10, maxmass: 630, optmass: 420, @@ -2677,6 +2702,7 @@ module.exports = { eddbID: 931, grp: "t", id: "t9", + integrity: 58, mass: 5, maxmass: 120, optmass: 80, @@ -2691,6 +2717,7 @@ module.exports = { eddbID: 932, grp: "t", id: "t8", + integrity: 51, mass: 2, maxmass: 135, optmass: 90, @@ -2705,6 +2732,7 @@ module.exports = { eddbID: 933, grp: "t", id: "t7", + integrity: 64, mass: 5, maxmass: 150, optmass: 100, @@ -2719,6 +2747,7 @@ module.exports = { eddbID: 934, grp: "t", id: "t6", + integrity: 77, mass: 8, maxmass: 165, optmass: 110, @@ -2733,6 +2762,7 @@ module.exports = { eddbID: 935, grp: "t", id: "t5", + integrity: 72, mass: 5, maxmass: 180, optmass: 120, @@ -2747,6 +2777,7 @@ module.exports = { eddbID: 926, grp: "t", id: "t4", + integrity: 46, mass: 2.5, maxmass: 72, optmass: 48, @@ -2761,6 +2792,7 @@ module.exports = { eddbID: 927, grp: "t", id: "t3", + integrity: 41, mass: 1, maxmass: 81, optmass: 54, @@ -2775,6 +2807,7 @@ module.exports = { eddbID: 928, grp: "t", id: "t2", + integrity: 51, mass: 2.5, maxmass: 90, optmass: 60, @@ -2789,6 +2822,7 @@ module.exports = { eddbID: 929, grp: "t", id: "t1", + integrity: 61, mass: 4, maxmass: 99, optmass: 66, @@ -2803,6 +2837,7 @@ module.exports = { eddbID: 930, grp: "t", id: "t0", + integrity: 56, mass: 2.5, maxmass: 108, optmass: 72, @@ -2817,6 +2852,7 @@ module.exports = { eddbID: 1548, grp: "t", id: "tz", + integrity: 70, mass: 5, maxmass: 200, name: "Enhanced Performance", @@ -2832,6 +2868,7 @@ module.exports = { eddbID: 1547, grp: "t", id: "u0", + integrity: 56, mass: 2.5, maxmass: 120, name: "Enhanced Performance", @@ -11910,5 +11947,44 @@ module.exports = { recover: 1 } ] } + }, + Modifications: { + modifiers: { + "1": { + value: "pGen", + description: "Modifier for power generation", + operator: "multiply" + }, + "2": { + value: "power", + description: "Modifier for power usage", + operator: "multiply" + }, + "3": { + value: "integrity", + description: "Modifier for integrity", + operator: "multiply" + }, + "4": { + value: "mass", + description: "Modifier for mass", + operator: "multiply" + }, + "5": { + value: "eff", + description: "Modifier for heat efficiency", + operator: "multiply" + } + }, + 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 ], + ft: [], + pas: [] + } } -}; \ No newline at end of file +}; diff --git a/dist/index.json b/dist/index.json index 6534952..fcfa0ae 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4012,6 +4012,7 @@ "eddbID": 956, "grp": "t", "id": "ty", + "integrity": 135, "mass": 160, "maxmass": 3360, "optmass": 2240, @@ -4027,6 +4028,7 @@ "eddbID": 957, "grp": "t", "id": "tx", + "integrity": 120, "mass": 64, "maxmass": 3780, "optmass": 2520, @@ -4042,6 +4044,7 @@ "eddbID": 958, "grp": "t", "id": "tw", + "integrity": 150, "mass": 160, "maxmass": 4200, "optmass": 2800, @@ -4057,6 +4060,7 @@ "eddbID": 959, "grp": "t", "id": "tv", + "integrity": 180, "mass": 256, "maxmass": 4620, "optmass": 3080, @@ -4072,6 +4076,7 @@ "eddbID": 960, "grp": "t", "id": "tu", + "integrity": 165, "mass": 160, "maxmass": 5040, "optmass": 3360, @@ -4087,6 +4092,7 @@ "eddbID": 951, "grp": "t", "id": "tt", + "integrity": 118, "mass": 80, "maxmass": 2160, "optmass": 1440, @@ -4102,6 +4108,7 @@ "eddbID": 952, "grp": "t", "id": "ts", + "integrity": 105, "mass": 32, "maxmass": 2430, "optmass": 1620, @@ -4117,6 +4124,7 @@ "eddbID": 953, "grp": "t", "id": "tr", + "integrity": 131, "mass": 80, "maxmass": 2700, "optmass": 1800, @@ -4132,6 +4140,7 @@ "eddbID": 954, "grp": "t", "id": "tq", + "integrity": 157, "mass": 128, "maxmass": 2970, "optmass": 1980, @@ -4147,6 +4156,7 @@ "eddbID": 955, "grp": "t", "id": "tp", + "integrity": 144, "mass": 80, "maxmass": 3240, "optmass": 2160, @@ -4162,6 +4172,7 @@ "eddbID": 946, "grp": "t", "id": "to", + "integrity": 102, "mass": 40, "maxmass": 1440, "optmass": 960, @@ -4177,6 +4188,7 @@ "eddbID": 947, "grp": "t", "id": "tn", + "integrity": 90, "mass": 16, "maxmass": 1620, "optmass": 1080, @@ -4192,6 +4204,7 @@ "eddbID": 948, "grp": "t", "id": "tm", + "integrity": 113, "mass": 40, "maxmass": 1800, "optmass": 1200, @@ -4207,6 +4220,7 @@ "eddbID": 949, "grp": "t", "id": "tl", + "integrity": 136, "mass": 64, "maxmass": 1980, "optmass": 1320, @@ -4222,6 +4236,7 @@ "eddbID": 950, "grp": "t", "id": "tk", + "integrity": 124, "mass": 40, "maxmass": 2160, "optmass": 1440, @@ -4237,6 +4252,7 @@ "eddbID": 941, "grp": "t", "id": "tj", + "integrity": 86, "mass": 20, "maxmass": 840, "optmass": 560, @@ -4252,6 +4268,7 @@ "eddbID": 942, "grp": "t", "id": "ti", + "integrity": 77, "mass": 8, "maxmass": 945, "optmass": 630, @@ -4267,6 +4284,7 @@ "eddbID": 943, "grp": "t", "id": "th", + "integrity": 96, "mass": 20, "maxmass": 1050, "optmass": 700, @@ -4282,6 +4300,7 @@ "eddbID": 944, "grp": "t", "id": "tg", + "integrity": 115, "mass": 32, "maxmass": 1155, "optmass": 770, @@ -4297,6 +4316,7 @@ "eddbID": 945, "grp": "t", "id": "tf", + "integrity": 106, "mass": 20, "maxmass": 1260, "optmass": 840, @@ -4312,6 +4332,7 @@ "eddbID": 936, "grp": "t", "id": "te", + "integrity": 72, "mass": 10, "maxmass": 420, "optmass": 280, @@ -4327,6 +4348,7 @@ "eddbID": 937, "grp": "t", "id": "td", + "integrity": 64, "mass": 4, "maxmass": 473, "optmass": 315, @@ -4342,6 +4364,7 @@ "eddbID": 938, "grp": "t", "id": "tc", + "integrity": 80, "mass": 10, "maxmass": 525, "optmass": 350, @@ -4357,6 +4380,7 @@ "eddbID": 939, "grp": "t", "id": "tb", + "integrity": 96, "mass": 16, "maxmass": 578, "optmass": 385, @@ -4372,6 +4396,7 @@ "eddbID": 940, "grp": "t", "id": "ta", + "integrity": 88, "mass": 10, "maxmass": 630, "optmass": 420, @@ -4387,6 +4412,7 @@ "eddbID": 931, "grp": "t", "id": "t9", + "integrity": 58, "mass": 5, "maxmass": 120, "optmass": 80, @@ -4402,6 +4428,7 @@ "eddbID": 932, "grp": "t", "id": "t8", + "integrity": 51, "mass": 2, "maxmass": 135, "optmass": 90, @@ -4417,6 +4444,7 @@ "eddbID": 933, "grp": "t", "id": "t7", + "integrity": 64, "mass": 5, "maxmass": 150, "optmass": 100, @@ -4432,6 +4460,7 @@ "eddbID": 934, "grp": "t", "id": "t6", + "integrity": 77, "mass": 8, "maxmass": 165, "optmass": 110, @@ -4447,6 +4476,7 @@ "eddbID": 935, "grp": "t", "id": "t5", + "integrity": 72, "mass": 5, "maxmass": 180, "optmass": 120, @@ -4462,6 +4492,7 @@ "eddbID": 926, "grp": "t", "id": "t4", + "integrity": 46, "mass": 2.5, "maxmass": 72, "optmass": 48, @@ -4477,6 +4508,7 @@ "eddbID": 927, "grp": "t", "id": "t3", + "integrity": 41, "mass": 1, "maxmass": 81, "optmass": 54, @@ -4492,6 +4524,7 @@ "eddbID": 928, "grp": "t", "id": "t2", + "integrity": 51, "mass": 2.5, "maxmass": 90, "optmass": 60, @@ -4507,6 +4540,7 @@ "eddbID": 929, "grp": "t", "id": "t1", + "integrity": 61, "mass": 4, "maxmass": 99, "optmass": 66, @@ -4522,6 +4556,7 @@ "eddbID": 930, "grp": "t", "id": "t0", + "integrity": 56, "mass": 2.5, "maxmass": 108, "optmass": 72, @@ -4537,6 +4572,7 @@ "eddbID": 1548, "grp": "t", "id": "tz", + "integrity": 70, "mass": 5, "maxmass": 200, "name": "Enhanced Performance", @@ -4553,6 +4589,7 @@ "eddbID": 1547, "grp": "t", "id": "u0", + "integrity": 56, "mass": 2.5, "maxmass": 120, "name": "Enhanced Performance", @@ -14303,5 +14340,74 @@ } ] } + }, + "Modifications": { + "modifiers": { + "1": { + "value": "pGen", + "description": "Modifier for power generation", + "operator": "multiply" + }, + "2": { + "value": "power", + "description": "Modifier for power usage", + "operator": "multiply" + }, + "3": { + "value": "integrity", + "description": "Modifier for integrity", + "operator": "multiply" + }, + "4": { + "value": "mass", + "description": "Modifier for mass", + "operator": "multiply" + }, + "5": { + "value": "eff", + "description": "Modifier for heat efficiency", + "operator": "multiply" + } + }, + "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 + ], + "ft": [], + "pas": [] + } } } \ No newline at end of file diff --git a/generate_distribution.js b/generate_distribution.js index 64d37c6..8221027 100644 --- a/generate_distribution.js +++ b/generate_distribution.js @@ -2,8 +2,9 @@ var fs = require('fs'); var UglifyJS = require('uglify-js'); var Ships = require('./ships'); var Modules = require('./modules'); -var exportString = JSON.stringify({ Ships: Ships, Modules: Modules }, null, '\t'); -var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules }), ';'].join('')); +var Modifications = require('./modifications'); +var exportString = JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }, null, '\t'); +var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }), ';'].join('')); var code = ast.print_to_string({beautify: true, indent_level: 2}); fs.open('./dist/index.json', 'w', function() { diff --git a/modifications/index.js b/modifications/index.js new file mode 100644 index 0000000..cd3513d --- /dev/null +++ b/modifications/index.js @@ -0,0 +1,4 @@ +module.exports = { + modifiers: require('./modifiers'), + validity: require('./validity') +}; diff --git a/modifications/modifiers.json b/modifications/modifiers.json new file mode 100644 index 0000000..b371ca5 --- /dev/null +++ b/modifications/modifiers.json @@ -0,0 +1,27 @@ +{ + "1": { + "value": "pGen", + "description": "Modifier for power generation", + "operator": "multiply" + }, + "2": { + "value": "power", + "description": "Modifier for power usage", + "operator": "multiply" + }, + "3": { + "value": "integrity", + "description": "Modifier for integrity", + "operator": "multiply" + }, + "4": { + "value": "mass", + "description": "Modifier for mass", + "operator": "multiply" + }, + "5": { + "value": "eff", + "description": "Modifier for heat efficiency", + "operator": "multiply" + } +} diff --git a/modifications/validity.json b/modifications/validity.json new file mode 100644 index 0000000..04e63ee --- /dev/null +++ b/modifications/validity.json @@ -0,0 +1,40 @@ +{ + "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 + ], + "ft": [], + "pas": [] +} From 0f8f2f70f3a64309a10b34d2e051511d63fc9f6d Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Tue, 25 Oct 2016 13:37:16 +0100 Subject: [PATCH 12/49] Add names for modifiers --- dist/index.js | 7 ++++++- dist/index.json | 5 +++++ modifications/modifiers.json | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index e3fc29f..70bb879 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11952,26 +11952,31 @@ module.exports = { modifiers: { "1": { value: "pGen", + name: "Power generation", description: "Modifier for power generation", operator: "multiply" }, "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" }, "5": { value: "eff", + name: "Heat efficiency", description: "Modifier for heat efficiency", operator: "multiply" } @@ -11987,4 +11992,4 @@ module.exports = { pas: [] } } -}; +}; \ No newline at end of file diff --git a/dist/index.json b/dist/index.json index fcfa0ae..272f271 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14345,26 +14345,31 @@ "modifiers": { "1": { "value": "pGen", + "name": "Power generation", "description": "Modifier for power generation", "operator": "multiply" }, "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" }, "5": { "value": "eff", + "name": "Heat efficiency", "description": "Modifier for heat efficiency", "operator": "multiply" } diff --git a/modifications/modifiers.json b/modifications/modifiers.json index b371ca5..8acd866 100644 --- a/modifications/modifiers.json +++ b/modifications/modifiers.json @@ -1,26 +1,31 @@ { "1": { "value": "pGen", + "name": "Power generation", "description": "Modifier for power generation", "operator": "multiply" }, "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" }, "5": { "value": "eff", + "name": "Heat efficiency", "description": "Modifier for heat efficiency", "operator": "multiply" } From e7e1ef320636bc7778eb0c5225add2518e6f61b9 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 28 Oct 2016 01:46:03 +0100 Subject: [PATCH 13/49] Add range for modifiers --- dist/index.js | 8 ++++++-- dist/index.json | 8 ++++++-- modifications/modifiers.json | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index 70bb879..a52dd79 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11954,7 +11954,9 @@ module.exports = { value: "pGen", name: "Power generation", description: "Modifier for power generation", - operator: "multiply" + operator: "multiply", + min: -.35, + max: .5 }, "2": { value: "power", @@ -11972,7 +11974,9 @@ module.exports = { value: "mass", name: "Mass", description: "Modifier for mass", - operator: "multiply" + operator: "multiply", + min: -1, + max: 3.5 }, "5": { value: "eff", diff --git a/dist/index.json b/dist/index.json index 272f271..79f1ffc 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14347,7 +14347,9 @@ "value": "pGen", "name": "Power generation", "description": "Modifier for power generation", - "operator": "multiply" + "operator": "multiply", + "min": -0.35, + "max": 0.5 }, "2": { "value": "power", @@ -14365,7 +14367,9 @@ "value": "mass", "name": "Mass", "description": "Modifier for mass", - "operator": "multiply" + "operator": "multiply", + "min": -1, + "max": 3.5 }, "5": { "value": "eff", diff --git a/modifications/modifiers.json b/modifications/modifiers.json index 8acd866..0fd32d6 100644 --- a/modifications/modifiers.json +++ b/modifications/modifiers.json @@ -3,7 +3,9 @@ "value": "pGen", "name": "Power generation", "description": "Modifier for power generation", - "operator": "multiply" + "operator": "multiply", + "min": -0.35, + "max": 0.50 }, "2": { "value": "power", @@ -21,7 +23,9 @@ "value": "mass", "name": "Mass", "description": "Modifier for mass", - "operator": "multiply" + "operator": "multiply", + "min": -1, + "max": 3.50 }, "5": { "value": "eff", From 5438cdcee6ec45ed2360f6728a6581b2c0ff8b45 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 29 Oct 2016 13:27:57 +0100 Subject: [PATCH 14/49] Updated stats for chaff and packhounds --- dist/index.js | 14 ++++++++------ dist/index.json | 14 ++++++++------ modules/hardpoints/countermeasures.json | 3 ++- modules/hardpoints/missile_rack.json | 8 ++++---- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5dd647d..e42b0a0 100644 --- a/dist/index.js +++ b/dist/index.js @@ -6749,7 +6749,7 @@ module.exports = { mr: [ { ammo: 48, armourpen: 60, - breachdps: 0, + breachdps: 4.8, breachmax: 0, breachmin: 0, class: 2, @@ -6759,6 +6759,7 @@ module.exports = { eddbID: 1559, eps: .12, grp: "mr", + hps: 1.08, id: "1z", integrity: 51, mass: 4, @@ -6880,18 +6881,18 @@ module.exports = { }, { ammo: 120, armourpen: 60, - breachdps: 3.6, + breachdps: 6, breachmax: 0, breachmin: 0, class: 2, clip: 12, cost: 768600, - dps: 72, + dps: 60, edID: 128671344, eddbID: 1480, - eps: .48, + eps: 1.92, grp: "mr", - hps: 7.2, + hps: 28.8, id: "Ph", integrity: 51, mass: 4, @@ -7178,7 +7179,8 @@ module.exports = { passive: 1, power: .2, rating: "I", - reload: 10 + reload: 10, + rof: 1 }, { activepower: 4, chargeup: 4, diff --git a/dist/index.json b/dist/index.json index a0b130b..69249b3 100644 --- a/dist/index.json +++ b/dist/index.json @@ -8725,7 +8725,7 @@ { "ammo": 48, "armourpen": 60, - "breachdps": 0, + "breachdps": 4.8, "breachmax": 0, "breachmin": 0, "class": 2, @@ -8735,6 +8735,7 @@ "eddbID": 1559, "eps": 0.12, "grp": "mr", + "hps": 1.08, "id": "1z", "integrity": 51, "mass": 4, @@ -8861,18 +8862,18 @@ { "ammo": 120, "armourpen": 60, - "breachdps": 3.6, + "breachdps": 6, "breachmax": 0, "breachmin": 0, "class": 2, "clip": 12, "cost": 768600, - "dps": 72, + "dps": 60, "edID": 128671344, "eddbID": 1480, - "eps": 0.48, + "eps": 1.92, "grp": "mr", - "hps": 7.2, + "hps": 28.8, "id": "Ph", "integrity": 51, "mass": 4, @@ -9178,7 +9179,8 @@ "passive": 1, "power": 0.2, "rating": "I", - "reload": 10 + "reload": 10, + "rof": 1 }, { "activepower": 4, diff --git a/modules/hardpoints/countermeasures.json b/modules/hardpoints/countermeasures.json index 0f3a434..a91b0d2 100644 --- a/modules/hardpoints/countermeasures.json +++ b/modules/hardpoints/countermeasures.json @@ -18,7 +18,8 @@ "passive": 1, "power": 0.2, "rating": "I", - "reload": 10 + "reload": 10, + "rof": 1 }, { "activepower": 4, diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index 1e13182..0785b38 100644 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -140,18 +140,18 @@ { "ammo": 120, "armourpen": 60, - "breachdps": 3.6, + "breachdps": 6, "breachmax": 0, "breachmin": 0, "class": 2, "clip": 12, "cost": 768600, - "dps": 72, + "dps": 60, "edID": 128671344, "eddbID": 1480, - "eps": 0.48, + "eps": 1.92, "grp": "mr", - "hps": 7.2, + "hps": 28.8, "id": "Ph", "integrity": 51, "mass": 4, From e8e69c0715e18be4c9f614c284031d43cb3d73a0 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 29 Oct 2016 15:18:41 +0100 Subject: [PATCH 15/49] Updated prices with 2.2 live --- dist/index.js | 71 ++++++++++++------ dist/index.json | 71 ++++++++++++------ modifications/.modifiers.json.swp | Bin 0 -> 12288 bytes modules/hardpoints/mine_launcher.json | 1 + .../internal/business_passenger_cabin.json | 12 ++- modules/internal/economy_passenger_cabin.json | 15 ++-- modules/internal/fighter_hangar.json | 9 ++- modules/internal/first_passenger_cabin.json | 9 ++- modules/internal/luxury_passenger_cabin.json | 6 +- ships/beluga.json | 16 ++-- 10 files changed, 137 insertions(+), 73 deletions(-) create mode 100644 modifications/.modifiers.json.swp diff --git a/dist/index.js b/dist/index.js index e42b0a0..5a68781 100644 --- a/dist/index.js +++ b/dist/index.js @@ -246,13 +246,13 @@ module.exports = { } }, beluga: { - edID: -1, + edID: 128049345, eddbID: 30, properties: { name: "Beluga Liner", manufacturer: "Saud Kruger", class: 3, - hullCost: -1, + hullCost: 79654610, speed: 195, boost: 273, boostEnergy: 20, @@ -265,31 +265,36 @@ module.exports = { luxuryCabins: true, fighterHangars: true }, - retailCost: -1, + retailCost: 84532770, bulkheads: [ { id: "cl", + edID: 128049346, eddbID: 1554, cost: 0, mass: 0 }, { id: "cm", + edID: 128049347, eddbID: 1555, - cost: -1, + cost: 33813120, mass: 83 }, { id: "cn", + edID: 128049348, eddbID: 1556, - cost: -1, + cost: 76079500, mass: 165 }, { id: "co", + edID: 128049349, eddbID: 1557, - cost: -1, + cost: 179801200, mass: 165 }, { id: "cp", + edID: 128049350, eddbID: 1558, - cost: -1, + cost: 199243730, mass: 165 } ], slots: { @@ -7019,6 +7024,7 @@ module.exports = { clip: 3, cost: 36400, dps: 32, + eps: 0, edID: 128671448, eddbID: 1523, grp: "nl", @@ -8425,7 +8431,8 @@ module.exports = { fh: [ { bays: 2, class: 7, - cost: -1, + cost: 575660, + edID: 128727930, eddbID: 1560, grp: "fh", id: "fh", @@ -8436,7 +8443,8 @@ module.exports = { }, { bays: 2, class: 6, - cost: -1, + cost: 1869350, + edID: 128727931, eddbID: 1561, grp: "fh", id: "fm", @@ -8447,7 +8455,8 @@ module.exports = { }, { bays: 1, class: 5, - cost: -1, + cost: 2369330, + edID: 128727932, eddbID: 1562, grp: "fh", id: "fr", @@ -10209,7 +10218,8 @@ module.exports = { } ], pce: [ { class: 2, - cost: -1, + cost: 4320, + edID: 128734690, eddbID: 1563, grp: "pce", id: "ma", @@ -10218,7 +10228,8 @@ module.exports = { rating: "E" }, { class: 3, - cost: -1, + cost: 8670, + edID: 128734691, eddbID: 1564, grp: "pce", id: "mb", @@ -10227,7 +10238,8 @@ module.exports = { rating: "E" }, { class: 4, - cost: -1, + cost: 18960, + edID: 128727922, eddbID: 1565, grp: "pce", id: "mc", @@ -10236,7 +10248,8 @@ module.exports = { rating: "E" }, { class: 5, - cost: -1, + cost: 34960, + edID: 128734693, eddbID: 1566, grp: "pce", id: "md", @@ -10245,7 +10258,8 @@ module.exports = { rating: "E" }, { class: 6, - cost: -1, + cost: 61420, + edID: 12872926, eddbID: 1567, grp: "pce", id: "me", @@ -10255,7 +10269,8 @@ module.exports = { } ], pci: [ { class: 3, - cost: -1, + cost: 26720, + edID: 128734692, eddbID: 1568, grp: "pci", id: "mf", @@ -10264,7 +10279,8 @@ module.exports = { rating: "D" }, { class: 4, - cost: -1, + cost: 56870, + edID: 128727923, eddbID: 1569, grp: "pci", id: "mg", @@ -10273,7 +10289,8 @@ module.exports = { rating: "D" }, { class: 5, - cost: -1, + cost: 92370, + edID: 128734694, eddbID: 1570, grp: "pci", id: "mh", @@ -10282,7 +10299,8 @@ module.exports = { rating: "D" }, { class: 6, - cost: -1, + cost: 184240, + edID: 128727927, eddbID: 1571, grp: "pci", id: "mi", @@ -10292,7 +10310,8 @@ module.exports = { } ], pcm: [ { class: 4, - cost: -1, + cost: 170600, + edID: 128727924, eddbID: 1572, grp: "pcm", id: "mj", @@ -10301,7 +10320,8 @@ module.exports = { rating: "C" }, { class: 5, - cost: -1, + cost: 340540, + edID: 128734695, eddbID: 1573, grp: "pcm", id: "mk", @@ -10310,7 +10330,8 @@ module.exports = { rating: "C" }, { class: 6, - cost: -1, + cost: 552700, + edID: 128727928, eddbID: 1574, grp: "pcm", id: "ml", @@ -10320,7 +10341,8 @@ module.exports = { } ], pcq: [ { class: 5, - cost: -1, + cost: 1658100, + edID: 128727095, eddbID: 1575, grp: "pcq", id: "mm", @@ -10329,7 +10351,8 @@ module.exports = { rating: "B" }, { class: 6, - cost: -1, + cost: 4974300, + edID: 128727929, eddbID: 1576, grp: "pcq", id: "mn", diff --git a/dist/index.json b/dist/index.json index 69249b3..f5cdffa 100644 --- a/dist/index.json +++ b/dist/index.json @@ -480,13 +480,13 @@ } }, "beluga": { - "edID": -1, + "edID": 128049345, "eddbID": 30, "properties": { "name": "Beluga Liner", "manufacturer": "Saud Kruger", "class": 3, - "hullCost": -1, + "hullCost": 79654610, "speed": 195, "boost": 273, "boostEnergy": 20, @@ -499,36 +499,41 @@ "luxuryCabins": true, "fighterHangars": true }, - "retailCost": -1, + "retailCost": 84532770, "bulkheads": [ { "id": "cl", + "edID": 128049346, "eddbID": 1554, "cost": 0, "mass": 0 }, { "id": "cm", + "edID": 128049347, "eddbID": 1555, - "cost": -1, + "cost": 33813120, "mass": 83 }, { "id": "cn", + "edID": 128049348, "eddbID": 1556, - "cost": -1, + "cost": 76079500, "mass": 165 }, { "id": "co", + "edID": 128049349, "eddbID": 1557, - "cost": -1, + "cost": 179801200, "mass": 165 }, { "id": "cp", + "edID": 128049350, "eddbID": 1558, - "cost": -1, + "cost": 199243730, "mass": 165 } ], @@ -9007,6 +9012,7 @@ "clip": 3, "cost": 36400, "dps": 32, + "eps": 0, "edID": 128671448, "eddbID": 1523, "grp": "nl", @@ -10532,7 +10538,8 @@ { "bays": 2, "class": 7, - "cost": -1, + "cost": 575660, + "edID": 128727930, "eddbID": 1560, "grp": "fh", "id": "fh", @@ -10544,7 +10551,8 @@ { "bays": 2, "class": 6, - "cost": -1, + "cost": 1869350, + "edID": 128727931, "eddbID": 1561, "grp": "fh", "id": "fm", @@ -10556,7 +10564,8 @@ { "bays": 1, "class": 5, - "cost": -1, + "cost": 2369330, + "edID": 128727932, "eddbID": 1562, "grp": "fh", "id": "fr", @@ -12481,7 +12490,8 @@ "pce": [ { "class": 2, - "cost": -1, + "cost": 4320, + "edID": 128734690, "eddbID": 1563, "grp": "pce", "id": "ma", @@ -12491,7 +12501,8 @@ }, { "class": 3, - "cost": -1, + "cost": 8670, + "edID": 128734691, "eddbID": 1564, "grp": "pce", "id": "mb", @@ -12501,7 +12512,8 @@ }, { "class": 4, - "cost": -1, + "cost": 18960, + "edID": 128727922, "eddbID": 1565, "grp": "pce", "id": "mc", @@ -12511,7 +12523,8 @@ }, { "class": 5, - "cost": -1, + "cost": 34960, + "edID": 128734693, "eddbID": 1566, "grp": "pce", "id": "md", @@ -12521,7 +12534,8 @@ }, { "class": 6, - "cost": -1, + "cost": 61420, + "edID": 12872926, "eddbID": 1567, "grp": "pce", "id": "me", @@ -12533,7 +12547,8 @@ "pci": [ { "class": 3, - "cost": -1, + "cost": 26720, + "edID": 128734692, "eddbID": 1568, "grp": "pci", "id": "mf", @@ -12543,7 +12558,8 @@ }, { "class": 4, - "cost": -1, + "cost": 56870, + "edID": 128727923, "eddbID": 1569, "grp": "pci", "id": "mg", @@ -12553,7 +12569,8 @@ }, { "class": 5, - "cost": -1, + "cost": 92370, + "edID": 128734694, "eddbID": 1570, "grp": "pci", "id": "mh", @@ -12563,7 +12580,8 @@ }, { "class": 6, - "cost": -1, + "cost": 184240, + "edID": 128727927, "eddbID": 1571, "grp": "pci", "id": "mi", @@ -12575,7 +12593,8 @@ "pcm": [ { "class": 4, - "cost": -1, + "cost": 170600, + "edID": 128727924, "eddbID": 1572, "grp": "pcm", "id": "mj", @@ -12585,7 +12604,8 @@ }, { "class": 5, - "cost": -1, + "cost": 340540, + "edID": 128734695, "eddbID": 1573, "grp": "pcm", "id": "mk", @@ -12595,7 +12615,8 @@ }, { "class": 6, - "cost": -1, + "cost": 552700, + "edID": 128727928, "eddbID": 1574, "grp": "pcm", "id": "ml", @@ -12607,7 +12628,8 @@ "pcq": [ { "class": 5, - "cost": -1, + "cost": 1658100, + "edID": 128727095, "eddbID": 1575, "grp": "pcq", "id": "mm", @@ -12617,7 +12639,8 @@ }, { "class": 6, - "cost": -1, + "cost": 4974300, + "edID": 128727929, "eddbID": 1576, "grp": "pcq", "id": "mn", diff --git a/modifications/.modifiers.json.swp b/modifications/.modifiers.json.swp new file mode 100644 index 0000000000000000000000000000000000000000..e004a41afb833d8e87c5adb7bc28acc7cfca361c GIT binary patch literal 12288 zcmeI2ziZTB7{}iV*FkM7t&7`h+{DY>^?E%K2XWC8PC8h165b~7UEiAI4M|Qd$N2*a zA_y+J*+u*d9CWRNgS)Fx-31qM6TkVkZxT4}U8-JfwRzK= zW7v)`_UYNt>(gIek3Sh_Y^CeQNB_88Qf^po3+uerH_HowHXUsVXSnSyPFRt)Wmha6 zDD9}QY>P-#Ty3k4vP7h`7iQmN5SlBY_J+?wN5}vf*t3CN)G42ySgg<1s&VfL<2aw0 zUflC(sDTWS0Wv@a$N(8217v^6DYrWpGMHo*pX4190{Tm~(04x9v2 zU~`hOcVGj&0qbB5Tmxr86PVx_D1na?jJ*Y~zzeVro`U;8029oBNl*e`4>R@wyabQH z8t8)#Xaf#PfPwG0me1flcn%(b0Z6WK1m}n%lL0b72FL&zAOmE84Ez@c28{C<&JFF$ zKtwt)&Tzx+Ig#?6RU<9gGPDBa$7^HbYCBmgD+Auq0bkNO;*oNtaVj0`34F#Vti;`3 zxFwukQi)rV(MA&k`)C_vy(63q m>y3Y$t~6^`dhy#Lej#M%+j{KNz{B-lsV~U1$*3iv`|Kxoa*Y%K literal 0 HcmV?d00001 diff --git a/modules/hardpoints/mine_launcher.json b/modules/hardpoints/mine_launcher.json index 94606a0..7533a7b 100644 --- a/modules/hardpoints/mine_launcher.json +++ b/modules/hardpoints/mine_launcher.json @@ -60,6 +60,7 @@ "clip": 3, "cost": 36400, "dps": 32, + "eps": 0, "edID": 128671448, "eddbID": 1523, "grp": "nl", diff --git a/modules/internal/business_passenger_cabin.json b/modules/internal/business_passenger_cabin.json index 3fc59f2..f1a3972 100644 --- a/modules/internal/business_passenger_cabin.json +++ b/modules/internal/business_passenger_cabin.json @@ -2,7 +2,8 @@ "pci": [ { "class": 3, - "cost": -1, + "cost": 26720, + "edID": 128734692, "eddbID": 1568, "grp": "pci", "id": "mf", @@ -12,7 +13,8 @@ }, { "class": 4, - "cost": -1, + "cost": 56870, + "edID": 128727923, "eddbID": 1569, "grp": "pci", "id": "mg", @@ -22,7 +24,8 @@ }, { "class": 5, - "cost": -1, + "cost": 92370, + "edID": 128734694, "eddbID": 1570, "grp": "pci", "id": "mh", @@ -32,7 +35,8 @@ }, { "class": 6, - "cost": -1, + "cost": 184240, + "edID": 128727927, "eddbID": 1571, "grp": "pci", "id": "mi", diff --git a/modules/internal/economy_passenger_cabin.json b/modules/internal/economy_passenger_cabin.json index 878b076..35d3177 100644 --- a/modules/internal/economy_passenger_cabin.json +++ b/modules/internal/economy_passenger_cabin.json @@ -2,7 +2,8 @@ "pce": [ { "class": 2, - "cost": -1, + "cost": 4320, + "edID": 128734690, "eddbID": 1563, "grp": "pce", "id": "ma", @@ -12,7 +13,8 @@ }, { "class": 3, - "cost": -1, + "cost": 8670, + "edID": 128734691, "eddbID": 1564, "grp": "pce", "id": "mb", @@ -22,7 +24,8 @@ }, { "class": 4, - "cost": -1, + "cost": 18960, + "edID": 128727922, "eddbID": 1565, "grp": "pce", "id": "mc", @@ -32,7 +35,8 @@ }, { "class": 5, - "cost": -1, + "cost": 34960, + "edID": 128734693, "eddbID": 1566, "grp": "pce", "id": "md", @@ -42,7 +46,8 @@ }, { "class": 6, - "cost": -1, + "cost": 61420, + "edID": 12872926, "eddbID": 1567, "grp": "pce", "id": "me", diff --git a/modules/internal/fighter_hangar.json b/modules/internal/fighter_hangar.json index 2f14b2c..4f12734 100644 --- a/modules/internal/fighter_hangar.json +++ b/modules/internal/fighter_hangar.json @@ -3,7 +3,8 @@ { "bays": 2, "class": 7, - "cost": -1, + "cost": 575660, + "edID": 128727930, "eddbID": 1560, "grp": "fh", "id": "fh", @@ -15,7 +16,8 @@ { "bays": 2, "class": 6, - "cost": -1, + "cost": 1869350, + "edID": 128727931, "eddbID": 1561, "grp": "fh", "id": "fm", @@ -27,7 +29,8 @@ { "bays": 1, "class": 5, - "cost": -1, + "cost": 2369330, + "edID": 128727932, "eddbID": 1562, "grp": "fh", "id": "fr", diff --git a/modules/internal/first_passenger_cabin.json b/modules/internal/first_passenger_cabin.json index c7f8606..3cb2b03 100644 --- a/modules/internal/first_passenger_cabin.json +++ b/modules/internal/first_passenger_cabin.json @@ -2,7 +2,8 @@ "pcm": [ { "class": 4, - "cost": -1, + "cost": 170600, + "edID": 128727924, "eddbID": 1572, "grp": "pcm", "id": "mj", @@ -12,7 +13,8 @@ }, { "class": 5, - "cost": -1, + "cost": 340540, + "edID": 128734695, "eddbID": 1573, "grp": "pcm", "id": "mk", @@ -22,7 +24,8 @@ }, { "class": 6, - "cost": -1, + "cost": 552700, + "edID": 128727928, "eddbID": 1574, "grp": "pcm", "id": "ml", diff --git a/modules/internal/luxury_passenger_cabin.json b/modules/internal/luxury_passenger_cabin.json index 79d2822..42064db 100644 --- a/modules/internal/luxury_passenger_cabin.json +++ b/modules/internal/luxury_passenger_cabin.json @@ -2,7 +2,8 @@ "pcq": [ { "class": 5, - "cost": -1, + "cost": 1658100, + "edID": 128727095, "eddbID": 1575, "grp": "pcq", "id": "mm", @@ -12,7 +13,8 @@ }, { "class": 6, - "cost": -1, + "cost": 4974300, + "edID": 128727929, "eddbID": 1576, "grp": "pcq", "id": "mn", diff --git a/ships/beluga.json b/ships/beluga.json index 06be323..e50a266 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -1,12 +1,12 @@ { "beluga": { - "edID": -1, + "edID": 128049345, "eddbID": 30, "properties": { "name": "Beluga Liner", "manufacturer": "Saud Kruger", "class": 3, - "hullCost": -1, + "hullCost": 79654610, "speed": 195, "boost": 273, "boostEnergy": 20, @@ -19,13 +19,13 @@ "luxuryCabins": true, "fighterHangars": true }, - "retailCost": -1, + "retailCost": 84532770, "bulkheads": [ - { "id": "cl", "eddbID": 1554,"cost": 0, "mass": 0 }, - { "id": "cm", "eddbID": 1555,"cost": -1, "mass": 83 }, - { "id": "cn", "eddbID": 1556,"cost": -1, "mass": 165 }, - { "id": "co", "eddbID": 1557,"cost": -1, "mass": 165 }, - { "id": "cp", "eddbID": 1558,"cost": -1, "mass": 165 } + { "id": "cl", "edID": 128049346, "eddbID": 1554,"cost": 0, "mass": 0 }, + { "id": "cm", "edID": 128049347, "eddbID": 1555,"cost": 33813120, "mass": 83 }, + { "id": "cn", "edID": 128049348, "eddbID": 1556,"cost": 76079500, "mass": 165 }, + { "id": "co", "edID": 128049349, "eddbID": 1557,"cost": 179801200, "mass": 165 }, + { "id": "cp", "edID": 128049350, "eddbID": 1558,"cost": 199243730, "mass": 165 } ], "slots": { "standard": [6, 7, 7, 8, 6, 5, 7], From deada172419a7c2b0c372a690be697357f00effe Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 29 Oct 2016 18:24:35 +0100 Subject: [PATCH 16/49] Remove swpfile --- modifications/.modifiers.json.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modifications/.modifiers.json.swp diff --git a/modifications/.modifiers.json.swp b/modifications/.modifiers.json.swp deleted file mode 100644 index e004a41afb833d8e87c5adb7bc28acc7cfca361c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2ziZTB7{}iV*FkM7t&7`h+{DY>^?E%K2XWC8PC8h165b~7UEiAI4M|Qd$N2*a zA_y+J*+u*d9CWRNgS)Fx-31qM6TkVkZxT4}U8-JfwRzK= zW7v)`_UYNt>(gIek3Sh_Y^CeQNB_88Qf^po3+uerH_HowHXUsVXSnSyPFRt)Wmha6 zDD9}QY>P-#Ty3k4vP7h`7iQmN5SlBY_J+?wN5}vf*t3CN)G42ySgg<1s&VfL<2aw0 zUflC(sDTWS0Wv@a$N(8217v^6DYrWpGMHo*pX4190{Tm~(04x9v2 zU~`hOcVGj&0qbB5Tmxr86PVx_D1na?jJ*Y~zzeVro`U;8029oBNl*e`4>R@wyabQH z8t8)#Xaf#PfPwG0me1flcn%(b0Z6WK1m}n%lL0b72FL&zAOmE84Ez@c28{C<&JFF$ zKtwt)&Tzx+Ig#?6RU<9gGPDBa$7^HbYCBmgD+Auq0bkNO;*oNtaVj0`34F#Vti;`3 zxFwukQi)rV(MA&k`)C_vy(63q m>y3Y$t~6^`dhy#Lej#M%+j{KNz{B-lsV~U1$*3iv`|Kxoa*Y%K From 6925e0836a78df8d61a5d9d1ab071e81d31c33ff Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 30 Oct 2016 14:41:29 +0000 Subject: [PATCH 17/49] 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 a52dd79..29cb918 100644 --- a/dist/index.js +++ b/dist/index.js @@ -3928,641 +3928,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, @@ -11949,51 +11949,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 79f1ffc..9e6ff46 100644 --- a/dist/index.json +++ b/dist/index.json @@ -5728,680 +5728,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": [ @@ -14342,81 +14342,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 } ] } From 4041dca40e3814699e54b209ad78c4039aa60b68 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 11:58:33 +0100 Subject: [PATCH 18/49] Update integrity and efficiency numbers for power plants --- dist/index.js | 105 ++++++++++++++++++++---------- dist/index.json | 105 ++++++++++++++++++++---------- modules/standard/power_plant.json | 105 ++++++++++++++++++++---------- 3 files changed, 210 insertions(+), 105 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5a68781..a390da5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1907,9 +1907,10 @@ module.exports = { cost: 2007240, edID: 128064063, eddbID: 921, - eff: "F", + eff: 1, grp: "pp", id: "py", + integrity: 135, mass: 160, pGen: 24, rating: "E" @@ -1918,9 +1919,10 @@ module.exports = { cost: 6021720, edID: 128064064, eddbID: 922, - eff: "D", + eff: .75, grp: "pp", id: "px", + integrity: 120, mass: 64, pGen: 27, rating: "D" @@ -1929,9 +1931,10 @@ module.exports = { cost: 18065170, edID: 128064065, eddbID: 923, - eff: "C", + eff: .5, grp: "pp", id: "pw", + integrity: 150, mass: 80, pGen: 30, rating: "C" @@ -1940,9 +1943,10 @@ module.exports = { cost: 54195500, edID: 128064066, eddbID: 924, - eff: "C", + eff: .45, grp: "pp", id: "pv", + integrity: 180, mass: 128, pGen: 33, rating: "B" @@ -1951,9 +1955,10 @@ module.exports = { cost: 162586490, edID: 128064067, eddbID: 925, - eff: "B", + eff: .4, grp: "pp", id: "pu", + integrity: 165, mass: 80, pGen: 36, rating: "A" @@ -1962,9 +1967,10 @@ module.exports = { cost: 633200, edID: 128064058, eddbID: 916, - eff: "F", + eff: 1, grp: "pp", id: "pt", + integrity: 118, mass: 80, pGen: 20, rating: "E" @@ -1973,9 +1979,10 @@ module.exports = { cost: 1899600, edID: 128064059, eddbID: 917, - eff: "D", + eff: .75, grp: "pp", id: "ps", + integrity: 105, mass: 32, pGen: 22.5, rating: "D" @@ -1984,9 +1991,10 @@ module.exports = { cost: 5698790, edID: 128064060, eddbID: 918, - eff: "C", + eff: .5, grp: "pp", id: "pr", + integrity: 131, mass: 40, pGen: 25, rating: "C" @@ -1995,9 +2003,10 @@ module.exports = { cost: 17096370, edID: 128064061, eddbID: 919, - eff: "C", + eff: .45, grp: "pp", id: "pq", + integrity: 157, mass: 64, pGen: 27.5, rating: "B" @@ -2006,9 +2015,10 @@ module.exports = { cost: 51289110, edID: 128064062, eddbID: 920, - eff: "B", + eff: .4, grp: "pp", id: "pp", + integrity: 144, mass: 40, pGen: 30, rating: "A" @@ -2017,9 +2027,10 @@ module.exports = { cost: 199750, edID: 128064053, eddbID: 911, - eff: "F", + eff: 1, grp: "pp", id: "po", + integrity: 90, mass: 40, pGen: 16.8, rating: "E" @@ -2028,9 +2039,10 @@ module.exports = { cost: 599240, edID: 128064054, eddbID: 912, - eff: "D", + eff: .75, grp: "pp", id: "pn", + integrity: 113, mass: 16, pGen: 18.9, rating: "D" @@ -2039,9 +2051,10 @@ module.exports = { cost: 1797730, edID: 128064055, eddbID: 913, - eff: "C", + eff: .5, grp: "pp", id: "pm", + integrity: 136, mass: 20, pGen: 21, rating: "C" @@ -2050,9 +2063,10 @@ module.exports = { cost: 5393180, edID: 128064056, eddbID: 914, - eff: "C", + eff: .45, grp: "pp", id: "pl", + integrity: 124, mass: 32, pGen: 23.1, rating: "B" @@ -2061,9 +2075,10 @@ module.exports = { cost: 16179530, edID: 128064057, eddbID: 915, - eff: "B", + eff: .4, grp: "pp", id: "pk", + integrity: 118, mass: 20, pGen: 25.2, rating: "A" @@ -2072,9 +2087,10 @@ module.exports = { cost: 63010, edID: 128064048, eddbID: 906, - eff: "F", + eff: 1, grp: "pp", id: "pj", + integrity: 86, mass: 20, pGen: 13.6, rating: "E" @@ -2083,9 +2099,10 @@ module.exports = { cost: 189040, edID: 128064049, eddbID: 907, - eff: "D", + eff: .75, grp: "pp", id: "pi", + integrity: 77, mass: 8, pGen: 15.3, rating: "D" @@ -2094,9 +2111,10 @@ module.exports = { cost: 567110, edID: 128064050, eddbID: 908, - eff: "C", + eff: .5, grp: "pp", id: "ph", + integrity: 96, mass: 10, pGen: 17, rating: "C" @@ -2105,9 +2123,10 @@ module.exports = { cost: 1701320, edID: 128064051, eddbID: 909, - eff: "C", + eff: .45, grp: "pp", id: "pg", + integrity: 114, mass: 16, pGen: 18.7, rating: "B" @@ -2116,9 +2135,10 @@ module.exports = { cost: 5103950, edID: 128064052, eddbID: 910, - eff: "B", + eff: .4, grp: "pp", id: "pf", + integrity: 106, mass: 10, pGen: 20.4, rating: "A" @@ -2127,9 +2147,10 @@ module.exports = { cost: 19880, edID: 128064043, eddbID: 901, - eff: "F", + eff: 1, grp: "pp", id: "pe", + integrity: 72, mass: 10, pGen: 10.4, rating: "E" @@ -2138,9 +2159,10 @@ module.exports = { cost: 59630, edID: 128064044, eddbID: 902, - eff: "D", + eff: .75, grp: "pp", id: "pd", + integrity: 64, mass: 4, pGen: 11.7, rating: "D" @@ -2149,9 +2171,10 @@ module.exports = { cost: 178900, edID: 128064045, eddbID: 903, - eff: "C", + eff: .5, grp: "pp", id: "pc", + integrity: 80, mass: 5, pGen: 13, rating: "C" @@ -2160,9 +2183,10 @@ module.exports = { cost: 536690, edID: 128064046, eddbID: 904, - eff: "C", + eff: .45, grp: "pp", id: "pb", + integrity: 96, mass: 8, pGen: 14.3, rating: "B" @@ -2171,9 +2195,10 @@ module.exports = { cost: 1610080, edID: 128064047, eddbID: 905, - eff: "B", + eff: .4, grp: "pp", id: "pa", + integrity: 88, mass: 5, pGen: 15.6, rating: "A" @@ -2182,9 +2207,10 @@ module.exports = { cost: 6270, edID: 128064038, eddbID: 896, - eff: "F", + eff: 1, grp: "pp", id: "p9", + integrity: 58, mass: 5, pGen: 8, rating: "E" @@ -2193,9 +2219,10 @@ module.exports = { cost: 18810, edID: 128064039, eddbID: 897, - eff: "D", + eff: .75, grp: "pp", id: "p8", + integrity: 51, mass: 2, pGen: 9, rating: "D" @@ -2204,9 +2231,10 @@ module.exports = { cost: 56440, edID: 128064040, eddbID: 898, - eff: "C", + eff: .5, grp: "pp", id: "p7", + integrity: 64, mass: 2.5, pGen: 10, rating: "C" @@ -2215,9 +2243,10 @@ module.exports = { cost: 169300, edID: 128064041, eddbID: 899, - eff: "C", + eff: .45, grp: "pp", id: "p6", + integrity: 77, mass: 4, pGen: 11, rating: "B" @@ -2226,9 +2255,10 @@ module.exports = { cost: 507910, edID: 128064042, eddbID: 900, - eff: "B", + eff: .4, grp: "pp", id: "p5", + integrity: 70, mass: 2.5, pGen: 12, rating: "A" @@ -2237,9 +2267,10 @@ module.exports = { cost: 1980, edID: 128064033, eddbID: 891, - eff: "F", + eff: 1, grp: "pp", id: "p4", + integrity: 46, mass: 2.5, pGen: 6.4, rating: "E" @@ -2248,9 +2279,10 @@ module.exports = { cost: 5930, edID: 128064034, eddbID: 892, - eff: "D", + eff: .75, grp: "pp", id: "p3", + integrity: 41, mass: 1, pGen: 7.2, rating: "D" @@ -2259,9 +2291,10 @@ module.exports = { cost: 17800, edID: 128064035, eddbID: 893, - eff: "C", + eff: .5, grp: "pp", id: "p2", + integrity: 51, mass: 1.3, pGen: 8, rating: "C" @@ -2270,9 +2303,10 @@ module.exports = { cost: 53410, edID: 128064036, eddbID: 894, - eff: "C", + eff: .45, grp: "pp", id: "p1", + integrity: 61, mass: 2, pGen: 8.8, rating: "B" @@ -2281,9 +2315,10 @@ module.exports = { cost: 160220, edID: 128064037, eddbID: 895, - eff: "B", + eff: .4, grp: "pp", id: "p0", + integrity: 56, mass: 1.3, pGen: 9.6, rating: "A" diff --git a/dist/index.json b/dist/index.json index f5cdffa..94c395b 100644 --- a/dist/index.json +++ b/dist/index.json @@ -3556,9 +3556,10 @@ "cost": 2007240, "edID": 128064063, "eddbID": 921, - "eff": "F", + "eff": 1, "grp": "pp", "id": "py", + "integrity": 135, "mass": 160, "pGen": 24, "rating": "E" @@ -3568,9 +3569,10 @@ "cost": 6021720, "edID": 128064064, "eddbID": 922, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "px", + "integrity": 120, "mass": 64, "pGen": 27, "rating": "D" @@ -3580,9 +3582,10 @@ "cost": 18065170, "edID": 128064065, "eddbID": 923, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pw", + "integrity": 150, "mass": 80, "pGen": 30, "rating": "C" @@ -3592,9 +3595,10 @@ "cost": 54195500, "edID": 128064066, "eddbID": 924, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pv", + "integrity": 180, "mass": 128, "pGen": 33, "rating": "B" @@ -3604,9 +3608,10 @@ "cost": 162586490, "edID": 128064067, "eddbID": 925, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pu", + "integrity": 165, "mass": 80, "pGen": 36, "rating": "A" @@ -3616,9 +3621,10 @@ "cost": 633200, "edID": 128064058, "eddbID": 916, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pt", + "integrity": 118, "mass": 80, "pGen": 20, "rating": "E" @@ -3628,9 +3634,10 @@ "cost": 1899600, "edID": 128064059, "eddbID": 917, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "ps", + "integrity": 105, "mass": 32, "pGen": 22.5, "rating": "D" @@ -3640,9 +3647,10 @@ "cost": 5698790, "edID": 128064060, "eddbID": 918, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pr", + "integrity": 131, "mass": 40, "pGen": 25, "rating": "C" @@ -3652,9 +3660,10 @@ "cost": 17096370, "edID": 128064061, "eddbID": 919, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pq", + "integrity": 157, "mass": 64, "pGen": 27.5, "rating": "B" @@ -3664,9 +3673,10 @@ "cost": 51289110, "edID": 128064062, "eddbID": 920, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pp", + "integrity": 144, "mass": 40, "pGen": 30, "rating": "A" @@ -3676,9 +3686,10 @@ "cost": 199750, "edID": 128064053, "eddbID": 911, - "eff": "F", + "eff": 1, "grp": "pp", "id": "po", + "integrity": 90, "mass": 40, "pGen": 16.8, "rating": "E" @@ -3688,9 +3699,10 @@ "cost": 599240, "edID": 128064054, "eddbID": 912, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pn", + "integrity": 113, "mass": 16, "pGen": 18.9, "rating": "D" @@ -3700,9 +3712,10 @@ "cost": 1797730, "edID": 128064055, "eddbID": 913, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pm", + "integrity": 136, "mass": 20, "pGen": 21, "rating": "C" @@ -3712,9 +3725,10 @@ "cost": 5393180, "edID": 128064056, "eddbID": 914, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pl", + "integrity": 124, "mass": 32, "pGen": 23.1, "rating": "B" @@ -3724,9 +3738,10 @@ "cost": 16179530, "edID": 128064057, "eddbID": 915, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pk", + "integrity": 118, "mass": 20, "pGen": 25.2, "rating": "A" @@ -3736,9 +3751,10 @@ "cost": 63010, "edID": 128064048, "eddbID": 906, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pj", + "integrity": 86, "mass": 20, "pGen": 13.6, "rating": "E" @@ -3748,9 +3764,10 @@ "cost": 189040, "edID": 128064049, "eddbID": 907, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pi", + "integrity": 77, "mass": 8, "pGen": 15.3, "rating": "D" @@ -3760,9 +3777,10 @@ "cost": 567110, "edID": 128064050, "eddbID": 908, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "ph", + "integrity": 96, "mass": 10, "pGen": 17, "rating": "C" @@ -3772,9 +3790,10 @@ "cost": 1701320, "edID": 128064051, "eddbID": 909, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pg", + "integrity": 114, "mass": 16, "pGen": 18.7, "rating": "B" @@ -3784,9 +3803,10 @@ "cost": 5103950, "edID": 128064052, "eddbID": 910, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pf", + "integrity": 106, "mass": 10, "pGen": 20.4, "rating": "A" @@ -3796,9 +3816,10 @@ "cost": 19880, "edID": 128064043, "eddbID": 901, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pe", + "integrity": 72, "mass": 10, "pGen": 10.4, "rating": "E" @@ -3808,9 +3829,10 @@ "cost": 59630, "edID": 128064044, "eddbID": 902, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pd", + "integrity": 64, "mass": 4, "pGen": 11.7, "rating": "D" @@ -3820,9 +3842,10 @@ "cost": 178900, "edID": 128064045, "eddbID": 903, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pc", + "integrity": 80, "mass": 5, "pGen": 13, "rating": "C" @@ -3832,9 +3855,10 @@ "cost": 536690, "edID": 128064046, "eddbID": 904, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pb", + "integrity": 96, "mass": 8, "pGen": 14.3, "rating": "B" @@ -3844,9 +3868,10 @@ "cost": 1610080, "edID": 128064047, "eddbID": 905, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pa", + "integrity": 88, "mass": 5, "pGen": 15.6, "rating": "A" @@ -3856,9 +3881,10 @@ "cost": 6270, "edID": 128064038, "eddbID": 896, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p9", + "integrity": 58, "mass": 5, "pGen": 8, "rating": "E" @@ -3868,9 +3894,10 @@ "cost": 18810, "edID": 128064039, "eddbID": 897, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p8", + "integrity": 51, "mass": 2, "pGen": 9, "rating": "D" @@ -3880,9 +3907,10 @@ "cost": 56440, "edID": 128064040, "eddbID": 898, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p7", + "integrity": 64, "mass": 2.5, "pGen": 10, "rating": "C" @@ -3892,9 +3920,10 @@ "cost": 169300, "edID": 128064041, "eddbID": 899, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p6", + "integrity": 77, "mass": 4, "pGen": 11, "rating": "B" @@ -3904,9 +3933,10 @@ "cost": 507910, "edID": 128064042, "eddbID": 900, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p5", + "integrity": 70, "mass": 2.5, "pGen": 12, "rating": "A" @@ -3916,9 +3946,10 @@ "cost": 1980, "edID": 128064033, "eddbID": 891, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p4", + "integrity": 46, "mass": 2.5, "pGen": 6.4, "rating": "E" @@ -3928,9 +3959,10 @@ "cost": 5930, "edID": 128064034, "eddbID": 892, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p3", + "integrity": 41, "mass": 1, "pGen": 7.2, "rating": "D" @@ -3940,9 +3972,10 @@ "cost": 17800, "edID": 128064035, "eddbID": 893, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p2", + "integrity": 51, "mass": 1.3, "pGen": 8, "rating": "C" @@ -3952,9 +3985,10 @@ "cost": 53410, "edID": 128064036, "eddbID": 894, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p1", + "integrity": 61, "mass": 2, "pGen": 8.8, "rating": "B" @@ -3964,9 +3998,10 @@ "cost": 160220, "edID": 128064037, "eddbID": 895, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p0", + "integrity": 56, "mass": 1.3, "pGen": 9.6, "rating": "A" diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 3ce735e..6aa0e32 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -5,9 +5,10 @@ "cost": 2007240, "edID": 128064063, "eddbID": 921, - "eff": "F", + "eff": 1, "grp": "pp", "id": "py", + "integrity": 135, "mass": 160, "pGen": 24, "rating": "E" @@ -17,9 +18,10 @@ "cost": 6021720, "edID": 128064064, "eddbID": 922, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "px", + "integrity": 120, "mass": 64, "pGen": 27, "rating": "D" @@ -29,9 +31,10 @@ "cost": 18065170, "edID": 128064065, "eddbID": 923, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pw", + "integrity": 150, "mass": 80, "pGen": 30, "rating": "C" @@ -41,9 +44,10 @@ "cost": 54195500, "edID": 128064066, "eddbID": 924, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pv", + "integrity": 180, "mass": 128, "pGen": 33, "rating": "B" @@ -53,9 +57,10 @@ "cost": 162586490, "edID": 128064067, "eddbID": 925, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pu", + "integrity": 165, "mass": 80, "pGen": 36, "rating": "A" @@ -65,9 +70,10 @@ "cost": 633200, "edID": 128064058, "eddbID": 916, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pt", + "integrity": 118, "mass": 80, "pGen": 20, "rating": "E" @@ -77,9 +83,10 @@ "cost": 1899600, "edID": 128064059, "eddbID": 917, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "ps", + "integrity": 105, "mass": 32, "pGen": 22.5, "rating": "D" @@ -89,9 +96,10 @@ "cost": 5698790, "edID": 128064060, "eddbID": 918, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pr", + "integrity": 131, "mass": 40, "pGen": 25, "rating": "C" @@ -101,9 +109,10 @@ "cost": 17096370, "edID": 128064061, "eddbID": 919, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pq", + "integrity": 157, "mass": 64, "pGen": 27.5, "rating": "B" @@ -113,9 +122,10 @@ "cost": 51289110, "edID": 128064062, "eddbID": 920, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pp", + "integrity": 144, "mass": 40, "pGen": 30, "rating": "A" @@ -125,9 +135,10 @@ "cost": 199750, "edID": 128064053, "eddbID": 911, - "eff": "F", + "eff": 1, "grp": "pp", "id": "po", + "integrity": 90, "mass": 40, "pGen": 16.8, "rating": "E" @@ -137,9 +148,10 @@ "cost": 599240, "edID": 128064054, "eddbID": 912, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pn", + "integrity": 113, "mass": 16, "pGen": 18.9, "rating": "D" @@ -149,9 +161,10 @@ "cost": 1797730, "edID": 128064055, "eddbID": 913, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pm", + "integrity": 136, "mass": 20, "pGen": 21, "rating": "C" @@ -161,9 +174,10 @@ "cost": 5393180, "edID": 128064056, "eddbID": 914, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pl", + "integrity": 124, "mass": 32, "pGen": 23.1, "rating": "B" @@ -173,9 +187,10 @@ "cost": 16179530, "edID": 128064057, "eddbID": 915, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pk", + "integrity": 118, "mass": 20, "pGen": 25.2, "rating": "A" @@ -185,9 +200,10 @@ "cost": 63010, "edID": 128064048, "eddbID": 906, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pj", + "integrity": 86, "mass": 20, "pGen": 13.6, "rating": "E" @@ -197,9 +213,10 @@ "cost": 189040, "edID": 128064049, "eddbID": 907, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pi", + "integrity": 77, "mass": 8, "pGen": 15.3, "rating": "D" @@ -209,9 +226,10 @@ "cost": 567110, "edID": 128064050, "eddbID": 908, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "ph", + "integrity": 96, "mass": 10, "pGen": 17, "rating": "C" @@ -221,9 +239,10 @@ "cost": 1701320, "edID": 128064051, "eddbID": 909, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pg", + "integrity": 114, "mass": 16, "pGen": 18.7, "rating": "B" @@ -233,9 +252,10 @@ "cost": 5103950, "edID": 128064052, "eddbID": 910, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pf", + "integrity": 106, "mass": 10, "pGen": 20.4, "rating": "A" @@ -245,9 +265,10 @@ "cost": 19880, "edID": 128064043, "eddbID": 901, - "eff": "F", + "eff": 1, "grp": "pp", "id": "pe", + "integrity": 72, "mass": 10, "pGen": 10.4, "rating": "E" @@ -257,9 +278,10 @@ "cost": 59630, "edID": 128064044, "eddbID": 902, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "pd", + "integrity": 64, "mass": 4, "pGen": 11.7, "rating": "D" @@ -269,9 +291,10 @@ "cost": 178900, "edID": 128064045, "eddbID": 903, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "pc", + "integrity": 80, "mass": 5, "pGen": 13, "rating": "C" @@ -281,9 +304,10 @@ "cost": 536690, "edID": 128064046, "eddbID": 904, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "pb", + "integrity": 96, "mass": 8, "pGen": 14.3, "rating": "B" @@ -293,9 +317,10 @@ "cost": 1610080, "edID": 128064047, "eddbID": 905, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "pa", + "integrity": 88, "mass": 5, "pGen": 15.6, "rating": "A" @@ -305,9 +330,10 @@ "cost": 6270, "edID": 128064038, "eddbID": 896, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p9", + "integrity": 58, "mass": 5, "pGen": 8, "rating": "E" @@ -317,9 +343,10 @@ "cost": 18810, "edID": 128064039, "eddbID": 897, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p8", + "integrity": 51, "mass": 2, "pGen": 9, "rating": "D" @@ -329,9 +356,10 @@ "cost": 56440, "edID": 128064040, "eddbID": 898, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p7", + "integrity": 64, "mass": 2.5, "pGen": 10, "rating": "C" @@ -341,9 +369,10 @@ "cost": 169300, "edID": 128064041, "eddbID": 899, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p6", + "integrity": 77, "mass": 4, "pGen": 11, "rating": "B" @@ -353,9 +382,10 @@ "cost": 507910, "edID": 128064042, "eddbID": 900, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p5", + "integrity": 70, "mass": 2.5, "pGen": 12, "rating": "A" @@ -365,9 +395,10 @@ "cost": 1980, "edID": 128064033, "eddbID": 891, - "eff": "F", + "eff": 1, "grp": "pp", "id": "p4", + "integrity": 46, "mass": 2.5, "pGen": 6.4, "rating": "E" @@ -377,9 +408,10 @@ "cost": 5930, "edID": 128064034, "eddbID": 892, - "eff": "D", + "eff": 0.75, "grp": "pp", "id": "p3", + "integrity": 41, "mass": 1, "pGen": 7.2, "rating": "D" @@ -389,9 +421,10 @@ "cost": 17800, "edID": 128064035, "eddbID": 893, - "eff": "C", + "eff": 0.5, "grp": "pp", "id": "p2", + "integrity": 51, "mass": 1.3, "pGen": 8, "rating": "C" @@ -401,9 +434,10 @@ "cost": 53410, "edID": 128064036, "eddbID": 894, - "eff": "C", + "eff": 0.45, "grp": "pp", "id": "p1", + "integrity": 61, "mass": 2, "pGen": 8.8, "rating": "B" @@ -413,9 +447,10 @@ "cost": 160220, "edID": 128064037, "eddbID": 895, - "eff": "B", + "eff": 0.4, "grp": "pp", "id": "p0", + "integrity": 56, "mass": 1.3, "pGen": 9.6, "rating": "A" From b257b1c4e92cf585cc9700e3a2a914abcab13430 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 12:40:56 +0100 Subject: [PATCH 19/49] Update integrity and optimal mass numbers for FSDs --- dist/index.js | 100 +++++++--------------- dist/index.json | 105 +++++++----------------- modules/standard/frame_shift_drive.json | 37 ++++++++- 3 files changed, 96 insertions(+), 146 deletions(-) diff --git a/dist/index.js b/dist/index.js index a390da5..75a84c1 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2845,76 +2845,6 @@ module.exports = { rating: "A" } ], fsd: [ { - class: 8, - cost: 0, - edID: 128064133, - eddbID: 991, - fuelmul: .011, - fuelpower: 2.9, - grp: "fsd", - id: "Fy", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "E" - }, { - class: 8, - cost: 0, - edID: 128064134, - eddbID: 992, - fuelmul: .01, - fuelpower: 2.9, - grp: "fsd", - id: "Fx", - mass: 64, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "D" - }, { - class: 8, - cost: 0, - edID: 128064135, - eddbID: 993, - fuelmul: .008, - fuelpower: 2.9, - grp: "fsd", - id: "Fw", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "C" - }, { - class: 8, - cost: 0, - edID: 128064136, - eddbID: 994, - fuelmul: .01, - fuelpower: 2.9, - grp: "fsd", - id: "Fv", - mass: 256, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "B" - }, { - class: 8, - cost: 0, - edID: 128064137, - eddbID: 995, - fuelmul: .012, - fuelpower: 2.9, - grp: "fsd", - id: "Fu", - mass: 160, - maxfuel: 0, - optmass: 0, - power: 0, - rating: "A" - }, { class: 7, cost: 633200, edID: 128064128, @@ -2923,6 +2853,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Ft", + integrity: 118, mass: 80, maxfuel: 8.5, optmass: 1440, @@ -2937,6 +2868,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fs", + integrity: 105, mass: 32, maxfuel: 8.5, optmass: 1620, @@ -2951,6 +2883,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fr", + integrity: 131, mass: 80, maxfuel: 8.5, optmass: 1800, @@ -2965,6 +2898,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fq", + integrity: 157, mass: 128, maxfuel: 10.6, optmass: 2250, @@ -2979,6 +2913,7 @@ module.exports = { fuelpower: 2.75, grp: "fsd", id: "Fp", + integrity: 144, mass: 80, maxfuel: 12.8, optmass: 2700, @@ -2993,6 +2928,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fo", + integrity: 102, mass: 40, maxfuel: 5.3, optmass: 960, @@ -3007,6 +2943,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fn", + integrity: 90, mass: 16, maxfuel: 5.3, optmass: 1080, @@ -3021,6 +2958,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fm", + integrity: 113, mass: 40, maxfuel: 5.3, optmass: 1200, @@ -3035,6 +2973,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fl", + integrity: 136, mass: 64, maxfuel: 6.6, optmass: 1500, @@ -3049,6 +2988,7 @@ module.exports = { fuelpower: 2.6, grp: "fsd", id: "Fk", + integrity: 124, mass: 40, maxfuel: 8, optmass: 1800, @@ -3063,6 +3003,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fj", + integrity: 86, mass: 20, maxfuel: 3.3, optmass: 560, @@ -3077,6 +3018,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fi", + integrity: 77, mass: 8, maxfuel: 3.3, optmass: 630, @@ -3091,6 +3033,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fh", + integrity: 96, mass: 20, maxfuel: 3.3, optmass: 700, @@ -3105,6 +3048,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Fg", + integrity: 115, mass: 32, maxfuel: 4.1, optmass: 875, @@ -3119,6 +3063,7 @@ module.exports = { fuelpower: 2.45, grp: "fsd", id: "Ff", + integrity: 106, mass: 20, maxfuel: 5, optmass: 1050, @@ -3133,6 +3078,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fe", + integrity: 72, mass: 10, maxfuel: 2, optmass: 280, @@ -3147,6 +3093,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fd", + integrity: 64, mass: 4, maxfuel: 2, optmass: 315, @@ -3161,6 +3108,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fc", + integrity: 80, mass: 10, maxfuel: 2, optmass: 350, @@ -3175,6 +3123,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fb", + integrity: 96, mass: 16, maxfuel: 2.5, optmass: 438, @@ -3189,6 +3138,7 @@ module.exports = { fuelpower: 2.3, grp: "fsd", id: "Fa", + integrity: 88, mass: 10, maxfuel: 3, optmass: 525, @@ -3203,6 +3153,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F9", + integrity: 58, mass: 5, maxfuel: 1.2, optmass: 80, @@ -3217,6 +3168,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F8", + integrity: 51, mass: 2, maxfuel: 1.2, optmass: 90, @@ -3231,6 +3183,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F7", + integrity: 64, mass: 5, maxfuel: 1.2, optmass: 100, @@ -3245,6 +3198,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F6", + integrity: 77, mass: 8, maxfuel: 1.5, optmass: 125, @@ -3259,6 +3213,7 @@ module.exports = { fuelpower: 2.15, grp: "fsd", id: "F5", + integrity: 70, mass: 5, maxfuel: 1.8, optmass: 150, @@ -3273,6 +3228,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F4", + integrity: 46, mass: 2.5, maxfuel: .6, optmass: 48, @@ -3287,6 +3243,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F3", + integrity: 41, mass: 1, maxfuel: .6, optmass: 54, @@ -3301,6 +3258,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F2", + integrity: 51, mass: 2.5, maxfuel: .6, optmass: 60, @@ -3315,6 +3273,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F1", + integrity: 61, mass: 4, maxfuel: .8, optmass: 75, @@ -3329,6 +3288,7 @@ module.exports = { fuelpower: 2, grp: "fsd", id: "F0", + integrity: 56, mass: 2.5, maxfuel: .9, optmass: 90, diff --git a/dist/index.json b/dist/index.json index 94c395b..c3c7e3b 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4567,81 +4567,6 @@ } ], "fsd": [ - { - "class": 8, - "cost": 0, - "edID": 128064133, - "eddbID": 991, - "fuelmul": 0.011, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fy", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "E" - }, - { - "class": 8, - "cost": 0, - "edID": 128064134, - "eddbID": 992, - "fuelmul": 0.01, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fx", - "mass": 64, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "D" - }, - { - "class": 8, - "cost": 0, - "edID": 128064135, - "eddbID": 993, - "fuelmul": 0.008, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fw", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "C" - }, - { - "class": 8, - "cost": 0, - "edID": 128064136, - "eddbID": 994, - "fuelmul": 0.01, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fv", - "mass": 256, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "B" - }, - { - "class": 8, - "cost": 0, - "edID": 128064137, - "eddbID": 995, - "fuelmul": 0.012, - "fuelpower": 2.9, - "grp": "fsd", - "id": "Fu", - "mass": 160, - "maxfuel": 0, - "optmass": 0, - "power": 0, - "rating": "A" - }, { "class": 7, "cost": 633200, @@ -4651,6 +4576,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Ft", + "integrity": 118, "mass": 80, "maxfuel": 8.5, "optmass": 1440, @@ -4666,6 +4592,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fs", + "integrity": 105, "mass": 32, "maxfuel": 8.5, "optmass": 1620, @@ -4681,6 +4608,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fr", + "integrity": 131, "mass": 80, "maxfuel": 8.5, "optmass": 1800, @@ -4696,6 +4624,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fq", + "integrity": 157, "mass": 128, "maxfuel": 10.6, "optmass": 2250, @@ -4711,6 +4640,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fp", + "integrity": 144, "mass": 80, "maxfuel": 12.8, "optmass": 2700, @@ -4726,6 +4656,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fo", + "integrity": 102, "mass": 40, "maxfuel": 5.3, "optmass": 960, @@ -4741,6 +4672,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fn", + "integrity": 90, "mass": 16, "maxfuel": 5.3, "optmass": 1080, @@ -4756,6 +4688,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fm", + "integrity": 113, "mass": 40, "maxfuel": 5.3, "optmass": 1200, @@ -4771,6 +4704,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fl", + "integrity": 136, "mass": 64, "maxfuel": 6.6, "optmass": 1500, @@ -4786,6 +4720,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fk", + "integrity": 124, "mass": 40, "maxfuel": 8, "optmass": 1800, @@ -4801,6 +4736,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fj", + "integrity": 86, "mass": 20, "maxfuel": 3.3, "optmass": 560, @@ -4816,6 +4752,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fi", + "integrity": 77, "mass": 8, "maxfuel": 3.3, "optmass": 630, @@ -4831,6 +4768,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fh", + "integrity": 96, "mass": 20, "maxfuel": 3.3, "optmass": 700, @@ -4846,6 +4784,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fg", + "integrity": 115, "mass": 32, "maxfuel": 4.1, "optmass": 875, @@ -4861,6 +4800,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Ff", + "integrity": 106, "mass": 20, "maxfuel": 5, "optmass": 1050, @@ -4876,6 +4816,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fe", + "integrity": 72, "mass": 10, "maxfuel": 2, "optmass": 280, @@ -4891,6 +4832,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fd", + "integrity": 64, "mass": 4, "maxfuel": 2, "optmass": 315, @@ -4906,6 +4848,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fc", + "integrity": 80, "mass": 10, "maxfuel": 2, "optmass": 350, @@ -4921,6 +4864,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fb", + "integrity": 96, "mass": 16, "maxfuel": 2.5, "optmass": 438, @@ -4936,6 +4880,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fa", + "integrity": 88, "mass": 10, "maxfuel": 3, "optmass": 525, @@ -4951,6 +4896,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F9", + "integrity": 58, "mass": 5, "maxfuel": 1.2, "optmass": 80, @@ -4966,6 +4912,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F8", + "integrity": 51, "mass": 2, "maxfuel": 1.2, "optmass": 90, @@ -4981,6 +4928,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F7", + "integrity": 64, "mass": 5, "maxfuel": 1.2, "optmass": 100, @@ -4996,6 +4944,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F6", + "integrity": 77, "mass": 8, "maxfuel": 1.5, "optmass": 125, @@ -5011,6 +4960,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F5", + "integrity": 70, "mass": 5, "maxfuel": 1.8, "optmass": 150, @@ -5026,6 +4976,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F4", + "integrity": 46, "mass": 2.5, "maxfuel": 0.6, "optmass": 48, @@ -5041,6 +4992,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F3", + "integrity": 41, "mass": 1, "maxfuel": 0.6, "optmass": 54, @@ -5056,6 +5008,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F2", + "integrity": 51, "mass": 2.5, "maxfuel": 0.6, "optmass": 60, @@ -5071,6 +5024,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F1", + "integrity": 61, "mass": 4, "maxfuel": 0.8, "optmass": 75, @@ -5086,6 +5040,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F0", + "integrity": 56, "mass": 2.5, "maxfuel": 0.9, "optmass": 90, diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index 84ca5f3..8728422 100644 --- a/modules/standard/frame_shift_drive.json +++ b/modules/standard/frame_shift_drive.json @@ -9,6 +9,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fy", + "integrity": 93, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -24,6 +25,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fx", + "integrity": 37, "mass": 64, "maxfuel": 0, "optmass": 0, @@ -39,6 +41,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fw", + "integrity": 46, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -54,6 +57,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fv", + "integrity": 74, "mass": 256, "maxfuel": 0, "optmass": 0, @@ -69,6 +73,7 @@ "fuelpower": 2.9, "grp": "fsd", "id": "Fu", + "integrity": 46, "mass": 160, "maxfuel": 0, "optmass": 0, @@ -84,6 +89,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Ft", + "integrity": 118, "mass": 80, "maxfuel": 8.5, "optmass": 1440, @@ -99,6 +105,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fs", + "integrity": 105, "mass": 32, "maxfuel": 8.5, "optmass": 1620, @@ -114,6 +121,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fr", + "integrity": 131, "mass": 80, "maxfuel": 8.5, "optmass": 1800, @@ -129,6 +137,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fq", + "integrity": 157, "mass": 128, "maxfuel": 10.6, "optmass": 2250, @@ -144,6 +153,7 @@ "fuelpower": 2.75, "grp": "fsd", "id": "Fp", + "integrity": 144, "mass": 80, "maxfuel": 12.8, "optmass": 2700, @@ -159,6 +169,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fo", + "integrity": 102, "mass": 40, "maxfuel": 5.3, "optmass": 960, @@ -174,6 +185,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fn", + "integrity": 90, "mass": 16, "maxfuel": 5.3, "optmass": 1080, @@ -189,6 +201,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fm", + "integrity": 113, "mass": 40, "maxfuel": 5.3, "optmass": 1200, @@ -204,6 +217,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fl", + "integrity": 136, "mass": 64, "maxfuel": 6.6, "optmass": 1500, @@ -219,6 +233,7 @@ "fuelpower": 2.6, "grp": "fsd", "id": "Fk", + "integrity": 124, "mass": 40, "maxfuel": 8, "optmass": 1800, @@ -234,6 +249,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fj", + "integrity": 86, "mass": 20, "maxfuel": 3.3, "optmass": 560, @@ -249,6 +265,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fi", + "integrity": 77, "mass": 8, "maxfuel": 3.3, "optmass": 630, @@ -264,6 +281,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fh", + "integrity": 96, "mass": 20, "maxfuel": 3.3, "optmass": 700, @@ -279,6 +297,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Fg", + "integrity": 115, "mass": 32, "maxfuel": 4.1, "optmass": 875, @@ -294,6 +313,7 @@ "fuelpower": 2.45, "grp": "fsd", "id": "Ff", + "integrity": 106, "mass": 20, "maxfuel": 5, "optmass": 1050, @@ -309,6 +329,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fe", + "integrity": 72, "mass": 10, "maxfuel": 2, "optmass": 280, @@ -324,6 +345,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fd", + "integrity": 64, "mass": 4, "maxfuel": 2, "optmass": 315, @@ -339,6 +361,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fc", + "integrity": 80, "mass": 10, "maxfuel": 2, "optmass": 350, @@ -354,9 +377,10 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fb", + "integrity": 96, "mass": 16, "maxfuel": 2.5, - "optmass": 438, + "optmass": 437.5, "power": 0.38, "rating": "B" }, @@ -369,6 +393,7 @@ "fuelpower": 2.3, "grp": "fsd", "id": "Fa", + "integrity": 88, "mass": 10, "maxfuel": 3, "optmass": 525, @@ -384,6 +409,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F9", + "integrity": 58, "mass": 5, "maxfuel": 1.2, "optmass": 80, @@ -399,6 +425,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F8", + "integrity": 51, "mass": 2, "maxfuel": 1.2, "optmass": 90, @@ -414,6 +441,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F7", + "integrity": 64, "mass": 5, "maxfuel": 1.2, "optmass": 100, @@ -429,6 +457,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F6", + "integrity": 77, "mass": 8, "maxfuel": 1.5, "optmass": 125, @@ -444,6 +473,7 @@ "fuelpower": 2.15, "grp": "fsd", "id": "F5", + "integrity": 70, "mass": 5, "maxfuel": 1.8, "optmass": 150, @@ -459,6 +489,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F4", + "integrity": 46, "mass": 2.5, "maxfuel": 0.6, "optmass": 48, @@ -474,6 +505,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F3", + "integrity": 41, "mass": 1, "maxfuel": 0.6, "optmass": 54, @@ -489,6 +521,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F2", + "integrity": 51, "mass": 2.5, "maxfuel": 0.6, "optmass": 60, @@ -504,6 +537,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F1", + "integrity": 61, "mass": 4, "maxfuel": 0.8, "optmass": 75, @@ -519,6 +553,7 @@ "fuelpower": 2, "grp": "fsd", "id": "F0", + "integrity": 56, "mass": 2.5, "maxfuel": 0.9, "optmass": 90, From ceed701a12e14e153cf07db12174882a4d66901c Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 30 Oct 2016 14:44:51 +0000 Subject: [PATCH 20/49] Rebase --- dist/index.js | 77 +++++++++++++++++++++++++++++++++++++++++++++- dist/index.json | 82 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 157 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 75a84c1..e4dc868 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2845,6 +2845,81 @@ module.exports = { rating: "A" } ], fsd: [ { + class: 8, + cost: 0, + edID: 128064133, + eddbID: 991, + fuelmul: .011, + fuelpower: 2.9, + grp: "fsd", + id: "Fy", + integrity: 93, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "E" + }, { + class: 8, + cost: 0, + edID: 128064134, + eddbID: 992, + fuelmul: .01, + fuelpower: 2.9, + grp: "fsd", + id: "Fx", + integrity: 37, + mass: 64, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "D" + }, { + class: 8, + cost: 0, + edID: 128064135, + eddbID: 993, + fuelmul: .008, + fuelpower: 2.9, + grp: "fsd", + id: "Fw", + integrity: 46, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "C" + }, { + class: 8, + cost: 0, + edID: 128064136, + eddbID: 994, + fuelmul: .01, + fuelpower: 2.9, + grp: "fsd", + id: "Fv", + integrity: 74, + mass: 256, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "B" + }, { + class: 8, + cost: 0, + edID: 128064137, + eddbID: 995, + fuelmul: .012, + fuelpower: 2.9, + grp: "fsd", + id: "Fu", + integrity: 46, + mass: 160, + maxfuel: 0, + optmass: 0, + power: 0, + rating: "A" + }, { class: 7, cost: 633200, edID: 128064128, @@ -3126,7 +3201,7 @@ module.exports = { integrity: 96, mass: 16, maxfuel: 2.5, - optmass: 438, + optmass: 437.5, power: .38, rating: "B" }, { diff --git a/dist/index.json b/dist/index.json index c3c7e3b..5184337 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4567,6 +4567,86 @@ } ], "fsd": [ + { + "class": 8, + "cost": 0, + "edID": 128064133, + "eddbID": 991, + "fuelmul": 0.011, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fy", + "integrity": 93, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "E" + }, + { + "class": 8, + "cost": 0, + "edID": 128064134, + "eddbID": 992, + "fuelmul": 0.01, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fx", + "integrity": 37, + "mass": 64, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "D" + }, + { + "class": 8, + "cost": 0, + "edID": 128064135, + "eddbID": 993, + "fuelmul": 0.008, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fw", + "integrity": 46, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "C" + }, + { + "class": 8, + "cost": 0, + "edID": 128064136, + "eddbID": 994, + "fuelmul": 0.01, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fv", + "integrity": 74, + "mass": 256, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "B" + }, + { + "class": 8, + "cost": 0, + "edID": 128064137, + "eddbID": 995, + "fuelmul": 0.012, + "fuelpower": 2.9, + "grp": "fsd", + "id": "Fu", + "integrity": 46, + "mass": 160, + "maxfuel": 0, + "optmass": 0, + "power": 0, + "rating": "A" + }, { "class": 7, "cost": 633200, @@ -4867,7 +4947,7 @@ "integrity": 96, "mass": 16, "maxfuel": 2.5, - "optmass": 438, + "optmass": 437.5, "power": 0.38, "rating": "B" }, From 88c580e31324e5969a1ccd81961059e1b5444b96 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 18:38:07 +0100 Subject: [PATCH 21/49] Update integrity for life support --- dist/index.js | 90 ++++++++++++++++++++++++++++-- dist/index.json | 90 ++++++++++++++++++++++++++++-- modules/standard/life_support.json | 90 ++++++++++++++++++++++++++++-- 3 files changed, 255 insertions(+), 15 deletions(-) diff --git a/dist/index.js b/dist/index.js index e4dc868..fd897c3 100644 --- a/dist/index.js +++ b/dist/index.js @@ -3371,441 +3371,521 @@ module.exports = { rating: "A" } ], ls: [ { + boot: 1, class: 8, cost: 0, edID: 128064173, eddbID: 1031, grp: "ls", id: "lD", + integrity: 120, mass: 160, - power: 0, + power: .8, rating: "E", time: 300 }, { + boot: 1, class: 8, cost: 0, edID: 128064174, eddbID: 1032, grp: "ls", id: "lC", + integrity: 135, mass: 64, - power: 0, + power: .9, rating: "D", time: 450 }, { + boot: 1, class: 8, cost: 0, edID: 128064175, eddbID: 1033, grp: "ls", id: "lB", + integrity: 150, mass: 160, - power: 0, + power: 1, rating: "C", time: 600 }, { + boot: 1, class: 8, cost: 0, edID: 128064176, eddbID: 1034, grp: "ls", id: "lA", + integrity: 165, mass: 256, - power: 0, + power: 1.1, rating: "B", time: 900 }, { + boot: 1, class: 8, cost: 0, edID: 128064177, eddbID: 1035, grp: "ls", id: "lz", + integrity: 180, mass: 160, - power: 0, + power: 1.2, rating: "A", time: 1500 }, { + boot: 1, class: 7, cost: 249140, edID: 128064168, eddbID: 1026, grp: "ls", id: "ly", + integrity: 105, mass: 80, power: .72, rating: "E", time: 300 }, { + boot: 1, class: 7, cost: 622840, edID: 128064169, eddbID: 1027, grp: "ls", id: "lx", + integrity: 118, mass: 32, power: .81, rating: "D", time: 450 }, { + boot: 1, class: 7, cost: 1557110, edID: 128064170, eddbID: 1028, grp: "ls", id: "lw", + integrity: 131, mass: 80, power: .9, rating: "C", time: 600 }, { + boot: 1, class: 7, cost: 3892770, edID: 128064171, eddbID: 1029, grp: "ls", id: "lv", + integrity: 144, mass: 128, power: .99, rating: "B", time: 900 }, { + boot: 1, class: 7, cost: 9731930, edID: 128064172, eddbID: 1030, grp: "ls", id: "lu", + integrity: 157, mass: 80, power: 1.08, rating: "A", time: 1500 }, { + boot: 1, class: 6, cost: 88980, edID: 128064163, eddbID: 1021, grp: "ls", id: "lt", + integrity: 90, mass: 40, power: .64, rating: "E", time: 300 }, { + boot: 1, class: 6, cost: 222440, edID: 128064164, eddbID: 1022, grp: "ls", id: "ls", + integrity: 102, mass: 16, power: .72, rating: "D", time: 450 }, { + boot: 1, class: 6, cost: 556110, edID: 128064165, eddbID: 1023, grp: "ls", id: "lr", + integrity: 113, mass: 40, power: .8, rating: "C", time: 600 }, { + boot: 1, class: 6, cost: 1390280, edID: 128064166, eddbID: 1024, grp: "ls", id: "lq", + integrity: 124, mass: 64, power: .88, rating: "B", time: 900 }, { + boot: 1, class: 6, cost: 3475690, edID: 128064167, eddbID: 1025, grp: "ls", id: "lp", + integrity: 136, mass: 40, power: .96, rating: "A", time: 1500 }, { + boot: 1, class: 5, cost: 31780, edID: 128064158, eddbID: 1016, grp: "ls", id: "lo", + integrity: 77, mass: 20, power: .57, rating: "E", time: 300 }, { + boot: 1, class: 5, cost: 79440, edID: 128064159, eddbID: 1017, grp: "ls", id: "ln", + integrity: 86, mass: 8, power: .64, rating: "D", time: 450 }, { + boot: 1, class: 5, cost: 198610, edID: 128064160, eddbID: 1018, grp: "ls", id: "lm", + integrity: 96, mass: 20, power: .71, rating: "C", time: 600 }, { + boot: 1, class: 5, cost: 496530, edID: 128064161, eddbID: 1019, grp: "ls", id: "ll", + integrity: 106, mass: 32, power: .78, rating: "B", time: 900 }, { + boot: 1, class: 5, cost: 1241320, edID: 128064162, eddbID: 1020, grp: "ls", id: "lk", + integrity: 115, mass: 20, power: .85, rating: "A", time: 1500 }, { + boot: 1, class: 4, cost: 11350, edID: 128064153, eddbID: 1011, grp: "ls", id: "lj", + integrity: 64, mass: 10, power: .5, rating: "E", time: 300 }, { + boot: 1, class: 4, cost: 28370, edID: 128064154, eddbID: 1012, grp: "ls", id: "li", + integrity: 72, mass: 4, power: .56, rating: "D", time: 450 }, { + boot: 1, class: 4, cost: 70930, edID: 128064155, eddbID: 1013, grp: "ls", id: "lh", + integrity: 80, mass: 10, power: .62, rating: "C", time: 600 }, { + boot: 1, class: 4, cost: 177330, edID: 128064156, eddbID: 1014, grp: "ls", id: "lg", + integrity: 88, mass: 16, power: .68, rating: "B", time: 900 }, { + boot: 1, class: 4, cost: 443330, edID: 128064157, eddbID: 1015, grp: "ls", id: "lf", + integrity: 96, mass: 10, power: .74, rating: "A", time: 1500 }, { + boot: 1, class: 3, cost: 4050, edID: 128064148, eddbID: 1006, grp: "ls", id: "le", + integrity: 51, mass: 5, power: .42, rating: "E", time: 300 }, { + boot: 1, class: 3, cost: 10130, edID: 128064149, eddbID: 1007, grp: "ls", id: "ld", + integrity: 58, mass: 2, power: .48, rating: "D", time: 450 }, { + boot: 1, class: 3, cost: 25330, edID: 128064150, eddbID: 1008, grp: "ls", id: "lc", + integrity: 64, mass: 5, power: .53, rating: "C", time: 600 }, { + boot: 1, class: 3, cost: 63330, edID: 128064151, eddbID: 1009, grp: "ls", id: "lb", + integrity: 70, mass: 8, power: .58, rating: "B", time: 900 }, { + boot: 1, class: 3, cost: 158330, edID: 128064152, eddbID: 1010, grp: "ls", id: "la", + integrity: 77, mass: 5, power: .64, rating: "A", time: 1500 }, { + boot: 1, class: 2, cost: 1450, edID: 128064143, eddbID: 1001, grp: "ls", id: "l9", + integrity: 41, mass: 2.5, power: .37, rating: "E", time: 300 }, { + boot: 1, class: 2, cost: 3620, edID: 128064144, eddbID: 1002, grp: "ls", id: "l8", + integrity: 46, mass: 1, power: .41, rating: "D", time: 450 }, { + boot: 1, class: 2, cost: 9050, edID: 128064145, eddbID: 1003, grp: "ls", id: "l7", + integrity: 51, mass: 2.5, power: .46, rating: "C", time: 600 }, { + boot: 1, class: 2, cost: 22620, edID: 128064146, eddbID: 1004, grp: "ls", id: "l6", + integrity: 56, mass: 4, power: .51, rating: "B", time: 900 }, { + boot: 1, class: 2, cost: 56550, edID: 128064147, eddbID: 1005, grp: "ls", id: "l5", + integrity: 61, mass: 2.5, power: .55, rating: "A", time: 1500 }, { + boot: 1, class: 1, cost: 520, edID: 128064138, eddbID: 996, grp: "ls", id: "l4", + integrity: 32, mass: 1.3, power: .32, rating: "E", time: 300 }, { + boot: 1, class: 1, cost: 1290, edID: 128064139, eddbID: 997, grp: "ls", id: "l3", + integrity: 36, mass: .5, power: .36, rating: "D", time: 450 }, { + boot: 1, class: 1, cost: 3230, edID: 128064140, eddbID: 998, grp: "ls", id: "l2", + integrity: 40, mass: 1.3, power: .4, rating: "C", time: 600 }, { + boot: 1, class: 1, cost: 8080, edID: 128064141, eddbID: 999, grp: "ls", id: "l1", + integrity: 44, mass: 2, power: .44, rating: "B", time: 900 }, { + boot: 1, class: 1, cost: 20200, edID: 128064142, eddbID: 1e3, grp: "ls", id: "l0", + integrity: 48, mass: 1.3, power: .48, rating: "A", diff --git a/dist/index.json b/dist/index.json index 5184337..23beeca 100644 --- a/dist/index.json +++ b/dist/index.json @@ -5130,480 +5130,560 @@ ], "ls": [ { + "boot": 1, "class": 8, "cost": 0, "edID": 128064173, "eddbID": 1031, "grp": "ls", "id": "lD", + "integrity": 120, "mass": 160, - "power": 0, + "power": 0.8, "rating": "E", "time": 300 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064174, "eddbID": 1032, "grp": "ls", "id": "lC", + "integrity": 135, "mass": 64, - "power": 0, + "power": 0.9, "rating": "D", "time": 450 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064175, "eddbID": 1033, "grp": "ls", "id": "lB", + "integrity": 150, "mass": 160, - "power": 0, + "power": 1, "rating": "C", "time": 600 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064176, "eddbID": 1034, "grp": "ls", "id": "lA", + "integrity": 165, "mass": 256, - "power": 0, + "power": 1.1, "rating": "B", "time": 900 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064177, "eddbID": 1035, "grp": "ls", "id": "lz", + "integrity": 180, "mass": 160, - "power": 0, + "power": 1.2, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 7, "cost": 249140, "edID": 128064168, "eddbID": 1026, "grp": "ls", "id": "ly", + "integrity": 105, "mass": 80, "power": 0.72, "rating": "E", "time": 300 }, { + "boot": 1, "class": 7, "cost": 622840, "edID": 128064169, "eddbID": 1027, "grp": "ls", "id": "lx", + "integrity": 118, "mass": 32, "power": 0.81, "rating": "D", "time": 450 }, { + "boot": 1, "class": 7, "cost": 1557110, "edID": 128064170, "eddbID": 1028, "grp": "ls", "id": "lw", + "integrity": 131, "mass": 80, "power": 0.9, "rating": "C", "time": 600 }, { + "boot": 1, "class": 7, "cost": 3892770, "edID": 128064171, "eddbID": 1029, "grp": "ls", "id": "lv", + "integrity": 144, "mass": 128, "power": 0.99, "rating": "B", "time": 900 }, { + "boot": 1, "class": 7, "cost": 9731930, "edID": 128064172, "eddbID": 1030, "grp": "ls", "id": "lu", + "integrity": 157, "mass": 80, "power": 1.08, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 6, "cost": 88980, "edID": 128064163, "eddbID": 1021, "grp": "ls", "id": "lt", + "integrity": 90, "mass": 40, "power": 0.64, "rating": "E", "time": 300 }, { + "boot": 1, "class": 6, "cost": 222440, "edID": 128064164, "eddbID": 1022, "grp": "ls", "id": "ls", + "integrity": 102, "mass": 16, "power": 0.72, "rating": "D", "time": 450 }, { + "boot": 1, "class": 6, "cost": 556110, "edID": 128064165, "eddbID": 1023, "grp": "ls", "id": "lr", + "integrity": 113, "mass": 40, "power": 0.8, "rating": "C", "time": 600 }, { + "boot": 1, "class": 6, "cost": 1390280, "edID": 128064166, "eddbID": 1024, "grp": "ls", "id": "lq", + "integrity": 124, "mass": 64, "power": 0.88, "rating": "B", "time": 900 }, { + "boot": 1, "class": 6, "cost": 3475690, "edID": 128064167, "eddbID": 1025, "grp": "ls", "id": "lp", + "integrity": 136, "mass": 40, "power": 0.96, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 5, "cost": 31780, "edID": 128064158, "eddbID": 1016, "grp": "ls", "id": "lo", + "integrity": 77, "mass": 20, "power": 0.57, "rating": "E", "time": 300 }, { + "boot": 1, "class": 5, "cost": 79440, "edID": 128064159, "eddbID": 1017, "grp": "ls", "id": "ln", + "integrity": 86, "mass": 8, "power": 0.64, "rating": "D", "time": 450 }, { + "boot": 1, "class": 5, "cost": 198610, "edID": 128064160, "eddbID": 1018, "grp": "ls", "id": "lm", + "integrity": 96, "mass": 20, "power": 0.71, "rating": "C", "time": 600 }, { + "boot": 1, "class": 5, "cost": 496530, "edID": 128064161, "eddbID": 1019, "grp": "ls", "id": "ll", + "integrity": 106, "mass": 32, "power": 0.78, "rating": "B", "time": 900 }, { + "boot": 1, "class": 5, "cost": 1241320, "edID": 128064162, "eddbID": 1020, "grp": "ls", "id": "lk", + "integrity": 115, "mass": 20, "power": 0.85, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 4, "cost": 11350, "edID": 128064153, "eddbID": 1011, "grp": "ls", "id": "lj", + "integrity": 64, "mass": 10, "power": 0.5, "rating": "E", "time": 300 }, { + "boot": 1, "class": 4, "cost": 28370, "edID": 128064154, "eddbID": 1012, "grp": "ls", "id": "li", + "integrity": 72, "mass": 4, "power": 0.56, "rating": "D", "time": 450 }, { + "boot": 1, "class": 4, "cost": 70930, "edID": 128064155, "eddbID": 1013, "grp": "ls", "id": "lh", + "integrity": 80, "mass": 10, "power": 0.62, "rating": "C", "time": 600 }, { + "boot": 1, "class": 4, "cost": 177330, "edID": 128064156, "eddbID": 1014, "grp": "ls", "id": "lg", + "integrity": 88, "mass": 16, "power": 0.68, "rating": "B", "time": 900 }, { + "boot": 1, "class": 4, "cost": 443330, "edID": 128064157, "eddbID": 1015, "grp": "ls", "id": "lf", + "integrity": 96, "mass": 10, "power": 0.74, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 3, "cost": 4050, "edID": 128064148, "eddbID": 1006, "grp": "ls", "id": "le", + "integrity": 51, "mass": 5, "power": 0.42, "rating": "E", "time": 300 }, { + "boot": 1, "class": 3, "cost": 10130, "edID": 128064149, "eddbID": 1007, "grp": "ls", "id": "ld", + "integrity": 58, "mass": 2, "power": 0.48, "rating": "D", "time": 450 }, { + "boot": 1, "class": 3, "cost": 25330, "edID": 128064150, "eddbID": 1008, "grp": "ls", "id": "lc", + "integrity": 64, "mass": 5, "power": 0.53, "rating": "C", "time": 600 }, { + "boot": 1, "class": 3, "cost": 63330, "edID": 128064151, "eddbID": 1009, "grp": "ls", "id": "lb", + "integrity": 70, "mass": 8, "power": 0.58, "rating": "B", "time": 900 }, { + "boot": 1, "class": 3, "cost": 158330, "edID": 128064152, "eddbID": 1010, "grp": "ls", "id": "la", + "integrity": 77, "mass": 5, "power": 0.64, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 2, "cost": 1450, "edID": 128064143, "eddbID": 1001, "grp": "ls", "id": "l9", + "integrity": 41, "mass": 2.5, "power": 0.37, "rating": "E", "time": 300 }, { + "boot": 1, "class": 2, "cost": 3620, "edID": 128064144, "eddbID": 1002, "grp": "ls", "id": "l8", + "integrity": 46, "mass": 1, "power": 0.41, "rating": "D", "time": 450 }, { + "boot": 1, "class": 2, "cost": 9050, "edID": 128064145, "eddbID": 1003, "grp": "ls", "id": "l7", + "integrity": 51, "mass": 2.5, "power": 0.46, "rating": "C", "time": 600 }, { + "boot": 1, "class": 2, "cost": 22620, "edID": 128064146, "eddbID": 1004, "grp": "ls", "id": "l6", + "integrity": 56, "mass": 4, "power": 0.51, "rating": "B", "time": 900 }, { + "boot": 1, "class": 2, "cost": 56550, "edID": 128064147, "eddbID": 1005, "grp": "ls", "id": "l5", + "integrity": 61, "mass": 2.5, "power": 0.55, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 1, "cost": 520, "edID": 128064138, "eddbID": 996, "grp": "ls", "id": "l4", + "integrity": 32, "mass": 1.3, "power": 0.32, "rating": "E", "time": 300 }, { + "boot": 1, "class": 1, "cost": 1290, "edID": 128064139, "eddbID": 997, "grp": "ls", "id": "l3", + "integrity": 36, "mass": 0.5, "power": 0.36, "rating": "D", "time": 450 }, { + "boot": 1, "class": 1, "cost": 3230, "edID": 128064140, "eddbID": 998, "grp": "ls", "id": "l2", + "integrity": 40, "mass": 1.3, "power": 0.4, "rating": "C", "time": 600 }, { + "boot": 1, "class": 1, "cost": 8080, "edID": 128064141, "eddbID": 999, "grp": "ls", "id": "l1", + "integrity": 44, "mass": 2, "power": 0.44, "rating": "B", "time": 900 }, { + "boot": 1, "class": 1, "cost": 20200, "edID": 128064142, "eddbID": 1000, "grp": "ls", "id": "l0", + "integrity": 48, "mass": 1.3, "power": 0.48, "rating": "A", diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json index 055ba89..d75de9e 100644 --- a/modules/standard/life_support.json +++ b/modules/standard/life_support.json @@ -1,480 +1,560 @@ { "ls": [ { + "boot": 1, "class": 8, "cost": 0, "edID": 128064173, "eddbID": 1031, "grp": "ls", "id": "lD", + "integrity": 120, "mass": 160, - "power": 0, + "power": 0.8, "rating": "E", "time": 300 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064174, "eddbID": 1032, "grp": "ls", "id": "lC", + "integrity": 135, "mass": 64, - "power": 0, + "power": 0.9, "rating": "D", "time": 450 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064175, "eddbID": 1033, "grp": "ls", "id": "lB", + "integrity": 150, "mass": 160, - "power": 0, + "power": 1, "rating": "C", "time": 600 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064176, "eddbID": 1034, "grp": "ls", "id": "lA", + "integrity": 165, "mass": 256, - "power": 0, + "power": 1.1, "rating": "B", "time": 900 }, { + "boot": 1, "class": 8, "cost": 0, "edID": 128064177, "eddbID": 1035, "grp": "ls", "id": "lz", + "integrity": 180, "mass": 160, - "power": 0, + "power": 1.2, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 7, "cost": 249140, "edID": 128064168, "eddbID": 1026, "grp": "ls", "id": "ly", + "integrity": 105, "mass": 80, "power": 0.72, "rating": "E", "time": 300 }, { + "boot": 1, "class": 7, "cost": 622840, "edID": 128064169, "eddbID": 1027, "grp": "ls", "id": "lx", + "integrity": 118, "mass": 32, "power": 0.81, "rating": "D", "time": 450 }, { + "boot": 1, "class": 7, "cost": 1557110, "edID": 128064170, "eddbID": 1028, "grp": "ls", "id": "lw", + "integrity": 131, "mass": 80, "power": 0.9, "rating": "C", "time": 600 }, { + "boot": 1, "class": 7, "cost": 3892770, "edID": 128064171, "eddbID": 1029, "grp": "ls", "id": "lv", + "integrity": 144, "mass": 128, "power": 0.99, "rating": "B", "time": 900 }, { + "boot": 1, "class": 7, "cost": 9731930, "edID": 128064172, "eddbID": 1030, "grp": "ls", "id": "lu", + "integrity": 157, "mass": 80, "power": 1.08, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 6, "cost": 88980, "edID": 128064163, "eddbID": 1021, "grp": "ls", "id": "lt", + "integrity": 90, "mass": 40, "power": 0.64, "rating": "E", "time": 300 }, { + "boot": 1, "class": 6, "cost": 222440, "edID": 128064164, "eddbID": 1022, "grp": "ls", "id": "ls", + "integrity": 102, "mass": 16, "power": 0.72, "rating": "D", "time": 450 }, { + "boot": 1, "class": 6, "cost": 556110, "edID": 128064165, "eddbID": 1023, "grp": "ls", "id": "lr", + "integrity": 113, "mass": 40, "power": 0.8, "rating": "C", "time": 600 }, { + "boot": 1, "class": 6, "cost": 1390280, "edID": 128064166, "eddbID": 1024, "grp": "ls", "id": "lq", + "integrity": 124, "mass": 64, "power": 0.88, "rating": "B", "time": 900 }, { + "boot": 1, "class": 6, "cost": 3475690, "edID": 128064167, "eddbID": 1025, "grp": "ls", "id": "lp", + "integrity": 136, "mass": 40, "power": 0.96, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 5, "cost": 31780, "edID": 128064158, "eddbID": 1016, "grp": "ls", "id": "lo", + "integrity": 77, "mass": 20, "power": 0.57, "rating": "E", "time": 300 }, { + "boot": 1, "class": 5, "cost": 79440, "edID": 128064159, "eddbID": 1017, "grp": "ls", "id": "ln", + "integrity": 86, "mass": 8, "power": 0.64, "rating": "D", "time": 450 }, { + "boot": 1, "class": 5, "cost": 198610, "edID": 128064160, "eddbID": 1018, "grp": "ls", "id": "lm", + "integrity": 96, "mass": 20, "power": 0.71, "rating": "C", "time": 600 }, { + "boot": 1, "class": 5, "cost": 496530, "edID": 128064161, "eddbID": 1019, "grp": "ls", "id": "ll", + "integrity": 106, "mass": 32, "power": 0.78, "rating": "B", "time": 900 }, { + "boot": 1, "class": 5, "cost": 1241320, "edID": 128064162, "eddbID": 1020, "grp": "ls", "id": "lk", + "integrity": 115, "mass": 20, "power": 0.85, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 4, "cost": 11350, "edID": 128064153, "eddbID": 1011, "grp": "ls", "id": "lj", + "integrity": 64, "mass": 10, "power": 0.5, "rating": "E", "time": 300 }, { + "boot": 1, "class": 4, "cost": 28370, "edID": 128064154, "eddbID": 1012, "grp": "ls", "id": "li", + "integrity": 72, "mass": 4, "power": 0.56, "rating": "D", "time": 450 }, { + "boot": 1, "class": 4, "cost": 70930, "edID": 128064155, "eddbID": 1013, "grp": "ls", "id": "lh", + "integrity": 80, "mass": 10, "power": 0.62, "rating": "C", "time": 600 }, { + "boot": 1, "class": 4, "cost": 177330, "edID": 128064156, "eddbID": 1014, "grp": "ls", "id": "lg", + "integrity": 88, "mass": 16, "power": 0.68, "rating": "B", "time": 900 }, { + "boot": 1, "class": 4, "cost": 443330, "edID": 128064157, "eddbID": 1015, "grp": "ls", "id": "lf", + "integrity": 96, "mass": 10, "power": 0.74, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 3, "cost": 4050, "edID": 128064148, "eddbID": 1006, "grp": "ls", "id": "le", + "integrity": 51, "mass": 5, "power": 0.42, "rating": "E", "time": 300 }, { + "boot": 1, "class": 3, "cost": 10130, "edID": 128064149, "eddbID": 1007, "grp": "ls", "id": "ld", + "integrity": 58, "mass": 2, "power": 0.48, "rating": "D", "time": 450 }, { + "boot": 1, "class": 3, "cost": 25330, "edID": 128064150, "eddbID": 1008, "grp": "ls", "id": "lc", + "integrity": 64, "mass": 5, "power": 0.53, "rating": "C", "time": 600 }, { + "boot": 1, "class": 3, "cost": 63330, "edID": 128064151, "eddbID": 1009, "grp": "ls", "id": "lb", + "integrity": 70, "mass": 8, "power": 0.58, "rating": "B", "time": 900 }, { + "boot": 1, "class": 3, "cost": 158330, "edID": 128064152, "eddbID": 1010, "grp": "ls", "id": "la", + "integrity": 77, "mass": 5, "power": 0.64, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 2, "cost": 1450, "edID": 128064143, "eddbID": 1001, "grp": "ls", "id": "l9", + "integrity": 41, "mass": 2.5, "power": 0.37, "rating": "E", "time": 300 }, { + "boot": 1, "class": 2, "cost": 3620, "edID": 128064144, "eddbID": 1002, "grp": "ls", "id": "l8", + "integrity": 46, "mass": 1, "power": 0.41, "rating": "D", "time": 450 }, { + "boot": 1, "class": 2, "cost": 9050, "edID": 128064145, "eddbID": 1003, "grp": "ls", "id": "l7", + "integrity": 51, "mass": 2.5, "power": 0.46, "rating": "C", "time": 600 }, { + "boot": 1, "class": 2, "cost": 22620, "edID": 128064146, "eddbID": 1004, "grp": "ls", "id": "l6", + "integrity": 56, "mass": 4, "power": 0.51, "rating": "B", "time": 900 }, { + "boot": 1, "class": 2, "cost": 56550, "edID": 128064147, "eddbID": 1005, "grp": "ls", "id": "l5", + "integrity": 61, "mass": 2.5, "power": 0.55, "rating": "A", "time": 1500 }, { + "boot": 1, "class": 1, "cost": 520, "edID": 128064138, "eddbID": 996, "grp": "ls", "id": "l4", + "integrity": 32, "mass": 1.3, "power": 0.32, "rating": "E", "time": 300 }, { + "boot": 1, "class": 1, "cost": 1290, "edID": 128064139, "eddbID": 997, "grp": "ls", "id": "l3", + "integrity": 36, "mass": 0.5, "power": 0.36, "rating": "D", "time": 450 }, { + "boot": 1, "class": 1, "cost": 3230, "edID": 128064140, "eddbID": 998, "grp": "ls", "id": "l2", + "integrity": 40, "mass": 1.3, "power": 0.4, "rating": "C", "time": 600 }, { + "boot": 1, "class": 1, "cost": 8080, "edID": 128064141, "eddbID": 999, "grp": "ls", "id": "l1", + "integrity": 44, "mass": 2, "power": 0.44, "rating": "B", "time": 900 }, { + "boot": 1, "class": 1, "cost": 20200, "edID": 128064142, "eddbID": 1000, "grp": "ls", "id": "l0", + "integrity": 48, "mass": 1.3, "power": 0.48, "rating": "A", From d5bbd45bce13fbfe05323e8d3622d9025b7fecd0 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 23 Oct 2016 00:50:11 +0100 Subject: [PATCH 22/49] Added integrity for thrusters --- modules/standard/thrusters.json | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index b15bfb4..76a731b 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -9,6 +9,7 @@ "eddbID": 956, "grp": "t", "id": "ty", + "integrity": 135, "mass": 160, "maxmass": 3360, "optmass": 2240, @@ -24,6 +25,7 @@ "eddbID": 957, "grp": "t", "id": "tx", + "integrity": 120, "mass": 64, "maxmass": 3780, "optmass": 2520, @@ -39,6 +41,7 @@ "eddbID": 958, "grp": "t", "id": "tw", + "integrity": 150, "mass": 160, "maxmass": 4200, "optmass": 2800, @@ -54,6 +57,7 @@ "eddbID": 959, "grp": "t", "id": "tv", + "integrity": 180, "mass": 256, "maxmass": 4620, "optmass": 3080, @@ -69,6 +73,7 @@ "eddbID": 960, "grp": "t", "id": "tu", + "integrity": 165, "mass": 160, "maxmass": 5040, "optmass": 3360, @@ -84,6 +89,7 @@ "eddbID": 951, "grp": "t", "id": "tt", + "integrity": 118, "mass": 80, "maxmass": 2160, "optmass": 1440, @@ -99,6 +105,7 @@ "eddbID": 952, "grp": "t", "id": "ts", + "integrity": 105, "mass": 32, "maxmass": 2430, "optmass": 1620, @@ -114,6 +121,7 @@ "eddbID": 953, "grp": "t", "id": "tr", + "integrity": 131, "mass": 80, "maxmass": 2700, "optmass": 1800, @@ -129,6 +137,7 @@ "eddbID": 954, "grp": "t", "id": "tq", + "integrity": 157, "mass": 128, "maxmass": 2970, "optmass": 1980, @@ -144,6 +153,7 @@ "eddbID": 955, "grp": "t", "id": "tp", + "integrity": 144, "mass": 80, "maxmass": 3240, "optmass": 2160, @@ -159,6 +169,7 @@ "eddbID": 946, "grp": "t", "id": "to", + "integrity": 102, "mass": 40, "maxmass": 1440, "optmass": 960, @@ -174,6 +185,7 @@ "eddbID": 947, "grp": "t", "id": "tn", + "integrity": 90, "mass": 16, "maxmass": 1620, "optmass": 1080, @@ -189,6 +201,7 @@ "eddbID": 948, "grp": "t", "id": "tm", + "integrity": 113, "mass": 40, "maxmass": 1800, "optmass": 1200, @@ -204,6 +217,7 @@ "eddbID": 949, "grp": "t", "id": "tl", + "integrity": 136, "mass": 64, "maxmass": 1980, "optmass": 1320, @@ -219,6 +233,7 @@ "eddbID": 950, "grp": "t", "id": "tk", + "integrity": 124, "mass": 40, "maxmass": 2160, "optmass": 1440, @@ -234,6 +249,7 @@ "eddbID": 941, "grp": "t", "id": "tj", + "integrity": 86, "mass": 20, "maxmass": 840, "optmass": 560, @@ -249,6 +265,7 @@ "eddbID": 942, "grp": "t", "id": "ti", + "integrity": 77, "mass": 8, "maxmass": 945, "optmass": 630, @@ -264,6 +281,7 @@ "eddbID": 943, "grp": "t", "id": "th", + "integrity": 96, "mass": 20, "maxmass": 1050, "optmass": 700, @@ -279,6 +297,7 @@ "eddbID": 944, "grp": "t", "id": "tg", + "integrity": 115, "mass": 32, "maxmass": 1155, "optmass": 770, @@ -294,6 +313,7 @@ "eddbID": 945, "grp": "t", "id": "tf", + "integrity": 106, "mass": 20, "maxmass": 1260, "optmass": 840, @@ -309,6 +329,7 @@ "eddbID": 936, "grp": "t", "id": "te", + "integrity": 72, "mass": 10, "maxmass": 420, "optmass": 280, @@ -324,6 +345,7 @@ "eddbID": 937, "grp": "t", "id": "td", + "integrity": 64, "mass": 4, "maxmass": 473, "optmass": 315, @@ -339,6 +361,7 @@ "eddbID": 938, "grp": "t", "id": "tc", + "integrity": 80, "mass": 10, "maxmass": 525, "optmass": 350, @@ -354,6 +377,7 @@ "eddbID": 939, "grp": "t", "id": "tb", + "integrity": 96, "mass": 16, "maxmass": 578, "optmass": 385, @@ -369,6 +393,7 @@ "eddbID": 940, "grp": "t", "id": "ta", + "integrity": 88, "mass": 10, "maxmass": 630, "optmass": 420, @@ -384,6 +409,7 @@ "eddbID": 931, "grp": "t", "id": "t9", + "integrity": 58, "mass": 5, "maxmass": 120, "optmass": 80, @@ -399,6 +425,7 @@ "eddbID": 932, "grp": "t", "id": "t8", + "integrity": 51, "mass": 2, "maxmass": 135, "optmass": 90, @@ -414,6 +441,7 @@ "eddbID": 933, "grp": "t", "id": "t7", + "integrity": 64, "mass": 5, "maxmass": 150, "optmass": 100, @@ -429,6 +457,7 @@ "eddbID": 934, "grp": "t", "id": "t6", + "integrity": 77, "mass": 8, "maxmass": 165, "optmass": 110, @@ -444,6 +473,7 @@ "eddbID": 935, "grp": "t", "id": "t5", + "integrity": 72, "mass": 5, "maxmass": 180, "optmass": 120, @@ -459,6 +489,7 @@ "eddbID": 926, "grp": "t", "id": "t4", + "integrity": 46, "mass": 2.5, "maxmass": 72, "optmass": 48, @@ -474,6 +505,7 @@ "eddbID": 927, "grp": "t", "id": "t3", + "integrity": 41, "mass": 1, "maxmass": 81, "optmass": 54, @@ -489,6 +521,7 @@ "eddbID": 928, "grp": "t", "id": "t2", + "integrity": 51, "mass": 2.5, "maxmass": 90, "optmass": 60, @@ -504,6 +537,7 @@ "eddbID": 929, "grp": "t", "id": "t1", + "integrity": 61, "mass": 4, "maxmass": 99, "optmass": 66, @@ -519,6 +553,7 @@ "eddbID": 930, "grp": "t", "id": "t0", + "integrity": 56, "mass": 2.5, "maxmass": 108, "optmass": 72, @@ -534,6 +569,7 @@ "eddbID": 1548, "grp": "t", "id": "tz", + "integrity": 70, "mass": 5, "maxmass": 200, "name": "Enhanced Performance", @@ -550,6 +586,7 @@ "eddbID": 1547, "grp": "t", "id": "u0", + "integrity": 56, "mass": 2.5, "maxmass": 120, "name": "Enhanced Performance", From 499f1d05e1b029a1e6ccf8951b0c7d865dfae1b7 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 22 Oct 2016 12:40:56 +0100 Subject: [PATCH 23/49] Update integrity and optimal mass numbers for FSDs --- dist/index.js | 37 +++++++++++++++++++++++++++++++++++++ dist/index.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/dist/index.js b/dist/index.js index fd897c3..ca6be8b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2332,6 +2332,7 @@ module.exports = { eddbID: 956, grp: "t", id: "ty", + integrity: 135, mass: 160, maxmass: 3360, optmass: 2240, @@ -2346,6 +2347,7 @@ module.exports = { eddbID: 957, grp: "t", id: "tx", + integrity: 120, mass: 64, maxmass: 3780, optmass: 2520, @@ -2360,6 +2362,7 @@ module.exports = { eddbID: 958, grp: "t", id: "tw", + integrity: 150, mass: 160, maxmass: 4200, optmass: 2800, @@ -2374,6 +2377,7 @@ module.exports = { eddbID: 959, grp: "t", id: "tv", + integrity: 180, mass: 256, maxmass: 4620, optmass: 3080, @@ -2388,6 +2392,7 @@ module.exports = { eddbID: 960, grp: "t", id: "tu", + integrity: 165, mass: 160, maxmass: 5040, optmass: 3360, @@ -2402,6 +2407,7 @@ module.exports = { eddbID: 951, grp: "t", id: "tt", + integrity: 118, mass: 80, maxmass: 2160, optmass: 1440, @@ -2416,6 +2422,7 @@ module.exports = { eddbID: 952, grp: "t", id: "ts", + integrity: 105, mass: 32, maxmass: 2430, optmass: 1620, @@ -2430,6 +2437,7 @@ module.exports = { eddbID: 953, grp: "t", id: "tr", + integrity: 131, mass: 80, maxmass: 2700, optmass: 1800, @@ -2444,6 +2452,7 @@ module.exports = { eddbID: 954, grp: "t", id: "tq", + integrity: 157, mass: 128, maxmass: 2970, optmass: 1980, @@ -2458,6 +2467,7 @@ module.exports = { eddbID: 955, grp: "t", id: "tp", + integrity: 144, mass: 80, maxmass: 3240, optmass: 2160, @@ -2472,6 +2482,7 @@ module.exports = { eddbID: 946, grp: "t", id: "to", + integrity: 102, mass: 40, maxmass: 1440, optmass: 960, @@ -2486,6 +2497,7 @@ module.exports = { eddbID: 947, grp: "t", id: "tn", + integrity: 90, mass: 16, maxmass: 1620, optmass: 1080, @@ -2500,6 +2512,7 @@ module.exports = { eddbID: 948, grp: "t", id: "tm", + integrity: 113, mass: 40, maxmass: 1800, optmass: 1200, @@ -2514,6 +2527,7 @@ module.exports = { eddbID: 949, grp: "t", id: "tl", + integrity: 136, mass: 64, maxmass: 1980, optmass: 1320, @@ -2528,6 +2542,7 @@ module.exports = { eddbID: 950, grp: "t", id: "tk", + integrity: 124, mass: 40, maxmass: 2160, optmass: 1440, @@ -2542,6 +2557,7 @@ module.exports = { eddbID: 941, grp: "t", id: "tj", + integrity: 86, mass: 20, maxmass: 840, optmass: 560, @@ -2556,6 +2572,7 @@ module.exports = { eddbID: 942, grp: "t", id: "ti", + integrity: 77, mass: 8, maxmass: 945, optmass: 630, @@ -2570,6 +2587,7 @@ module.exports = { eddbID: 943, grp: "t", id: "th", + integrity: 96, mass: 20, maxmass: 1050, optmass: 700, @@ -2584,6 +2602,7 @@ module.exports = { eddbID: 944, grp: "t", id: "tg", + integrity: 115, mass: 32, maxmass: 1155, optmass: 770, @@ -2598,6 +2617,7 @@ module.exports = { eddbID: 945, grp: "t", id: "tf", + integrity: 106, mass: 20, maxmass: 1260, optmass: 840, @@ -2612,6 +2632,7 @@ module.exports = { eddbID: 936, grp: "t", id: "te", + integrity: 72, mass: 10, maxmass: 420, optmass: 280, @@ -2626,6 +2647,7 @@ module.exports = { eddbID: 937, grp: "t", id: "td", + integrity: 64, mass: 4, maxmass: 473, optmass: 315, @@ -2640,6 +2662,7 @@ module.exports = { eddbID: 938, grp: "t", id: "tc", + integrity: 80, mass: 10, maxmass: 525, optmass: 350, @@ -2654,6 +2677,7 @@ module.exports = { eddbID: 939, grp: "t", id: "tb", + integrity: 96, mass: 16, maxmass: 578, optmass: 385, @@ -2668,6 +2692,7 @@ module.exports = { eddbID: 940, grp: "t", id: "ta", + integrity: 88, mass: 10, maxmass: 630, optmass: 420, @@ -2682,6 +2707,7 @@ module.exports = { eddbID: 931, grp: "t", id: "t9", + integrity: 58, mass: 5, maxmass: 120, optmass: 80, @@ -2696,6 +2722,7 @@ module.exports = { eddbID: 932, grp: "t", id: "t8", + integrity: 51, mass: 2, maxmass: 135, optmass: 90, @@ -2710,6 +2737,7 @@ module.exports = { eddbID: 933, grp: "t", id: "t7", + integrity: 64, mass: 5, maxmass: 150, optmass: 100, @@ -2724,6 +2752,7 @@ module.exports = { eddbID: 934, grp: "t", id: "t6", + integrity: 77, mass: 8, maxmass: 165, optmass: 110, @@ -2738,6 +2767,7 @@ module.exports = { eddbID: 935, grp: "t", id: "t5", + integrity: 72, mass: 5, maxmass: 180, optmass: 120, @@ -2752,6 +2782,7 @@ module.exports = { eddbID: 926, grp: "t", id: "t4", + integrity: 46, mass: 2.5, maxmass: 72, optmass: 48, @@ -2766,6 +2797,7 @@ module.exports = { eddbID: 927, grp: "t", id: "t3", + integrity: 41, mass: 1, maxmass: 81, optmass: 54, @@ -2780,6 +2812,7 @@ module.exports = { eddbID: 928, grp: "t", id: "t2", + integrity: 51, mass: 2.5, maxmass: 90, optmass: 60, @@ -2794,6 +2827,7 @@ module.exports = { eddbID: 929, grp: "t", id: "t1", + integrity: 61, mass: 4, maxmass: 99, optmass: 66, @@ -2808,6 +2842,7 @@ module.exports = { eddbID: 930, grp: "t", id: "t0", + integrity: 56, mass: 2.5, maxmass: 108, optmass: 72, @@ -2822,6 +2857,7 @@ module.exports = { eddbID: 1548, grp: "t", id: "tz", + integrity: 70, mass: 5, maxmass: 200, name: "Enhanced Performance", @@ -2837,6 +2873,7 @@ module.exports = { eddbID: 1547, grp: "t", id: "u0", + integrity: 56, mass: 2.5, maxmass: 120, name: "Enhanced Performance", diff --git a/dist/index.json b/dist/index.json index 23beeca..32a9086 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4017,6 +4017,7 @@ "eddbID": 956, "grp": "t", "id": "ty", + "integrity": 135, "mass": 160, "maxmass": 3360, "optmass": 2240, @@ -4032,6 +4033,7 @@ "eddbID": 957, "grp": "t", "id": "tx", + "integrity": 120, "mass": 64, "maxmass": 3780, "optmass": 2520, @@ -4047,6 +4049,7 @@ "eddbID": 958, "grp": "t", "id": "tw", + "integrity": 150, "mass": 160, "maxmass": 4200, "optmass": 2800, @@ -4062,6 +4065,7 @@ "eddbID": 959, "grp": "t", "id": "tv", + "integrity": 180, "mass": 256, "maxmass": 4620, "optmass": 3080, @@ -4077,6 +4081,7 @@ "eddbID": 960, "grp": "t", "id": "tu", + "integrity": 165, "mass": 160, "maxmass": 5040, "optmass": 3360, @@ -4092,6 +4097,7 @@ "eddbID": 951, "grp": "t", "id": "tt", + "integrity": 118, "mass": 80, "maxmass": 2160, "optmass": 1440, @@ -4107,6 +4113,7 @@ "eddbID": 952, "grp": "t", "id": "ts", + "integrity": 105, "mass": 32, "maxmass": 2430, "optmass": 1620, @@ -4122,6 +4129,7 @@ "eddbID": 953, "grp": "t", "id": "tr", + "integrity": 131, "mass": 80, "maxmass": 2700, "optmass": 1800, @@ -4137,6 +4145,7 @@ "eddbID": 954, "grp": "t", "id": "tq", + "integrity": 157, "mass": 128, "maxmass": 2970, "optmass": 1980, @@ -4152,6 +4161,7 @@ "eddbID": 955, "grp": "t", "id": "tp", + "integrity": 144, "mass": 80, "maxmass": 3240, "optmass": 2160, @@ -4167,6 +4177,7 @@ "eddbID": 946, "grp": "t", "id": "to", + "integrity": 102, "mass": 40, "maxmass": 1440, "optmass": 960, @@ -4182,6 +4193,7 @@ "eddbID": 947, "grp": "t", "id": "tn", + "integrity": 90, "mass": 16, "maxmass": 1620, "optmass": 1080, @@ -4197,6 +4209,7 @@ "eddbID": 948, "grp": "t", "id": "tm", + "integrity": 113, "mass": 40, "maxmass": 1800, "optmass": 1200, @@ -4212,6 +4225,7 @@ "eddbID": 949, "grp": "t", "id": "tl", + "integrity": 136, "mass": 64, "maxmass": 1980, "optmass": 1320, @@ -4227,6 +4241,7 @@ "eddbID": 950, "grp": "t", "id": "tk", + "integrity": 124, "mass": 40, "maxmass": 2160, "optmass": 1440, @@ -4242,6 +4257,7 @@ "eddbID": 941, "grp": "t", "id": "tj", + "integrity": 86, "mass": 20, "maxmass": 840, "optmass": 560, @@ -4257,6 +4273,7 @@ "eddbID": 942, "grp": "t", "id": "ti", + "integrity": 77, "mass": 8, "maxmass": 945, "optmass": 630, @@ -4272,6 +4289,7 @@ "eddbID": 943, "grp": "t", "id": "th", + "integrity": 96, "mass": 20, "maxmass": 1050, "optmass": 700, @@ -4287,6 +4305,7 @@ "eddbID": 944, "grp": "t", "id": "tg", + "integrity": 115, "mass": 32, "maxmass": 1155, "optmass": 770, @@ -4302,6 +4321,7 @@ "eddbID": 945, "grp": "t", "id": "tf", + "integrity": 106, "mass": 20, "maxmass": 1260, "optmass": 840, @@ -4317,6 +4337,7 @@ "eddbID": 936, "grp": "t", "id": "te", + "integrity": 72, "mass": 10, "maxmass": 420, "optmass": 280, @@ -4332,6 +4353,7 @@ "eddbID": 937, "grp": "t", "id": "td", + "integrity": 64, "mass": 4, "maxmass": 473, "optmass": 315, @@ -4347,6 +4369,7 @@ "eddbID": 938, "grp": "t", "id": "tc", + "integrity": 80, "mass": 10, "maxmass": 525, "optmass": 350, @@ -4362,6 +4385,7 @@ "eddbID": 939, "grp": "t", "id": "tb", + "integrity": 96, "mass": 16, "maxmass": 578, "optmass": 385, @@ -4377,6 +4401,7 @@ "eddbID": 940, "grp": "t", "id": "ta", + "integrity": 88, "mass": 10, "maxmass": 630, "optmass": 420, @@ -4392,6 +4417,7 @@ "eddbID": 931, "grp": "t", "id": "t9", + "integrity": 58, "mass": 5, "maxmass": 120, "optmass": 80, @@ -4407,6 +4433,7 @@ "eddbID": 932, "grp": "t", "id": "t8", + "integrity": 51, "mass": 2, "maxmass": 135, "optmass": 90, @@ -4422,6 +4449,7 @@ "eddbID": 933, "grp": "t", "id": "t7", + "integrity": 64, "mass": 5, "maxmass": 150, "optmass": 100, @@ -4437,6 +4465,7 @@ "eddbID": 934, "grp": "t", "id": "t6", + "integrity": 77, "mass": 8, "maxmass": 165, "optmass": 110, @@ -4452,6 +4481,7 @@ "eddbID": 935, "grp": "t", "id": "t5", + "integrity": 72, "mass": 5, "maxmass": 180, "optmass": 120, @@ -4467,6 +4497,7 @@ "eddbID": 926, "grp": "t", "id": "t4", + "integrity": 46, "mass": 2.5, "maxmass": 72, "optmass": 48, @@ -4482,6 +4513,7 @@ "eddbID": 927, "grp": "t", "id": "t3", + "integrity": 41, "mass": 1, "maxmass": 81, "optmass": 54, @@ -4497,6 +4529,7 @@ "eddbID": 928, "grp": "t", "id": "t2", + "integrity": 51, "mass": 2.5, "maxmass": 90, "optmass": 60, @@ -4512,6 +4545,7 @@ "eddbID": 929, "grp": "t", "id": "t1", + "integrity": 61, "mass": 4, "maxmass": 99, "optmass": 66, @@ -4527,6 +4561,7 @@ "eddbID": 930, "grp": "t", "id": "t0", + "integrity": 56, "mass": 2.5, "maxmass": 108, "optmass": 72, @@ -4542,6 +4577,7 @@ "eddbID": 1548, "grp": "t", "id": "tz", + "integrity": 70, "mass": 5, "maxmass": 200, "name": "Enhanced Performance", @@ -4558,6 +4594,7 @@ "eddbID": 1547, "grp": "t", "id": "u0", + "integrity": 56, "mass": 2.5, "maxmass": 120, "name": "Enhanced Performance", From c1f21cf6f1abc3952601a6bf6b27799b358d9cc7 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Mon, 24 Oct 2016 13:17:11 +0100 Subject: [PATCH 24/49] Add modification information --- dist/index.js | 41 ++++++++++++++++++++- dist/index.json | 69 ++++++++++++++++++++++++++++++++++++ generate_distribution.js | 5 +-- modifications/index.js | 4 +++ modifications/modifiers.json | 27 ++++++++++++++ modifications/validity.json | 40 +++++++++++++++++++++ 6 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 modifications/index.js create mode 100644 modifications/modifiers.json create mode 100644 modifications/validity.json diff --git a/dist/index.js b/dist/index.js index ca6be8b..36bd9a2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11971,5 +11971,44 @@ module.exports = { recover: 1 } ] } + }, + Modifications: { + modifiers: { + "1": { + value: "pGen", + description: "Modifier for power generation", + operator: "multiply" + }, + "2": { + value: "power", + description: "Modifier for power usage", + operator: "multiply" + }, + "3": { + value: "integrity", + description: "Modifier for integrity", + operator: "multiply" + }, + "4": { + value: "mass", + description: "Modifier for mass", + operator: "multiply" + }, + "5": { + value: "eff", + description: "Modifier for heat efficiency", + operator: "multiply" + } + }, + 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 ], + ft: [], + pas: [] + } } -}; \ No newline at end of file +}; diff --git a/dist/index.json b/dist/index.json index 32a9086..d1c1aa8 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14364,5 +14364,74 @@ } ] } + }, + "Modifications": { + "modifiers": { + "1": { + "value": "pGen", + "description": "Modifier for power generation", + "operator": "multiply" + }, + "2": { + "value": "power", + "description": "Modifier for power usage", + "operator": "multiply" + }, + "3": { + "value": "integrity", + "description": "Modifier for integrity", + "operator": "multiply" + }, + "4": { + "value": "mass", + "description": "Modifier for mass", + "operator": "multiply" + }, + "5": { + "value": "eff", + "description": "Modifier for heat efficiency", + "operator": "multiply" + } + }, + "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 + ], + "ft": [], + "pas": [] + } } } \ No newline at end of file diff --git a/generate_distribution.js b/generate_distribution.js index 64d37c6..8221027 100644 --- a/generate_distribution.js +++ b/generate_distribution.js @@ -2,8 +2,9 @@ var fs = require('fs'); var UglifyJS = require('uglify-js'); var Ships = require('./ships'); var Modules = require('./modules'); -var exportString = JSON.stringify({ Ships: Ships, Modules: Modules }, null, '\t'); -var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules }), ';'].join('')); +var Modifications = require('./modifications'); +var exportString = JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }, null, '\t'); +var ast = UglifyJS.parse(['module.exports = ', JSON.stringify({ Ships: Ships, Modules: Modules, Modifications: Modifications }), ';'].join('')); var code = ast.print_to_string({beautify: true, indent_level: 2}); fs.open('./dist/index.json', 'w', function() { diff --git a/modifications/index.js b/modifications/index.js new file mode 100644 index 0000000..cd3513d --- /dev/null +++ b/modifications/index.js @@ -0,0 +1,4 @@ +module.exports = { + modifiers: require('./modifiers'), + validity: require('./validity') +}; diff --git a/modifications/modifiers.json b/modifications/modifiers.json new file mode 100644 index 0000000..b371ca5 --- /dev/null +++ b/modifications/modifiers.json @@ -0,0 +1,27 @@ +{ + "1": { + "value": "pGen", + "description": "Modifier for power generation", + "operator": "multiply" + }, + "2": { + "value": "power", + "description": "Modifier for power usage", + "operator": "multiply" + }, + "3": { + "value": "integrity", + "description": "Modifier for integrity", + "operator": "multiply" + }, + "4": { + "value": "mass", + "description": "Modifier for mass", + "operator": "multiply" + }, + "5": { + "value": "eff", + "description": "Modifier for heat efficiency", + "operator": "multiply" + } +} diff --git a/modifications/validity.json b/modifications/validity.json new file mode 100644 index 0000000..04e63ee --- /dev/null +++ b/modifications/validity.json @@ -0,0 +1,40 @@ +{ + "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 + ], + "ft": [], + "pas": [] +} From f279bbcfd754b6f2f5f4b1c99120869b65731837 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Tue, 25 Oct 2016 13:37:16 +0100 Subject: [PATCH 25/49] Add names for modifiers --- dist/index.js | 7 ++++++- dist/index.json | 5 +++++ modifications/modifiers.json | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 36bd9a2..0648d85 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11976,26 +11976,31 @@ module.exports = { modifiers: { "1": { value: "pGen", + name: "Power generation", description: "Modifier for power generation", operator: "multiply" }, "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" }, "5": { value: "eff", + name: "Heat efficiency", description: "Modifier for heat efficiency", operator: "multiply" } @@ -12011,4 +12016,4 @@ module.exports = { pas: [] } } -}; +}; \ No newline at end of file diff --git a/dist/index.json b/dist/index.json index d1c1aa8..74d875b 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14369,26 +14369,31 @@ "modifiers": { "1": { "value": "pGen", + "name": "Power generation", "description": "Modifier for power generation", "operator": "multiply" }, "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" }, "5": { "value": "eff", + "name": "Heat efficiency", "description": "Modifier for heat efficiency", "operator": "multiply" } diff --git a/modifications/modifiers.json b/modifications/modifiers.json index b371ca5..8acd866 100644 --- a/modifications/modifiers.json +++ b/modifications/modifiers.json @@ -1,26 +1,31 @@ { "1": { "value": "pGen", + "name": "Power generation", "description": "Modifier for power generation", "operator": "multiply" }, "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" }, "5": { "value": "eff", + "name": "Heat efficiency", "description": "Modifier for heat efficiency", "operator": "multiply" } From bc1af2eb774e4b554730c8bc91e7e032059a97d3 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 28 Oct 2016 01:46:03 +0100 Subject: [PATCH 26/49] Add range for modifiers --- dist/index.js | 8 ++++++-- dist/index.json | 8 ++++++-- modifications/modifiers.json | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index 0648d85..271007e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11978,7 +11978,9 @@ module.exports = { value: "pGen", name: "Power generation", description: "Modifier for power generation", - operator: "multiply" + operator: "multiply", + min: -.35, + max: .5 }, "2": { value: "power", @@ -11996,7 +11998,9 @@ module.exports = { value: "mass", name: "Mass", description: "Modifier for mass", - operator: "multiply" + operator: "multiply", + min: -1, + max: 3.5 }, "5": { value: "eff", diff --git a/dist/index.json b/dist/index.json index 74d875b..8e0be8b 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14371,7 +14371,9 @@ "value": "pGen", "name": "Power generation", "description": "Modifier for power generation", - "operator": "multiply" + "operator": "multiply", + "min": -0.35, + "max": 0.5 }, "2": { "value": "power", @@ -14389,7 +14391,9 @@ "value": "mass", "name": "Mass", "description": "Modifier for mass", - "operator": "multiply" + "operator": "multiply", + "min": -1, + "max": 3.5 }, "5": { "value": "eff", diff --git a/modifications/modifiers.json b/modifications/modifiers.json index 8acd866..0fd32d6 100644 --- a/modifications/modifiers.json +++ b/modifications/modifiers.json @@ -3,7 +3,9 @@ "value": "pGen", "name": "Power generation", "description": "Modifier for power generation", - "operator": "multiply" + "operator": "multiply", + "min": -0.35, + "max": 0.50 }, "2": { "value": "power", @@ -21,7 +23,9 @@ "value": "mass", "name": "Mass", "description": "Modifier for mass", - "operator": "multiply" + "operator": "multiply", + "min": -1, + "max": 3.50 }, "5": { "value": "eff", From cf1e49d753227bb97035bb0e5e72f9f6f8cdb47b Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 30 Oct 2016 14:41:29 +0000 Subject: [PATCH 27/49] 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 } ] } From 9a1aac8dd01d5c304f761f590bed9e970b6e02c5 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 30 Oct 2016 16:48:56 +0000 Subject: [PATCH 28/49] 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" ] } From 54f1700f5e381096c25f9ae49ce5b27a2b26709b Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 30 Oct 2016 20:54:54 +0000 Subject: [PATCH 29/49] Updates for modifications and new calculations --- dist/index.js | 714 ++++++++++-------- dist/index.json | 714 ++++++++++-------- .../internal/bi_weave_shield_generator.json | 32 +- .../internal/pristmatic_shield_generator.json | 32 +- modules/internal/shield_generator.json | 144 ++-- modules/standard/thrusters.json | 234 ++++-- ships/adder.json | 4 +- ships/anaconda.json | 10 +- ships/asp.json | 10 +- ships/asp_scout.json | 8 +- ships/beluga.json | 10 +- ships/cobra_mk_iii.json | 10 +- ships/cobra_mk_iv.json | 8 +- ships/diamondback_explorer.json | 10 +- ships/diamondback_scout.json | 10 +- ships/eagle.json | 10 +- ships/federal_assault_ship.json | 10 +- ships/federal_corvette.json | 6 +- ships/federal_dropship.json | 10 +- ships/federal_gunship.json | 10 +- ships/fer_de_lance.json | 10 +- ships/hauler.json | 8 +- ships/imperial_clipper.json | 10 +- ships/imperial_courier.json | 6 +- ships/imperial_cutter.json | 10 +- ships/imperial_eagle.json | 10 +- ships/keelback.json | 8 +- ships/orca.json | 10 +- ships/python.json | 10 +- ships/sidewinder.json | 6 +- ships/type_6_transporter.json | 10 +- ships/type_7_transport.json | 10 +- ships/type_9_heavy.json | 10 +- ships/viper.json | 10 +- ships/viper_mk_iv.json | 8 +- ships/vulture.json | 10 +- 36 files changed, 1182 insertions(+), 960 deletions(-) diff --git a/dist/index.js b/dist/index.js index cb434c7..ba27608 100644 --- a/dist/index.js +++ b/dist/index.js @@ -12,8 +12,8 @@ module.exports = { boost: 320, boostEnergy: 9, agility: 8, - baseShieldStrength: 78, - baseArmour: 162, + baseShieldStrength: 60, + baseArmour: 90, hullMass: 35, masslock: 7, pipSpeed: .13625 @@ -69,12 +69,12 @@ module.exports = { manufacturer: "Faulcon DeLacy", class: 3, hullCost: 141889930, - speed: 183, - boost: 244, - boostEnergy: 29, + speed: 180, + boost: 240, + boostEnergy: 27, agility: 2, - baseShieldStrength: 362, - baseArmour: 945, + baseShieldStrength: 350, + baseArmour: 525, hullMass: 400, masslock: 23, pipSpeed: .13875, @@ -131,12 +131,12 @@ module.exports = { manufacturer: "Lakon", class: 2, hullCost: 6135660, - speed: 254, - boost: 345, - boostEnergy: 14, + speed: 250, + boost: 340, + boostEnergy: 13, agility: 6, - baseShieldStrength: 152, - baseArmour: 378, + baseShieldStrength: 140, + baseArmour: 210, hullMass: 280, masslock: 11, pipSpeed: .13 @@ -192,12 +192,12 @@ module.exports = { manufacturer: "Lakon", class: 2, hullCost: 3818240, - speed: 223, - boost: 304, + speed: 220, + boost: 300, boostEnergy: 13, agility: 8, - baseShieldStrength: 105, - baseArmour: 324, + baseShieldStrength: 120, + baseArmour: 180, hullMass: 150, masslock: 8, pipSpeed: .125 @@ -253,12 +253,12 @@ module.exports = { manufacturer: "Saud Kruger", class: 3, hullCost: 79654610, - speed: 195, - boost: 273, - boostEnergy: 20, + speed: 200, + boost: 280, + boostEnergy: 19, agility: 2, - baseShieldStrength: 92, - baseArmour: 504, + baseShieldStrength: 280, + baseArmour: 280, hullMass: 1100, masslock: 18, pipSpeed: -1, @@ -356,12 +356,12 @@ module.exports = { manufacturer: "Faulcon DeLacy", class: 1, hullCost: 205800, - speed: 282, - boost: 402, - boostEnergy: 11, + speed: 280, + boost: 400, + boostEnergy: 10, agility: 6, - baseShieldStrength: 92, - baseArmour: 216, + baseShieldStrength: 80, + baseArmour: 120, hullMass: 180, masslock: 8, pipSpeed: .125 @@ -418,11 +418,11 @@ module.exports = { class: 1, hullCost: 603740, speed: 200, - boost: 299, - boostEnergy: 11, + boost: 300, + boostEnergy: 10, agility: 4, - baseShieldStrength: 125, - baseArmour: 216, + baseShieldStrength: 120, + baseArmour: 120, hullMass: 210, masslock: 8, pipSpeed: .125 @@ -478,12 +478,12 @@ module.exports = { manufacturer: "Lakon", class: 1, hullCost: 1635700, - speed: 242, - boost: 316, - boostEnergy: 14, + speed: 260, + boost: 340, + boostEnergy: 13, agility: 5, - baseShieldStrength: 115, - baseArmour: 270, + baseShieldStrength: 150, + baseArmour: 150, hullMass: 298, masslock: 10, pipSpeed: .09625 @@ -539,12 +539,12 @@ module.exports = { manufacturer: "Lakon", class: 1, hullCost: 461340, - speed: 283, - boost: 384, - boostEnergy: 11, + speed: 280, + boost: 380, + boostEnergy: 10, agility: 8, - baseShieldStrength: 93, - baseArmour: 216, + baseShieldStrength: 120, + baseArmour: 120, hullMass: 170, masslock: 8, pipSpeed: .09875 @@ -600,12 +600,12 @@ module.exports = { manufacturer: "Core Dynamics", class: 1, hullCost: 10440, - speed: 239, - boost: 349, - boostEnergy: 9, + speed: 240, + boost: 350, + boostEnergy: 8, agility: 10, - baseShieldStrength: 89, - baseArmour: 72, + baseShieldStrength: 60, + baseArmour: 40, hullMass: 50, masslock: 6, pipSpeed: .0625 @@ -661,12 +661,12 @@ module.exports = { manufacturer: "Core Dynamics", class: 2, hullCost: 19072e3, - speed: 214, - boost: 357, - boostEnergy: 21, + speed: 210, + boost: 350, + boostEnergy: 19, agility: 6, - baseShieldStrength: 133, - baseArmour: 540, + baseShieldStrength: 200, + baseArmour: 300, hullMass: 480, masslock: 14, pipSpeed: .11125 @@ -722,11 +722,11 @@ module.exports = { manufacturer: "Core Dynamics", class: 3, hullCost: 182589570, - speed: 198, - boost: 257, + speed: 200, + boost: 260, boostEnergy: 27, agility: 2, - baseShieldStrength: 516, + baseShieldStrength: 555, baseArmour: 666, hullMass: 900, masslock: 24, @@ -784,12 +784,12 @@ module.exports = { manufacturer: "Core Dynamics", class: 2, hullCost: 13469990, - speed: 182, - boost: 304, - boostEnergy: 21, + speed: 180, + boost: 300, + boostEnergy: 19, agility: 2, - baseShieldStrength: 104, - baseArmour: 540, + baseShieldStrength: 200, + baseArmour: 300, hullMass: 580, masslock: 14, pipSpeed: .0725 @@ -845,12 +845,12 @@ module.exports = { manufacturer: "Core Dynamics", class: 2, hullCost: 34774790, - speed: 171, - boost: 282, - boostEnergy: 21, + speed: 170, + boost: 280, + boostEnergy: 23, agility: 2, - baseShieldStrength: 186, - baseArmour: 630, + baseShieldStrength: 250, + baseArmour: 350, hullMass: 580, masslock: 14, pipSpeed: .1025, @@ -907,12 +907,12 @@ module.exports = { manufacturer: "Zorgon Peterson", class: 2, hullCost: 51232230, - speed: 265, - boost: 357, - boostEnergy: 21, + speed: 260, + boost: 350, + boostEnergy: 19, agility: 6, - baseShieldStrength: 271, - baseArmour: 405, + baseShieldStrength: 300, + baseArmour: 225, hullMass: 250, masslock: 12, pipSpeed: .03875 @@ -968,12 +968,12 @@ module.exports = { manufacturer: "Zorgon Peterson", class: 1, hullCost: 29790, - speed: 203, - boost: 305, + speed: 200, + boost: 300, agility: 6, boostEnergy: 7, - baseShieldStrength: 65, - baseArmour: 90, + baseShieldStrength: 50, + baseArmour: 50, hullMass: 14, masslock: 6, pipSpeed: .1625 @@ -1029,12 +1029,12 @@ module.exports = { manufacturer: "Gutamaya", class: 3, hullCost: 21077780, - speed: 306, - boost: 388, - boostEnergy: 21, + speed: 300, + boost: 380, + boostEnergy: 19, agility: 2, - baseShieldStrength: 186, - baseArmour: 486, + baseShieldStrength: 180, + baseArmour: 270, hullMass: 400, masslock: 12, pipSpeed: .1 @@ -1092,10 +1092,10 @@ module.exports = { hullCost: 2481550, speed: 280, boost: 380, - boostEnergy: 11, + boostEnergy: 10, agility: 6, - baseShieldStrength: 230, - baseArmour: 144, + baseShieldStrength: 200, + baseArmour: 80, hullMass: 35, masslock: 7, pipSpeed: .05375 @@ -1151,12 +1151,12 @@ module.exports = { manufacturer: "Gutamaya", class: 3, hullCost: 199926890, - speed: 202, - boost: 323, - boostEnergy: 24, + speed: 200, + boost: 320, + boostEnergy: 23, agility: 2, - baseShieldStrength: 703, - baseArmour: 720, + baseShieldStrength: 600, + baseArmour: 400, hullMass: 1100, masslock: 27, pipSpeed: .05, @@ -1213,12 +1213,12 @@ module.exports = { manufacturer: "Core Dynamics", class: 1, hullCost: 72180, - speed: 298, - boost: 397, - boostEnergy: 9, + speed: 300, + boost: 400, + boostEnergy: 8, agility: 6, - baseShieldStrength: 104, - baseArmour: 108, + baseShieldStrength: 80, + baseArmour: 60, hullMass: 50, masslock: 6, pipSpeed: .075 @@ -1274,12 +1274,12 @@ module.exports = { manufacturer: "Lakon", class: 2, hullCost: 2951180, - speed: 202, - boost: 303, + speed: 200, + boost: 300, boostEnergy: 10, agility: 2, - baseShieldStrength: 99, - baseArmour: 243, + baseShieldStrength: 135, + baseArmour: 135, hullMass: 180, masslock: 8, pipSpeed: .1375, @@ -1336,12 +1336,12 @@ module.exports = { manufacturer: "Saud Kruger", class: 3, hullCost: 47798080, - speed: 303, - boost: 384, - boostEnergy: 17, + speed: 300, + boost: 380, + boostEnergy: 16, agility: 2, - baseShieldStrength: 114, - baseArmour: 396, + baseShieldStrength: 220, + baseArmour: 220, hullMass: 580, masslock: 13, pipSpeed: .08375, @@ -1418,12 +1418,12 @@ module.exports = { manufacturer: "Faulcon DeLacy", class: 2, hullCost: 55171380, - speed: 234, - boost: 305, - boostEnergy: 24, + speed: 230, + boost: 300, + boostEnergy: 23, agility: 6, - baseShieldStrength: 294, - baseArmour: 468, + baseShieldStrength: 260, + baseArmour: 260, hullMass: 350, masslock: 17, pipSpeed: .0975 @@ -1480,11 +1480,11 @@ module.exports = { class: 1, hullCost: 12870, speed: 220, - boost: 321, + boost: 320, boostEnergy: 7, agility: 8, - baseShieldStrength: 52, - baseArmour: 108, + baseShieldStrength: 40, + baseArmour: 60, hullMass: 25, masslock: 6, pipSpeed: .1375 @@ -1540,12 +1540,12 @@ module.exports = { manufacturer: "Lakon", class: 2, hullCost: 865790, - speed: 223, - boost: 355, - boostEnergy: 11, + speed: 220, + boost: 350, + boostEnergy: 10, agility: 3, - baseShieldStrength: 77, - baseArmour: 162, + baseShieldStrength: 90, + baseArmour: 90, hullMass: 155, masslock: 8, pipSpeed: .1475 @@ -1601,12 +1601,12 @@ module.exports = { manufacturer: "Lakon", class: 3, hullCost: 16881510, - speed: 181, - boost: 301, - boostEnergy: 11, + speed: 180, + boost: 300, + boostEnergy: 10, agility: 2, - baseShieldStrength: 78, - baseArmour: 306, + baseShieldStrength: 155, + baseArmour: 170, hullMass: 420, masslock: 10, pipSpeed: .16625 @@ -1662,12 +1662,12 @@ module.exports = { manufacturer: "Lakon", class: 3, hullCost: 73255150, - speed: 131, - boost: 201, - boostEnergy: 21, + speed: 130, + boost: 200, + boostEnergy: 19, agility: 0, - baseShieldStrength: 88, - baseArmour: 432, + baseShieldStrength: 240, + baseArmour: 240, hullMass: 1e3, masslock: 16, pipSpeed: .17375, @@ -1724,12 +1724,12 @@ module.exports = { manufacturer: "Faulcon DeLacy", class: 1, hullCost: 95900, - speed: 310, - boost: 388, - boostEnergy: 11, + speed: 320, + boost: 400, + boostEnergy: 10, agility: 6, - baseShieldStrength: 137, - baseArmour: 126, + baseShieldStrength: 105, + baseArmour: 70, hullMass: 60, masslock: 7, pipSpeed: .09375 @@ -1785,12 +1785,12 @@ module.exports = { manufacturer: "Faulcon DeLacy", class: 1, hullCost: 310220, - speed: 271, - boost: 342, + speed: 270, + boost: 340, boostEnergy: 10, agility: 4, - baseShieldStrength: 103, - baseArmour: 270, + baseShieldStrength: 150, + baseArmour: 150, hullMass: 190, masslock: 7, pipSpeed: .0875 @@ -1846,12 +1846,12 @@ module.exports = { manufacturer: "Core Dynamics", class: 1, hullCost: 4689640, - speed: 215, - boost: 348, - boostEnergy: 17, + speed: 210, + boost: 340, + boostEnergy: 16, agility: 9, - baseShieldStrength: 293, - baseArmour: 288, + baseShieldStrength: 240, + baseArmour: 160, hullMass: 230, masslock: 10, pipSpeed: .02375 @@ -2324,8 +2324,6 @@ module.exports = { rating: "A" } ], t: [ { - M: .17, - P: .235, class: 8, cost: 2007240, edID: 128064098, @@ -2335,12 +2333,14 @@ module.exports = { integrity: 135, mass: 160, maxmass: 3360, + maxmul: 1.03, + minmass: 1120, + minmul: .83, optmass: 2240, + optmul: 1, power: 7.2, rating: "E" }, { - M: .14, - P: .5145, class: 8, cost: 6021720, edID: 128064099, @@ -2350,12 +2350,14 @@ module.exports = { integrity: 120, mass: 64, maxmass: 3780, + maxmul: 1.06, + minmass: 1260, + minmul: .86, optmass: 2520, + optmul: 1, power: 8.1, rating: "D" }, { - M: .1, - P: 1, class: 8, cost: 18065170, edID: 128064100, @@ -2365,12 +2367,14 @@ module.exports = { integrity: 150, mass: 160, maxmass: 4200, + maxmul: 1.1, + minmass: 1400, + minmul: .9, optmass: 2800, + optmul: 1, power: 9, rating: "C" }, { - M: .07, - P: 1.51, class: 8, cost: 54195500, edID: 128064101, @@ -2380,12 +2384,14 @@ module.exports = { integrity: 180, mass: 256, maxmass: 4620, + maxmul: 1.13, + minmass: 1540, + minmul: .93, optmass: 3080, + optmul: 1, power: 9.9, rating: "B" }, { - M: .04, - P: 2.33, class: 8, cost: 162586490, edID: 128064102, @@ -2395,12 +2401,14 @@ module.exports = { integrity: 165, mass: 160, maxmass: 5040, - optmass: 3360, + maxmul: 1.16, + minmass: 1680, + minmul: .96, + optmass: 5040, + optmul: 1, power: 10.8, rating: "A" }, { - M: .17, - P: .235, class: 7, cost: 633200, edID: 128064093, @@ -2410,12 +2418,14 @@ module.exports = { integrity: 118, mass: 80, maxmass: 2160, + maxmul: 1.03, + minmass: 720, + minmul: .83, optmass: 1440, + optmul: 1, power: 6.08, rating: "E" }, { - M: .14, - P: .5145, class: 7, cost: 1899600, edID: 128064094, @@ -2425,12 +2435,14 @@ module.exports = { integrity: 105, mass: 32, maxmass: 2430, + maxmul: .86, + minmass: 810, + minmul: .86, optmass: 1620, + optmul: 1, power: 6.84, rating: "D" }, { - M: .1, - P: 1, class: 7, cost: 5698790, edID: 128064095, @@ -2440,12 +2452,14 @@ module.exports = { integrity: 131, mass: 80, maxmass: 2700, + maxmul: 1.1, + minmass: 900, + minmul: .9, optmass: 1800, + optmul: 1, power: 7.6, rating: "C" }, { - M: .07, - P: 1.51, class: 7, cost: 17096370, edID: 128064096, @@ -2455,12 +2469,14 @@ module.exports = { integrity: 157, mass: 128, maxmass: 2970, + maxmul: 1.13, + minmass: 990, + minmul: .93, optmass: 1980, + optmul: 1, power: 8.36, rating: "B" }, { - M: .04, - P: 2.33, class: 7, cost: 51289110, edID: 128064097, @@ -2470,12 +2486,14 @@ module.exports = { integrity: 144, mass: 80, maxmass: 3240, + maxmul: 1.16, + minmass: 1080, + minmul: .96, optmass: 2160, + optmul: 1, power: 9.12, rating: "A" }, { - M: .17, - P: .235, class: 6, cost: 199750, edID: 128064088, @@ -2485,12 +2503,14 @@ module.exports = { integrity: 102, mass: 40, maxmass: 1440, + maxmul: 1.03, + minmass: 480, + minmul: .83, optmass: 960, + optmul: 1, power: 5.04, rating: "E" }, { - M: .14, - P: .5145, class: 6, cost: 599240, edID: 128064089, @@ -2500,12 +2520,14 @@ module.exports = { integrity: 90, mass: 16, maxmass: 1620, + maxmul: 1.06, + minmass: 540, + minmul: .86, optmass: 1080, + optmul: 1, power: 5.67, rating: "D" }, { - M: .1, - P: 1, class: 6, cost: 1797730, edID: 128064090, @@ -2515,12 +2537,14 @@ module.exports = { integrity: 113, mass: 40, maxmass: 1800, + maxmul: 1.1, + minmass: 600, + minmul: .9, optmass: 1200, + optmul: 1, power: 6.3, rating: "C" }, { - M: .07, - P: 1.51, class: 6, cost: 5393180, edID: 128064091, @@ -2530,12 +2554,14 @@ module.exports = { integrity: 136, mass: 64, maxmass: 1980, + maxmul: 1.13, + minmass: 660, + minmul: .93, optmass: 1320, + optmul: 1, power: 6.93, rating: "B" }, { - M: .04, - P: 2.33, class: 6, cost: 16179530, edID: 128064092, @@ -2545,12 +2571,14 @@ module.exports = { integrity: 124, mass: 40, maxmass: 2160, + maxmul: 1.16, + minmass: 720, + minmul: .96, optmass: 1440, + optmul: 1, power: 7.56, rating: "A" }, { - M: .17, - P: .235, class: 5, cost: 63010, edID: 128064083, @@ -2560,12 +2588,14 @@ module.exports = { integrity: 86, mass: 20, maxmass: 840, + maxmul: 1.03, + minmass: 280, + minmul: .83, optmass: 560, + optmul: 1, power: 4.08, rating: "E" }, { - M: .14, - P: .5145, class: 5, cost: 189040, edID: 128064084, @@ -2575,12 +2605,14 @@ module.exports = { integrity: 77, mass: 8, maxmass: 945, + maxmul: 1.06, + minmass: 315, + minmul: .86, optmass: 630, + optmul: 1, power: 4.59, rating: "D" }, { - M: .1, - P: 1, class: 5, cost: 567110, edID: 128064085, @@ -2590,12 +2622,14 @@ module.exports = { integrity: 96, mass: 20, maxmass: 1050, + maxmul: 1.1, + minmass: 350, + minmul: .9, optmass: 700, + optmul: 1, power: 5.1, rating: "C" }, { - M: .07, - P: 1.51, class: 5, cost: 1701320, edID: 128064086, @@ -2605,12 +2639,14 @@ module.exports = { integrity: 115, mass: 32, maxmass: 1155, + maxmul: 1.13, + minmass: 385, + minmul: .93, optmass: 770, + optmul: 1, power: 5.61, rating: "B" }, { - M: .04, - P: 2.33, class: 5, cost: 5103950, edID: 128064087, @@ -2620,12 +2656,14 @@ module.exports = { integrity: 106, mass: 20, maxmass: 1260, + maxmul: 1.16, + minmass: 420, + minmul: .96, optmass: 840, + optmul: 1, power: 6.12, rating: "A" }, { - M: .17, - P: .235, class: 4, cost: 19880, edID: 128064078, @@ -2635,12 +2673,14 @@ module.exports = { integrity: 72, mass: 10, maxmass: 420, + maxmul: 1.03, + minmass: 140, + minmul: .83, optmass: 280, + optmul: 1, power: 3.28, rating: "E" }, { - M: .14, - P: .5145, class: 4, cost: 59630, edID: 128064079, @@ -2649,13 +2689,15 @@ module.exports = { id: "td", integrity: 64, mass: 4, - maxmass: 473, + maxmass: 472.5, + maxmul: 1.06, + minmass: 157.5, + minmul: .86, optmass: 315, + optmul: 1, power: 3.69, rating: "D" }, { - M: .1, - P: 1, class: 4, cost: 178900, edID: 128064080, @@ -2665,12 +2707,14 @@ module.exports = { integrity: 80, mass: 10, maxmass: 525, + maxmul: 1.1, + minmass: 175, + minmul: .9, optmass: 350, + optmul: 1, power: 4.1, rating: "C" }, { - M: .07, - P: 1.51, class: 4, cost: 536690, edID: 128064081, @@ -2679,13 +2723,15 @@ module.exports = { id: "tb", integrity: 96, mass: 16, - maxmass: 578, + maxmass: 577.5, + maxmul: 1.13, + minmass: 192.5, + minmul: .93, optmass: 385, + optmul: 1, power: 4.51, rating: "B" }, { - M: .04, - P: 2.33, class: 4, cost: 1610080, edID: 128064082, @@ -2695,12 +2741,14 @@ module.exports = { integrity: 88, mass: 10, maxmass: 630, + maxmul: 1.16, + minmass: 210, + minmul: .96, optmass: 420, + optmul: 1, power: 4.92, rating: "A" }, { - M: .17, - P: .235, class: 3, cost: 6270, edID: 128064073, @@ -2710,12 +2758,14 @@ module.exports = { integrity: 58, mass: 5, maxmass: 120, + maxmul: 1.03, + minmass: 40, + minmul: .83, optmass: 80, + optmul: 1, power: 2.48, rating: "E" }, { - M: .14, - P: .5145, class: 3, cost: 18810, edID: 128064074, @@ -2725,12 +2775,14 @@ module.exports = { integrity: 51, mass: 2, maxmass: 135, + maxmul: 1.06, + minmass: 45, + minmul: .86, optmass: 90, + optmul: 1, power: 2.79, rating: "D" }, { - M: .1, - P: 1, class: 3, cost: 56440, edID: 128064075, @@ -2740,12 +2792,14 @@ module.exports = { integrity: 64, mass: 5, maxmass: 150, + maxmul: 1.1, + minmass: 50, + minmul: .9, optmass: 100, + optmul: 1, power: 3.1, rating: "C" }, { - M: .07, - P: 1.51, class: 3, cost: 169300, edID: 128064076, @@ -2755,12 +2809,14 @@ module.exports = { integrity: 77, mass: 8, maxmass: 165, + maxmul: 1.13, + minmass: 55, + minmul: .93, optmass: 110, + optmul: 1, power: 3.41, rating: "B" }, { - M: .04, - P: 2.33, class: 3, cost: 507910, edID: 128064077, @@ -2770,12 +2826,14 @@ module.exports = { integrity: 72, mass: 5, maxmass: 180, + maxmul: 1.16, + minmass: 60, + minmul: .96, optmass: 120, + optmul: 1, power: 3.72, rating: "A" }, { - M: .17, - P: .235, class: 2, cost: 1980, edID: 128064068, @@ -2785,12 +2843,14 @@ module.exports = { integrity: 46, mass: 2.5, maxmass: 72, + maxmul: 1.03, + minmass: 24, + minmul: .83, optmass: 48, + optmul: 1, power: 2, rating: "E" }, { - M: .14, - P: .5145, class: 2, cost: 5930, edID: 128064069, @@ -2800,12 +2860,14 @@ module.exports = { integrity: 41, mass: 1, maxmass: 81, + maxmul: 1.06, + minmass: 27, + minmul: .86, optmass: 54, + optmul: 1, power: 2.25, rating: "D" }, { - M: .1, - P: 1, class: 2, cost: 17800, edID: 128064070, @@ -2815,12 +2877,14 @@ module.exports = { integrity: 51, mass: 2.5, maxmass: 90, + maxmul: 1.1, + minmass: 30, + minmul: .9, optmass: 60, + optmul: 1, power: 2.5, rating: "C" }, { - M: .07, - P: 1.51, class: 2, cost: 53410, edID: 128064071, @@ -2830,12 +2894,14 @@ module.exports = { integrity: 61, mass: 4, maxmass: 99, + maxmul: 1.13, + minmass: 33, + minmul: .93, optmass: 66, + optmul: 1, power: 2.75, rating: "B" }, { - M: .04, - P: 2.33, class: 2, cost: 160220, edID: 128064072, @@ -2845,39 +2911,47 @@ module.exports = { integrity: 56, mass: 2.5, maxmass: 108, + maxmul: .96, + minmass: 36, + minmul: 1.16, optmass: 72, + optmul: 1, power: 3, rating: "A" }, { - M: .04, - P: 2.33, class: 3, - cost: 5103952, + cost: 5103950, edID: 128682013, eddbID: 1548, grp: "t", id: "tz", - integrity: 70, + integrity: 55, mass: 5, maxmass: 200, + maxmul: 1.6, + minmass: 70, + minmul: .9, name: "Enhanced Performance", optmass: 90, + optmul: 1.25, power: 5, rating: "A" }, { - M: .04, - P: 2.33, class: 2, cost: 1610080, edID: 128682014, eddbID: 1547, grp: "t", id: "u0", - integrity: 56, + integrity: 40, mass: 2.5, maxmass: 120, + maxmul: 1.6, + minmass: 50, + minmul: .9, name: "Enhanced Performance", optmass: 60, + optmul: 1.25, power: 4, rating: "A" } ], @@ -8122,9 +8196,9 @@ module.exports = { id: "B6", mass: 1.3, maxmass: 63, - maxmul: .4, + maxmul: 1.4, minmass: 13, - minmul: 1.4, + minmul: .4, optmass: 25, optmul: .9, power: 1.2, @@ -8139,9 +8213,9 @@ module.exports = { id: "B5", mass: 2.5, maxmass: 138, - maxmul: .4, + maxmul: 1.4, minmass: 23, - minmul: 1.4, + minmul: .4, optmass: 55, optmul: .9, power: 1.5, @@ -8156,9 +8230,9 @@ module.exports = { id: "B4", mass: 5, maxmass: 413, - maxmul: .4, + maxmul: 1.4, minmass: 83, - minmul: 1.4, + minmul: .4, optmass: 165, optmul: .9, power: 1.8, @@ -8173,9 +8247,9 @@ module.exports = { id: "B3", mass: 10, maxmass: 713, - maxmul: .4, + maxmul: 1.4, minmass: 143, - minmul: 1.4, + minmul: .4, optmass: 285, optmul: .9, power: 2.2, @@ -8190,9 +8264,9 @@ module.exports = { id: "B2", mass: 20, maxmass: 1013, - maxmul: .4, + maxmul: 1.4, minmass: 203, - minmul: 1.4, + minmul: .4, optmass: 405, optmul: .9, power: 2.6, @@ -8207,9 +8281,9 @@ module.exports = { id: "B1", mass: 40, maxmass: 1350, - maxmul: .4, + maxmul: 1.4, minmass: 270, - minmul: 1.4, + minmul: .4, optmass: 540, optmul: .9, power: 3.1, @@ -8224,9 +8298,9 @@ module.exports = { id: "B0", mass: 80, maxmass: 2650, - maxmul: .4, + maxmul: 1.4, minmass: 530, - minmul: 1.4, + minmul: .4, optmass: 1060, optmul: .9, power: 3.5, @@ -8241,9 +8315,9 @@ module.exports = { id: "B7", mass: 160, maxmass: 4500, - maxmul: .4, + maxmul: 1.4, minmass: 900, - minmul: 1.4, + minmul: .4, optmass: 1800, optmul: .9, power: 4, @@ -10026,9 +10100,9 @@ module.exports = { id: "p6", mass: 2.5, maxmass: 63, - maxmul: 1, + maxmul: 2, minmass: 13, - minmul: 2, + minmul: 1, optmass: 25, optmul: 1.5, power: 2.52, @@ -10044,9 +10118,9 @@ module.exports = { id: "p5", mass: 5, maxmass: 138, - maxmul: 1, + maxmul: 2, minmass: 23, - minmul: 2, + minmul: 1, optmass: 55, optmul: 1.5, power: 3.15, @@ -10062,9 +10136,9 @@ module.exports = { id: "p4", mass: 10, maxmass: 413, - maxmul: 1, + maxmul: 2, minmass: 83, - minmul: 2, + minmul: 1, optmass: 165, optmul: 1.5, power: 3.78, @@ -10080,9 +10154,9 @@ module.exports = { id: "p3", mass: 20, maxmass: 713, - maxmul: 1, + maxmul: 2, minmass: 143, - minmul: 2, + minmul: 1, optmass: 285, optmul: 1.5, power: 4.62, @@ -10098,9 +10172,9 @@ module.exports = { id: "p2", mass: 40, maxmass: 1013, - maxmul: 1, + maxmul: 2, minmass: 203, - minmul: 2, + minmul: 1, optmass: 405, optmul: 1.5, power: 5.46, @@ -10116,9 +10190,9 @@ module.exports = { id: "p1", mass: 80, maxmass: 1350, - maxmul: 1, + maxmul: 2, minmass: 270, - minmul: 2, + minmul: 1, optmass: 540, optmul: 1.5, power: 6.51, @@ -10134,9 +10208,9 @@ module.exports = { id: "p0", mass: 160, maxmass: 2650, - maxmul: 1, + maxmul: 2, minmass: 530, - minmul: 2, + minmul: 1, optmass: 1060, optmul: 1.5, power: 7.35, @@ -10152,9 +10226,9 @@ module.exports = { id: "p7", mass: 320, maxmass: 4500, - maxmul: 1, + maxmul: 2, minmass: 900, - minmul: 2, + minmul: 1, optmass: 1800, optmul: 1.5, power: 8.4, @@ -11366,9 +11440,9 @@ module.exports = { id: "4t", mass: 160, maxmass: 4500, - maxmul: .3, + maxmul: 1.3, minmass: 900, - minmul: 1.3, + minmul: .3, optmass: 1800, optmul: .8, power: 2.4, @@ -11383,9 +11457,9 @@ module.exports = { id: "4s", mass: 64, maxmass: 4500, - maxmul: .4, + maxmul: 1.4, minmass: 900, - minmul: 1.4, + minmul: .4, optmass: 1800, optmul: .9, power: 3.2, @@ -11400,9 +11474,9 @@ module.exports = { id: "4r", mass: 160, maxmass: 4500, - maxmul: .5, + maxmul: 1.5, minmass: 900, - minmul: 1.5, + minmul: .5, optmass: 1800, optmul: 1, power: 4, @@ -11417,9 +11491,9 @@ module.exports = { id: "4q", mass: 256, maxmass: 4500, - maxmul: .6, + maxmul: 1.6, minmass: 900, - minmul: 1.6, + minmul: .6, optmass: 1800, optmul: 1.1, power: 4.8, @@ -11434,9 +11508,9 @@ module.exports = { id: "4p", mass: 160, maxmass: 4500, - maxmul: .7, + maxmul: 1.7, minmass: 900, - minmul: 1.7, + minmul: .7, optmass: 1800, optmul: 1.2, power: 5.6, @@ -11451,9 +11525,9 @@ module.exports = { id: "4o", mass: 80, maxmass: 2650, - maxmul: .3, + maxmul: 1.3, minmass: 530, - minmul: 1.3, + minmul: .3, optmass: 1060, optmul: .8, power: 2.1, @@ -11468,9 +11542,9 @@ module.exports = { id: "4n", mass: 32, maxmass: 2650, - maxmul: .4, + maxmul: 1.4, minmass: 530, - minmul: 1.4, + minmul: .4, optmass: 1060, optmul: .9, power: 2.8, @@ -11485,9 +11559,9 @@ module.exports = { id: "4m", mass: 80, maxmass: 2650, - maxmul: .5, + maxmul: 1.5, minmass: 530, - minmul: 1.5, + minmul: .5, optmass: 1060, optmul: 1, power: 3.5, @@ -11502,9 +11576,9 @@ module.exports = { id: "4l", mass: 128, maxmass: 2650, - maxmul: .6, + maxmul: 1.6, minmass: 530, - minmul: 1.6, + minmul: .6, optmass: 1060, optmul: 1.1, power: 4.2, @@ -11519,9 +11593,9 @@ module.exports = { id: "4k", mass: 80, maxmass: 2650, - maxmul: .7, + maxmul: 1.7, minmass: 530, - minmul: 1.7, + minmul: .7, optmass: 1060, optmul: 1.2, power: 4.9, @@ -11536,9 +11610,9 @@ module.exports = { id: "4j", mass: 40, maxmass: 1350, - maxmul: .3, + maxmul: 1.3, minmass: 270, - minmul: 1.3, + minmul: .3, optmass: 540, optmul: .8, power: 1.86, @@ -11553,9 +11627,9 @@ module.exports = { id: "4i", mass: 16, maxmass: 1350, - maxmul: .4, + maxmul: 1.4, minmass: 270, - minmul: 1.4, + minmul: .4, optmass: 540, optmul: .9, power: 2.48, @@ -11570,9 +11644,9 @@ module.exports = { id: "4h", mass: 40, maxmass: 1350, - maxmul: .5, + maxmul: 1.5, minmass: 270, - minmul: 1.5, + minmul: .5, optmass: 540, optmul: 1, power: 3.1, @@ -11587,9 +11661,9 @@ module.exports = { id: "4g", mass: 64, maxmass: 1350, - maxmul: .6, + maxmul: 1.6, minmass: 270, - minmul: 1.6, + minmul: .6, optmass: 540, optmul: 1.1, power: 3.72, @@ -11604,9 +11678,9 @@ module.exports = { id: "4f", mass: 40, maxmass: 1350, - maxmul: .7, + maxmul: 1.7, minmass: 270, - minmul: 1.7, + minmul: .7, optmass: 540, optmul: 1.2, power: 4.34, @@ -11621,9 +11695,9 @@ module.exports = { id: "4e", mass: 20, maxmass: 1013, - maxmul: .3, + maxmul: 1.3, minmass: 203, - minmul: 1.3, + minmul: .3, optmass: 405, optmul: .8, power: 1.56, @@ -11638,9 +11712,9 @@ module.exports = { id: "4d", mass: 8, maxmass: 1013, - maxmul: .4, + maxmul: 1.4, minmass: 203, - minmul: 1.4, + minmul: .4, optmass: 405, optmul: .9, power: 2.08, @@ -11655,9 +11729,9 @@ module.exports = { id: "4c", mass: 20, maxmass: 1013, - maxmul: .5, + maxmul: 1.5, minmass: 203, - minmul: 1.5, + minmul: .5, optmass: 405, optmul: 1, power: 2.6, @@ -11672,9 +11746,9 @@ module.exports = { id: "4b", mass: 32, maxmass: 1013, - maxmul: .6, + maxmul: 1.6, minmass: 203, - minmul: 1.6, + minmul: .6, optmass: 405, optmul: 1.1, power: 3.12, @@ -11689,9 +11763,9 @@ module.exports = { id: "4a", mass: 20, maxmass: 1013, - maxmul: .7, + maxmul: 1.7, minmass: 203, - minmul: 1.7, + minmul: .7, optmass: 405, optmul: 1.2, power: 3.64, @@ -11706,9 +11780,9 @@ module.exports = { id: "49", mass: 10, maxmass: 713, - maxmul: .3, + maxmul: 1.3, minmass: 143, - minmul: 1.3, + minmul: .3, optmass: 285, optmul: .8, power: 1.32, @@ -11723,9 +11797,9 @@ module.exports = { id: "48", mass: 4, maxmass: 713, - maxmul: .4, + maxmul: 1.4, minmass: 143, - minmul: 1.4, + minmul: .4, optmass: 285, optmul: .9, power: 1.76, @@ -11740,9 +11814,9 @@ module.exports = { id: "47", mass: 10, maxmass: 713, - maxmul: .5, + maxmul: 1.5, minmass: 143, - minmul: 1.5, + minmul: .5, optmass: 285, optmul: 1, power: 2.2, @@ -11757,9 +11831,9 @@ module.exports = { id: "46", mass: 16, maxmass: 713, - maxmul: .6, + maxmul: 1.6, minmass: 143, - minmul: 1.6, + minmul: .6, optmass: 285, optmul: 1.1, power: 2.64, @@ -11774,9 +11848,9 @@ module.exports = { id: "45", mass: 10, maxmass: 713, - maxmul: .7, + maxmul: 1.7, minmass: 143, - minmul: 1.7, + minmul: .7, optmass: 285, optmul: 1.2, power: 3.08, @@ -11791,9 +11865,9 @@ module.exports = { id: "44", mass: 5, maxmass: 413, - maxmul: .3, + maxmul: 1.3, minmass: 83, - minmul: 1.3, + minmul: .3, optmass: 165, optmul: .8, power: 1.08, @@ -11808,9 +11882,9 @@ module.exports = { id: "43", mass: 2, maxmass: 413, - maxmul: .4, + maxmul: 1.4, minmass: 83, - minmul: 1.4, + minmul: .4, optmass: 165, optmul: .9, power: 1.44, @@ -11825,9 +11899,9 @@ module.exports = { id: "42", mass: 5, maxmass: 413, - maxmul: .5, + maxmul: 1.5, minmass: 83, - minmul: 1.5, + minmul: .5, optmass: 165, optmul: 1, power: 1.8, @@ -11842,9 +11916,9 @@ module.exports = { id: "41", mass: 8, maxmass: 413, - maxmul: .6, + maxmul: 1.6, minmass: 83, - minmul: 1.6, + minmul: .6, optmass: 165, optmul: 1.1, power: 2.16, @@ -11859,9 +11933,9 @@ module.exports = { id: "40", mass: 5, maxmass: 413, - maxmul: .7, + maxmul: 1.7, minmass: 83, - minmul: 1.7, + minmul: .7, optmass: 165, optmul: 1.2, power: 2.52, @@ -11876,9 +11950,9 @@ module.exports = { id: "3v", mass: 2.5, maxmass: 138, - maxmul: .3, + maxmul: 1.3, minmass: 28, - minmul: 1.3, + minmul: .3, optmass: 55, optmul: .8, power: .9, @@ -11893,9 +11967,9 @@ module.exports = { id: "3u", mass: 1, maxmass: 138, - maxmul: .4, + maxmul: 1.4, minmass: 28, - minmul: 1.4, + minmul: .4, optmass: 55, optmul: .9, power: 1.2, @@ -11910,9 +11984,9 @@ module.exports = { id: "3t", mass: 2.5, maxmass: 138, - maxmul: .5, + maxmul: 1.5, minmass: 28, - minmul: 1.5, + minmul: .5, optmass: 55, optmul: 1, power: 1.5, @@ -11927,9 +12001,9 @@ module.exports = { id: "3s", mass: 4, maxmass: 138, - maxmul: .6, + maxmul: 1.6, minmass: 28, - minmul: 1.6, + minmul: .6, optmass: 55, optmul: 1.1, power: 1.8, @@ -11944,9 +12018,9 @@ module.exports = { id: "3r", mass: 2.5, maxmass: 138, - maxmul: .7, + maxmul: 1.7, minmass: 28, - minmul: 1.7, + minmul: .7, optmass: 55, optmul: 1.2, power: 2.1, @@ -11961,9 +12035,9 @@ module.exports = { id: "1x", mass: 1.3, maxmass: 63, - maxmul: .7, + maxmul: 1.7, minmass: 13, - minmul: 1.7, + minmul: .7, optmass: 25, optmul: 1.2, power: 1.68, diff --git a/dist/index.json b/dist/index.json index 5248f98..dc9a641 100644 --- a/dist/index.json +++ b/dist/index.json @@ -12,8 +12,8 @@ "boost": 320, "boostEnergy": 9, "agility": 8, - "baseShieldStrength": 78, - "baseArmour": 162, + "baseShieldStrength": 60, + "baseArmour": 90, "hullMass": 35, "masslock": 7, "pipSpeed": 0.13625 @@ -115,12 +115,12 @@ "manufacturer": "Faulcon DeLacy", "class": 3, "hullCost": 141889930, - "speed": 183, - "boost": 244, - "boostEnergy": 29, + "speed": 180, + "boost": 240, + "boostEnergy": 27, "agility": 2, - "baseShieldStrength": 362, - "baseArmour": 945, + "baseShieldStrength": 350, + "baseArmour": 525, "hullMass": 400, "masslock": 23, "pipSpeed": 0.13875, @@ -257,12 +257,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 6135660, - "speed": 254, - "boost": 345, - "boostEnergy": 14, + "speed": 250, + "boost": 340, + "boostEnergy": 13, "agility": 6, - "baseShieldStrength": 152, - "baseArmour": 378, + "baseShieldStrength": 140, + "baseArmour": 210, "hullMass": 280, "masslock": 11, "pipSpeed": 0.13 @@ -378,12 +378,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 3818240, - "speed": 223, - "boost": 304, + "speed": 220, + "boost": 300, "boostEnergy": 13, "agility": 8, - "baseShieldStrength": 105, - "baseArmour": 324, + "baseShieldStrength": 120, + "baseArmour": 180, "hullMass": 150, "masslock": 8, "pipSpeed": 0.125 @@ -487,12 +487,12 @@ "manufacturer": "Saud Kruger", "class": 3, "hullCost": 79654610, - "speed": 195, - "boost": 273, - "boostEnergy": 20, + "speed": 200, + "boost": 280, + "boostEnergy": 19, "agility": 2, - "baseShieldStrength": 92, - "baseArmour": 504, + "baseShieldStrength": 280, + "baseArmour": 280, "hullMass": 1100, "masslock": 18, "pipSpeed": -1, @@ -660,12 +660,12 @@ "manufacturer": "Faulcon DeLacy", "class": 1, "hullCost": 205800, - "speed": 282, - "boost": 402, - "boostEnergy": 11, + "speed": 280, + "boost": 400, + "boostEnergy": 10, "agility": 6, - "baseShieldStrength": 92, - "baseArmour": 216, + "baseShieldStrength": 80, + "baseArmour": 120, "hullMass": 180, "masslock": 8, "pipSpeed": 0.125 @@ -772,11 +772,11 @@ "class": 1, "hullCost": 603740, "speed": 200, - "boost": 299, - "boostEnergy": 11, + "boost": 300, + "boostEnergy": 10, "agility": 4, - "baseShieldStrength": 125, - "baseArmour": 216, + "baseShieldStrength": 120, + "baseArmour": 120, "hullMass": 210, "masslock": 8, "pipSpeed": 0.125 @@ -888,12 +888,12 @@ "manufacturer": "Lakon", "class": 1, "hullCost": 1635700, - "speed": 242, - "boost": 316, - "boostEnergy": 14, + "speed": 260, + "boost": 340, + "boostEnergy": 13, "agility": 5, - "baseShieldStrength": 115, - "baseArmour": 270, + "baseShieldStrength": 150, + "baseArmour": 150, "hullMass": 298, "masslock": 10, "pipSpeed": 0.09625 @@ -999,12 +999,12 @@ "manufacturer": "Lakon", "class": 1, "hullCost": 461340, - "speed": 283, - "boost": 384, - "boostEnergy": 11, + "speed": 280, + "boost": 380, + "boostEnergy": 10, "agility": 8, - "baseShieldStrength": 93, - "baseArmour": 216, + "baseShieldStrength": 120, + "baseArmour": 120, "hullMass": 170, "masslock": 8, "pipSpeed": 0.09875 @@ -1110,12 +1110,12 @@ "manufacturer": "Core Dynamics", "class": 1, "hullCost": 10440, - "speed": 239, - "boost": 349, - "boostEnergy": 9, + "speed": 240, + "boost": 350, + "boostEnergy": 8, "agility": 10, - "baseShieldStrength": 89, - "baseArmour": 72, + "baseShieldStrength": 60, + "baseArmour": 40, "hullMass": 50, "masslock": 6, "pipSpeed": 0.0625 @@ -1213,12 +1213,12 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 19072000, - "speed": 214, - "boost": 357, - "boostEnergy": 21, + "speed": 210, + "boost": 350, + "boostEnergy": 19, "agility": 6, - "baseShieldStrength": 133, - "baseArmour": 540, + "baseShieldStrength": 200, + "baseArmour": 300, "hullMass": 480, "masslock": 14, "pipSpeed": 0.11125 @@ -1328,11 +1328,11 @@ "manufacturer": "Core Dynamics", "class": 3, "hullCost": 182589570, - "speed": 198, - "boost": 257, + "speed": 200, + "boost": 260, "boostEnergy": 27, "agility": 2, - "baseShieldStrength": 516, + "baseShieldStrength": 555, "baseArmour": 666, "hullMass": 900, "masslock": 24, @@ -1466,12 +1466,12 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 13469990, - "speed": 182, - "boost": 304, - "boostEnergy": 21, + "speed": 180, + "boost": 300, + "boostEnergy": 19, "agility": 2, - "baseShieldStrength": 104, - "baseArmour": 540, + "baseShieldStrength": 200, + "baseArmour": 300, "hullMass": 580, "masslock": 14, "pipSpeed": 0.0725 @@ -1585,12 +1585,12 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 34774790, - "speed": 171, - "boost": 282, - "boostEnergy": 21, + "speed": 170, + "boost": 280, + "boostEnergy": 23, "agility": 2, - "baseShieldStrength": 186, - "baseArmour": 630, + "baseShieldStrength": 250, + "baseArmour": 350, "hullMass": 580, "masslock": 14, "pipSpeed": 0.1025, @@ -1705,12 +1705,12 @@ "manufacturer": "Zorgon Peterson", "class": 2, "hullCost": 51232230, - "speed": 265, - "boost": 357, - "boostEnergy": 21, + "speed": 260, + "boost": 350, + "boostEnergy": 19, "agility": 6, - "baseShieldStrength": 271, - "baseArmour": 405, + "baseShieldStrength": 300, + "baseArmour": 225, "hullMass": 250, "masslock": 12, "pipSpeed": 0.03875 @@ -1824,12 +1824,12 @@ "manufacturer": "Zorgon Peterson", "class": 1, "hullCost": 29790, - "speed": 203, - "boost": 305, + "speed": 200, + "boost": 300, "agility": 6, "boostEnergy": 7, - "baseShieldStrength": 65, - "baseArmour": 90, + "baseShieldStrength": 50, + "baseArmour": 50, "hullMass": 14, "masslock": 6, "pipSpeed": 0.1625 @@ -1925,12 +1925,12 @@ "manufacturer": "Gutamaya", "class": 3, "hullCost": 21077780, - "speed": 306, - "boost": 388, - "boostEnergy": 21, + "speed": 300, + "boost": 380, + "boostEnergy": 19, "agility": 2, - "baseShieldStrength": 186, - "baseArmour": 486, + "baseShieldStrength": 180, + "baseArmour": 270, "hullMass": 400, "masslock": 12, "pipSpeed": 0.1 @@ -2046,10 +2046,10 @@ "hullCost": 2481550, "speed": 280, "boost": 380, - "boostEnergy": 11, + "boostEnergy": 10, "agility": 6, - "baseShieldStrength": 230, - "baseArmour": 144, + "baseShieldStrength": 200, + "baseArmour": 80, "hullMass": 35, "masslock": 7, "pipSpeed": 0.05375 @@ -2157,12 +2157,12 @@ "manufacturer": "Gutamaya", "class": 3, "hullCost": 199926890, - "speed": 202, - "boost": 323, - "boostEnergy": 24, + "speed": 200, + "boost": 320, + "boostEnergy": 23, "agility": 2, - "baseShieldStrength": 703, - "baseArmour": 720, + "baseShieldStrength": 600, + "baseArmour": 400, "hullMass": 1100, "masslock": 27, "pipSpeed": 0.05, @@ -2293,12 +2293,12 @@ "manufacturer": "Core Dynamics", "class": 1, "hullCost": 72180, - "speed": 298, - "boost": 397, - "boostEnergy": 9, + "speed": 300, + "boost": 400, + "boostEnergy": 8, "agility": 6, - "baseShieldStrength": 104, - "baseArmour": 108, + "baseShieldStrength": 80, + "baseArmour": 60, "hullMass": 50, "masslock": 6, "pipSpeed": 0.075 @@ -2396,12 +2396,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 2951180, - "speed": 202, - "boost": 303, + "speed": 200, + "boost": 300, "boostEnergy": 10, "agility": 2, - "baseShieldStrength": 99, - "baseArmour": 243, + "baseShieldStrength": 135, + "baseArmour": 135, "hullMass": 180, "masslock": 8, "pipSpeed": 0.1375, @@ -2510,12 +2510,12 @@ "manufacturer": "Saud Kruger", "class": 3, "hullCost": 47798080, - "speed": 303, - "boost": 384, - "boostEnergy": 17, + "speed": 300, + "boost": 380, + "boostEnergy": 16, "agility": 2, - "baseShieldStrength": 114, - "baseArmour": 396, + "baseShieldStrength": 220, + "baseArmour": 220, "hullMass": 580, "masslock": 13, "pipSpeed": 0.08375, @@ -2648,12 +2648,12 @@ "manufacturer": "Faulcon DeLacy", "class": 2, "hullCost": 55171380, - "speed": 234, - "boost": 305, - "boostEnergy": 24, + "speed": 230, + "boost": 300, + "boostEnergy": 23, "agility": 6, - "baseShieldStrength": 294, - "baseArmour": 468, + "baseShieldStrength": 260, + "baseArmour": 260, "hullMass": 350, "masslock": 17, "pipSpeed": 0.0975 @@ -2772,11 +2772,11 @@ "class": 1, "hullCost": 12870, "speed": 220, - "boost": 321, + "boost": 320, "boostEnergy": 7, "agility": 8, - "baseShieldStrength": 52, - "baseArmour": 108, + "baseShieldStrength": 40, + "baseArmour": 60, "hullMass": 25, "masslock": 6, "pipSpeed": 0.1375 @@ -2874,12 +2874,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 865790, - "speed": 223, - "boost": 355, - "boostEnergy": 11, + "speed": 220, + "boost": 350, + "boostEnergy": 10, "agility": 3, - "baseShieldStrength": 77, - "baseArmour": 162, + "baseShieldStrength": 90, + "baseArmour": 90, "hullMass": 155, "masslock": 8, "pipSpeed": 0.1475 @@ -2985,12 +2985,12 @@ "manufacturer": "Lakon", "class": 3, "hullCost": 16881510, - "speed": 181, - "boost": 301, - "boostEnergy": 11, + "speed": 180, + "boost": 300, + "boostEnergy": 10, "agility": 2, - "baseShieldStrength": 78, - "baseArmour": 306, + "baseShieldStrength": 155, + "baseArmour": 170, "hullMass": 420, "masslock": 10, "pipSpeed": 0.16625 @@ -3104,12 +3104,12 @@ "manufacturer": "Lakon", "class": 3, "hullCost": 73255150, - "speed": 131, - "boost": 201, - "boostEnergy": 21, + "speed": 130, + "boost": 200, + "boostEnergy": 19, "agility": 0, - "baseShieldStrength": 88, - "baseArmour": 432, + "baseShieldStrength": 240, + "baseArmour": 240, "hullMass": 1000, "masslock": 16, "pipSpeed": 0.17375, @@ -3228,12 +3228,12 @@ "manufacturer": "Faulcon DeLacy", "class": 1, "hullCost": 95900, - "speed": 310, - "boost": 388, - "boostEnergy": 11, + "speed": 320, + "boost": 400, + "boostEnergy": 10, "agility": 6, - "baseShieldStrength": 137, - "baseArmour": 126, + "baseShieldStrength": 105, + "baseArmour": 70, "hullMass": 60, "masslock": 7, "pipSpeed": 0.09375 @@ -3335,12 +3335,12 @@ "manufacturer": "Faulcon DeLacy", "class": 1, "hullCost": 310220, - "speed": 271, - "boost": 342, + "speed": 270, + "boost": 340, "boostEnergy": 10, "agility": 4, - "baseShieldStrength": 103, - "baseArmour": 270, + "baseShieldStrength": 150, + "baseArmour": 150, "hullMass": 190, "masslock": 7, "pipSpeed": 0.0875 @@ -3446,12 +3446,12 @@ "manufacturer": "Core Dynamics", "class": 1, "hullCost": 4689640, - "speed": 215, - "boost": 348, - "boostEnergy": 17, + "speed": 210, + "boost": 340, + "boostEnergy": 16, "agility": 9, - "baseShieldStrength": 293, - "baseArmour": 288, + "baseShieldStrength": 240, + "baseArmour": 160, "hullMass": 230, "masslock": 10, "pipSpeed": 0.02375 @@ -4009,8 +4009,6 @@ ], "t": [ { - "M": 0.17, - "P": 0.235, "class": 8, "cost": 2007240, "edID": 128064098, @@ -4020,13 +4018,15 @@ "integrity": 135, "mass": 160, "maxmass": 3360, + "maxmul": 1.03, + "minmass": 1120, + "minmul": 0.83, "optmass": 2240, + "optmul": 1, "power": 7.2, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 8, "cost": 6021720, "edID": 128064099, @@ -4036,13 +4036,15 @@ "integrity": 120, "mass": 64, "maxmass": 3780, + "maxmul": 1.06, + "minmass": 1260, + "minmul": 0.86, "optmass": 2520, + "optmul": 1, "power": 8.1, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 8, "cost": 18065170, "edID": 128064100, @@ -4052,13 +4054,15 @@ "integrity": 150, "mass": 160, "maxmass": 4200, + "maxmul": 1.1, + "minmass": 1400, + "minmul": 0.9, "optmass": 2800, + "optmul": 1, "power": 9, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 8, "cost": 54195500, "edID": 128064101, @@ -4068,13 +4072,15 @@ "integrity": 180, "mass": 256, "maxmass": 4620, + "maxmul": 1.13, + "minmass": 1540, + "minmul": 0.93, "optmass": 3080, + "optmul": 1, "power": 9.9, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 8, "cost": 162586490, "edID": 128064102, @@ -4084,13 +4090,15 @@ "integrity": 165, "mass": 160, "maxmass": 5040, - "optmass": 3360, + "maxmul": 1.16, + "minmass": 1680, + "minmul": 0.96, + "optmass": 5040, + "optmul": 1, "power": 10.8, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 7, "cost": 633200, "edID": 128064093, @@ -4100,13 +4108,15 @@ "integrity": 118, "mass": 80, "maxmass": 2160, + "maxmul": 1.03, + "minmass": 720, + "minmul": 0.83, "optmass": 1440, + "optmul": 1, "power": 6.08, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 7, "cost": 1899600, "edID": 128064094, @@ -4116,13 +4126,15 @@ "integrity": 105, "mass": 32, "maxmass": 2430, + "maxmul": 0.86, + "minmass": 810, + "minmul": 0.86, "optmass": 1620, + "optmul": 1, "power": 6.84, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 7, "cost": 5698790, "edID": 128064095, @@ -4132,13 +4144,15 @@ "integrity": 131, "mass": 80, "maxmass": 2700, + "maxmul": 1.1, + "minmass": 900, + "minmul": 0.9, "optmass": 1800, + "optmul": 1, "power": 7.6, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 7, "cost": 17096370, "edID": 128064096, @@ -4148,13 +4162,15 @@ "integrity": 157, "mass": 128, "maxmass": 2970, + "maxmul": 1.13, + "minmass": 990, + "minmul": 0.93, "optmass": 1980, + "optmul": 1, "power": 8.36, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 7, "cost": 51289110, "edID": 128064097, @@ -4164,13 +4180,15 @@ "integrity": 144, "mass": 80, "maxmass": 3240, + "maxmul": 1.16, + "minmass": 1080, + "minmul": 0.96, "optmass": 2160, + "optmul": 1, "power": 9.12, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 6, "cost": 199750, "edID": 128064088, @@ -4180,13 +4198,15 @@ "integrity": 102, "mass": 40, "maxmass": 1440, + "maxmul": 1.03, + "minmass": 480, + "minmul": 0.83, "optmass": 960, + "optmul": 1, "power": 5.04, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 6, "cost": 599240, "edID": 128064089, @@ -4196,13 +4216,15 @@ "integrity": 90, "mass": 16, "maxmass": 1620, + "maxmul": 1.06, + "minmass": 540, + "minmul": 0.86, "optmass": 1080, + "optmul": 1, "power": 5.67, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 6, "cost": 1797730, "edID": 128064090, @@ -4212,13 +4234,15 @@ "integrity": 113, "mass": 40, "maxmass": 1800, + "maxmul": 1.1, + "minmass": 600, + "minmul": 0.9, "optmass": 1200, + "optmul": 1, "power": 6.3, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 6, "cost": 5393180, "edID": 128064091, @@ -4228,13 +4252,15 @@ "integrity": 136, "mass": 64, "maxmass": 1980, + "maxmul": 1.13, + "minmass": 660, + "minmul": 0.93, "optmass": 1320, + "optmul": 1, "power": 6.93, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 6, "cost": 16179530, "edID": 128064092, @@ -4244,13 +4270,15 @@ "integrity": 124, "mass": 40, "maxmass": 2160, + "maxmul": 1.16, + "minmass": 720, + "minmul": 0.96, "optmass": 1440, + "optmul": 1, "power": 7.56, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 5, "cost": 63010, "edID": 128064083, @@ -4260,13 +4288,15 @@ "integrity": 86, "mass": 20, "maxmass": 840, + "maxmul": 1.03, + "minmass": 280, + "minmul": 0.83, "optmass": 560, + "optmul": 1, "power": 4.08, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 5, "cost": 189040, "edID": 128064084, @@ -4276,13 +4306,15 @@ "integrity": 77, "mass": 8, "maxmass": 945, + "maxmul": 1.06, + "minmass": 315, + "minmul": 0.86, "optmass": 630, + "optmul": 1, "power": 4.59, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 5, "cost": 567110, "edID": 128064085, @@ -4292,13 +4324,15 @@ "integrity": 96, "mass": 20, "maxmass": 1050, + "maxmul": 1.1, + "minmass": 350, + "minmul": 0.9, "optmass": 700, + "optmul": 1, "power": 5.1, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 5, "cost": 1701320, "edID": 128064086, @@ -4308,13 +4342,15 @@ "integrity": 115, "mass": 32, "maxmass": 1155, + "maxmul": 1.13, + "minmass": 385, + "minmul": 0.93, "optmass": 770, + "optmul": 1, "power": 5.61, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 5, "cost": 5103950, "edID": 128064087, @@ -4324,13 +4360,15 @@ "integrity": 106, "mass": 20, "maxmass": 1260, + "maxmul": 1.16, + "minmass": 420, + "minmul": 0.96, "optmass": 840, + "optmul": 1, "power": 6.12, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 4, "cost": 19880, "edID": 128064078, @@ -4340,13 +4378,15 @@ "integrity": 72, "mass": 10, "maxmass": 420, + "maxmul": 1.03, + "minmass": 140, + "minmul": 0.83, "optmass": 280, + "optmul": 1, "power": 3.28, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 4, "cost": 59630, "edID": 128064079, @@ -4355,14 +4395,16 @@ "id": "td", "integrity": 64, "mass": 4, - "maxmass": 473, + "maxmass": 472.5, + "maxmul": 1.06, + "minmass": 157.5, + "minmul": 0.86, "optmass": 315, + "optmul": 1, "power": 3.69, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 4, "cost": 178900, "edID": 128064080, @@ -4372,13 +4414,15 @@ "integrity": 80, "mass": 10, "maxmass": 525, + "maxmul": 1.1, + "minmass": 175, + "minmul": 0.9, "optmass": 350, + "optmul": 1, "power": 4.1, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 4, "cost": 536690, "edID": 128064081, @@ -4387,14 +4431,16 @@ "id": "tb", "integrity": 96, "mass": 16, - "maxmass": 578, + "maxmass": 577.5, + "maxmul": 1.13, + "minmass": 192.5, + "minmul": 0.93, "optmass": 385, + "optmul": 1, "power": 4.51, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 4, "cost": 1610080, "edID": 128064082, @@ -4404,13 +4450,15 @@ "integrity": 88, "mass": 10, "maxmass": 630, + "maxmul": 1.16, + "minmass": 210, + "minmul": 0.96, "optmass": 420, + "optmul": 1, "power": 4.92, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 3, "cost": 6270, "edID": 128064073, @@ -4420,13 +4468,15 @@ "integrity": 58, "mass": 5, "maxmass": 120, + "maxmul": 1.03, + "minmass": 40, + "minmul": 0.83, "optmass": 80, + "optmul": 1, "power": 2.48, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 3, "cost": 18810, "edID": 128064074, @@ -4436,13 +4486,15 @@ "integrity": 51, "mass": 2, "maxmass": 135, + "maxmul": 1.06, + "minmass": 45, + "minmul": 0.86, "optmass": 90, + "optmul": 1, "power": 2.79, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 3, "cost": 56440, "edID": 128064075, @@ -4452,13 +4504,15 @@ "integrity": 64, "mass": 5, "maxmass": 150, + "maxmul": 1.1, + "minmass": 50, + "minmul": 0.9, "optmass": 100, + "optmul": 1, "power": 3.1, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 3, "cost": 169300, "edID": 128064076, @@ -4468,13 +4522,15 @@ "integrity": 77, "mass": 8, "maxmass": 165, + "maxmul": 1.13, + "minmass": 55, + "minmul": 0.93, "optmass": 110, + "optmul": 1, "power": 3.41, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 3, "cost": 507910, "edID": 128064077, @@ -4484,13 +4540,15 @@ "integrity": 72, "mass": 5, "maxmass": 180, + "maxmul": 1.16, + "minmass": 60, + "minmul": 0.96, "optmass": 120, + "optmul": 1, "power": 3.72, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 2, "cost": 1980, "edID": 128064068, @@ -4500,13 +4558,15 @@ "integrity": 46, "mass": 2.5, "maxmass": 72, + "maxmul": 1.03, + "minmass": 24, + "minmul": 0.83, "optmass": 48, + "optmul": 1, "power": 2, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 2, "cost": 5930, "edID": 128064069, @@ -4516,13 +4576,15 @@ "integrity": 41, "mass": 1, "maxmass": 81, + "maxmul": 1.06, + "minmass": 27, + "minmul": 0.86, "optmass": 54, + "optmul": 1, "power": 2.25, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 2, "cost": 17800, "edID": 128064070, @@ -4532,13 +4594,15 @@ "integrity": 51, "mass": 2.5, "maxmass": 90, + "maxmul": 1.1, + "minmass": 30, + "minmul": 0.9, "optmass": 60, + "optmul": 1, "power": 2.5, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 2, "cost": 53410, "edID": 128064071, @@ -4548,13 +4612,15 @@ "integrity": 61, "mass": 4, "maxmass": 99, + "maxmul": 1.13, + "minmass": 33, + "minmul": 0.93, "optmass": 66, + "optmul": 1, "power": 2.75, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 2, "cost": 160220, "edID": 128064072, @@ -4564,41 +4630,49 @@ "integrity": 56, "mass": 2.5, "maxmass": 108, + "maxmul": 0.96, + "minmass": 36, + "minmul": 1.16, "optmass": 72, + "optmul": 1, "power": 3, "rating": "A" }, { - "M": 0.04, - "P": 2.33, "class": 3, - "cost": 5103952, + "cost": 5103950, "edID": 128682013, "eddbID": 1548, "grp": "t", "id": "tz", - "integrity": 70, + "integrity": 55, "mass": 5, "maxmass": 200, + "maxmul": 1.6, + "minmass": 70, + "minmul": 0.9, "name": "Enhanced Performance", "optmass": 90, + "optmul": 1.25, "power": 5, "rating": "A" }, { - "M": 0.04, - "P": 2.33, "class": 2, "cost": 1610080, "edID": 128682014, "eddbID": 1547, "grp": "t", "id": "u0", - "integrity": 56, + "integrity": 40, "mass": 2.5, "maxmass": 120, + "maxmul": 1.6, + "minmass": 50, + "minmul": 0.9, "name": "Enhanced Performance", "optmass": 60, + "optmul": 1.25, "power": 4, "rating": "A" } @@ -10186,9 +10260,9 @@ "id": "B6", "mass": 1.3, "maxmass": 63, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 13, - "minmul": 1.4, + "minmul": 0.4, "optmass": 25, "optmul": 0.9, "power": 1.2, @@ -10204,9 +10278,9 @@ "id": "B5", "mass": 2.5, "maxmass": 138, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 23, - "minmul": 1.4, + "minmul": 0.4, "optmass": 55, "optmul": 0.9, "power": 1.5, @@ -10222,9 +10296,9 @@ "id": "B4", "mass": 5, "maxmass": 413, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 83, - "minmul": 1.4, + "minmul": 0.4, "optmass": 165, "optmul": 0.9, "power": 1.8, @@ -10240,9 +10314,9 @@ "id": "B3", "mass": 10, "maxmass": 713, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 143, - "minmul": 1.4, + "minmul": 0.4, "optmass": 285, "optmul": 0.9, "power": 2.2, @@ -10258,9 +10332,9 @@ "id": "B2", "mass": 20, "maxmass": 1013, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 203, - "minmul": 1.4, + "minmul": 0.4, "optmass": 405, "optmul": 0.9, "power": 2.6, @@ -10276,9 +10350,9 @@ "id": "B1", "mass": 40, "maxmass": 1350, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 270, - "minmul": 1.4, + "minmul": 0.4, "optmass": 540, "optmul": 0.9, "power": 3.1, @@ -10294,9 +10368,9 @@ "id": "B0", "mass": 80, "maxmass": 2650, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 530, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1060, "optmul": 0.9, "power": 3.5, @@ -10312,9 +10386,9 @@ "id": "B7", "mass": 160, "maxmass": 4500, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 900, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1800, "optmul": 0.9, "power": 4, @@ -12268,9 +12342,9 @@ "id": "p6", "mass": 2.5, "maxmass": 63, - "maxmul": 1, + "maxmul": 2, "minmass": 13, - "minmul": 2, + "minmul": 1, "optmass": 25, "optmul": 1.5, "power": 2.52, @@ -12287,9 +12361,9 @@ "id": "p5", "mass": 5, "maxmass": 138, - "maxmul": 1, + "maxmul": 2, "minmass": 23, - "minmul": 2, + "minmul": 1, "optmass": 55, "optmul": 1.5, "power": 3.15, @@ -12306,9 +12380,9 @@ "id": "p4", "mass": 10, "maxmass": 413, - "maxmul": 1, + "maxmul": 2, "minmass": 83, - "minmul": 2, + "minmul": 1, "optmass": 165, "optmul": 1.5, "power": 3.78, @@ -12325,9 +12399,9 @@ "id": "p3", "mass": 20, "maxmass": 713, - "maxmul": 1, + "maxmul": 2, "minmass": 143, - "minmul": 2, + "minmul": 1, "optmass": 285, "optmul": 1.5, "power": 4.62, @@ -12344,9 +12418,9 @@ "id": "p2", "mass": 40, "maxmass": 1013, - "maxmul": 1, + "maxmul": 2, "minmass": 203, - "minmul": 2, + "minmul": 1, "optmass": 405, "optmul": 1.5, "power": 5.46, @@ -12363,9 +12437,9 @@ "id": "p1", "mass": 80, "maxmass": 1350, - "maxmul": 1, + "maxmul": 2, "minmass": 270, - "minmul": 2, + "minmul": 1, "optmass": 540, "optmul": 1.5, "power": 6.51, @@ -12382,9 +12456,9 @@ "id": "p0", "mass": 160, "maxmass": 2650, - "maxmul": 1, + "maxmul": 2, "minmass": 530, - "minmul": 2, + "minmul": 1, "optmass": 1060, "optmul": 1.5, "power": 7.35, @@ -12401,9 +12475,9 @@ "id": "p7", "mass": 320, "maxmass": 4500, - "maxmul": 1, + "maxmul": 2, "minmass": 900, - "minmul": 2, + "minmul": 1, "optmass": 1800, "optmul": 1.5, "power": 8.4, @@ -13723,9 +13797,9 @@ "id": "4t", "mass": 160, "maxmass": 4500, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 900, - "minmul": 1.3, + "minmul": 0.3, "optmass": 1800, "optmul": 0.8, "power": 2.4, @@ -13741,9 +13815,9 @@ "id": "4s", "mass": 64, "maxmass": 4500, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 900, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1800, "optmul": 0.9, "power": 3.2, @@ -13759,9 +13833,9 @@ "id": "4r", "mass": 160, "maxmass": 4500, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 900, - "minmul": 1.5, + "minmul": 0.5, "optmass": 1800, "optmul": 1, "power": 4, @@ -13777,9 +13851,9 @@ "id": "4q", "mass": 256, "maxmass": 4500, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 900, - "minmul": 1.6, + "minmul": 0.6, "optmass": 1800, "optmul": 1.1, "power": 4.8, @@ -13795,9 +13869,9 @@ "id": "4p", "mass": 160, "maxmass": 4500, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 900, - "minmul": 1.7, + "minmul": 0.7, "optmass": 1800, "optmul": 1.2, "power": 5.6, @@ -13813,9 +13887,9 @@ "id": "4o", "mass": 80, "maxmass": 2650, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 530, - "minmul": 1.3, + "minmul": 0.3, "optmass": 1060, "optmul": 0.8, "power": 2.1, @@ -13831,9 +13905,9 @@ "id": "4n", "mass": 32, "maxmass": 2650, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 530, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1060, "optmul": 0.9, "power": 2.8, @@ -13849,9 +13923,9 @@ "id": "4m", "mass": 80, "maxmass": 2650, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 530, - "minmul": 1.5, + "minmul": 0.5, "optmass": 1060, "optmul": 1, "power": 3.5, @@ -13867,9 +13941,9 @@ "id": "4l", "mass": 128, "maxmass": 2650, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 530, - "minmul": 1.6, + "minmul": 0.6, "optmass": 1060, "optmul": 1.1, "power": 4.2, @@ -13885,9 +13959,9 @@ "id": "4k", "mass": 80, "maxmass": 2650, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 530, - "minmul": 1.7, + "minmul": 0.7, "optmass": 1060, "optmul": 1.2, "power": 4.9, @@ -13903,9 +13977,9 @@ "id": "4j", "mass": 40, "maxmass": 1350, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 270, - "minmul": 1.3, + "minmul": 0.3, "optmass": 540, "optmul": 0.8, "power": 1.86, @@ -13921,9 +13995,9 @@ "id": "4i", "mass": 16, "maxmass": 1350, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 270, - "minmul": 1.4, + "minmul": 0.4, "optmass": 540, "optmul": 0.9, "power": 2.48, @@ -13939,9 +14013,9 @@ "id": "4h", "mass": 40, "maxmass": 1350, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 270, - "minmul": 1.5, + "minmul": 0.5, "optmass": 540, "optmul": 1, "power": 3.1, @@ -13957,9 +14031,9 @@ "id": "4g", "mass": 64, "maxmass": 1350, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 270, - "minmul": 1.6, + "minmul": 0.6, "optmass": 540, "optmul": 1.1, "power": 3.72, @@ -13975,9 +14049,9 @@ "id": "4f", "mass": 40, "maxmass": 1350, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 270, - "minmul": 1.7, + "minmul": 0.7, "optmass": 540, "optmul": 1.2, "power": 4.34, @@ -13993,9 +14067,9 @@ "id": "4e", "mass": 20, "maxmass": 1013, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 203, - "minmul": 1.3, + "minmul": 0.3, "optmass": 405, "optmul": 0.8, "power": 1.56, @@ -14011,9 +14085,9 @@ "id": "4d", "mass": 8, "maxmass": 1013, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 203, - "minmul": 1.4, + "minmul": 0.4, "optmass": 405, "optmul": 0.9, "power": 2.08, @@ -14029,9 +14103,9 @@ "id": "4c", "mass": 20, "maxmass": 1013, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 203, - "minmul": 1.5, + "minmul": 0.5, "optmass": 405, "optmul": 1, "power": 2.6, @@ -14047,9 +14121,9 @@ "id": "4b", "mass": 32, "maxmass": 1013, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 203, - "minmul": 1.6, + "minmul": 0.6, "optmass": 405, "optmul": 1.1, "power": 3.12, @@ -14065,9 +14139,9 @@ "id": "4a", "mass": 20, "maxmass": 1013, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 203, - "minmul": 1.7, + "minmul": 0.7, "optmass": 405, "optmul": 1.2, "power": 3.64, @@ -14083,9 +14157,9 @@ "id": "49", "mass": 10, "maxmass": 713, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 143, - "minmul": 1.3, + "minmul": 0.3, "optmass": 285, "optmul": 0.8, "power": 1.32, @@ -14101,9 +14175,9 @@ "id": "48", "mass": 4, "maxmass": 713, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 143, - "minmul": 1.4, + "minmul": 0.4, "optmass": 285, "optmul": 0.9, "power": 1.76, @@ -14119,9 +14193,9 @@ "id": "47", "mass": 10, "maxmass": 713, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 143, - "minmul": 1.5, + "minmul": 0.5, "optmass": 285, "optmul": 1, "power": 2.2, @@ -14137,9 +14211,9 @@ "id": "46", "mass": 16, "maxmass": 713, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 143, - "minmul": 1.6, + "minmul": 0.6, "optmass": 285, "optmul": 1.1, "power": 2.64, @@ -14155,9 +14229,9 @@ "id": "45", "mass": 10, "maxmass": 713, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 143, - "minmul": 1.7, + "minmul": 0.7, "optmass": 285, "optmul": 1.2, "power": 3.08, @@ -14173,9 +14247,9 @@ "id": "44", "mass": 5, "maxmass": 413, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 83, - "minmul": 1.3, + "minmul": 0.3, "optmass": 165, "optmul": 0.8, "power": 1.08, @@ -14191,9 +14265,9 @@ "id": "43", "mass": 2, "maxmass": 413, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 83, - "minmul": 1.4, + "minmul": 0.4, "optmass": 165, "optmul": 0.9, "power": 1.44, @@ -14209,9 +14283,9 @@ "id": "42", "mass": 5, "maxmass": 413, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 83, - "minmul": 1.5, + "minmul": 0.5, "optmass": 165, "optmul": 1, "power": 1.8, @@ -14227,9 +14301,9 @@ "id": "41", "mass": 8, "maxmass": 413, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 83, - "minmul": 1.6, + "minmul": 0.6, "optmass": 165, "optmul": 1.1, "power": 2.16, @@ -14245,9 +14319,9 @@ "id": "40", "mass": 5, "maxmass": 413, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 83, - "minmul": 1.7, + "minmul": 0.7, "optmass": 165, "optmul": 1.2, "power": 2.52, @@ -14263,9 +14337,9 @@ "id": "3v", "mass": 2.5, "maxmass": 138, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 28, - "minmul": 1.3, + "minmul": 0.3, "optmass": 55, "optmul": 0.8, "power": 0.9, @@ -14281,9 +14355,9 @@ "id": "3u", "mass": 1, "maxmass": 138, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 28, - "minmul": 1.4, + "minmul": 0.4, "optmass": 55, "optmul": 0.9, "power": 1.2, @@ -14299,9 +14373,9 @@ "id": "3t", "mass": 2.5, "maxmass": 138, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 28, - "minmul": 1.5, + "minmul": 0.5, "optmass": 55, "optmul": 1, "power": 1.5, @@ -14317,9 +14391,9 @@ "id": "3s", "mass": 4, "maxmass": 138, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 28, - "minmul": 1.6, + "minmul": 0.6, "optmass": 55, "optmul": 1.1, "power": 1.8, @@ -14335,9 +14409,9 @@ "id": "3r", "mass": 2.5, "maxmass": 138, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 28, - "minmul": 1.7, + "minmul": 0.7, "optmass": 55, "optmul": 1.2, "power": 2.1, @@ -14353,9 +14427,9 @@ "id": "1x", "mass": 1.3, "maxmass": 63, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 13, - "minmul": 1.7, + "minmul": 0.7, "optmass": 25, "optmul": 1.2, "power": 1.68, diff --git a/modules/internal/bi_weave_shield_generator.json b/modules/internal/bi_weave_shield_generator.json index 2326538..3533f68 100644 --- a/modules/internal/bi_weave_shield_generator.json +++ b/modules/internal/bi_weave_shield_generator.json @@ -9,9 +9,9 @@ "id": "B6", "mass": 1.3, "maxmass": 63, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 13, - "minmul": 1.4, + "minmul": 0.4, "optmass": 25, "optmul": 0.9, "power": 1.2, @@ -27,9 +27,9 @@ "id": "B5", "mass": 2.5, "maxmass": 138, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 23, - "minmul": 1.4, + "minmul": 0.4, "optmass": 55, "optmul": 0.9, "power": 1.5, @@ -45,9 +45,9 @@ "id": "B4", "mass": 5, "maxmass": 413, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 83, - "minmul": 1.4, + "minmul": 0.4, "optmass": 165, "optmul": 0.9, "power": 1.8, @@ -63,9 +63,9 @@ "id": "B3", "mass": 10, "maxmass": 713, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 143, - "minmul": 1.4, + "minmul": 0.4, "optmass": 285, "optmul": 0.9, "power": 2.2, @@ -81,9 +81,9 @@ "id": "B2", "mass": 20, "maxmass": 1013, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 203, - "minmul": 1.4, + "minmul": 0.4, "optmass": 405, "optmul": 0.9, "power": 2.6, @@ -99,9 +99,9 @@ "id": "B1", "mass": 40, "maxmass": 1350, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 270, - "minmul": 1.4, + "minmul": 0.4, "optmass": 540, "optmul": 0.9, "power": 3.1, @@ -117,9 +117,9 @@ "id": "B0", "mass": 80, "maxmass": 2650, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 530, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1060, "optmul": 0.9, "power": 3.5, @@ -135,9 +135,9 @@ "id": "B7", "mass": 160, "maxmass": 4500, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 900, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1800, "optmul": 0.9, "power": 4, diff --git a/modules/internal/pristmatic_shield_generator.json b/modules/internal/pristmatic_shield_generator.json index ab3803a..2e0b2b7 100644 --- a/modules/internal/pristmatic_shield_generator.json +++ b/modules/internal/pristmatic_shield_generator.json @@ -9,9 +9,9 @@ "id": "p6", "mass": 2.5, "maxmass": 63, - "maxmul": 1, + "maxmul": 2, "minmass": 13, - "minmul": 2, + "minmul": 1, "optmass": 25, "optmul": 1.5, "power": 2.52, @@ -28,9 +28,9 @@ "id": "p5", "mass": 5, "maxmass": 138, - "maxmul": 1, + "maxmul": 2, "minmass": 23, - "minmul": 2, + "minmul": 1, "optmass": 55, "optmul": 1.5, "power": 3.15, @@ -47,9 +47,9 @@ "id": "p4", "mass": 10, "maxmass": 413, - "maxmul": 1, + "maxmul": 2, "minmass": 83, - "minmul": 2, + "minmul": 1, "optmass": 165, "optmul": 1.5, "power": 3.78, @@ -66,9 +66,9 @@ "id": "p3", "mass": 20, "maxmass": 713, - "maxmul": 1, + "maxmul": 2, "minmass": 143, - "minmul": 2, + "minmul": 1, "optmass": 285, "optmul": 1.5, "power": 4.62, @@ -85,9 +85,9 @@ "id": "p2", "mass": 40, "maxmass": 1013, - "maxmul": 1, + "maxmul": 2, "minmass": 203, - "minmul": 2, + "minmul": 1, "optmass": 405, "optmul": 1.5, "power": 5.46, @@ -104,9 +104,9 @@ "id": "p1", "mass": 80, "maxmass": 1350, - "maxmul": 1, + "maxmul": 2, "minmass": 270, - "minmul": 2, + "minmul": 1, "optmass": 540, "optmul": 1.5, "power": 6.51, @@ -123,9 +123,9 @@ "id": "p0", "mass": 160, "maxmass": 2650, - "maxmul": 1, + "maxmul": 2, "minmass": 530, - "minmul": 2, + "minmul": 1, "optmass": 1060, "optmul": 1.5, "power": 7.35, @@ -142,9 +142,9 @@ "id": "p7", "mass": 320, "maxmass": 4500, - "maxmul": 1, + "maxmul": 2, "minmass": 900, - "minmul": 2, + "minmul": 1, "optmass": 1800, "optmul": 1.5, "power": 8.4, diff --git a/modules/internal/shield_generator.json b/modules/internal/shield_generator.json index 1dfd804..8386291 100644 --- a/modules/internal/shield_generator.json +++ b/modules/internal/shield_generator.json @@ -9,9 +9,9 @@ "id": "4t", "mass": 160, "maxmass": 4500, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 900, - "minmul": 1.3, + "minmul": 0.3, "optmass": 1800, "optmul": 0.8, "power": 2.4, @@ -27,9 +27,9 @@ "id": "4s", "mass": 64, "maxmass": 4500, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 900, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1800, "optmul": 0.9, "power": 3.2, @@ -45,9 +45,9 @@ "id": "4r", "mass": 160, "maxmass": 4500, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 900, - "minmul": 1.5, + "minmul": 0.5, "optmass": 1800, "optmul": 1, "power": 4, @@ -63,9 +63,9 @@ "id": "4q", "mass": 256, "maxmass": 4500, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 900, - "minmul": 1.6, + "minmul": 0.6, "optmass": 1800, "optmul": 1.1, "power": 4.8, @@ -81,9 +81,9 @@ "id": "4p", "mass": 160, "maxmass": 4500, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 900, - "minmul": 1.7, + "minmul": 0.7, "optmass": 1800, "optmul": 1.2, "power": 5.6, @@ -99,9 +99,9 @@ "id": "4o", "mass": 80, "maxmass": 2650, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 530, - "minmul": 1.3, + "minmul": 0.3, "optmass": 1060, "optmul": 0.8, "power": 2.1, @@ -117,9 +117,9 @@ "id": "4n", "mass": 32, "maxmass": 2650, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 530, - "minmul": 1.4, + "minmul": 0.4, "optmass": 1060, "optmul": 0.9, "power": 2.8, @@ -135,9 +135,9 @@ "id": "4m", "mass": 80, "maxmass": 2650, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 530, - "minmul": 1.5, + "minmul": 0.5, "optmass": 1060, "optmul": 1, "power": 3.5, @@ -153,9 +153,9 @@ "id": "4l", "mass": 128, "maxmass": 2650, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 530, - "minmul": 1.6, + "minmul": 0.6, "optmass": 1060, "optmul": 1.1, "power": 4.2, @@ -171,9 +171,9 @@ "id": "4k", "mass": 80, "maxmass": 2650, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 530, - "minmul": 1.7, + "minmul": 0.7, "optmass": 1060, "optmul": 1.2, "power": 4.9, @@ -189,9 +189,9 @@ "id": "4j", "mass": 40, "maxmass": 1350, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 270, - "minmul": 1.3, + "minmul": 0.3, "optmass": 540, "optmul": 0.8, "power": 1.86, @@ -207,9 +207,9 @@ "id": "4i", "mass": 16, "maxmass": 1350, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 270, - "minmul": 1.4, + "minmul": 0.4, "optmass": 540, "optmul": 0.9, "power": 2.48, @@ -225,9 +225,9 @@ "id": "4h", "mass": 40, "maxmass": 1350, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 270, - "minmul": 1.5, + "minmul": 0.5, "optmass": 540, "optmul": 1, "power": 3.1, @@ -243,9 +243,9 @@ "id": "4g", "mass": 64, "maxmass": 1350, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 270, - "minmul": 1.6, + "minmul": 0.6, "optmass": 540, "optmul": 1.1, "power": 3.72, @@ -261,9 +261,9 @@ "id": "4f", "mass": 40, "maxmass": 1350, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 270, - "minmul": 1.7, + "minmul": 0.7, "optmass": 540, "optmul": 1.2, "power": 4.34, @@ -279,9 +279,9 @@ "id": "4e", "mass": 20, "maxmass": 1013, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 203, - "minmul": 1.3, + "minmul": 0.3, "optmass": 405, "optmul": 0.8, "power": 1.56, @@ -297,9 +297,9 @@ "id": "4d", "mass": 8, "maxmass": 1013, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 203, - "minmul": 1.4, + "minmul": 0.4, "optmass": 405, "optmul": 0.9, "power": 2.08, @@ -315,9 +315,9 @@ "id": "4c", "mass": 20, "maxmass": 1013, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 203, - "minmul": 1.5, + "minmul": 0.5, "optmass": 405, "optmul": 1, "power": 2.6, @@ -333,9 +333,9 @@ "id": "4b", "mass": 32, "maxmass": 1013, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 203, - "minmul": 1.6, + "minmul": 0.6, "optmass": 405, "optmul": 1.1, "power": 3.12, @@ -351,9 +351,9 @@ "id": "4a", "mass": 20, "maxmass": 1013, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 203, - "minmul": 1.7, + "minmul": 0.7, "optmass": 405, "optmul": 1.2, "power": 3.64, @@ -369,9 +369,9 @@ "id": "49", "mass": 10, "maxmass": 713, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 143, - "minmul": 1.3, + "minmul": 0.3, "optmass": 285, "optmul": 0.8, "power": 1.32, @@ -387,9 +387,9 @@ "id": "48", "mass": 4, "maxmass": 713, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 143, - "minmul": 1.4, + "minmul": 0.4, "optmass": 285, "optmul": 0.9, "power": 1.76, @@ -405,9 +405,9 @@ "id": "47", "mass": 10, "maxmass": 713, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 143, - "minmul": 1.5, + "minmul": 0.5, "optmass": 285, "optmul": 1, "power": 2.2, @@ -423,9 +423,9 @@ "id": "46", "mass": 16, "maxmass": 713, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 143, - "minmul": 1.6, + "minmul": 0.6, "optmass": 285, "optmul": 1.1, "power": 2.64, @@ -441,9 +441,9 @@ "id": "45", "mass": 10, "maxmass": 713, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 143, - "minmul": 1.7, + "minmul": 0.7, "optmass": 285, "optmul": 1.2, "power": 3.08, @@ -459,9 +459,9 @@ "id": "44", "mass": 5, "maxmass": 413, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 83, - "minmul": 1.3, + "minmul": 0.3, "optmass": 165, "optmul": 0.8, "power": 1.08, @@ -477,9 +477,9 @@ "id": "43", "mass": 2, "maxmass": 413, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 83, - "minmul": 1.4, + "minmul": 0.4, "optmass": 165, "optmul": 0.9, "power": 1.44, @@ -495,9 +495,9 @@ "id": "42", "mass": 5, "maxmass": 413, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 83, - "minmul": 1.5, + "minmul": 0.5, "optmass": 165, "optmul": 1, "power": 1.8, @@ -513,9 +513,9 @@ "id": "41", "mass": 8, "maxmass": 413, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 83, - "minmul": 1.6, + "minmul": 0.6, "optmass": 165, "optmul": 1.1, "power": 2.16, @@ -531,9 +531,9 @@ "id": "40", "mass": 5, "maxmass": 413, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 83, - "minmul": 1.7, + "minmul": 0.7, "optmass": 165, "optmul": 1.2, "power": 2.52, @@ -549,9 +549,9 @@ "id": "3v", "mass": 2.5, "maxmass": 138, - "maxmul": 0.3, + "maxmul": 1.3, "minmass": 28, - "minmul": 1.3, + "minmul": 0.3, "optmass": 55, "optmul": 0.8, "power": 0.9, @@ -567,9 +567,9 @@ "id": "3u", "mass": 1, "maxmass": 138, - "maxmul": 0.4, + "maxmul": 1.4, "minmass": 28, - "minmul": 1.4, + "minmul": 0.4, "optmass": 55, "optmul": 0.9, "power": 1.2, @@ -585,9 +585,9 @@ "id": "3t", "mass": 2.5, "maxmass": 138, - "maxmul": 0.5, + "maxmul": 1.5, "minmass": 28, - "minmul": 1.5, + "minmul": 0.5, "optmass": 55, "optmul": 1, "power": 1.5, @@ -603,9 +603,9 @@ "id": "3s", "mass": 4, "maxmass": 138, - "maxmul": 0.6, + "maxmul": 1.6, "minmass": 28, - "minmul": 1.6, + "minmul": 0.6, "optmass": 55, "optmul": 1.1, "power": 1.8, @@ -621,9 +621,9 @@ "id": "3r", "mass": 2.5, "maxmass": 138, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 28, - "minmul": 1.7, + "minmul": 0.7, "optmass": 55, "optmul": 1.2, "power": 2.1, @@ -639,9 +639,9 @@ "id": "1x", "mass": 1.3, "maxmass": 63, - "maxmul": 0.7, + "maxmul": 1.7, "minmass": 13, - "minmul": 1.7, + "minmul": 0.7, "optmass": 25, "optmul": 1.2, "power": 1.68, diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index 76a731b..2349a3c 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -1,8 +1,6 @@ { "t": [ { - "M": 0.17, - "P": 0.235, "class": 8, "cost": 2007240, "edID": 128064098, @@ -12,13 +10,15 @@ "integrity": 135, "mass": 160, "maxmass": 3360, + "maxmul": 1.03, + "minmass": 1120, + "minmul": 0.83, "optmass": 2240, + "optmul": 1, "power": 7.2, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 8, "cost": 6021720, "edID": 128064099, @@ -28,13 +28,15 @@ "integrity": 120, "mass": 64, "maxmass": 3780, + "maxmul": 1.06, + "minmass": 1260, + "minmul": 0.86, "optmass": 2520, + "optmul": 1, "power": 8.1, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 8, "cost": 18065170, "edID": 128064100, @@ -44,13 +46,15 @@ "integrity": 150, "mass": 160, "maxmass": 4200, + "maxmul": 1.1, + "minmass": 1400, + "minmul": 0.9, "optmass": 2800, + "optmul": 1, "power": 9, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 8, "cost": 54195500, "edID": 128064101, @@ -60,13 +64,15 @@ "integrity": 180, "mass": 256, "maxmass": 4620, + "maxmul": 1.13, + "minmass": 1540, + "minmul": 0.93, "optmass": 3080, + "optmul": 1, "power": 9.9, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 8, "cost": 162586490, "edID": 128064102, @@ -76,13 +82,15 @@ "integrity": 165, "mass": 160, "maxmass": 5040, - "optmass": 3360, + "maxmul": 1.16, + "minmass": 1680, + "minmul": 0.96, + "optmass": 5040, + "optmul": 1, "power": 10.8, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 7, "cost": 633200, "edID": 128064093, @@ -92,13 +100,15 @@ "integrity": 118, "mass": 80, "maxmass": 2160, + "maxmul": 1.03, + "minmass": 720, + "minmul": 0.83, "optmass": 1440, + "optmul": 1, "power": 6.08, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 7, "cost": 1899600, "edID": 128064094, @@ -108,13 +118,15 @@ "integrity": 105, "mass": 32, "maxmass": 2430, + "maxmul": 0.86, + "minmass": 810, + "minmul": 0.86, "optmass": 1620, + "optmul": 1, "power": 6.84, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 7, "cost": 5698790, "edID": 128064095, @@ -124,13 +136,15 @@ "integrity": 131, "mass": 80, "maxmass": 2700, + "maxmul": 1.1, + "minmass": 900, + "minmul": 0.9, "optmass": 1800, + "optmul": 1, "power": 7.6, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 7, "cost": 17096370, "edID": 128064096, @@ -140,13 +154,15 @@ "integrity": 157, "mass": 128, "maxmass": 2970, + "maxmul": 1.13, + "minmass": 990, + "minmul": 0.93, "optmass": 1980, + "optmul": 1, "power": 8.36, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 7, "cost": 51289110, "edID": 128064097, @@ -156,13 +172,15 @@ "integrity": 144, "mass": 80, "maxmass": 3240, + "maxmul": 1.16, + "minmass": 1080, + "minmul": 0.96, "optmass": 2160, + "optmul": 1, "power": 9.12, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 6, "cost": 199750, "edID": 128064088, @@ -172,13 +190,15 @@ "integrity": 102, "mass": 40, "maxmass": 1440, + "maxmul": 1.03, + "minmass": 480, + "minmul": 0.83, "optmass": 960, + "optmul": 1, "power": 5.04, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 6, "cost": 599240, "edID": 128064089, @@ -188,13 +208,15 @@ "integrity": 90, "mass": 16, "maxmass": 1620, + "maxmul": 1.06, + "minmass": 540, + "minmul": 0.86, "optmass": 1080, + "optmul": 1, "power": 5.67, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 6, "cost": 1797730, "edID": 128064090, @@ -204,13 +226,15 @@ "integrity": 113, "mass": 40, "maxmass": 1800, + "maxmul": 1.1, + "minmass": 600, + "minmul": 0.9, "optmass": 1200, + "optmul": 1, "power": 6.3, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 6, "cost": 5393180, "edID": 128064091, @@ -220,13 +244,15 @@ "integrity": 136, "mass": 64, "maxmass": 1980, + "maxmul": 1.13, + "minmass": 660, + "minmul": 0.93, "optmass": 1320, + "optmul": 1, "power": 6.93, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 6, "cost": 16179530, "edID": 128064092, @@ -236,13 +262,15 @@ "integrity": 124, "mass": 40, "maxmass": 2160, + "maxmul": 1.16, + "minmass": 720, + "minmul": 0.96, "optmass": 1440, + "optmul": 1, "power": 7.56, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 5, "cost": 63010, "edID": 128064083, @@ -252,13 +280,15 @@ "integrity": 86, "mass": 20, "maxmass": 840, + "maxmul": 1.03, + "minmass": 280, + "minmul": 0.83, "optmass": 560, + "optmul": 1, "power": 4.08, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 5, "cost": 189040, "edID": 128064084, @@ -268,13 +298,15 @@ "integrity": 77, "mass": 8, "maxmass": 945, + "maxmul": 1.06, + "minmass": 315, + "minmul": 0.86, "optmass": 630, + "optmul": 1, "power": 4.59, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 5, "cost": 567110, "edID": 128064085, @@ -284,13 +316,15 @@ "integrity": 96, "mass": 20, "maxmass": 1050, + "maxmul": 1.1, + "minmass": 350, + "minmul": 0.9, "optmass": 700, + "optmul": 1, "power": 5.1, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 5, "cost": 1701320, "edID": 128064086, @@ -300,13 +334,15 @@ "integrity": 115, "mass": 32, "maxmass": 1155, + "maxmul": 1.13, + "minmass": 385, + "minmul": 0.93, "optmass": 770, + "optmul": 1, "power": 5.61, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 5, "cost": 5103950, "edID": 128064087, @@ -316,13 +352,15 @@ "integrity": 106, "mass": 20, "maxmass": 1260, + "maxmul": 1.16, + "minmass": 420, + "minmul": 0.96, "optmass": 840, + "optmul": 1, "power": 6.12, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 4, "cost": 19880, "edID": 128064078, @@ -332,13 +370,15 @@ "integrity": 72, "mass": 10, "maxmass": 420, + "maxmul": 1.03, + "minmass": 140, + "minmul": 0.83, "optmass": 280, + "optmul": 1, "power": 3.28, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 4, "cost": 59630, "edID": 128064079, @@ -347,14 +387,16 @@ "id": "td", "integrity": 64, "mass": 4, - "maxmass": 473, + "maxmass": 472.5, + "maxmul": 1.06, + "minmass": 157.5, + "minmul": 0.86, "optmass": 315, + "optmul": 1, "power": 3.69, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 4, "cost": 178900, "edID": 128064080, @@ -364,13 +406,15 @@ "integrity": 80, "mass": 10, "maxmass": 525, + "maxmul": 1.1, + "minmass": 175, + "minmul": 0.9, "optmass": 350, + "optmul": 1, "power": 4.1, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 4, "cost": 536690, "edID": 128064081, @@ -379,14 +423,16 @@ "id": "tb", "integrity": 96, "mass": 16, - "maxmass": 578, + "maxmass": 577.5, + "maxmul": 1.13, + "minmass": 192.5, + "minmul": 0.93, "optmass": 385, + "optmul": 1, "power": 4.51, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 4, "cost": 1610080, "edID": 128064082, @@ -396,13 +442,15 @@ "integrity": 88, "mass": 10, "maxmass": 630, + "maxmul": 1.16, + "minmass": 210, + "minmul": 0.96, "optmass": 420, + "optmul": 1, "power": 4.92, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 3, "cost": 6270, "edID": 128064073, @@ -412,13 +460,15 @@ "integrity": 58, "mass": 5, "maxmass": 120, + "maxmul": 1.03, + "minmass": 40, + "minmul": 0.83, "optmass": 80, + "optmul": 1, "power": 2.48, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 3, "cost": 18810, "edID": 128064074, @@ -428,13 +478,15 @@ "integrity": 51, "mass": 2, "maxmass": 135, + "maxmul": 1.06, + "minmass": 45, + "minmul": 0.86, "optmass": 90, + "optmul": 1, "power": 2.79, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 3, "cost": 56440, "edID": 128064075, @@ -444,13 +496,15 @@ "integrity": 64, "mass": 5, "maxmass": 150, + "maxmul": 1.1, + "minmass": 50, + "minmul": 0.9, "optmass": 100, + "optmul": 1, "power": 3.1, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 3, "cost": 169300, "edID": 128064076, @@ -460,13 +514,15 @@ "integrity": 77, "mass": 8, "maxmass": 165, + "maxmul": 1.13, + "minmass": 55, + "minmul": 0.93, "optmass": 110, + "optmul": 1, "power": 3.41, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 3, "cost": 507910, "edID": 128064077, @@ -476,13 +532,15 @@ "integrity": 72, "mass": 5, "maxmass": 180, + "maxmul": 1.16, + "minmass": 60, + "minmul": 0.96, "optmass": 120, + "optmul": 1, "power": 3.72, "rating": "A" }, { - "M": 0.17, - "P": 0.235, "class": 2, "cost": 1980, "edID": 128064068, @@ -492,13 +550,15 @@ "integrity": 46, "mass": 2.5, "maxmass": 72, + "maxmul": 1.03, + "minmass": 24, + "minmul": 0.83, "optmass": 48, + "optmul": 1, "power": 2, "rating": "E" }, { - "M": 0.14, - "P": 0.5145, "class": 2, "cost": 5930, "edID": 128064069, @@ -508,13 +568,15 @@ "integrity": 41, "mass": 1, "maxmass": 81, + "maxmul": 1.06, + "minmass": 27, + "minmul": 0.86, "optmass": 54, + "optmul": 1, "power": 2.25, "rating": "D" }, { - "M": 0.1, - "P": 1, "class": 2, "cost": 17800, "edID": 128064070, @@ -524,13 +586,15 @@ "integrity": 51, "mass": 2.5, "maxmass": 90, + "maxmul": 1.1, + "minmass": 30, + "minmul": 0.9, "optmass": 60, + "optmul": 1, "power": 2.5, "rating": "C" }, { - "M": 0.07, - "P": 1.51, "class": 2, "cost": 53410, "edID": 128064071, @@ -540,13 +604,15 @@ "integrity": 61, "mass": 4, "maxmass": 99, + "maxmul": 1.13, + "minmass": 33, + "minmul": 0.93, "optmass": 66, + "optmul": 1, "power": 2.75, "rating": "B" }, { - "M": 0.04, - "P": 2.33, "class": 2, "cost": 160220, "edID": 128064072, @@ -556,41 +622,49 @@ "integrity": 56, "mass": 2.5, "maxmass": 108, + "maxmul": 0.96, + "minmass": 36, + "minmul": 1.16, "optmass": 72, + "optmul": 1, "power": 3, "rating": "A" }, { - "M": 0.04, - "P": 2.33, "class": 3, - "cost": 5103952, + "cost": 5103950, "edID": 128682013, "eddbID": 1548, "grp": "t", "id": "tz", - "integrity": 70, + "integrity": 55, "mass": 5, "maxmass": 200, + "maxmul": 1.6, + "minmass": 70, + "minmul": 0.9, "name": "Enhanced Performance", "optmass": 90, + "optmul": 1.25, "power": 5, "rating": "A" }, { - "M": 0.04, - "P": 2.33, "class": 2, "cost": 1610080, "edID": 128682014, "eddbID": 1547, "grp": "t", "id": "u0", - "integrity": 56, + "integrity": 40, "mass": 2.5, "maxmass": 120, + "maxmul": 1.6, + "minmass": 50, + "minmul": 0.9, "name": "Enhanced Performance", "optmass": 60, + "optmul": 1.25, "power": 4, "rating": "A" } diff --git a/ships/adder.json b/ships/adder.json index fe8a9bf..d91b9d9 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -11,8 +11,8 @@ "boost": 320, "boostEnergy": 9, "agility": 8, - "baseShieldStrength": 78, - "baseArmour": 162, + "baseShieldStrength": 60, + "baseArmour": 90, "hullMass": 35, "masslock": 7, "pipSpeed": 0.13625 diff --git a/ships/anaconda.json b/ships/anaconda.json index 02c884b..532e144 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -7,12 +7,12 @@ "manufacturer": "Faulcon DeLacy", "class": 3, "hullCost": 141889930, - "speed": 183, - "boost": 244, - "boostEnergy": 29, + "speed": 180, + "boost": 240, + "boostEnergy": 27, "agility": 2, - "baseShieldStrength": 362, - "baseArmour": 945, + "baseShieldStrength": 350, + "baseArmour": 525, "hullMass": 400, "masslock": 23, "pipSpeed": 0.13875, diff --git a/ships/asp.json b/ships/asp.json index 06389e5..28fef6d 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -7,12 +7,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 6135660, - "speed": 254, - "boost": 345, - "boostEnergy": 14, + "speed": 250, + "boost": 340, + "boostEnergy": 13, "agility": 6, - "baseShieldStrength": 152, - "baseArmour": 378, + "baseShieldStrength": 140, + "baseArmour": 210, "hullMass": 280, "masslock": 11, "pipSpeed": 0.13 diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 3212324..40e2f55 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -6,12 +6,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 3818240, - "speed": 223, - "boost": 304, + "speed": 220, + "boost": 300, "boostEnergy": 13, "agility": 8, - "baseShieldStrength": 105, - "baseArmour": 324, + "baseShieldStrength": 120, + "baseArmour": 180, "hullMass": 150, "masslock": 8, "pipSpeed": 0.125 diff --git a/ships/beluga.json b/ships/beluga.json index e50a266..6a6774e 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -7,12 +7,12 @@ "manufacturer": "Saud Kruger", "class": 3, "hullCost": 79654610, - "speed": 195, - "boost": 273, - "boostEnergy": 20, + "speed": 200, + "boost": 280, + "boostEnergy": 19, "agility": 2, - "baseShieldStrength": 92, - "baseArmour": 504, + "baseShieldStrength": 280, + "baseArmour": 280, "hullMass": 1100, "masslock": 18, "pipSpeed": -1, diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 344c318..95b8707 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -7,12 +7,12 @@ "manufacturer": "Faulcon DeLacy", "class": 1, "hullCost": 205800, - "speed": 282, - "boost": 402, - "boostEnergy": 11, + "speed": 280, + "boost": 400, + "boostEnergy": 10, "agility": 6, - "baseShieldStrength": 92, - "baseArmour": 216, + "baseShieldStrength": 80, + "baseArmour": 120, "hullMass": 180, "masslock": 8, "pipSpeed": 0.125 diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index ca88335..5016555 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -8,11 +8,11 @@ "class": 1, "hullCost": 603740, "speed": 200, - "boost": 299, - "boostEnergy": 11, + "boost": 300, + "boostEnergy": 10, "agility": 4, - "baseShieldStrength": 125, - "baseArmour": 216, + "baseShieldStrength": 120, + "baseArmour": 120, "hullMass": 210, "masslock": 8, "pipSpeed": 0.125 diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 855b9df..5a92d00 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -6,12 +6,12 @@ "manufacturer": "Lakon", "class": 1, "hullCost": 1635700, - "speed": 242, - "boost": 316, - "boostEnergy": 14, + "speed": 260, + "boost": 340, + "boostEnergy": 13, "agility": 5, - "baseShieldStrength": 115, - "baseArmour": 270, + "baseShieldStrength": 150, + "baseArmour": 150, "hullMass": 298, "masslock": 10, "pipSpeed": 0.09625 diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index cbbb815..a70fa3a 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -7,12 +7,12 @@ "manufacturer": "Lakon", "class": 1, "hullCost": 461340, - "speed": 283, - "boost": 384, - "boostEnergy": 11, + "speed": 280, + "boost": 380, + "boostEnergy": 10, "agility": 8, - "baseShieldStrength": 93, - "baseArmour": 216, + "baseShieldStrength": 120, + "baseArmour": 120, "hullMass": 170, "masslock": 8, "pipSpeed": 0.09875 diff --git a/ships/eagle.json b/ships/eagle.json index 984b228..f1a7db5 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -7,12 +7,12 @@ "manufacturer": "Core Dynamics", "class": 1, "hullCost": 10440, - "speed": 239, - "boost": 349, - "boostEnergy": 9, + "speed": 240, + "boost": 350, + "boostEnergy": 8, "agility": 10, - "baseShieldStrength": 89, - "baseArmour": 72, + "baseShieldStrength": 60, + "baseArmour": 40, "hullMass": 50, "masslock": 6, "pipSpeed": 0.0625 diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index b3f4c6a..c9e9086 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -6,12 +6,12 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 19072000, - "speed": 214, - "boost": 357, - "boostEnergy": 21, + "speed": 210, + "boost": 350, + "boostEnergy": 19, "agility": 6, - "baseShieldStrength": 133, - "baseArmour": 540, + "baseShieldStrength": 200, + "baseArmour": 300, "hullMass": 480, "masslock": 14, "pipSpeed": 0.11125 diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index e844bb4..621ef26 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -7,11 +7,11 @@ "manufacturer": "Core Dynamics", "class": 3, "hullCost": 182589570, - "speed": 198, - "boost": 257, + "speed": 200, + "boost": 260, "boostEnergy": 27, "agility": 2, - "baseShieldStrength": 516, + "baseShieldStrength": 555, "baseArmour": 666, "hullMass": 900, "masslock": 24, diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index dd36fc9..7d7a051 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -7,12 +7,12 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 13469990, - "speed": 182, - "boost": 304, - "boostEnergy": 21, + "speed": 180, + "boost": 300, + "boostEnergy": 19, "agility": 2, - "baseShieldStrength": 104, - "baseArmour": 540, + "baseShieldStrength": 200, + "baseArmour": 300, "hullMass": 580, "masslock": 14, "pipSpeed": 0.0725 diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 4b2aeef..9b9191b 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -7,12 +7,12 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 34774790, - "speed": 171, - "boost": 282, - "boostEnergy": 21, + "speed": 170, + "boost": 280, + "boostEnergy": 23, "agility": 2, - "baseShieldStrength": 186, - "baseArmour": 630, + "baseShieldStrength": 250, + "baseArmour": 350, "hullMass": 580, "masslock": 14, "pipSpeed": 0.1025, diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index b9cb728..31695a7 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -7,12 +7,12 @@ "manufacturer": "Zorgon Peterson", "class": 2, "hullCost": 51232230, - "speed": 265, - "boost": 357, - "boostEnergy": 21, + "speed": 260, + "boost": 350, + "boostEnergy": 19, "agility": 6, - "baseShieldStrength": 271, - "baseArmour": 405, + "baseShieldStrength": 300, + "baseArmour": 225, "hullMass": 250, "masslock": 12, "pipSpeed": 0.03875 diff --git a/ships/hauler.json b/ships/hauler.json index 7f9c38c..8b472ad 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -7,12 +7,12 @@ "manufacturer": "Zorgon Peterson", "class": 1, "hullCost": 29790, - "speed": 203, - "boost": 305, + "speed": 200, + "boost": 300, "agility": 6, "boostEnergy": 7, - "baseShieldStrength": 65, - "baseArmour": 90, + "baseShieldStrength": 50, + "baseArmour": 50, "hullMass": 14, "masslock": 6, "pipSpeed": 0.1625 diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index a4acfac..a90ab4c 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -7,12 +7,12 @@ "manufacturer": "Gutamaya", "class": 3, "hullCost": 21077780, - "speed": 306, - "boost": 388, - "boostEnergy": 21, + "speed": 300, + "boost": 380, + "boostEnergy": 19, "agility": 2, - "baseShieldStrength": 186, - "baseArmour": 486, + "baseShieldStrength": 180, + "baseArmour": 270, "hullMass": 400, "masslock": 12, "pipSpeed": 0.1 diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index dfae0e2..ccc9e33 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -8,10 +8,10 @@ "hullCost": 2481550, "speed": 280, "boost": 380, - "boostEnergy": 11, + "boostEnergy": 10, "agility": 6, - "baseShieldStrength": 230, - "baseArmour": 144, + "baseShieldStrength": 200, + "baseArmour": 80, "hullMass": 35, "masslock": 7, "pipSpeed": 0.05375 diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 6d47857..c866894 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -6,12 +6,12 @@ "manufacturer": "Gutamaya", "class": 3, "hullCost": 199926890, - "speed": 202, - "boost": 323, - "boostEnergy": 24, + "speed": 200, + "boost": 320, + "boostEnergy": 23, "agility": 2, - "baseShieldStrength": 703, - "baseArmour": 720, + "baseShieldStrength": 600, + "baseArmour": 400, "hullMass": 1100, "masslock": 27, "pipSpeed": 0.05, diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index d265345..31b9000 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -7,12 +7,12 @@ "manufacturer": "Core Dynamics", "class": 1, "hullCost": 72180, - "speed": 298, - "boost": 397, - "boostEnergy": 9, + "speed": 300, + "boost": 400, + "boostEnergy": 8, "agility": 6, - "baseShieldStrength": 104, - "baseArmour": 108, + "baseShieldStrength": 80, + "baseArmour": 60, "hullMass": 50, "masslock": 6, "pipSpeed": 0.075 diff --git a/ships/keelback.json b/ships/keelback.json index 67d7186..ba03717 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -7,12 +7,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 2951180, - "speed": 202, - "boost": 303, + "speed": 200, + "boost": 300, "boostEnergy": 10, "agility": 2, - "baseShieldStrength": 99, - "baseArmour": 243, + "baseShieldStrength": 135, + "baseArmour": 135, "hullMass": 180, "masslock": 8, "pipSpeed": 0.1375, diff --git a/ships/orca.json b/ships/orca.json index 6a2ea23..a28993f 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -7,12 +7,12 @@ "manufacturer": "Saud Kruger", "class": 3, "hullCost": 47798080, - "speed": 303, - "boost": 384, - "boostEnergy": 17, + "speed": 300, + "boost": 380, + "boostEnergy": 16, "agility": 2, - "baseShieldStrength": 114, - "baseArmour": 396, + "baseShieldStrength": 220, + "baseArmour": 220, "hullMass": 580, "masslock": 13, "pipSpeed": 0.08375, diff --git a/ships/python.json b/ships/python.json index 21096cd..b7f9cbe 100755 --- a/ships/python.json +++ b/ships/python.json @@ -7,12 +7,12 @@ "manufacturer": "Faulcon DeLacy", "class": 2, "hullCost": 55171380, - "speed": 234, - "boost": 305, - "boostEnergy": 24, + "speed": 230, + "boost": 300, + "boostEnergy": 23, "agility": 6, - "baseShieldStrength": 294, - "baseArmour": 468, + "baseShieldStrength": 260, + "baseArmour": 260, "hullMass": 350, "masslock": 17, "pipSpeed": 0.0975 diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 36357f8..af0a6bb 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -8,11 +8,11 @@ "class": 1, "hullCost": 12870, "speed": 220, - "boost": 321, + "boost": 320, "boostEnergy": 7, "agility": 8, - "baseShieldStrength": 52, - "baseArmour": 108, + "baseShieldStrength": 40, + "baseArmour": 60, "hullMass": 25, "masslock": 6, "pipSpeed": 0.1375 diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 24fa79e..70fc260 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -7,12 +7,12 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 865790, - "speed": 223, - "boost": 355, - "boostEnergy": 11, + "speed": 220, + "boost": 350, + "boostEnergy": 10, "agility": 3, - "baseShieldStrength": 77, - "baseArmour": 162, + "baseShieldStrength": 90, + "baseArmour": 90, "hullMass": 155, "masslock": 8, "pipSpeed": 0.1475 diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index e35b280..e1cac0a 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -7,12 +7,12 @@ "manufacturer": "Lakon", "class": 3, "hullCost": 16881510, - "speed": 181, - "boost": 301, - "boostEnergy": 11, + "speed": 180, + "boost": 300, + "boostEnergy": 10, "agility": 2, - "baseShieldStrength": 78, - "baseArmour": 306, + "baseShieldStrength": 155, + "baseArmour": 170, "hullMass": 420, "masslock": 10, "pipSpeed": 0.16625 diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 2316948..c1b7ae7 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -7,12 +7,12 @@ "manufacturer": "Lakon", "class": 3, "hullCost": 73255150, - "speed": 131, - "boost": 201, - "boostEnergy": 21, + "speed": 130, + "boost": 200, + "boostEnergy": 19, "agility": 0, - "baseShieldStrength": 88, - "baseArmour": 432, + "baseShieldStrength": 240, + "baseArmour": 240, "hullMass": 1000, "masslock": 16, "pipSpeed": 0.17375, diff --git a/ships/viper.json b/ships/viper.json index 49c0c3c..8dd469a 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -7,12 +7,12 @@ "manufacturer": "Faulcon DeLacy", "class": 1, "hullCost": 95900, - "speed": 310, - "boost": 388, - "boostEnergy": 11, + "speed": 320, + "boost": 400, + "boostEnergy": 10, "agility": 6, - "baseShieldStrength": 137, - "baseArmour": 126, + "baseShieldStrength": 105, + "baseArmour": 70, "hullMass": 60, "masslock": 7, "pipSpeed": 0.09375 diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index e9149e3..4d95ee3 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -7,12 +7,12 @@ "manufacturer": "Faulcon DeLacy", "class": 1, "hullCost": 310220, - "speed": 271, - "boost": 342, + "speed": 270, + "boost": 340, "boostEnergy": 10, "agility": 4, - "baseShieldStrength": 103, - "baseArmour": 270, + "baseShieldStrength": 150, + "baseArmour": 150, "hullMass": 190, "masslock": 7, "pipSpeed": 0.0875 diff --git a/ships/vulture.json b/ships/vulture.json index 16e3848..19fc022 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -7,12 +7,12 @@ "manufacturer": "Core Dynamics", "class": 1, "hullCost": 4689640, - "speed": 215, - "boost": 348, - "boostEnergy": 17, + "speed": 210, + "boost": 340, + "boostEnergy": 16, "agility": 9, - "baseShieldStrength": 293, - "baseArmour": 288, + "baseShieldStrength": 240, + "baseArmour": 160, "hullMass": 230, "masslock": 10, "pipSpeed": 0.02375 From 6f83578f2d0dc9fff91c14c7714bf2abf7f1e451 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Mon, 31 Oct 2016 11:17:02 +0000 Subject: [PATCH 30/49] Fix shield boost --- dist/index.js | 2 +- dist/index.json | 2 +- modifications/validity.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index ba27608..dcc4188 100644 --- a/dist/index.js +++ b/dist/index.js @@ -12085,7 +12085,7 @@ module.exports = { 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" ], + sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldmul", "thermres" ], sc: [], scb: [ "boot", "delay", "duration", "integrity", "power", "shield", "thermload" ], sg: [ "boot", "brokenregen", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], diff --git a/dist/index.json b/dist/index.json index dc9a641..3939e48 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14741,7 +14741,7 @@ "kinres", "mass", "power", - "shieldboost", + "shieldmul", "thermres" ], "sc": [], diff --git a/modifications/validity.json b/modifications/validity.json index 5ecd433..9729a08 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -274,7 +274,7 @@ "kinres", "mass", "power", - "shieldboost", + "shieldmul", "thermres" ], "sc": [], From 7985b29da15130ac25cabb6839f58573e627ba76 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Mon, 31 Oct 2016 21:07:36 +0000 Subject: [PATCH 31/49] explosive resistance for shield generator --- dist/index.js | 6 +++--- dist/index.json | 3 +++ modifications/validity.json | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index dcc4188..10df595 100644 --- a/dist/index.js +++ b/dist/index.js @@ -12051,7 +12051,7 @@ module.exports = { validity: { 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" ], + 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" ], cc: [ "boot", "integrity", "mass", "power" ], cr: [], @@ -12080,7 +12080,7 @@ module.exports = { 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" ], + psg: [ "boot", "brokenregen", "explres", "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" ], @@ -12088,7 +12088,7 @@ module.exports = { sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldmul", "thermres" ], sc: [], scb: [ "boot", "delay", "duration", "integrity", "power", "shield", "thermload" ], - sg: [ "boot", "brokenregen", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], + 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" ], diff --git a/dist/index.json b/dist/index.json index 3939e48..6051406 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14484,6 +14484,7 @@ "bsg": [ "boot", "brokenregen", + "explres", "integrity", "kinres", "mass", @@ -14697,6 +14698,7 @@ "psg": [ "boot", "brokenregen", + "explres", "integrity", "kinres", "mass", @@ -14757,6 +14759,7 @@ "sg": [ "boot", "brokenregen", + "explres", "integrity", "kinres", "mass", diff --git a/modifications/validity.json b/modifications/validity.json index 9729a08..bcd68fc 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -17,6 +17,7 @@ "bsg": [ "boot", "brokenregen", + "explres", "integrity", "kinres", "mass", @@ -230,6 +231,7 @@ "psg": [ "boot", "brokenregen", + "explres", "integrity", "kinres", "mass", @@ -290,6 +292,7 @@ "sg": [ "boot", "brokenregen", + "explres", "integrity", "kinres", "mass", From be51784658543d9ed89121a74417d46d1111b0aa Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Tue, 1 Nov 2016 08:14:21 +0000 Subject: [PATCH 32/49] Fix issue with thrusters; examine using derived DPS --- dist/index.js | 17 ++++++----------- dist/index.json | 17 ++++++----------- modules/hardpoints/multi_cannon.json | 15 +++++---------- modules/standard/thrusters.json | 2 +- 4 files changed, 18 insertions(+), 33 deletions(-) diff --git a/dist/index.js b/dist/index.js index 10df595..d6e21c9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2435,7 +2435,7 @@ module.exports = { integrity: 105, mass: 32, maxmass: 2430, - maxmul: .86, + maxmul: 1.86, minmass: 810, minmul: .86, optmass: 1620, @@ -6055,7 +6055,6 @@ module.exports = { rating: "C", reload: 4, rof: 5.9, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6067,12 +6066,14 @@ module.exports = { class: 3, clip: 90, cost: 578436, + damage: 2.83, + distdraw: .25, dps: 18.9, edID: 128049461, eddbID: 1543, eps: 1.675, grp: "mc", - hps: 2.01, + hps: 2.22, id: "7l", integrity: 64, mass: 8, @@ -6081,9 +6082,9 @@ module.exports = { range: 4e3, rating: "C", reload: 4, - rof: 6.7, - roundspershot: 1, + rof: 6.667, speed: 1600, + thermload: .333, type: "K" }, { ammo: 2100, @@ -6109,7 +6110,6 @@ module.exports = { rating: "E", reload: 4, rof: 7.1, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6136,7 +6136,6 @@ module.exports = { rating: "F", reload: 4, rof: 7.7, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6163,7 +6162,6 @@ module.exports = { rating: "F", reload: 4, rof: 6.2, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6190,7 +6188,6 @@ module.exports = { rating: "F", reload: 4, rof: 7.7, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6217,7 +6214,6 @@ module.exports = { rating: "G", reload: 4, rof: 8.3, - roundspershot: 1, speed: 1600, type: "K" }, { @@ -6244,7 +6240,6 @@ module.exports = { rating: "G", reload: 4, rof: 7.1, - roundspershot: 1, speed: 1600, type: "K" }, { diff --git a/dist/index.json b/dist/index.json index 6051406..faf88e7 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4126,7 +4126,7 @@ "integrity": 105, "mass": 32, "maxmass": 2430, - "maxmul": 0.86, + "maxmul": 1.86, "minmass": 810, "minmul": 0.86, "optmass": 1620, @@ -7989,7 +7989,6 @@ "rating": "C", "reload": 4, "rof": 5.9, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8002,12 +8001,14 @@ "class": 3, "clip": 90, "cost": 578436, + "damage": 2.83, + "distdraw": 0.25, "dps": 18.9, "edID": 128049461, "eddbID": 1543, "eps": 1.675, "grp": "mc", - "hps": 2.01, + "hps": 2.22, "id": "7l", "integrity": 64, "mass": 8, @@ -8016,9 +8017,9 @@ "range": 4000, "rating": "C", "reload": 4, - "rof": 6.7, - "roundspershot": 1, + "rof": 6.667, "speed": 1600, + "thermload": 0.333, "type": "K" }, { @@ -8045,7 +8046,6 @@ "rating": "E", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8073,7 +8073,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8101,7 +8100,6 @@ "rating": "F", "reload": 4, "rof": 6.2, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8129,7 +8127,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8157,7 +8154,6 @@ "rating": "G", "reload": 4, "rof": 8.3, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -8185,7 +8181,6 @@ "rating": "G", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index aedf347..b8aca62 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -80,7 +80,6 @@ "rating": "C", "reload": 4, "rof": 5.9, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -93,12 +92,14 @@ "class": 3, "clip": 90, "cost": 578436, + "damage": 2.83, + "distdraw": 0.25, "dps": 18.9, "edID": 128049461, "eddbID": 1543, "eps": 1.675, "grp": "mc", - "hps": 2.01, + "hps": 2.22, "id": "7l", "integrity": 64, "mass": 8, @@ -107,9 +108,9 @@ "range": 4000, "rating": "C", "reload": 4, - "rof": 6.7, - "roundspershot": 1, + "rof": 6.667, "speed": 1600, + "thermload": 0.333, "type": "K" }, { @@ -136,7 +137,6 @@ "rating": "E", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -164,7 +164,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -192,7 +191,6 @@ "rating": "F", "reload": 4, "rof": 6.2, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -220,7 +218,6 @@ "rating": "F", "reload": 4, "rof": 7.7, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -248,7 +245,6 @@ "rating": "G", "reload": 4, "rof": 8.3, - "roundspershot": 1, "speed": 1600, "type": "K" }, @@ -276,7 +272,6 @@ "rating": "G", "reload": 4, "rof": 7.1, - "roundspershot": 1, "speed": 1600, "type": "K" }, diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index 2349a3c..2e09108 100644 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -118,7 +118,7 @@ "integrity": 105, "mass": 32, "maxmass": 2430, - "maxmul": 0.86, + "maxmul": 1.86, "minmass": 810, "minmul": 0.86, "optmass": 1620, From 8bf8f6dc7d245bf39c61f25ab744d29545f5ae09 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Tue, 1 Nov 2016 10:17:01 +0000 Subject: [PATCH 33/49] Rename arc to facinglimit --- dist/index.js | 2 +- dist/index.json | 2 +- modifications/validity.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index d6e21c9..a84b260 100644 --- a/dist/index.js +++ b/dist/index.js @@ -12054,7 +12054,7 @@ module.exports = { dc: [], fc: [ "ammo", "armourpen", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], fh: [], - fi: [ "arc", "boot", "integrity", "mass", "power", "range" ], + fi: [ "boot", "facinglimit", "integrity", "mass", "power", "range" ], fs: [ "boot", "integrity", "mass", "power" ], fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ], ft: [], diff --git a/dist/index.json b/dist/index.json index faf88e7..da9af12 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14537,8 +14537,8 @@ ], "fh": [], "fi": [ - "arc", "boot", + "facinglimit", "integrity", "mass", "power", diff --git a/modifications/validity.json b/modifications/validity.json index bcd68fc..dd8f70f 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -75,8 +75,8 @@ ], "fh": [], "fi": [ - "arc", "boot", + "facinglimit", "integrity", "mass", "power", From 8f60b7b9ac3c7a22d6339cccf7c64972ad21fb04 Mon Sep 17 00:00:00 2001 From: QV Date: Tue, 1 Nov 2016 16:07:57 +0100 Subject: [PATCH 34/49] SCB data changes: all recharge values were wrong and some data was missing. The number of cells proved still accurate since the first inital charge is not counted towards the in-game ammo field so coriolos cells = ammo +1. added: boot, duration, integrity, spinUpTime, thermload modified: cost, recharge, rechargeRating --- dist/index.js | 464 +++++++++++++++++------- dist/index.json | 464 +++++++++++++++++------- modules/internal/shield_cell_bank.json | 466 ++++++++++++++++++------- 3 files changed, 997 insertions(+), 397 deletions(-) diff --git a/dist/index.js b/dist/index.js index a84b260..bed1b17 100644 --- a/dist/index.js +++ b/dist/index.js @@ -10867,564 +10867,764 @@ module.exports = { } ], scb: [ { ammocost: 300, + boot: 25, cells: 6, class: 8, - cost: 697580, + cost: 697584, + duration: 17, edID: 128064333, eddbID: 1186, grp: "scb", id: "65", + integrity: 120, mass: 160, power: 1.44, rating: "E", - recharge: 475, - rechargeRating: "C" + recharge: 476, + rechargeRating: "C", + spinUpTime: 5, + thermload: 800 }, { ammocost: 300, + boot: 25, cells: 4, class: 8, - cost: 1743960, + cost: 1743961, + duration: 17, edID: 128064334, eddbID: 1187, grp: "scb", id: "64", + integrity: 90, mass: 64, power: 1.92, rating: "D", - recharge: 630, - rechargeRating: "C" + recharge: 629, + rechargeRating: "D", + spinUpTime: 5, + thermload: 800 }, { ammocost: 300, + boot: 25, cells: 5, class: 8, - cost: 4359900, + cost: 4359903, + duration: 17, edID: 128064335, eddbID: 1188, grp: "scb", id: "63", + integrity: 150, mass: 160, power: 2.4, rating: "C", - recharge: 790, - rechargeRating: "B" + recharge: 799, + rechargeRating: "C", + spinUpTime: 5, + thermload: 800 }, { ammocost: 300, + boot: 25, cells: 6, class: 8, - cost: 10899760, + cost: 10899756, + duration: 17, edID: 128064336, eddbID: 1189, grp: "scb", id: "62", + integrity: 210, mass: 256, power: 2.88, rating: "B", - recharge: 950, - rechargeRating: "A" + recharge: 952, + rechargeRating: "B", + spinUpTime: 5, + thermload: 800 }, { ammocost: 300, + boot: 25, cells: 5, class: 8, - cost: 27249390, + cost: 27249391, + duration: 17, edID: 128064337, eddbID: 1190, grp: "scb", id: "61", + integrity: 180, mass: 160, power: 3.36, rating: "A", recharge: 1105, - rechargeRating: "A" + rechargeRating: "A", + spinUpTime: 5, + thermload: 800 }, { - ammocost: 300, - cells: 6, - class: 7, - cost: 249140, - edID: 128064328, - eddbID: 1181, - grp: "scb", - id: "60", - mass: 80, - power: 1.24, + thermload: 720, + spinUpTime: 5, + rechargeRating: "E", + recharge: 264, rating: "E", - recharge: 280, - rechargeRating: "D" + power: 1.24, + mass: 80, + integrity: 105, + id: "60", + grp: "scb", + eddbID: 1181, + edID: 128064328, + duration: 11, + cost: 249137, + class: 7, + cells: 6, + boot: 25, + ammocost: 300 }, { ammocost: 300, + boot: 25, cells: 4, class: 7, - cost: 622840, + cost: 622843, + duration: 11, edID: 128064329, eddbID: 1182, grp: "scb", id: "5v", + integrity: 79, mass: 32, power: 1.66, rating: "D", - recharge: 370, - rechargeRating: "C" + recharge: 352, + rechargeRating: "D", + spinUpTime: 5, + thermload: 720 }, { ammocost: 300, + boot: 25, cells: 5, class: 7, - cost: 1557110, + cost: 1557108, + duration: 11, edID: 128064330, eddbID: 1183, grp: "scb", id: "5u", + integrity: 131, mass: 80, power: 2.07, rating: "C", - recharge: 465, - rechargeRating: "B" + recharge: 451, + rechargeRating: "C", + spinUpTime: 5, + thermload: 720 }, { ammocost: 300, + boot: 25, cells: 6, class: 7, cost: 3892770, + duration: 11, edID: 128064331, eddbID: 1184, grp: "scb", id: "5t", + integrity: 183, mass: 128, power: 2.48, rating: "B", - recharge: 560, - rechargeRating: "B" + recharge: 539, + rechargeRating: "B", + spinUpTime: 5, + thermload: 720 }, { ammocost: 300, + boot: 25, cells: 5, class: 7, - cost: 9731930, + cost: 9731925, + duration: 11, edID: 128064332, eddbID: 1185, grp: "scb", id: "5s", + integrity: 157, mass: 80, power: 2.9, rating: "A", - recharge: 650, - rechargeRating: "A" + recharge: 627, + rechargeRating: "A", + spinUpTime: 5, + thermload: 720 }, { ammocost: 300, + boot: 25, cells: 6, class: 6, - cost: 88980, + cost: 88987, + duration: 8, edID: 128064323, eddbID: 1176, grp: "scb", id: "5r", + integrity: 90, mass: 40, power: 1.06, rating: "E", - recharge: 150, - rechargeRating: "D" + recharge: 160, + rechargeRating: "E", + spinUpTime: 5, + thermload: 640 }, { ammocost: 300, + boot: 25, cells: 4, class: 6, - cost: 222440, + cost: 222444, + duration: 8, edID: 128064324, eddbID: 1177, grp: "scb", id: "5q", + integrity: 68, mass: 16, power: 1.42, rating: "D", - recharge: 200, - rechargeRating: "C" + recharge: 208, + rechargeRating: "D", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 5, class: 6, cost: 556110, + duration: 8, edID: 128064325, eddbID: 1178, grp: "scb", id: "5p", + integrity: 113, mass: 40, power: 1.77, rating: "C", - recharge: 250, - rechargeRating: "C" + recharge: 264, + rechargeRating: "C", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 6, class: 6, - cost: 1390280, + cost: 1390275, + duration: 8, edID: 128064326, eddbID: 1179, grp: "scb", id: "5o", + integrity: 158, mass: 64, power: 2.12, rating: "B", - recharge: 300, - rechargeRating: "B" + recharge: 312, + rechargeRating: "B", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 5, class: 6, - cost: 3475690, + cost: 3475688, + duration: 8, edID: 128064327, eddbID: 1180, grp: "scb", id: "5n", + integrity: 136, mass: 40, power: 2.48, rating: "A", - recharge: 350, - rechargeRating: "A" + recharge: 368, + rechargeRating: "A", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 5, class: 5, - cost: 31780, + cost: 31778, + duration: 5, edID: 128064318, eddbID: 1171, grp: "scb", id: "5m", + integrity: 77, mass: 20, power: .9, rating: "E", recharge: 105, - rechargeRating: "D" + rechargeRating: "E", + spinUpTime: 5, + thermload: 540 }, { ammocost: 300, + boot: 25, cells: 3, class: 5, - cost: 79440, + cost: 79444, + duration: 5, edID: 128064319, eddbID: 1172, grp: "scb", id: "5l", + integrity: 58, mass: 8, power: 1.2, rating: "D", recharge: 140, - rechargeRating: "C" + rechargeRating: "D", + spinUpTime: 5, + thermload: 540 }, { ammocost: 300, + boot: 25, cells: 4, class: 5, - cost: 198610, + cost: 194143, + duration: 5, edID: 128064320, eddbID: 1173, grp: "scb", id: "5k", + integrity: 96, mass: 20, power: 1.5, rating: "C", recharge: 175, - rechargeRating: "C" + rechargeRating: "C", + spinUpTime: 5, + thermload: 540 }, { ammocost: 300, + boot: 25, cells: 5, class: 5, - cost: 496530, + cost: 496527, + duration: 5, edID: 128064321, eddbID: 1174, grp: "scb", id: "5j", + integrity: 134, mass: 32, power: 1.8, rating: "B", - recharge: 210, - rechargeRating: "B" + recharge: 205, + rechargeRating: "B", + spinUpTime: 5, + thermload: 540 }, { ammocost: 300, + boot: 25, cells: 4, class: 5, - cost: 1241320, + cost: 1210285, + duration: 5, edID: 128064322, eddbID: 1175, grp: "scb", id: "5i", + integrity: 115, mass: 20, power: 2.1, rating: "A", - recharge: 245, - rechargeRating: "B" + recharge: 240, + rechargeRating: "A", + spinUpTime: 5, + thermload: 540 }, { ammocost: 300, + boot: 25, cells: 5, class: 4, - cost: 11350, + cost: 11349, + duration: 3, edID: 128064313, eddbID: 1166, grp: "scb", id: "5h", + integrity: 64, mass: 10, power: .74, rating: "E", - recharge: 65, - rechargeRating: "D" + recharge: 60, + rechargeRating: "E", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 3, class: 4, - cost: 28370, + cost: 28373, + duration: 3, edID: 128064314, eddbID: 1167, grp: "scb", id: "5g", + integrity: 48, mass: 4, power: .98, rating: "D", - recharge: 90, - rechargeRating: "D" + recharge: 78, + rechargeRating: "D", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 4, class: 4, - cost: 70930, + cost: 70932, + duration: 3, edID: 128064315, eddbID: 1168, grp: "scb", id: "5f", + integrity: 80, mass: 10, power: 1.23, rating: "C", - recharge: 110, - rechargeRating: "C" + recharge: 99, + rechargeRating: "C", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 5, class: 4, - cost: 177330, + cost: 177331, + duration: 3, edID: 128064316, eddbID: 1169, grp: "scb", id: "5e", + integrity: 112, mass: 16, power: 1.48, rating: "B", - recharge: 135, - rechargeRating: "C" + recharge: 117, + rechargeRating: "B", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 4, class: 4, - cost: 443330, + cost: 443328, + duration: 3, edID: 128064317, eddbID: 1170, grp: "scb", id: "5d", + integrity: 96, mass: 10, power: 1.72, rating: "A", - recharge: 155, - rechargeRating: "B" + recharge: 138, + rechargeRating: "A", + spinUpTime: 5, + thermload: 410 }, { ammocost: 300, + boot: 25, cells: 5, class: 3, - cost: 4050, + cost: 4053, + duration: 2, edID: 128064308, eddbID: 1161, grp: "scb", id: "5c", + integrity: 51, mass: 5, power: .61, rating: "E", - recharge: 40, - rechargeRating: "D" + recharge: 34, + rechargeRating: "E", + spinUpTime: 5, + thermload: 340 }, { ammocost: 300, + boot: 25, cells: 3, class: 3, - cost: 10130, + cost: 10133, + duration: 2, edID: 128064309, eddbID: 1162, grp: "scb", id: "5b", + integrity: 38, mass: 2, power: .82, rating: "D", - recharge: 50, - rechargeRating: "D" + recharge: 46, + rechargeRating: "D", + spinUpTime: 5, + thermload: 340 }, { ammocost: 300, + boot: 25, cells: 4, class: 3, - cost: 25330, + cost: 25333, + duration: 2, edID: 128064310, eddbID: 1163, grp: "scb", id: "5a", + integrity: 64, mass: 5, power: 1.02, rating: "C", - recharge: 65, - rechargeRating: "D" + recharge: 58, + rechargeRating: "C", + spinUpTime: 5, + thermload: 340 }, { ammocost: 300, + boot: 25, cells: 5, class: 3, - cost: 63330, + cost: 61909, + duration: 2, edID: 128064311, eddbID: 1164, grp: "scb", id: "59", + integrity: 90, mass: 8, power: 1.22, rating: "B", - recharge: 80, - rechargeRating: "C" + recharge: 70, + rechargeRating: "B", + spinUpTime: 5, + thermload: 340 }, { ammocost: 300, + boot: 25, cells: 4, class: 3, - cost: 158330, + cost: 158331, + duration: 2, edID: 128064312, eddbID: 1165, grp: "scb", id: "58", + integrity: 77, mass: 5, power: 1.43, rating: "A", - recharge: 90, - rechargeRating: "C" + recharge: 82, + rechargeRating: "A", + spinUpTime: 5, + thermload: 340 }, { ammocost: 300, + boot: 25, cells: 5, class: 2, - cost: 11, + cost: 1448, + duration: 2, edID: 128064303, eddbID: 1156, grp: "scb", id: "57", + integrity: 41, mass: 2.5, power: .5, rating: "E", - recharge: 25, - rechargeRating: "E" + recharge: 28, + rechargeRating: "E", + spinUpTime: 5, + thermload: 240 }, { ammocost: 300, + boot: 25, cells: 3, class: 2, - cost: 3620, + cost: 3619, + duration: 2, edID: 128064304, eddbID: 1157, grp: "scb", id: "56", + integrity: 31, mass: 1, power: .67, rating: "D", - recharge: 30, - rechargeRating: "D" + recharge: 36, + rechargeRating: "D", + spinUpTime: 5, + thermload: 240 }, { ammocost: 300, + boot: 25, cells: 4, class: 2, - cost: 9050, + cost: 9048, + duration: 2, edID: 128064305, eddbID: 1158, grp: "scb", id: "55", + integrity: 51, mass: 2.5, power: .84, rating: "C", - recharge: 38, - rechargeRating: "D" + recharge: 46, + rechargeRating: "C", + spinUpTime: 5, + thermload: 240 }, { - ammocost: 300, - cells: 5, - class: 2, - cost: 22620, - edID: 128064306, - eddbID: 1159, - grp: "scb", - id: "54", - mass: 4, - power: 1.01, + thermload: 240, + spinUpTime: 5, + rechargeRating: "B", + recharge: 56, rating: "B", - recharge: 45, - rechargeRating: "D" + power: 1.01, + mass: 4, + integrity: 71, + id: "54", + grp: "scb", + eddbID: 1159, + edID: 128064306, + duration: 2, + cost: 22619, + class: 2, + cells: 5, + boot: 25, + ammocost: 300 }, { ammocost: 300, + boot: 25, cells: 4, class: 2, - cost: 56550, + cost: 56547, + duration: 2, edID: 128064307, eddbID: 1160, grp: "scb", id: "53", + integrity: 61, mass: 2.5, power: 1.18, rating: "A", - recharge: 55, - rechargeRating: "C" + recharge: 64, + rechargeRating: "A", + spinUpTime: 5, + thermload: 240 }, { ammocost: 300, + boot: 25, cells: 4, class: 1, - cost: 520, + cost: 517, + duration: 1, edID: 128064298, eddbID: 1151, grp: "scb", id: "52", + integrity: 32, mass: 1.3, power: .41, rating: "E", - recharge: 10, - rechargeRating: "E" + recharge: 12, + rechargeRating: "E", + spinUpTime: 5, + thermload: 170 }, { ammocost: 300, - cells: 2, + boot: 25, + cells: 1, class: 1, - cost: 1290, + cost: 1293, + duration: 1, edID: 128064299, eddbID: 1152, grp: "scb", id: "51", + integrity: 24, mass: .5, power: .55, rating: "D", recharge: 12.5, - rechargeRating: "E" + rechargeRating: "D", + spinUpTime: 5, + thermload: 170 }, { ammocost: 300, + boot: 25, cells: 3, class: 1, - cost: 3230, + cost: 3231, + duration: 1, edID: 128064300, eddbID: 1153, grp: "scb", id: "50", + integrity: 40, mass: 1.3, power: .69, rating: "C", - recharge: 15, - rechargeRating: "D" + recharge: 20, + rechargeRating: "C", + spinUpTime: 5, + thermload: 170 }, { ammocost: 300, + boot: 25, cells: 4, class: 1, - cost: 8080, + cost: 8078, + duration: 1, edID: 128064301, eddbID: 1154, grp: "scb", id: "4v", + integrity: 56, mass: 2, power: .83, rating: "B", - recharge: 20, - rechargeRating: "D" + recharge: 24, + rechargeRating: "B", + spinUpTime: 5, + thermload: 170 }, { ammocost: 300, + boot: 25, cells: 3, class: 1, - cost: 20200, + cost: 20195, + duration: 1, edID: 128064302, eddbID: 1155, grp: "scb", id: "4u", + integrity: 48, mass: 1.3, power: .97, rating: "A", - recharge: 25, - rechargeRating: "D" + recharge: 28, + rechargeRating: "A", + spinUpTime: 5, + thermload: 170 } ], sg: [ { class: 8, diff --git a/dist/index.json b/dist/index.json index da9af12..638057c 100644 --- a/dist/index.json +++ b/dist/index.json @@ -13183,603 +13183,803 @@ "scb": [ { "ammocost": 300, + "boot": 25, "cells": 6, "class": 8, - "cost": 697580, + "cost": 697584, + "duration": 17, "edID": 128064333, "eddbID": 1186, "grp": "scb", "id": "65", + "integrity": 120, "mass": 160, "power": 1.44, "rating": "E", - "recharge": 475, - "rechargeRating": "C" + "recharge": 476, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 8, - "cost": 1743960, + "cost": 1743961, + "duration": 17, "edID": 128064334, "eddbID": 1187, "grp": "scb", "id": "64", + "integrity": 90, "mass": 64, "power": 1.92, "rating": "D", - "recharge": 630, - "rechargeRating": "C" + "recharge": 629, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 8, - "cost": 4359900, + "cost": 4359903, + "duration": 17, "edID": 128064335, "eddbID": 1188, "grp": "scb", "id": "63", + "integrity": 150, "mass": 160, "power": 2.4, "rating": "C", - "recharge": 790, - "rechargeRating": "B" + "recharge": 799, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 8, - "cost": 10899760, + "cost": 10899756, + "duration": 17, "edID": 128064336, "eddbID": 1189, "grp": "scb", "id": "62", + "integrity": 210, "mass": 256, "power": 2.88, "rating": "B", - "recharge": 950, - "rechargeRating": "A" + "recharge": 952, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 8, - "cost": 27249390, + "cost": 27249391, + "duration": 17, "edID": 128064337, "eddbID": 1190, "grp": "scb", "id": "61", + "integrity": 180, "mass": 160, "power": 3.36, "rating": "A", "recharge": 1105, - "rechargeRating": "A" + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 800 }, { - "ammocost": 300, - "cells": 6, - "class": 7, - "cost": 249140, - "edID": 128064328, - "eddbID": 1181, - "grp": "scb", - "id": "60", - "mass": 80, - "power": 1.24, + "thermload": 720, + "spinUpTime": 5, + "rechargeRating": "E", + "recharge": 264, "rating": "E", - "recharge": 280, - "rechargeRating": "D" + "power": 1.24, + "mass": 80, + "integrity": 105, + "id": "60", + "grp": "scb", + "eddbID": 1181, + "edID": 128064328, + "duration": 11, + "cost": 249137, + "class": 7, + "cells": 6, + "boot": 25, + "ammocost": 300 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 7, - "cost": 622840, + "cost": 622843, + "duration": 11, "edID": 128064329, "eddbID": 1182, "grp": "scb", "id": "5v", + "integrity": 79, "mass": 32, "power": 1.66, "rating": "D", - "recharge": 370, - "rechargeRating": "C" + "recharge": 352, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 7, - "cost": 1557110, + "cost": 1557108, + "duration": 11, "edID": 128064330, "eddbID": 1183, "grp": "scb", "id": "5u", + "integrity": 131, "mass": 80, "power": 2.07, "rating": "C", - "recharge": 465, - "rechargeRating": "B" + "recharge": 451, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 7, "cost": 3892770, + "duration": 11, "edID": 128064331, "eddbID": 1184, "grp": "scb", "id": "5t", + "integrity": 183, "mass": 128, "power": 2.48, "rating": "B", - "recharge": 560, - "rechargeRating": "B" + "recharge": 539, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 7, - "cost": 9731930, + "cost": 9731925, + "duration": 11, "edID": 128064332, "eddbID": 1185, "grp": "scb", "id": "5s", + "integrity": 157, "mass": 80, "power": 2.9, "rating": "A", - "recharge": 650, - "rechargeRating": "A" + "recharge": 627, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 6, - "cost": 88980, + "cost": 88987, + "duration": 8, "edID": 128064323, "eddbID": 1176, "grp": "scb", "id": "5r", + "integrity": 90, "mass": 40, "power": 1.06, "rating": "E", - "recharge": 150, - "rechargeRating": "D" + "recharge": 160, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 640 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 6, - "cost": 222440, + "cost": 222444, + "duration": 8, "edID": 128064324, "eddbID": 1177, "grp": "scb", "id": "5q", + "integrity": 68, "mass": 16, "power": 1.42, "rating": "D", - "recharge": 200, - "rechargeRating": "C" + "recharge": 208, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 6, "cost": 556110, + "duration": 8, "edID": 128064325, "eddbID": 1178, "grp": "scb", "id": "5p", + "integrity": 113, "mass": 40, "power": 1.77, "rating": "C", - "recharge": 250, - "rechargeRating": "C" + "recharge": 264, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 6, - "cost": 1390280, + "cost": 1390275, + "duration": 8, "edID": 128064326, "eddbID": 1179, "grp": "scb", "id": "5o", + "integrity": 158, "mass": 64, "power": 2.12, "rating": "B", - "recharge": 300, - "rechargeRating": "B" + "recharge": 312, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 6, - "cost": 3475690, + "cost": 3475688, + "duration": 8, "edID": 128064327, "eddbID": 1180, "grp": "scb", "id": "5n", + "integrity": 136, "mass": 40, "power": 2.48, "rating": "A", - "recharge": 350, - "rechargeRating": "A" + "recharge": 368, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 5, - "cost": 31780, + "cost": 31778, + "duration": 5, "edID": 128064318, "eddbID": 1171, "grp": "scb", "id": "5m", + "integrity": 77, "mass": 20, "power": 0.9, "rating": "E", "recharge": 105, - "rechargeRating": "D" + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 5, - "cost": 79440, + "cost": 79444, + "duration": 5, "edID": 128064319, "eddbID": 1172, "grp": "scb", "id": "5l", + "integrity": 58, "mass": 8, "power": 1.2, "rating": "D", "recharge": 140, - "rechargeRating": "C" + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 5, - "cost": 198610, + "cost": 194143, + "duration": 5, "edID": 128064320, "eddbID": 1173, "grp": "scb", "id": "5k", + "integrity": 96, "mass": 20, "power": 1.5, "rating": "C", "recharge": 175, - "rechargeRating": "C" + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 5, - "cost": 496530, + "cost": 496527, + "duration": 5, "edID": 128064321, "eddbID": 1174, "grp": "scb", "id": "5j", + "integrity": 134, "mass": 32, "power": 1.8, "rating": "B", - "recharge": 210, - "rechargeRating": "B" + "recharge": 205, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 5, - "cost": 1241320, + "cost": 1210285, + "duration": 5, "edID": 128064322, "eddbID": 1175, "grp": "scb", "id": "5i", + "integrity": 115, "mass": 20, "power": 2.1, "rating": "A", - "recharge": 245, - "rechargeRating": "B" + "recharge": 240, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 4, - "cost": 11350, + "cost": 11349, + "duration": 3, "edID": 128064313, "eddbID": 1166, "grp": "scb", "id": "5h", + "integrity": 64, "mass": 10, "power": 0.74, "rating": "E", - "recharge": 65, - "rechargeRating": "D" + "recharge": 60, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 4, - "cost": 28370, + "cost": 28373, + "duration": 3, "edID": 128064314, "eddbID": 1167, "grp": "scb", "id": "5g", + "integrity": 48, "mass": 4, "power": 0.98, "rating": "D", - "recharge": 90, - "rechargeRating": "D" + "recharge": 78, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 4, - "cost": 70930, + "cost": 70932, + "duration": 3, "edID": 128064315, "eddbID": 1168, "grp": "scb", "id": "5f", + "integrity": 80, "mass": 10, "power": 1.23, "rating": "C", - "recharge": 110, - "rechargeRating": "C" + "recharge": 99, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 4, - "cost": 177330, + "cost": 177331, + "duration": 3, "edID": 128064316, "eddbID": 1169, "grp": "scb", "id": "5e", + "integrity": 112, "mass": 16, "power": 1.48, "rating": "B", - "recharge": 135, - "rechargeRating": "C" + "recharge": 117, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 4, - "cost": 443330, + "cost": 443328, + "duration": 3, "edID": 128064317, "eddbID": 1170, "grp": "scb", "id": "5d", + "integrity": 96, "mass": 10, "power": 1.72, "rating": "A", - "recharge": 155, - "rechargeRating": "B" + "recharge": 138, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 3, - "cost": 4050, + "cost": 4053, + "duration": 2, "edID": 128064308, "eddbID": 1161, "grp": "scb", "id": "5c", + "integrity": 51, "mass": 5, "power": 0.61, "rating": "E", - "recharge": 40, - "rechargeRating": "D" + "recharge": 34, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 3, - "cost": 10130, + "cost": 10133, + "duration": 2, "edID": 128064309, "eddbID": 1162, "grp": "scb", "id": "5b", + "integrity": 38, "mass": 2, "power": 0.82, "rating": "D", - "recharge": 50, - "rechargeRating": "D" + "recharge": 46, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 3, - "cost": 25330, + "cost": 25333, + "duration": 2, "edID": 128064310, "eddbID": 1163, "grp": "scb", "id": "5a", + "integrity": 64, "mass": 5, "power": 1.02, "rating": "C", - "recharge": 65, - "rechargeRating": "D" + "recharge": 58, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 3, - "cost": 63330, + "cost": 61909, + "duration": 2, "edID": 128064311, "eddbID": 1164, "grp": "scb", "id": "59", + "integrity": 90, "mass": 8, "power": 1.22, "rating": "B", - "recharge": 80, - "rechargeRating": "C" + "recharge": 70, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 3, - "cost": 158330, + "cost": 158331, + "duration": 2, "edID": 128064312, "eddbID": 1165, "grp": "scb", "id": "58", + "integrity": 77, "mass": 5, "power": 1.43, "rating": "A", - "recharge": 90, - "rechargeRating": "C" + "recharge": 82, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 2, - "cost": 11, + "cost": 1448, + "duration": 2, "edID": 128064303, "eddbID": 1156, "grp": "scb", "id": "57", + "integrity": 41, "mass": 2.5, "power": 0.5, "rating": "E", - "recharge": 25, - "rechargeRating": "E" + "recharge": 28, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 240 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 2, - "cost": 3620, + "cost": 3619, + "duration": 2, "edID": 128064304, "eddbID": 1157, "grp": "scb", "id": "56", + "integrity": 31, "mass": 1, "power": 0.67, "rating": "D", - "recharge": 30, - "rechargeRating": "D" + "recharge": 36, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 240 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 2, - "cost": 9050, + "cost": 9048, + "duration": 2, "edID": 128064305, "eddbID": 1158, "grp": "scb", "id": "55", + "integrity": 51, "mass": 2.5, "power": 0.84, "rating": "C", - "recharge": 38, - "rechargeRating": "D" + "recharge": 46, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 240 }, { - "ammocost": 300, - "cells": 5, - "class": 2, - "cost": 22620, - "edID": 128064306, - "eddbID": 1159, - "grp": "scb", - "id": "54", - "mass": 4, - "power": 1.01, + "thermload": 240, + "spinUpTime": 5, + "rechargeRating": "B", + "recharge": 56, "rating": "B", - "recharge": 45, - "rechargeRating": "D" + "power": 1.01, + "mass": 4, + "integrity": 71, + "id": "54", + "grp": "scb", + "eddbID": 1159, + "edID": 128064306, + "duration": 2, + "cost": 22619, + "class": 2, + "cells": 5, + "boot": 25, + "ammocost": 300 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 2, - "cost": 56550, + "cost": 56547, + "duration": 2, "edID": 128064307, "eddbID": 1160, "grp": "scb", "id": "53", + "integrity": 61, "mass": 2.5, "power": 1.18, "rating": "A", - "recharge": 55, - "rechargeRating": "C" + "recharge": 64, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 240 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 1, - "cost": 520, + "cost": 517, + "duration": 1, "edID": 128064298, "eddbID": 1151, "grp": "scb", "id": "52", + "integrity": 32, "mass": 1.3, "power": 0.41, "rating": "E", - "recharge": 10, - "rechargeRating": "E" + "recharge": 12, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, - "cells": 2, + "boot": 25, + "cells": 1, "class": 1, - "cost": 1290, + "cost": 1293, + "duration": 1, "edID": 128064299, "eddbID": 1152, "grp": "scb", "id": "51", + "integrity": 24, "mass": 0.5, "power": 0.55, "rating": "D", "recharge": 12.5, - "rechargeRating": "E" + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 1, - "cost": 3230, + "cost": 3231, + "duration": 1, "edID": 128064300, "eddbID": 1153, "grp": "scb", "id": "50", + "integrity": 40, "mass": 1.3, "power": 0.69, "rating": "C", - "recharge": 15, - "rechargeRating": "D" + "recharge": 20, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 1, - "cost": 8080, + "cost": 8078, + "duration": 1, "edID": 128064301, "eddbID": 1154, "grp": "scb", "id": "4v", + "integrity": 56, "mass": 2, "power": 0.83, "rating": "B", - "recharge": 20, - "rechargeRating": "D" + "recharge": 24, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 1, - "cost": 20200, + "cost": 20195, + "duration": 1, "edID": 128064302, "eddbID": 1155, "grp": "scb", "id": "4u", + "integrity": 48, "mass": 1.3, "power": 0.97, "rating": "A", - "recharge": 25, - "rechargeRating": "D" + "recharge": 28, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 170 } ], "sg": [ diff --git a/modules/internal/shield_cell_bank.json b/modules/internal/shield_cell_bank.json index c9fb1bb..de2b251 100644 --- a/modules/internal/shield_cell_bank.json +++ b/modules/internal/shield_cell_bank.json @@ -2,603 +2,803 @@ "scb": [ { "ammocost": 300, + "boot": 25, "cells": 6, "class": 8, - "cost": 697580, + "cost": 697584, + "duration": 17, "edID": 128064333, "eddbID": 1186, "grp": "scb", "id": "65", + "integrity": 120, "mass": 160, "power": 1.44, "rating": "E", - "recharge": 475, - "rechargeRating": "C" + "recharge": 476, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 8, - "cost": 1743960, + "cost": 1743961, + "duration": 17, "edID": 128064334, "eddbID": 1187, "grp": "scb", "id": "64", + "integrity": 90, "mass": 64, "power": 1.92, "rating": "D", - "recharge": 630, - "rechargeRating": "C" + "recharge": 629, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 8, - "cost": 4359900, + "cost": 4359903, + "duration": 17, "edID": 128064335, "eddbID": 1188, "grp": "scb", "id": "63", + "integrity": 150, "mass": 160, "power": 2.4, "rating": "C", - "recharge": 790, - "rechargeRating": "B" + "recharge": 799, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 8, - "cost": 10899760, + "cost": 10899756, + "duration": 17, "edID": 128064336, "eddbID": 1189, "grp": "scb", "id": "62", + "integrity": 210, "mass": 256, "power": 2.88, "rating": "B", - "recharge": 950, - "rechargeRating": "A" + "recharge": 952, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 800 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 8, - "cost": 27249390, + "cost": 27249391, + "duration": 17, "edID": 128064337, "eddbID": 1190, "grp": "scb", "id": "61", + "integrity": 180, "mass": 160, "power": 3.36, "rating": "A", "recharge": 1105, - "rechargeRating": "A" + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 800 }, { - "ammocost": 300, - "cells": 6, - "class": 7, - "cost": 249140, - "edID": 128064328, - "eddbID": 1181, - "grp": "scb", - "id": "60", - "mass": 80, - "power": 1.24, + "thermload": 720, + "spinUpTime": 5, + "rechargeRating": "E", + "recharge": 264, "rating": "E", - "recharge": 280, - "rechargeRating": "D" + "power": 1.24, + "mass": 80, + "integrity": 105, + "id": "60", + "grp": "scb", + "eddbID": 1181, + "edID": 128064328, + "duration": 11, + "cost": 249137, + "class": 7, + "cells": 6, + "boot": 25, + "ammocost": 300 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 7, - "cost": 622840, + "cost": 622843, + "duration": 11, "edID": 128064329, "eddbID": 1182, "grp": "scb", "id": "5v", + "integrity": 79, "mass": 32, "power": 1.66, "rating": "D", - "recharge": 370, - "rechargeRating": "C" + "recharge": 352, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 7, - "cost": 1557110, + "cost": 1557108, + "duration": 11, "edID": 128064330, "eddbID": 1183, "grp": "scb", "id": "5u", + "integrity": 131, "mass": 80, "power": 2.07, "rating": "C", - "recharge": 465, - "rechargeRating": "B" + "recharge": 451, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 7, "cost": 3892770, + "duration": 11, "edID": 128064331, "eddbID": 1184, "grp": "scb", "id": "5t", + "integrity": 183, "mass": 128, "power": 2.48, "rating": "B", - "recharge": 560, - "rechargeRating": "B" + "recharge": 539, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 7, - "cost": 9731930, + "cost": 9731925, + "duration": 11, "edID": 128064332, "eddbID": 1185, "grp": "scb", "id": "5s", + "integrity": 157, "mass": 80, "power": 2.9, "rating": "A", - "recharge": 650, - "rechargeRating": "A" + "recharge": 627, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 720 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 6, - "cost": 88980, + "cost": 88987, + "duration": 8, "edID": 128064323, "eddbID": 1176, "grp": "scb", "id": "5r", + "integrity": 90, "mass": 40, "power": 1.06, "rating": "E", - "recharge": 150, - "rechargeRating": "D" + "recharge": 160, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 640 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 6, - "cost": 222440, + "cost": 222444, + "duration": 8, "edID": 128064324, "eddbID": 1177, "grp": "scb", "id": "5q", + "integrity": 68, "mass": 16, "power": 1.42, "rating": "D", - "recharge": 200, - "rechargeRating": "C" + "recharge": 208, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 6, "cost": 556110, + "duration": 8, "edID": 128064325, "eddbID": 1178, "grp": "scb", "id": "5p", + "integrity": 113, "mass": 40, "power": 1.77, "rating": "C", - "recharge": 250, - "rechargeRating": "C" + "recharge": 264, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 6, "class": 6, - "cost": 1390280, + "cost": 1390275, + "duration": 8, "edID": 128064326, "eddbID": 1179, "grp": "scb", "id": "5o", + "integrity": 158, "mass": 64, "power": 2.12, "rating": "B", - "recharge": 300, - "rechargeRating": "B" + "recharge": 312, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 6, - "cost": 3475690, + "cost": 3475688, + "duration": 8, "edID": 128064327, "eddbID": 1180, "grp": "scb", "id": "5n", + "integrity": 136, "mass": 40, "power": 2.48, "rating": "A", - "recharge": 350, - "rechargeRating": "A" + "recharge": 368, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 5, - "cost": 31780, + "cost": 31778, + "duration": 5, "edID": 128064318, "eddbID": 1171, "grp": "scb", "id": "5m", + "integrity": 77, "mass": 20, "power": 0.9, "rating": "E", "recharge": 105, - "rechargeRating": "D" + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 5, - "cost": 79440, + "cost": 79444, + "duration": 5, "edID": 128064319, "eddbID": 1172, "grp": "scb", "id": "5l", + "integrity": 58, "mass": 8, "power": 1.2, "rating": "D", "recharge": 140, - "rechargeRating": "C" + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 5, - "cost": 198610, + "cost": 194143, + "duration": 5, "edID": 128064320, "eddbID": 1173, "grp": "scb", "id": "5k", + "integrity": 96, "mass": 20, "power": 1.5, "rating": "C", "recharge": 175, - "rechargeRating": "C" + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 5, - "cost": 496530, + "cost": 496527, + "duration": 5, "edID": 128064321, "eddbID": 1174, "grp": "scb", "id": "5j", + "integrity": 134, "mass": 32, "power": 1.8, "rating": "B", - "recharge": 210, - "rechargeRating": "B" + "recharge": 205, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 5, - "cost": 1241320, + "cost": 1210285, + "duration": 5, "edID": 128064322, "eddbID": 1175, "grp": "scb", "id": "5i", + "integrity": 115, "mass": 20, "power": 2.1, "rating": "A", - "recharge": 245, - "rechargeRating": "B" + "recharge": 240, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 540 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 4, - "cost": 11350, + "cost": 11349, + "duration": 3, "edID": 128064313, "eddbID": 1166, "grp": "scb", "id": "5h", + "integrity": 64, "mass": 10, "power": 0.74, "rating": "E", - "recharge": 65, - "rechargeRating": "D" + "recharge": 60, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 4, - "cost": 28370, + "cost": 28373, + "duration": 3, "edID": 128064314, "eddbID": 1167, "grp": "scb", "id": "5g", + "integrity": 48, "mass": 4, "power": 0.98, "rating": "D", - "recharge": 90, - "rechargeRating": "D" + "recharge": 78, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 4, - "cost": 70930, + "cost": 70932, + "duration": 3, "edID": 128064315, "eddbID": 1168, "grp": "scb", "id": "5f", + "integrity": 80, "mass": 10, "power": 1.23, "rating": "C", - "recharge": 110, - "rechargeRating": "C" + "recharge": 99, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 4, - "cost": 177330, + "cost": 177331, + "duration": 3, "edID": 128064316, "eddbID": 1169, "grp": "scb", "id": "5e", + "integrity": 112, "mass": 16, "power": 1.48, "rating": "B", - "recharge": 135, - "rechargeRating": "C" + "recharge": 117, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 4, - "cost": 443330, + "cost": 443328, + "duration": 3, "edID": 128064317, "eddbID": 1170, "grp": "scb", "id": "5d", + "integrity": 96, "mass": 10, "power": 1.72, "rating": "A", - "recharge": 155, - "rechargeRating": "B" + "recharge": 138, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 410 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 3, - "cost": 4050, + "cost": 4053, + "duration": 2, "edID": 128064308, "eddbID": 1161, "grp": "scb", "id": "5c", + "integrity": 51, "mass": 5, "power": 0.61, "rating": "E", - "recharge": 40, - "rechargeRating": "D" + "recharge": 34, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 3, - "cost": 10130, + "cost": 10133, + "duration": 2, "edID": 128064309, "eddbID": 1162, "grp": "scb", "id": "5b", + "integrity": 38, "mass": 2, "power": 0.82, "rating": "D", - "recharge": 50, - "rechargeRating": "D" + "recharge": 46, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 3, - "cost": 25330, + "cost": 25333, + "duration": 2, "edID": 128064310, "eddbID": 1163, "grp": "scb", "id": "5a", + "integrity": 64, "mass": 5, "power": 1.02, "rating": "C", - "recharge": 65, - "rechargeRating": "D" + "recharge": 58, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 3, - "cost": 63330, + "cost": 61909, + "duration": 2, "edID": 128064311, "eddbID": 1164, "grp": "scb", "id": "59", + "integrity": 90, "mass": 8, "power": 1.22, "rating": "B", - "recharge": 80, - "rechargeRating": "C" + "recharge": 70, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 3, - "cost": 158330, + "cost": 158331, + "duration": 2, "edID": 128064312, "eddbID": 1165, "grp": "scb", "id": "58", + "integrity": 77, "mass": 5, "power": 1.43, "rating": "A", - "recharge": 90, - "rechargeRating": "C" + "recharge": 82, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 340 }, { "ammocost": 300, + "boot": 25, "cells": 5, "class": 2, - "cost": 11, + "cost": 1448, + "duration": 2, "edID": 128064303, "eddbID": 1156, "grp": "scb", "id": "57", + "integrity": 41, "mass": 2.5, "power": 0.5, "rating": "E", - "recharge": 25, - "rechargeRating": "E" + "recharge": 28, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 240 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 2, - "cost": 3620, + "cost": 3619, + "duration": 2, "edID": 128064304, "eddbID": 1157, "grp": "scb", "id": "56", + "integrity": 31, "mass": 1, "power": 0.67, "rating": "D", - "recharge": 30, - "rechargeRating": "D" + "recharge": 36, + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 240 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 2, - "cost": 9050, + "cost": 9048, + "duration": 2, "edID": 128064305, "eddbID": 1158, "grp": "scb", "id": "55", + "integrity": 51, "mass": 2.5, "power": 0.84, "rating": "C", - "recharge": 38, - "rechargeRating": "D" + "recharge": 46, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 240 }, { - "ammocost": 300, - "cells": 5, - "class": 2, - "cost": 22620, - "edID": 128064306, - "eddbID": 1159, - "grp": "scb", - "id": "54", - "mass": 4, - "power": 1.01, + "thermload": 240, + "spinUpTime": 5, + "rechargeRating": "B", + "recharge": 56, "rating": "B", - "recharge": 45, - "rechargeRating": "D" + "power": 1.01, + "mass": 4, + "integrity": 71, + "id": "54", + "grp": "scb", + "eddbID": 1159, + "edID": 128064306, + "duration": 2, + "cost": 22619, + "class": 2, + "cells": 5, + "boot": 25, + "ammocost": 300 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 2, - "cost": 56550, + "cost": 56547, + "duration": 2, "edID": 128064307, "eddbID": 1160, "grp": "scb", "id": "53", + "integrity": 61, "mass": 2.5, "power": 1.18, "rating": "A", - "recharge": 55, - "rechargeRating": "C" + "recharge": 64, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 240 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 1, - "cost": 520, + "cost": 517, + "duration": 1, "edID": 128064298, "eddbID": 1151, "grp": "scb", "id": "52", + "integrity": 32, "mass": 1.3, "power": 0.41, "rating": "E", - "recharge": 10, - "rechargeRating": "E" + "recharge": 12, + "rechargeRating": "E", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, - "cells": 2, + "boot": 25, + "cells": 1, "class": 1, - "cost": 1290, + "cost": 1293, + "duration": 1, "edID": 128064299, "eddbID": 1152, "grp": "scb", "id": "51", + "integrity": 24, "mass": 0.5, "power": 0.55, "rating": "D", "recharge": 12.5, - "rechargeRating": "E" + "rechargeRating": "D", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 1, - "cost": 3230, + "cost": 3231, + "duration": 1, "edID": 128064300, "eddbID": 1153, "grp": "scb", "id": "50", + "integrity": 40, "mass": 1.3, "power": 0.69, "rating": "C", - "recharge": 15, - "rechargeRating": "D" + "recharge": 20, + "rechargeRating": "C", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, + "boot": 25, "cells": 4, "class": 1, - "cost": 8080, + "cost": 8078, + "duration": 1, "edID": 128064301, "eddbID": 1154, "grp": "scb", "id": "4v", + "integrity": 56, "mass": 2, "power": 0.83, "rating": "B", - "recharge": 20, - "rechargeRating": "D" + "recharge": 24, + "rechargeRating": "B", + "spinUpTime": 5, + "thermload": 170 }, { "ammocost": 300, + "boot": 25, "cells": 3, "class": 1, - "cost": 20200, + "cost": 20195, + "duration": 1, "edID": 128064302, "eddbID": 1155, "grp": "scb", "id": "4u", + "integrity": 48, "mass": 1.3, "power": 0.97, "rating": "A", - "recharge": 25, - "rechargeRating": "D" + "recharge": 28, + "rechargeRating": "A", + "spinUpTime": 5, + "thermload": 170 } ] -} +} \ No newline at end of file From cf6a0964ff96c8dde643c5f75b9a4b3d197a8681 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 08:46:26 +0000 Subject: [PATCH 35/49] Tweak key names --- dist/index.js | 228 ++++++++++++------------ dist/index.json | 228 ++++++++++++------------ modules/internal/shield_cell_bank.json | 230 ++++++++++++------------- 3 files changed, 343 insertions(+), 343 deletions(-) diff --git a/dist/index.js b/dist/index.js index bed1b17..a27be31 100644 --- a/dist/index.js +++ b/dist/index.js @@ -10881,8 +10881,8 @@ module.exports = { power: 1.44, rating: "E", recharge: 476, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 800 }, { ammocost: 300, @@ -10900,8 +10900,8 @@ module.exports = { power: 1.92, rating: "D", recharge: 629, - rechargeRating: "D", - spinUpTime: 5, + rechargerating: "D", + spinup: 5, thermload: 800 }, { ammocost: 300, @@ -10919,8 +10919,8 @@ module.exports = { power: 2.4, rating: "C", recharge: 799, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 800 }, { ammocost: 300, @@ -10938,8 +10938,8 @@ module.exports = { power: 2.88, rating: "B", recharge: 952, - rechargeRating: "B", - spinUpTime: 5, + rechargerating: "B", + spinup: 5, thermload: 800 }, { ammocost: 300, @@ -10957,28 +10957,28 @@ module.exports = { power: 3.36, rating: "A", recharge: 1105, - rechargeRating: "A", - spinUpTime: 5, + rechargerating: "A", + spinup: 5, thermload: 800 }, { - thermload: 720, - spinUpTime: 5, - rechargeRating: "E", - recharge: 264, - rating: "E", - power: 1.24, - mass: 80, - integrity: 105, - id: "60", - grp: "scb", - eddbID: 1181, - edID: 128064328, - duration: 11, - cost: 249137, - class: 7, - cells: 6, + ammocost: 300, boot: 25, - ammocost: 300 + cells: 6, + class: 7, + cost: 249137, + duration: 11, + edID: 128064328, + eddbID: 1181, + grp: "scb", + id: "60", + integrity: 105, + mass: 80, + power: 1.24, + rating: "E", + recharge: 264, + rechargerating: "E", + spinup: 5, + thermload: 720 }, { ammocost: 300, boot: 25, @@ -10995,8 +10995,8 @@ module.exports = { power: 1.66, rating: "D", recharge: 352, - rechargeRating: "D", - spinUpTime: 5, + rechargerating: "D", + spinup: 5, thermload: 720 }, { ammocost: 300, @@ -11014,8 +11014,8 @@ module.exports = { power: 2.07, rating: "C", recharge: 451, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 720 }, { ammocost: 300, @@ -11033,8 +11033,8 @@ module.exports = { power: 2.48, rating: "B", recharge: 539, - rechargeRating: "B", - spinUpTime: 5, + rechargerating: "B", + spinup: 5, thermload: 720 }, { ammocost: 300, @@ -11052,8 +11052,8 @@ module.exports = { power: 2.9, rating: "A", recharge: 627, - rechargeRating: "A", - spinUpTime: 5, + rechargerating: "A", + spinup: 5, thermload: 720 }, { ammocost: 300, @@ -11071,8 +11071,8 @@ module.exports = { power: 1.06, rating: "E", recharge: 160, - rechargeRating: "E", - spinUpTime: 5, + rechargerating: "E", + spinup: 5, thermload: 640 }, { ammocost: 300, @@ -11090,9 +11090,9 @@ module.exports = { power: 1.42, rating: "D", recharge: 208, - rechargeRating: "D", - spinUpTime: 5, - thermload: 410 + rechargerating: "D", + spinup: 5, + thermload: 640 }, { ammocost: 300, boot: 25, @@ -11109,9 +11109,9 @@ module.exports = { power: 1.77, rating: "C", recharge: 264, - rechargeRating: "C", - spinUpTime: 5, - thermload: 410 + rechargerating: "C", + spinup: 5, + thermload: 640 }, { ammocost: 300, boot: 25, @@ -11128,9 +11128,9 @@ module.exports = { power: 2.12, rating: "B", recharge: 312, - rechargeRating: "B", - spinUpTime: 5, - thermload: 410 + rechargerating: "B", + spinup: 5, + thermload: 640 }, { ammocost: 300, boot: 25, @@ -11147,9 +11147,9 @@ module.exports = { power: 2.48, rating: "A", recharge: 368, - rechargeRating: "A", - spinUpTime: 5, - thermload: 410 + rechargerating: "A", + spinup: 5, + thermload: 640 }, { ammocost: 300, boot: 25, @@ -11166,8 +11166,8 @@ module.exports = { power: .9, rating: "E", recharge: 105, - rechargeRating: "E", - spinUpTime: 5, + rechargerating: "E", + spinup: 5, thermload: 540 }, { ammocost: 300, @@ -11185,8 +11185,8 @@ module.exports = { power: 1.2, rating: "D", recharge: 140, - rechargeRating: "D", - spinUpTime: 5, + rechargerating: "D", + spinup: 5, thermload: 540 }, { ammocost: 300, @@ -11204,8 +11204,8 @@ module.exports = { power: 1.5, rating: "C", recharge: 175, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 540 }, { ammocost: 300, @@ -11223,8 +11223,8 @@ module.exports = { power: 1.8, rating: "B", recharge: 205, - rechargeRating: "B", - spinUpTime: 5, + rechargerating: "B", + spinup: 5, thermload: 540 }, { ammocost: 300, @@ -11242,8 +11242,8 @@ module.exports = { power: 2.1, rating: "A", recharge: 240, - rechargeRating: "A", - spinUpTime: 5, + rechargerating: "A", + spinup: 5, thermload: 540 }, { ammocost: 300, @@ -11261,8 +11261,8 @@ module.exports = { power: .74, rating: "E", recharge: 60, - rechargeRating: "E", - spinUpTime: 5, + rechargerating: "E", + spinup: 5, thermload: 410 }, { ammocost: 300, @@ -11280,8 +11280,8 @@ module.exports = { power: .98, rating: "D", recharge: 78, - rechargeRating: "D", - spinUpTime: 5, + rechargerating: "D", + spinup: 5, thermload: 410 }, { ammocost: 300, @@ -11299,8 +11299,8 @@ module.exports = { power: 1.23, rating: "C", recharge: 99, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 410 }, { ammocost: 300, @@ -11318,8 +11318,8 @@ module.exports = { power: 1.48, rating: "B", recharge: 117, - rechargeRating: "B", - spinUpTime: 5, + rechargerating: "B", + spinup: 5, thermload: 410 }, { ammocost: 300, @@ -11337,8 +11337,8 @@ module.exports = { power: 1.72, rating: "A", recharge: 138, - rechargeRating: "A", - spinUpTime: 5, + rechargerating: "A", + spinup: 5, thermload: 410 }, { ammocost: 300, @@ -11356,8 +11356,8 @@ module.exports = { power: .61, rating: "E", recharge: 34, - rechargeRating: "E", - spinUpTime: 5, + rechargerating: "E", + spinup: 5, thermload: 340 }, { ammocost: 300, @@ -11375,8 +11375,8 @@ module.exports = { power: .82, rating: "D", recharge: 46, - rechargeRating: "D", - spinUpTime: 5, + rechargerating: "D", + spinup: 5, thermload: 340 }, { ammocost: 300, @@ -11394,8 +11394,8 @@ module.exports = { power: 1.02, rating: "C", recharge: 58, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 340 }, { ammocost: 300, @@ -11413,8 +11413,8 @@ module.exports = { power: 1.22, rating: "B", recharge: 70, - rechargeRating: "B", - spinUpTime: 5, + rechargerating: "B", + spinup: 5, thermload: 340 }, { ammocost: 300, @@ -11432,8 +11432,8 @@ module.exports = { power: 1.43, rating: "A", recharge: 82, - rechargeRating: "A", - spinUpTime: 5, + rechargerating: "A", + spinup: 5, thermload: 340 }, { ammocost: 300, @@ -11451,8 +11451,8 @@ module.exports = { power: .5, rating: "E", recharge: 28, - rechargeRating: "E", - spinUpTime: 5, + rechargerating: "E", + spinup: 5, thermload: 240 }, { ammocost: 300, @@ -11470,8 +11470,8 @@ module.exports = { power: .67, rating: "D", recharge: 36, - rechargeRating: "D", - spinUpTime: 5, + rechargerating: "D", + spinup: 5, thermload: 240 }, { ammocost: 300, @@ -11489,28 +11489,28 @@ module.exports = { power: .84, rating: "C", recharge: 46, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 240 }, { - thermload: 240, - spinUpTime: 5, - rechargeRating: "B", - recharge: 56, - rating: "B", - power: 1.01, - mass: 4, - integrity: 71, - id: "54", - grp: "scb", - eddbID: 1159, - edID: 128064306, - duration: 2, - cost: 22619, - class: 2, - cells: 5, + ammocost: 300, boot: 25, - ammocost: 300 + cells: 5, + class: 2, + cost: 22619, + duration: 2, + edID: 128064306, + eddbID: 1159, + grp: "scb", + id: "54", + integrity: 71, + mass: 4, + power: 1.01, + rating: "B", + recharge: 56, + rechargerating: "B", + spinup: 5, + thermload: 240 }, { ammocost: 300, boot: 25, @@ -11527,8 +11527,8 @@ module.exports = { power: 1.18, rating: "A", recharge: 64, - rechargeRating: "A", - spinUpTime: 5, + rechargerating: "A", + spinup: 5, thermload: 240 }, { ammocost: 300, @@ -11546,8 +11546,8 @@ module.exports = { power: .41, rating: "E", recharge: 12, - rechargeRating: "E", - spinUpTime: 5, + rechargerating: "E", + spinup: 5, thermload: 170 }, { ammocost: 300, @@ -11565,8 +11565,8 @@ module.exports = { power: .55, rating: "D", recharge: 12.5, - rechargeRating: "D", - spinUpTime: 5, + rechargerating: "D", + spinup: 5, thermload: 170 }, { ammocost: 300, @@ -11584,8 +11584,8 @@ module.exports = { power: .69, rating: "C", recharge: 20, - rechargeRating: "C", - spinUpTime: 5, + rechargerating: "C", + spinup: 5, thermload: 170 }, { ammocost: 300, @@ -11603,8 +11603,8 @@ module.exports = { power: .83, rating: "B", recharge: 24, - rechargeRating: "B", - spinUpTime: 5, + rechargerating: "B", + spinup: 5, thermload: 170 }, { ammocost: 300, @@ -11622,8 +11622,8 @@ module.exports = { power: .97, rating: "A", recharge: 28, - rechargeRating: "A", - spinUpTime: 5, + rechargerating: "A", + spinup: 5, thermload: 170 } ], sg: [ { diff --git a/dist/index.json b/dist/index.json index 638057c..11d2629 100644 --- a/dist/index.json +++ b/dist/index.json @@ -13197,8 +13197,8 @@ "power": 1.44, "rating": "E", "recharge": 476, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 800 }, { @@ -13217,8 +13217,8 @@ "power": 1.92, "rating": "D", "recharge": 629, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 800 }, { @@ -13237,8 +13237,8 @@ "power": 2.4, "rating": "C", "recharge": 799, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 800 }, { @@ -13257,8 +13257,8 @@ "power": 2.88, "rating": "B", "recharge": 952, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 800 }, { @@ -13277,29 +13277,29 @@ "power": 3.36, "rating": "A", "recharge": 1105, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 800 }, { - "thermload": 720, - "spinUpTime": 5, - "rechargeRating": "E", - "recharge": 264, - "rating": "E", - "power": 1.24, - "mass": 80, - "integrity": 105, - "id": "60", - "grp": "scb", - "eddbID": 1181, - "edID": 128064328, - "duration": 11, - "cost": 249137, - "class": 7, - "cells": 6, + "ammocost": 300, "boot": 25, - "ammocost": 300 + "cells": 6, + "class": 7, + "cost": 249137, + "duration": 11, + "edID": 128064328, + "eddbID": 1181, + "grp": "scb", + "id": "60", + "integrity": 105, + "mass": 80, + "power": 1.24, + "rating": "E", + "recharge": 264, + "rechargerating": "E", + "spinup": 5, + "thermload": 720 }, { "ammocost": 300, @@ -13317,8 +13317,8 @@ "power": 1.66, "rating": "D", "recharge": 352, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 720 }, { @@ -13337,8 +13337,8 @@ "power": 2.07, "rating": "C", "recharge": 451, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 720 }, { @@ -13357,8 +13357,8 @@ "power": 2.48, "rating": "B", "recharge": 539, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 720 }, { @@ -13377,8 +13377,8 @@ "power": 2.9, "rating": "A", "recharge": 627, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 720 }, { @@ -13397,8 +13397,8 @@ "power": 1.06, "rating": "E", "recharge": 160, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 640 }, { @@ -13417,9 +13417,9 @@ "power": 1.42, "rating": "D", "recharge": 208, - "rechargeRating": "D", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "D", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -13437,9 +13437,9 @@ "power": 1.77, "rating": "C", "recharge": 264, - "rechargeRating": "C", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "C", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -13457,9 +13457,9 @@ "power": 2.12, "rating": "B", "recharge": 312, - "rechargeRating": "B", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "B", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -13477,9 +13477,9 @@ "power": 2.48, "rating": "A", "recharge": 368, - "rechargeRating": "A", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "A", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -13497,8 +13497,8 @@ "power": 0.9, "rating": "E", "recharge": 105, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 540 }, { @@ -13517,8 +13517,8 @@ "power": 1.2, "rating": "D", "recharge": 140, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 540 }, { @@ -13537,8 +13537,8 @@ "power": 1.5, "rating": "C", "recharge": 175, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 540 }, { @@ -13557,8 +13557,8 @@ "power": 1.8, "rating": "B", "recharge": 205, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 540 }, { @@ -13577,8 +13577,8 @@ "power": 2.1, "rating": "A", "recharge": 240, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 540 }, { @@ -13597,8 +13597,8 @@ "power": 0.74, "rating": "E", "recharge": 60, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 410 }, { @@ -13617,8 +13617,8 @@ "power": 0.98, "rating": "D", "recharge": 78, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 410 }, { @@ -13637,8 +13637,8 @@ "power": 1.23, "rating": "C", "recharge": 99, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 410 }, { @@ -13657,8 +13657,8 @@ "power": 1.48, "rating": "B", "recharge": 117, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 410 }, { @@ -13677,8 +13677,8 @@ "power": 1.72, "rating": "A", "recharge": 138, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 410 }, { @@ -13697,8 +13697,8 @@ "power": 0.61, "rating": "E", "recharge": 34, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 340 }, { @@ -13717,8 +13717,8 @@ "power": 0.82, "rating": "D", "recharge": 46, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 340 }, { @@ -13737,8 +13737,8 @@ "power": 1.02, "rating": "C", "recharge": 58, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 340 }, { @@ -13757,8 +13757,8 @@ "power": 1.22, "rating": "B", "recharge": 70, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 340 }, { @@ -13777,8 +13777,8 @@ "power": 1.43, "rating": "A", "recharge": 82, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 340 }, { @@ -13797,8 +13797,8 @@ "power": 0.5, "rating": "E", "recharge": 28, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 240 }, { @@ -13817,8 +13817,8 @@ "power": 0.67, "rating": "D", "recharge": 36, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 240 }, { @@ -13837,29 +13837,29 @@ "power": 0.84, "rating": "C", "recharge": 46, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 240 }, { - "thermload": 240, - "spinUpTime": 5, - "rechargeRating": "B", - "recharge": 56, - "rating": "B", - "power": 1.01, - "mass": 4, - "integrity": 71, - "id": "54", - "grp": "scb", - "eddbID": 1159, - "edID": 128064306, - "duration": 2, - "cost": 22619, - "class": 2, - "cells": 5, + "ammocost": 300, "boot": 25, - "ammocost": 300 + "cells": 5, + "class": 2, + "cost": 22619, + "duration": 2, + "edID": 128064306, + "eddbID": 1159, + "grp": "scb", + "id": "54", + "integrity": 71, + "mass": 4, + "power": 1.01, + "rating": "B", + "recharge": 56, + "rechargerating": "B", + "spinup": 5, + "thermload": 240 }, { "ammocost": 300, @@ -13877,8 +13877,8 @@ "power": 1.18, "rating": "A", "recharge": 64, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 240 }, { @@ -13897,8 +13897,8 @@ "power": 0.41, "rating": "E", "recharge": 12, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 170 }, { @@ -13917,8 +13917,8 @@ "power": 0.55, "rating": "D", "recharge": 12.5, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 170 }, { @@ -13937,8 +13937,8 @@ "power": 0.69, "rating": "C", "recharge": 20, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 170 }, { @@ -13957,8 +13957,8 @@ "power": 0.83, "rating": "B", "recharge": 24, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 170 }, { @@ -13977,8 +13977,8 @@ "power": 0.97, "rating": "A", "recharge": 28, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 170 } ], diff --git a/modules/internal/shield_cell_bank.json b/modules/internal/shield_cell_bank.json index de2b251..e7e5f7a 100644 --- a/modules/internal/shield_cell_bank.json +++ b/modules/internal/shield_cell_bank.json @@ -16,8 +16,8 @@ "power": 1.44, "rating": "E", "recharge": 476, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 800 }, { @@ -36,8 +36,8 @@ "power": 1.92, "rating": "D", "recharge": 629, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 800 }, { @@ -56,8 +56,8 @@ "power": 2.4, "rating": "C", "recharge": 799, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 800 }, { @@ -76,8 +76,8 @@ "power": 2.88, "rating": "B", "recharge": 952, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 800 }, { @@ -96,29 +96,29 @@ "power": 3.36, "rating": "A", "recharge": 1105, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 800 }, { - "thermload": 720, - "spinUpTime": 5, - "rechargeRating": "E", - "recharge": 264, - "rating": "E", - "power": 1.24, - "mass": 80, - "integrity": 105, - "id": "60", - "grp": "scb", - "eddbID": 1181, - "edID": 128064328, - "duration": 11, - "cost": 249137, - "class": 7, - "cells": 6, + "ammocost": 300, "boot": 25, - "ammocost": 300 + "cells": 6, + "class": 7, + "cost": 249137, + "duration": 11, + "edID": 128064328, + "eddbID": 1181, + "grp": "scb", + "id": "60", + "integrity": 105, + "mass": 80, + "power": 1.24, + "rating": "E", + "recharge": 264, + "rechargerating": "E", + "spinup": 5, + "thermload": 720 }, { "ammocost": 300, @@ -136,8 +136,8 @@ "power": 1.66, "rating": "D", "recharge": 352, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 720 }, { @@ -156,8 +156,8 @@ "power": 2.07, "rating": "C", "recharge": 451, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 720 }, { @@ -176,8 +176,8 @@ "power": 2.48, "rating": "B", "recharge": 539, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 720 }, { @@ -196,8 +196,8 @@ "power": 2.9, "rating": "A", "recharge": 627, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 720 }, { @@ -216,8 +216,8 @@ "power": 1.06, "rating": "E", "recharge": 160, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 640 }, { @@ -236,9 +236,9 @@ "power": 1.42, "rating": "D", "recharge": 208, - "rechargeRating": "D", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "D", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -256,9 +256,9 @@ "power": 1.77, "rating": "C", "recharge": 264, - "rechargeRating": "C", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "C", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -276,9 +276,9 @@ "power": 2.12, "rating": "B", "recharge": 312, - "rechargeRating": "B", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "B", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -296,9 +296,9 @@ "power": 2.48, "rating": "A", "recharge": 368, - "rechargeRating": "A", - "spinUpTime": 5, - "thermload": 410 + "rechargerating": "A", + "spinup": 5, + "thermload": 640 }, { "ammocost": 300, @@ -316,8 +316,8 @@ "power": 0.9, "rating": "E", "recharge": 105, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 540 }, { @@ -336,8 +336,8 @@ "power": 1.2, "rating": "D", "recharge": 140, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 540 }, { @@ -356,8 +356,8 @@ "power": 1.5, "rating": "C", "recharge": 175, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 540 }, { @@ -376,8 +376,8 @@ "power": 1.8, "rating": "B", "recharge": 205, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 540 }, { @@ -396,8 +396,8 @@ "power": 2.1, "rating": "A", "recharge": 240, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 540 }, { @@ -416,8 +416,8 @@ "power": 0.74, "rating": "E", "recharge": 60, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 410 }, { @@ -436,8 +436,8 @@ "power": 0.98, "rating": "D", "recharge": 78, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 410 }, { @@ -456,8 +456,8 @@ "power": 1.23, "rating": "C", "recharge": 99, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 410 }, { @@ -476,8 +476,8 @@ "power": 1.48, "rating": "B", "recharge": 117, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 410 }, { @@ -496,8 +496,8 @@ "power": 1.72, "rating": "A", "recharge": 138, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 410 }, { @@ -516,8 +516,8 @@ "power": 0.61, "rating": "E", "recharge": 34, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 340 }, { @@ -536,8 +536,8 @@ "power": 0.82, "rating": "D", "recharge": 46, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 340 }, { @@ -556,8 +556,8 @@ "power": 1.02, "rating": "C", "recharge": 58, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 340 }, { @@ -576,8 +576,8 @@ "power": 1.22, "rating": "B", "recharge": 70, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 340 }, { @@ -596,8 +596,8 @@ "power": 1.43, "rating": "A", "recharge": 82, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 340 }, { @@ -616,8 +616,8 @@ "power": 0.5, "rating": "E", "recharge": 28, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 240 }, { @@ -636,8 +636,8 @@ "power": 0.67, "rating": "D", "recharge": 36, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 240 }, { @@ -656,29 +656,29 @@ "power": 0.84, "rating": "C", "recharge": 46, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 240 }, { - "thermload": 240, - "spinUpTime": 5, - "rechargeRating": "B", - "recharge": 56, - "rating": "B", - "power": 1.01, - "mass": 4, - "integrity": 71, - "id": "54", - "grp": "scb", - "eddbID": 1159, - "edID": 128064306, - "duration": 2, - "cost": 22619, - "class": 2, - "cells": 5, + "ammocost": 300, "boot": 25, - "ammocost": 300 + "cells": 5, + "class": 2, + "cost": 22619, + "duration": 2, + "edID": 128064306, + "eddbID": 1159, + "grp": "scb", + "id": "54", + "integrity": 71, + "mass": 4, + "power": 1.01, + "rating": "B", + "recharge": 56, + "rechargerating": "B", + "spinup": 5, + "thermload": 240 }, { "ammocost": 300, @@ -696,8 +696,8 @@ "power": 1.18, "rating": "A", "recharge": 64, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 240 }, { @@ -716,8 +716,8 @@ "power": 0.41, "rating": "E", "recharge": 12, - "rechargeRating": "E", - "spinUpTime": 5, + "rechargerating": "E", + "spinup": 5, "thermload": 170 }, { @@ -736,8 +736,8 @@ "power": 0.55, "rating": "D", "recharge": 12.5, - "rechargeRating": "D", - "spinUpTime": 5, + "rechargerating": "D", + "spinup": 5, "thermload": 170 }, { @@ -756,8 +756,8 @@ "power": 0.69, "rating": "C", "recharge": 20, - "rechargeRating": "C", - "spinUpTime": 5, + "rechargerating": "C", + "spinup": 5, "thermload": 170 }, { @@ -776,8 +776,8 @@ "power": 0.83, "rating": "B", "recharge": 24, - "rechargeRating": "B", - "spinUpTime": 5, + "rechargerating": "B", + "spinup": 5, "thermload": 170 }, { @@ -796,9 +796,9 @@ "power": 0.97, "rating": "A", "recharge": 28, - "rechargeRating": "A", - "spinUpTime": 5, + "rechargerating": "A", + "spinup": 5, "thermload": 170 } ] -} \ No newline at end of file +} From 406adaf1852739427825567fe40a68dd8ccbdb4f Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 09:08:24 +0000 Subject: [PATCH 36/49] Ensure that standard modules have integrity --- dist/index.js | 80 +++++++++++++++++++++++++ dist/index.json | 80 +++++++++++++++++++++++++ modules/standard/power_distributor.json | 40 +++++++++++++ modules/standard/sensors.json | 40 +++++++++++++ spec/data-spec.js | 5 +- 5 files changed, 244 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index a27be31..c70f75b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -4011,6 +4011,7 @@ module.exports = { engrate: 3.2, grp: "pd", id: "dD", + integrity: 135, mass: 160, power: .64, rating: "E", @@ -4027,6 +4028,7 @@ module.exports = { engrate: 3.6, grp: "pd", id: "dC", + integrity: 120, mass: 64, power: .72, rating: "D", @@ -4043,6 +4045,7 @@ module.exports = { engrate: 4, grp: "pd", id: "dB", + integrity: 150, mass: 160, power: .8, rating: "C", @@ -4059,6 +4062,7 @@ module.exports = { engrate: 4.4, grp: "pd", id: "dA", + integrity: 180, mass: 256, power: .88, rating: "B", @@ -4075,6 +4079,7 @@ module.exports = { engrate: 4.8, grp: "pd", id: "dz", + integrity: 165, mass: 160, power: .96, rating: "A", @@ -4091,6 +4096,7 @@ module.exports = { engrate: 2.6, grp: "pd", id: "dy", + integrity: 118, mass: 80, power: .59, rating: "E", @@ -4107,6 +4113,7 @@ module.exports = { engrate: 3, grp: "pd", id: "dx", + integrity: 105, mass: 32, power: .67, rating: "D", @@ -4123,6 +4130,7 @@ module.exports = { engrate: 3.3, grp: "pd", id: "dw", + integrity: 131, mass: 80, power: .74, rating: "C", @@ -4139,6 +4147,7 @@ module.exports = { engrate: 3.6, grp: "pd", id: "dv", + integrity: 157, mass: 128, power: .81, rating: "B", @@ -4155,6 +4164,7 @@ module.exports = { engrate: 4, grp: "pd", id: "du", + integrity: 144, mass: 80, power: .89, rating: "A", @@ -4171,6 +4181,7 @@ module.exports = { engrate: 2.2, grp: "pd", id: "dt", + integrity: 102, mass: 40, power: .54, rating: "E", @@ -4187,6 +4198,7 @@ module.exports = { engrate: 2.4, grp: "pd", id: "ds", + integrity: 90, mass: 16, power: .61, rating: "D", @@ -4203,6 +4215,7 @@ module.exports = { engrate: 2.7, grp: "pd", id: "dr", + integrity: 113, mass: 40, power: .68, rating: "C", @@ -4219,6 +4232,7 @@ module.exports = { engrate: 3, grp: "pd", id: "dq", + integrity: 136, mass: 64, power: .75, rating: "B", @@ -4235,6 +4249,7 @@ module.exports = { engrate: 3.2, grp: "pd", id: "dp", + integrity: 124, mass: 40, power: .82, rating: "A", @@ -4251,6 +4266,7 @@ module.exports = { engrate: 1.7, grp: "pd", id: "do", + integrity: 86, mass: 20, power: .5, rating: "E", @@ -4267,6 +4283,7 @@ module.exports = { engrate: 1.9, grp: "pd", id: "dn", + integrity: 77, mass: 8, power: .56, rating: "D", @@ -4283,6 +4300,7 @@ module.exports = { engrate: 2.1, grp: "pd", id: "dm", + integrity: 96, mass: 20, power: .62, rating: "C", @@ -4299,6 +4317,7 @@ module.exports = { engrate: 2.3, grp: "pd", id: "dl", + integrity: 115, mass: 32, power: .68, rating: "B", @@ -4315,6 +4334,7 @@ module.exports = { engrate: 2.5, grp: "pd", id: "dk", + integrity: 106, mass: 20, power: .74, rating: "A", @@ -4331,6 +4351,7 @@ module.exports = { engrate: 1.3, grp: "pd", id: "dj", + integrity: 72, mass: 10, power: .45, rating: "E", @@ -4347,6 +4368,7 @@ module.exports = { engrate: 1.4, grp: "pd", id: "di", + integrity: 64, mass: 4, power: .5, rating: "D", @@ -4363,6 +4385,7 @@ module.exports = { engrate: 1.6, grp: "pd", id: "dh", + integrity: 80, mass: 10, power: .56, rating: "C", @@ -4379,6 +4402,7 @@ module.exports = { engrate: 1.8, grp: "pd", id: "dg", + integrity: 96, mass: 16, power: .62, rating: "B", @@ -4395,6 +4419,7 @@ module.exports = { engrate: 1.9, grp: "pd", id: "df", + integrity: 88, mass: 10, power: .67, rating: "A", @@ -4411,6 +4436,7 @@ module.exports = { engrate: .9, grp: "pd", id: "de", + integrity: 58, mass: 5, power: .4, rating: "E", @@ -4427,6 +4453,7 @@ module.exports = { engrate: 1, grp: "pd", id: "dd", + integrity: 51, mass: 2, power: .45, rating: "D", @@ -4443,6 +4470,7 @@ module.exports = { engrate: 1.1, grp: "pd", id: "dc", + integrity: 64, mass: 5, power: .5, rating: "C", @@ -4459,6 +4487,7 @@ module.exports = { engrate: 1.2, grp: "pd", id: "db", + integrity: 77, mass: 8, power: .55, rating: "B", @@ -4475,6 +4504,7 @@ module.exports = { engrate: 1.3, grp: "pd", id: "da", + integrity: 70, mass: 5, power: .6, rating: "A", @@ -4491,6 +4521,7 @@ module.exports = { engrate: .6, grp: "pd", id: "d9", + integrity: 46, mass: 2.5, power: .36, rating: "E", @@ -4507,6 +4538,7 @@ module.exports = { engrate: .6, grp: "pd", id: "d8", + integrity: 41, mass: 1, power: .41, rating: "D", @@ -4523,6 +4555,7 @@ module.exports = { engrate: .7, grp: "pd", id: "d7", + integrity: 51, mass: 2.5, power: .45, rating: "C", @@ -4539,6 +4572,7 @@ module.exports = { engrate: .8, grp: "pd", id: "d6", + integrity: 61, mass: 4, power: .5, rating: "B", @@ -4555,6 +4589,7 @@ module.exports = { engrate: .8, grp: "pd", id: "d5", + integrity: 56, mass: 2.5, power: .54, rating: "A", @@ -4571,6 +4606,7 @@ module.exports = { engrate: .4, grp: "pd", id: "d4", + integrity: 46, mass: 1.3, power: .32, rating: "E", @@ -4587,6 +4623,7 @@ module.exports = { engrate: .5, grp: "pd", id: "d3", + integrity: 41, mass: .5, power: .36, rating: "D", @@ -4603,6 +4640,7 @@ module.exports = { engrate: .5, grp: "pd", id: "d2", + integrity: 51, mass: 1.3, power: .4, rating: "C", @@ -4619,6 +4657,7 @@ module.exports = { engrate: .6, grp: "pd", id: "d1", + integrity: 61, mass: 2, power: .44, rating: "B", @@ -4635,6 +4674,7 @@ module.exports = { engrate: .6, grp: "pd", id: "d0", + integrity: 56, mass: 1.3, power: .48, rating: "A", @@ -4650,6 +4690,7 @@ module.exports = { eddbID: 1111, grp: "s", id: "sy", + integrity: 135, mass: 160, power: .55, range: 5.12, @@ -4661,6 +4702,7 @@ module.exports = { eddbID: 1112, grp: "s", id: "sx", + integrity: 120, mass: 64, power: .62, range: 5.76, @@ -4672,6 +4714,7 @@ module.exports = { eddbID: 1113, grp: "s", id: "sw", + integrity: 150, mass: 160, power: .69, range: 6.4, @@ -4683,6 +4726,7 @@ module.exports = { eddbID: 1114, grp: "s", id: "sv", + integrity: 180, mass: 256, power: 1.14, range: 7.04, @@ -4694,6 +4738,7 @@ module.exports = { eddbID: 1115, grp: "s", id: "su", + integrity: 165, mass: 160, power: 2.07, range: 7.68, @@ -4705,6 +4750,7 @@ module.exports = { eddbID: 1106, grp: "s", id: "sD", + integrity: 118, mass: 80, power: .47, range: 4.96, @@ -4716,6 +4762,7 @@ module.exports = { eddbID: 1107, grp: "s", id: "sC", + integrity: 105, mass: 32, power: .53, range: 5.58, @@ -4727,6 +4774,7 @@ module.exports = { eddbID: 1108, grp: "s", id: "sB", + integrity: 131, mass: 80, power: .59, range: 6.2, @@ -4738,6 +4786,7 @@ module.exports = { eddbID: 1109, grp: "s", id: "sA", + integrity: 157, mass: 128, power: .97, range: 6.82, @@ -4749,6 +4798,7 @@ module.exports = { eddbID: 1110, grp: "s", id: "sz", + integrity: 144, mass: 80, power: 1.77, range: 7.44, @@ -4760,6 +4810,7 @@ module.exports = { eddbID: 1101, grp: "s", id: "st", + integrity: 102, mass: 40, power: .4, range: 4.8, @@ -4771,6 +4822,7 @@ module.exports = { eddbID: 1102, grp: "s", id: "ss", + integrity: 90, mass: 16, power: .45, range: 5.4, @@ -4782,6 +4834,7 @@ module.exports = { eddbID: 1103, grp: "s", id: "sr", + integrity: 113, mass: 40, power: .5, range: 6, @@ -4793,6 +4846,7 @@ module.exports = { eddbID: 1104, grp: "s", id: "sq", + integrity: 136, mass: 64, power: .83, range: 6.6, @@ -4804,6 +4858,7 @@ module.exports = { eddbID: 1105, grp: "s", id: "sp", + integrity: 124, mass: 40, power: 1.5, range: 7.2, @@ -4815,6 +4870,7 @@ module.exports = { eddbID: 1096, grp: "s", id: "so", + integrity: 86, mass: 20, power: .33, range: 4.64, @@ -4826,6 +4882,7 @@ module.exports = { eddbID: 1097, grp: "s", id: "sn", + integrity: 77, mass: 8, power: .37, range: 5.22, @@ -4837,6 +4894,7 @@ module.exports = { eddbID: 1098, grp: "s", id: "sm", + integrity: 96, mass: 20, power: .41, range: 5.8, @@ -4848,6 +4906,7 @@ module.exports = { eddbID: 1099, grp: "s", id: "sl", + integrity: 115, mass: 32, power: .68, range: 6.38, @@ -4859,6 +4918,7 @@ module.exports = { eddbID: 1100, grp: "s", id: "sk", + integrity: 106, mass: 20, power: 1.23, range: 6.96, @@ -4870,6 +4930,7 @@ module.exports = { eddbID: 1091, grp: "s", id: "sj", + integrity: 72, mass: 10, power: .27, range: 4.48, @@ -4881,6 +4942,7 @@ module.exports = { eddbID: 1092, grp: "s", id: "si", + integrity: 64, mass: 4, power: .31, range: 5.04, @@ -4892,6 +4954,7 @@ module.exports = { eddbID: 1093, grp: "s", id: "sh", + integrity: 80, mass: 10, power: .34, range: 5.6, @@ -4903,6 +4966,7 @@ module.exports = { eddbID: 1094, grp: "s", id: "sg", + integrity: 96, mass: 16, power: .56, range: 6.16, @@ -4914,6 +4978,7 @@ module.exports = { eddbID: 1095, grp: "s", id: "sf", + integrity: 88, mass: 10, power: 1.02, range: 6.72, @@ -4925,6 +4990,7 @@ module.exports = { eddbID: 1086, grp: "s", id: "se", + integrity: 58, mass: 5, power: .22, range: 4.32, @@ -4936,6 +5002,7 @@ module.exports = { eddbID: 1087, grp: "s", id: "sd", + integrity: 51, mass: 2, power: .25, range: 4.86, @@ -4947,6 +5014,7 @@ module.exports = { eddbID: 1088, grp: "s", id: "sc", + integrity: 64, mass: 5, power: .28, range: 5.4, @@ -4958,6 +5026,7 @@ module.exports = { eddbID: 1089, grp: "s", id: "sb", + integrity: 77, mass: 8, power: .46, range: 5.94, @@ -4969,6 +5038,7 @@ module.exports = { eddbID: 1090, grp: "s", id: "sa", + integrity: 70, mass: 5, power: .84, range: 6.48, @@ -4980,6 +5050,7 @@ module.exports = { eddbID: 1081, grp: "s", id: "s9", + integrity: 46, mass: 2.5, power: .18, range: 4.16, @@ -4991,6 +5062,7 @@ module.exports = { eddbID: 1082, grp: "s", id: "s8", + integrity: 41, mass: 1, power: .21, range: 4.68, @@ -5002,6 +5074,7 @@ module.exports = { eddbID: 1083, grp: "s", id: "s7", + integrity: 51, mass: 2.5, power: .23, range: 5.2, @@ -5013,6 +5086,7 @@ module.exports = { eddbID: 1084, grp: "s", id: "s6", + integrity: 61, mass: 4, power: .38, range: 5.72, @@ -5024,6 +5098,7 @@ module.exports = { eddbID: 1085, grp: "s", id: "s5", + integrity: 56, mass: 2.5, power: .69, range: 6.24, @@ -5035,6 +5110,7 @@ module.exports = { eddbID: 1076, grp: "s", id: "s4", + integrity: 46, mass: 1.3, power: .16, range: 4, @@ -5046,6 +5122,7 @@ module.exports = { eddbID: 1077, grp: "s", id: "s3", + integrity: 41, mass: .5, power: .18, range: 4.5, @@ -5057,6 +5134,7 @@ module.exports = { eddbID: 1078, grp: "s", id: "s2", + integrity: 51, mass: 1.3, power: .2, range: 5, @@ -5068,6 +5146,7 @@ module.exports = { eddbID: 1079, grp: "s", id: "s1", + integrity: 61, mass: 2, power: .33, range: 5.5, @@ -5079,6 +5158,7 @@ module.exports = { eddbID: 1080, grp: "s", id: "s0", + integrity: 56, mass: 1.3, power: .6, range: 6, diff --git a/dist/index.json b/dist/index.json index 11d2629..21b5f17 100644 --- a/dist/index.json +++ b/dist/index.json @@ -5811,6 +5811,7 @@ "engrate": 3.2, "grp": "pd", "id": "dD", + "integrity": 135, "mass": 160, "power": 0.64, "rating": "E", @@ -5828,6 +5829,7 @@ "engrate": 3.6, "grp": "pd", "id": "dC", + "integrity": 120, "mass": 64, "power": 0.72, "rating": "D", @@ -5845,6 +5847,7 @@ "engrate": 4, "grp": "pd", "id": "dB", + "integrity": 150, "mass": 160, "power": 0.8, "rating": "C", @@ -5862,6 +5865,7 @@ "engrate": 4.4, "grp": "pd", "id": "dA", + "integrity": 180, "mass": 256, "power": 0.88, "rating": "B", @@ -5879,6 +5883,7 @@ "engrate": 4.8, "grp": "pd", "id": "dz", + "integrity": 165, "mass": 160, "power": 0.96, "rating": "A", @@ -5896,6 +5901,7 @@ "engrate": 2.6, "grp": "pd", "id": "dy", + "integrity": 118, "mass": 80, "power": 0.59, "rating": "E", @@ -5913,6 +5919,7 @@ "engrate": 3, "grp": "pd", "id": "dx", + "integrity": 105, "mass": 32, "power": 0.67, "rating": "D", @@ -5930,6 +5937,7 @@ "engrate": 3.3, "grp": "pd", "id": "dw", + "integrity": 131, "mass": 80, "power": 0.74, "rating": "C", @@ -5947,6 +5955,7 @@ "engrate": 3.6, "grp": "pd", "id": "dv", + "integrity": 157, "mass": 128, "power": 0.81, "rating": "B", @@ -5964,6 +5973,7 @@ "engrate": 4, "grp": "pd", "id": "du", + "integrity": 144, "mass": 80, "power": 0.89, "rating": "A", @@ -5981,6 +5991,7 @@ "engrate": 2.2, "grp": "pd", "id": "dt", + "integrity": 102, "mass": 40, "power": 0.54, "rating": "E", @@ -5998,6 +6009,7 @@ "engrate": 2.4, "grp": "pd", "id": "ds", + "integrity": 90, "mass": 16, "power": 0.61, "rating": "D", @@ -6015,6 +6027,7 @@ "engrate": 2.7, "grp": "pd", "id": "dr", + "integrity": 113, "mass": 40, "power": 0.68, "rating": "C", @@ -6032,6 +6045,7 @@ "engrate": 3, "grp": "pd", "id": "dq", + "integrity": 136, "mass": 64, "power": 0.75, "rating": "B", @@ -6049,6 +6063,7 @@ "engrate": 3.2, "grp": "pd", "id": "dp", + "integrity": 124, "mass": 40, "power": 0.82, "rating": "A", @@ -6066,6 +6081,7 @@ "engrate": 1.7, "grp": "pd", "id": "do", + "integrity": 86, "mass": 20, "power": 0.5, "rating": "E", @@ -6083,6 +6099,7 @@ "engrate": 1.9, "grp": "pd", "id": "dn", + "integrity": 77, "mass": 8, "power": 0.56, "rating": "D", @@ -6100,6 +6117,7 @@ "engrate": 2.1, "grp": "pd", "id": "dm", + "integrity": 96, "mass": 20, "power": 0.62, "rating": "C", @@ -6117,6 +6135,7 @@ "engrate": 2.3, "grp": "pd", "id": "dl", + "integrity": 115, "mass": 32, "power": 0.68, "rating": "B", @@ -6134,6 +6153,7 @@ "engrate": 2.5, "grp": "pd", "id": "dk", + "integrity": 106, "mass": 20, "power": 0.74, "rating": "A", @@ -6151,6 +6171,7 @@ "engrate": 1.3, "grp": "pd", "id": "dj", + "integrity": 72, "mass": 10, "power": 0.45, "rating": "E", @@ -6168,6 +6189,7 @@ "engrate": 1.4, "grp": "pd", "id": "di", + "integrity": 64, "mass": 4, "power": 0.5, "rating": "D", @@ -6185,6 +6207,7 @@ "engrate": 1.6, "grp": "pd", "id": "dh", + "integrity": 80, "mass": 10, "power": 0.56, "rating": "C", @@ -6202,6 +6225,7 @@ "engrate": 1.8, "grp": "pd", "id": "dg", + "integrity": 96, "mass": 16, "power": 0.62, "rating": "B", @@ -6219,6 +6243,7 @@ "engrate": 1.9, "grp": "pd", "id": "df", + "integrity": 88, "mass": 10, "power": 0.67, "rating": "A", @@ -6236,6 +6261,7 @@ "engrate": 0.9, "grp": "pd", "id": "de", + "integrity": 58, "mass": 5, "power": 0.4, "rating": "E", @@ -6253,6 +6279,7 @@ "engrate": 1, "grp": "pd", "id": "dd", + "integrity": 51, "mass": 2, "power": 0.45, "rating": "D", @@ -6270,6 +6297,7 @@ "engrate": 1.1, "grp": "pd", "id": "dc", + "integrity": 64, "mass": 5, "power": 0.5, "rating": "C", @@ -6287,6 +6315,7 @@ "engrate": 1.2, "grp": "pd", "id": "db", + "integrity": 77, "mass": 8, "power": 0.55, "rating": "B", @@ -6304,6 +6333,7 @@ "engrate": 1.3, "grp": "pd", "id": "da", + "integrity": 70, "mass": 5, "power": 0.6, "rating": "A", @@ -6321,6 +6351,7 @@ "engrate": 0.6, "grp": "pd", "id": "d9", + "integrity": 46, "mass": 2.5, "power": 0.36, "rating": "E", @@ -6338,6 +6369,7 @@ "engrate": 0.6, "grp": "pd", "id": "d8", + "integrity": 41, "mass": 1, "power": 0.41, "rating": "D", @@ -6355,6 +6387,7 @@ "engrate": 0.7, "grp": "pd", "id": "d7", + "integrity": 51, "mass": 2.5, "power": 0.45, "rating": "C", @@ -6372,6 +6405,7 @@ "engrate": 0.8, "grp": "pd", "id": "d6", + "integrity": 61, "mass": 4, "power": 0.5, "rating": "B", @@ -6389,6 +6423,7 @@ "engrate": 0.8, "grp": "pd", "id": "d5", + "integrity": 56, "mass": 2.5, "power": 0.54, "rating": "A", @@ -6406,6 +6441,7 @@ "engrate": 0.4, "grp": "pd", "id": "d4", + "integrity": 46, "mass": 1.3, "power": 0.32, "rating": "E", @@ -6423,6 +6459,7 @@ "engrate": 0.5, "grp": "pd", "id": "d3", + "integrity": 41, "mass": 0.5, "power": 0.36, "rating": "D", @@ -6440,6 +6477,7 @@ "engrate": 0.5, "grp": "pd", "id": "d2", + "integrity": 51, "mass": 1.3, "power": 0.4, "rating": "C", @@ -6457,6 +6495,7 @@ "engrate": 0.6, "grp": "pd", "id": "d1", + "integrity": 61, "mass": 2, "power": 0.44, "rating": "B", @@ -6474,6 +6513,7 @@ "engrate": 0.6, "grp": "pd", "id": "d0", + "integrity": 56, "mass": 1.3, "power": 0.48, "rating": "A", @@ -6491,6 +6531,7 @@ "eddbID": 1111, "grp": "s", "id": "sy", + "integrity": 135, "mass": 160, "power": 0.55, "range": 5.12, @@ -6503,6 +6544,7 @@ "eddbID": 1112, "grp": "s", "id": "sx", + "integrity": 120, "mass": 64, "power": 0.62, "range": 5.76, @@ -6515,6 +6557,7 @@ "eddbID": 1113, "grp": "s", "id": "sw", + "integrity": 150, "mass": 160, "power": 0.69, "range": 6.4, @@ -6527,6 +6570,7 @@ "eddbID": 1114, "grp": "s", "id": "sv", + "integrity": 180, "mass": 256, "power": 1.14, "range": 7.04, @@ -6539,6 +6583,7 @@ "eddbID": 1115, "grp": "s", "id": "su", + "integrity": 165, "mass": 160, "power": 2.07, "range": 7.68, @@ -6551,6 +6596,7 @@ "eddbID": 1106, "grp": "s", "id": "sD", + "integrity": 118, "mass": 80, "power": 0.47, "range": 4.96, @@ -6563,6 +6609,7 @@ "eddbID": 1107, "grp": "s", "id": "sC", + "integrity": 105, "mass": 32, "power": 0.53, "range": 5.58, @@ -6575,6 +6622,7 @@ "eddbID": 1108, "grp": "s", "id": "sB", + "integrity": 131, "mass": 80, "power": 0.59, "range": 6.2, @@ -6587,6 +6635,7 @@ "eddbID": 1109, "grp": "s", "id": "sA", + "integrity": 157, "mass": 128, "power": 0.97, "range": 6.82, @@ -6599,6 +6648,7 @@ "eddbID": 1110, "grp": "s", "id": "sz", + "integrity": 144, "mass": 80, "power": 1.77, "range": 7.44, @@ -6611,6 +6661,7 @@ "eddbID": 1101, "grp": "s", "id": "st", + "integrity": 102, "mass": 40, "power": 0.4, "range": 4.8, @@ -6623,6 +6674,7 @@ "eddbID": 1102, "grp": "s", "id": "ss", + "integrity": 90, "mass": 16, "power": 0.45, "range": 5.4, @@ -6635,6 +6687,7 @@ "eddbID": 1103, "grp": "s", "id": "sr", + "integrity": 113, "mass": 40, "power": 0.5, "range": 6, @@ -6647,6 +6700,7 @@ "eddbID": 1104, "grp": "s", "id": "sq", + "integrity": 136, "mass": 64, "power": 0.83, "range": 6.6, @@ -6659,6 +6713,7 @@ "eddbID": 1105, "grp": "s", "id": "sp", + "integrity": 124, "mass": 40, "power": 1.5, "range": 7.2, @@ -6671,6 +6726,7 @@ "eddbID": 1096, "grp": "s", "id": "so", + "integrity": 86, "mass": 20, "power": 0.33, "range": 4.64, @@ -6683,6 +6739,7 @@ "eddbID": 1097, "grp": "s", "id": "sn", + "integrity": 77, "mass": 8, "power": 0.37, "range": 5.22, @@ -6695,6 +6752,7 @@ "eddbID": 1098, "grp": "s", "id": "sm", + "integrity": 96, "mass": 20, "power": 0.41, "range": 5.8, @@ -6707,6 +6765,7 @@ "eddbID": 1099, "grp": "s", "id": "sl", + "integrity": 115, "mass": 32, "power": 0.68, "range": 6.38, @@ -6719,6 +6778,7 @@ "eddbID": 1100, "grp": "s", "id": "sk", + "integrity": 106, "mass": 20, "power": 1.23, "range": 6.96, @@ -6731,6 +6791,7 @@ "eddbID": 1091, "grp": "s", "id": "sj", + "integrity": 72, "mass": 10, "power": 0.27, "range": 4.48, @@ -6743,6 +6804,7 @@ "eddbID": 1092, "grp": "s", "id": "si", + "integrity": 64, "mass": 4, "power": 0.31, "range": 5.04, @@ -6755,6 +6817,7 @@ "eddbID": 1093, "grp": "s", "id": "sh", + "integrity": 80, "mass": 10, "power": 0.34, "range": 5.6, @@ -6767,6 +6830,7 @@ "eddbID": 1094, "grp": "s", "id": "sg", + "integrity": 96, "mass": 16, "power": 0.56, "range": 6.16, @@ -6779,6 +6843,7 @@ "eddbID": 1095, "grp": "s", "id": "sf", + "integrity": 88, "mass": 10, "power": 1.02, "range": 6.72, @@ -6791,6 +6856,7 @@ "eddbID": 1086, "grp": "s", "id": "se", + "integrity": 58, "mass": 5, "power": 0.22, "range": 4.32, @@ -6803,6 +6869,7 @@ "eddbID": 1087, "grp": "s", "id": "sd", + "integrity": 51, "mass": 2, "power": 0.25, "range": 4.86, @@ -6815,6 +6882,7 @@ "eddbID": 1088, "grp": "s", "id": "sc", + "integrity": 64, "mass": 5, "power": 0.28, "range": 5.4, @@ -6827,6 +6895,7 @@ "eddbID": 1089, "grp": "s", "id": "sb", + "integrity": 77, "mass": 8, "power": 0.46, "range": 5.94, @@ -6839,6 +6908,7 @@ "eddbID": 1090, "grp": "s", "id": "sa", + "integrity": 70, "mass": 5, "power": 0.84, "range": 6.48, @@ -6851,6 +6921,7 @@ "eddbID": 1081, "grp": "s", "id": "s9", + "integrity": 46, "mass": 2.5, "power": 0.18, "range": 4.16, @@ -6863,6 +6934,7 @@ "eddbID": 1082, "grp": "s", "id": "s8", + "integrity": 41, "mass": 1, "power": 0.21, "range": 4.68, @@ -6875,6 +6947,7 @@ "eddbID": 1083, "grp": "s", "id": "s7", + "integrity": 51, "mass": 2.5, "power": 0.23, "range": 5.2, @@ -6887,6 +6960,7 @@ "eddbID": 1084, "grp": "s", "id": "s6", + "integrity": 61, "mass": 4, "power": 0.38, "range": 5.72, @@ -6899,6 +6973,7 @@ "eddbID": 1085, "grp": "s", "id": "s5", + "integrity": 56, "mass": 2.5, "power": 0.69, "range": 6.24, @@ -6911,6 +6986,7 @@ "eddbID": 1076, "grp": "s", "id": "s4", + "integrity": 46, "mass": 1.3, "power": 0.16, "range": 4, @@ -6923,6 +6999,7 @@ "eddbID": 1077, "grp": "s", "id": "s3", + "integrity": 41, "mass": 0.5, "power": 0.18, "range": 4.5, @@ -6935,6 +7012,7 @@ "eddbID": 1078, "grp": "s", "id": "s2", + "integrity": 51, "mass": 1.3, "power": 0.2, "range": 5, @@ -6947,6 +7025,7 @@ "eddbID": 1079, "grp": "s", "id": "s1", + "integrity": 61, "mass": 2, "power": 0.33, "range": 5.5, @@ -6959,6 +7038,7 @@ "eddbID": 1080, "grp": "s", "id": "s0", + "integrity": 56, "mass": 1.3, "power": 0.6, "range": 6, diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json index a27b741..505cd12 100644 --- a/modules/standard/power_distributor.json +++ b/modules/standard/power_distributor.json @@ -9,6 +9,7 @@ "engrate": 3.2, "grp": "pd", "id": "dD", + "integrity": 135, "mass": 160, "power": 0.64, "rating": "E", @@ -26,6 +27,7 @@ "engrate": 3.6, "grp": "pd", "id": "dC", + "integrity": 120, "mass": 64, "power": 0.72, "rating": "D", @@ -43,6 +45,7 @@ "engrate": 4, "grp": "pd", "id": "dB", + "integrity": 150, "mass": 160, "power": 0.8, "rating": "C", @@ -60,6 +63,7 @@ "engrate": 4.4, "grp": "pd", "id": "dA", + "integrity": 180, "mass": 256, "power": 0.88, "rating": "B", @@ -77,6 +81,7 @@ "engrate": 4.8, "grp": "pd", "id": "dz", + "integrity": 165, "mass": 160, "power": 0.96, "rating": "A", @@ -94,6 +99,7 @@ "engrate": 2.6, "grp": "pd", "id": "dy", + "integrity": 118, "mass": 80, "power": 0.59, "rating": "E", @@ -111,6 +117,7 @@ "engrate": 3, "grp": "pd", "id": "dx", + "integrity": 105, "mass": 32, "power": 0.67, "rating": "D", @@ -128,6 +135,7 @@ "engrate": 3.3, "grp": "pd", "id": "dw", + "integrity": 131, "mass": 80, "power": 0.74, "rating": "C", @@ -145,6 +153,7 @@ "engrate": 3.6, "grp": "pd", "id": "dv", + "integrity": 157, "mass": 128, "power": 0.81, "rating": "B", @@ -162,6 +171,7 @@ "engrate": 4, "grp": "pd", "id": "du", + "integrity": 144, "mass": 80, "power": 0.89, "rating": "A", @@ -179,6 +189,7 @@ "engrate": 2.2, "grp": "pd", "id": "dt", + "integrity": 102, "mass": 40, "power": 0.54, "rating": "E", @@ -196,6 +207,7 @@ "engrate": 2.4, "grp": "pd", "id": "ds", + "integrity": 90, "mass": 16, "power": 0.61, "rating": "D", @@ -213,6 +225,7 @@ "engrate": 2.7, "grp": "pd", "id": "dr", + "integrity": 113, "mass": 40, "power": 0.68, "rating": "C", @@ -230,6 +243,7 @@ "engrate": 3, "grp": "pd", "id": "dq", + "integrity": 136, "mass": 64, "power": 0.75, "rating": "B", @@ -247,6 +261,7 @@ "engrate": 3.2, "grp": "pd", "id": "dp", + "integrity": 124, "mass": 40, "power": 0.82, "rating": "A", @@ -264,6 +279,7 @@ "engrate": 1.7, "grp": "pd", "id": "do", + "integrity": 86, "mass": 20, "power": 0.5, "rating": "E", @@ -281,6 +297,7 @@ "engrate": 1.9, "grp": "pd", "id": "dn", + "integrity": 77, "mass": 8, "power": 0.56, "rating": "D", @@ -298,6 +315,7 @@ "engrate": 2.1, "grp": "pd", "id": "dm", + "integrity": 96, "mass": 20, "power": 0.62, "rating": "C", @@ -315,6 +333,7 @@ "engrate": 2.3, "grp": "pd", "id": "dl", + "integrity": 115, "mass": 32, "power": 0.68, "rating": "B", @@ -332,6 +351,7 @@ "engrate": 2.5, "grp": "pd", "id": "dk", + "integrity": 106, "mass": 20, "power": 0.74, "rating": "A", @@ -349,6 +369,7 @@ "engrate": 1.3, "grp": "pd", "id": "dj", + "integrity": 72, "mass": 10, "power": 0.45, "rating": "E", @@ -366,6 +387,7 @@ "engrate": 1.4, "grp": "pd", "id": "di", + "integrity": 64, "mass": 4, "power": 0.5, "rating": "D", @@ -383,6 +405,7 @@ "engrate": 1.6, "grp": "pd", "id": "dh", + "integrity": 80, "mass": 10, "power": 0.56, "rating": "C", @@ -400,6 +423,7 @@ "engrate": 1.8, "grp": "pd", "id": "dg", + "integrity": 96, "mass": 16, "power": 0.62, "rating": "B", @@ -417,6 +441,7 @@ "engrate": 1.9, "grp": "pd", "id": "df", + "integrity": 88, "mass": 10, "power": 0.67, "rating": "A", @@ -434,6 +459,7 @@ "engrate": 0.9, "grp": "pd", "id": "de", + "integrity": 58, "mass": 5, "power": 0.4, "rating": "E", @@ -451,6 +477,7 @@ "engrate": 1, "grp": "pd", "id": "dd", + "integrity": 51, "mass": 2, "power": 0.45, "rating": "D", @@ -468,6 +495,7 @@ "engrate": 1.1, "grp": "pd", "id": "dc", + "integrity": 64, "mass": 5, "power": 0.5, "rating": "C", @@ -485,6 +513,7 @@ "engrate": 1.2, "grp": "pd", "id": "db", + "integrity": 77, "mass": 8, "power": 0.55, "rating": "B", @@ -502,6 +531,7 @@ "engrate": 1.3, "grp": "pd", "id": "da", + "integrity": 70, "mass": 5, "power": 0.6, "rating": "A", @@ -519,6 +549,7 @@ "engrate": 0.6, "grp": "pd", "id": "d9", + "integrity": 46, "mass": 2.5, "power": 0.36, "rating": "E", @@ -536,6 +567,7 @@ "engrate": 0.6, "grp": "pd", "id": "d8", + "integrity": 41, "mass": 1, "power": 0.41, "rating": "D", @@ -553,6 +585,7 @@ "engrate": 0.7, "grp": "pd", "id": "d7", + "integrity": 51, "mass": 2.5, "power": 0.45, "rating": "C", @@ -570,6 +603,7 @@ "engrate": 0.8, "grp": "pd", "id": "d6", + "integrity": 61, "mass": 4, "power": 0.5, "rating": "B", @@ -587,6 +621,7 @@ "engrate": 0.8, "grp": "pd", "id": "d5", + "integrity": 56, "mass": 2.5, "power": 0.54, "rating": "A", @@ -604,6 +639,7 @@ "engrate": 0.4, "grp": "pd", "id": "d4", + "integrity": 46, "mass": 1.3, "power": 0.32, "rating": "E", @@ -621,6 +657,7 @@ "engrate": 0.5, "grp": "pd", "id": "d3", + "integrity": 41, "mass": 0.5, "power": 0.36, "rating": "D", @@ -638,6 +675,7 @@ "engrate": 0.5, "grp": "pd", "id": "d2", + "integrity": 51, "mass": 1.3, "power": 0.4, "rating": "C", @@ -655,6 +693,7 @@ "engrate": 0.6, "grp": "pd", "id": "d1", + "integrity": 61, "mass": 2, "power": 0.44, "rating": "B", @@ -672,6 +711,7 @@ "engrate": 0.6, "grp": "pd", "id": "d0", + "integrity": 56, "mass": 1.3, "power": 0.48, "rating": "A", diff --git a/modules/standard/sensors.json b/modules/standard/sensors.json index e35ea98..d31b00e 100644 --- a/modules/standard/sensors.json +++ b/modules/standard/sensors.json @@ -7,6 +7,7 @@ "eddbID": 1111, "grp": "s", "id": "sy", + "integrity": 135, "mass": 160, "power": 0.55, "range": 5.12, @@ -19,6 +20,7 @@ "eddbID": 1112, "grp": "s", "id": "sx", + "integrity": 120, "mass": 64, "power": 0.62, "range": 5.76, @@ -31,6 +33,7 @@ "eddbID": 1113, "grp": "s", "id": "sw", + "integrity": 150, "mass": 160, "power": 0.69, "range": 6.4, @@ -43,6 +46,7 @@ "eddbID": 1114, "grp": "s", "id": "sv", + "integrity": 180, "mass": 256, "power": 1.14, "range": 7.04, @@ -55,6 +59,7 @@ "eddbID": 1115, "grp": "s", "id": "su", + "integrity": 165, "mass": 160, "power": 2.07, "range": 7.68, @@ -67,6 +72,7 @@ "eddbID": 1106, "grp": "s", "id": "sD", + "integrity": 118, "mass": 80, "power": 0.47, "range": 4.96, @@ -79,6 +85,7 @@ "eddbID": 1107, "grp": "s", "id": "sC", + "integrity": 105, "mass": 32, "power": 0.53, "range": 5.58, @@ -91,6 +98,7 @@ "eddbID": 1108, "grp": "s", "id": "sB", + "integrity": 131, "mass": 80, "power": 0.59, "range": 6.2, @@ -103,6 +111,7 @@ "eddbID": 1109, "grp": "s", "id": "sA", + "integrity": 157, "mass": 128, "power": 0.97, "range": 6.82, @@ -115,6 +124,7 @@ "eddbID": 1110, "grp": "s", "id": "sz", + "integrity": 144, "mass": 80, "power": 1.77, "range": 7.44, @@ -127,6 +137,7 @@ "eddbID": 1101, "grp": "s", "id": "st", + "integrity": 102, "mass": 40, "power": 0.4, "range": 4.8, @@ -139,6 +150,7 @@ "eddbID": 1102, "grp": "s", "id": "ss", + "integrity": 90, "mass": 16, "power": 0.45, "range": 5.4, @@ -151,6 +163,7 @@ "eddbID": 1103, "grp": "s", "id": "sr", + "integrity": 113, "mass": 40, "power": 0.5, "range": 6, @@ -163,6 +176,7 @@ "eddbID": 1104, "grp": "s", "id": "sq", + "integrity": 136, "mass": 64, "power": 0.83, "range": 6.6, @@ -175,6 +189,7 @@ "eddbID": 1105, "grp": "s", "id": "sp", + "integrity": 124, "mass": 40, "power": 1.5, "range": 7.2, @@ -187,6 +202,7 @@ "eddbID": 1096, "grp": "s", "id": "so", + "integrity": 86, "mass": 20, "power": 0.33, "range": 4.64, @@ -199,6 +215,7 @@ "eddbID": 1097, "grp": "s", "id": "sn", + "integrity": 77, "mass": 8, "power": 0.37, "range": 5.22, @@ -211,6 +228,7 @@ "eddbID": 1098, "grp": "s", "id": "sm", + "integrity": 96, "mass": 20, "power": 0.41, "range": 5.8, @@ -223,6 +241,7 @@ "eddbID": 1099, "grp": "s", "id": "sl", + "integrity": 115, "mass": 32, "power": 0.68, "range": 6.38, @@ -235,6 +254,7 @@ "eddbID": 1100, "grp": "s", "id": "sk", + "integrity": 106, "mass": 20, "power": 1.23, "range": 6.96, @@ -247,6 +267,7 @@ "eddbID": 1091, "grp": "s", "id": "sj", + "integrity": 72, "mass": 10, "power": 0.27, "range": 4.48, @@ -259,6 +280,7 @@ "eddbID": 1092, "grp": "s", "id": "si", + "integrity": 64, "mass": 4, "power": 0.31, "range": 5.04, @@ -271,6 +293,7 @@ "eddbID": 1093, "grp": "s", "id": "sh", + "integrity": 80, "mass": 10, "power": 0.34, "range": 5.6, @@ -283,6 +306,7 @@ "eddbID": 1094, "grp": "s", "id": "sg", + "integrity": 96, "mass": 16, "power": 0.56, "range": 6.16, @@ -295,6 +319,7 @@ "eddbID": 1095, "grp": "s", "id": "sf", + "integrity": 88, "mass": 10, "power": 1.02, "range": 6.72, @@ -307,6 +332,7 @@ "eddbID": 1086, "grp": "s", "id": "se", + "integrity": 58, "mass": 5, "power": 0.22, "range": 4.32, @@ -319,6 +345,7 @@ "eddbID": 1087, "grp": "s", "id": "sd", + "integrity": 51, "mass": 2, "power": 0.25, "range": 4.86, @@ -331,6 +358,7 @@ "eddbID": 1088, "grp": "s", "id": "sc", + "integrity": 64, "mass": 5, "power": 0.28, "range": 5.4, @@ -343,6 +371,7 @@ "eddbID": 1089, "grp": "s", "id": "sb", + "integrity": 77, "mass": 8, "power": 0.46, "range": 5.94, @@ -355,6 +384,7 @@ "eddbID": 1090, "grp": "s", "id": "sa", + "integrity": 70, "mass": 5, "power": 0.84, "range": 6.48, @@ -367,6 +397,7 @@ "eddbID": 1081, "grp": "s", "id": "s9", + "integrity": 46, "mass": 2.5, "power": 0.18, "range": 4.16, @@ -379,6 +410,7 @@ "eddbID": 1082, "grp": "s", "id": "s8", + "integrity": 41, "mass": 1, "power": 0.21, "range": 4.68, @@ -391,6 +423,7 @@ "eddbID": 1083, "grp": "s", "id": "s7", + "integrity": 51, "mass": 2.5, "power": 0.23, "range": 5.2, @@ -403,6 +436,7 @@ "eddbID": 1084, "grp": "s", "id": "s6", + "integrity": 61, "mass": 4, "power": 0.38, "range": 5.72, @@ -415,6 +449,7 @@ "eddbID": 1085, "grp": "s", "id": "s5", + "integrity": 56, "mass": 2.5, "power": 0.69, "range": 6.24, @@ -427,6 +462,7 @@ "eddbID": 1076, "grp": "s", "id": "s4", + "integrity": 46, "mass": 1.3, "power": 0.16, "range": 4, @@ -439,6 +475,7 @@ "eddbID": 1077, "grp": "s", "id": "s3", + "integrity": 41, "mass": 0.5, "power": 0.18, "range": 4.5, @@ -451,6 +488,7 @@ "eddbID": 1078, "grp": "s", "id": "s2", + "integrity": 51, "mass": 1.3, "power": 0.2, "range": 5, @@ -463,6 +501,7 @@ "eddbID": 1079, "grp": "s", "id": "s1", + "integrity": 61, "mass": 2, "power": 0.33, "range": 5.5, @@ -475,6 +514,7 @@ "eddbID": 1080, "grp": "s", "id": "s0", + "integrity": 56, "mass": 1.3, "power": 0.6, "range": 6, diff --git a/spec/data-spec.js b/spec/data-spec.js index a795e1c..af7cacc 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -36,7 +36,10 @@ describe('JSON Data', function() { var id = group[i].id; expect(ids[id]).toBeFalsy('ID already exists: ' + id); expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID'); - expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module' + id + ' is missing EDDB ID'); + expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID'); + if (s != 'ft' && s != 'pas' ) { + expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity'); + } expect(group[i].grp).toBeDefined(`No group defined, Type: ${s}, ID: ${id}, Index: ${i}`); expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists for ID: ${id}, Index: ${i}`); expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists for ID: ${id}, Index: ${i}`); From c521c03b888965605c987f1bceca9393481770ce Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 09:43:51 +0000 Subject: [PATCH 37/49] Updates for bulkheads --- dist/index.js | 151 ++++++++++++++++++++++++++++++ dist/index.json | 157 ++++++++++++++++++++++++++++++++ modifications/validity.json | 7 ++ ships/adder.json | 10 +- ships/anaconda.json | 10 +- ships/asp.json | 10 +- ships/asp_scout.json | 10 +- ships/beluga.json | 10 +- ships/cobra_mk_iii.json | 10 +- ships/cobra_mk_iv.json | 10 +- ships/diamondback_explorer.json | 10 +- ships/diamondback_scout.json | 10 +- ships/eagle.json | 10 +- ships/federal_assault_ship.json | 10 +- ships/federal_corvette.json | 10 +- ships/federal_dropship.json | 10 +- ships/federal_gunship.json | 10 +- ships/fer_de_lance.json | 10 +- ships/hauler.json | 10 +- ships/imperial_clipper.json | 10 +- ships/imperial_courier.json | 10 +- ships/imperial_cutter.json | 10 +- ships/imperial_eagle.json | 10 +- ships/keelback.json | 10 +- ships/orca.json | 10 +- ships/python.json | 10 +- ships/sidewinder.json | 10 +- ships/type_6_transporter.json | 10 +- ships/type_7_transport.json | 10 +- ships/type_9_heavy.json | 10 +- ships/viper.json | 10 +- ships/viper_mk_iv.json | 10 +- ships/vulture.json | 10 +- 33 files changed, 465 insertions(+), 150 deletions(-) diff --git a/dist/index.js b/dist/index.js index c70f75b..dda7bc4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -23,30 +23,35 @@ module.exports = { id: "BC", edID: 128049268, eddbID: 753, + grp: "bh", cost: 0, mass: 0 }, { id: "BD", edID: 128049269, eddbID: 754, + grp: "bh", cost: 35120, mass: 3 }, { id: "BE", edID: 128049270, eddbID: 755, + grp: "bh", cost: 79030, mass: 5 }, { id: "BF", edID: 128049271, eddbID: 756, + grp: "bh", cost: 186770, mass: 5 }, { id: "BG", edID: 128049272, eddbID: 757, + grp: "bh", cost: 206960, mass: 5 } ], @@ -85,30 +90,35 @@ module.exports = { id: "bT", edID: 128049364, eddbID: 818, + grp: "bh", cost: 0, mass: 0 }, { id: "bU", edID: 128049365, eddbID: 819, + grp: "bh", cost: 58787780, mass: 30 }, { id: "bV", edID: 128049366, eddbID: 820, + grp: "bh", cost: 132272510, mass: 60 }, { id: "bW", edID: 128049367, eddbID: 821, + grp: "bh", cost: 312604020, mass: 60 }, { id: "bX", edID: 128049368, eddbID: 822, + grp: "bh", cost: 346407e3, mass: 60 } ], @@ -146,30 +156,35 @@ module.exports = { id: "BH", edID: 128049304, eddbID: 778, + grp: "bh", cost: 0, mass: 0 }, { id: "BI", edID: 128049305, eddbID: 779, + grp: "bh", cost: 2664460, mass: 21 }, { id: "BJ", edID: 128049306, eddbID: 780, + grp: "bh", cost: 5995040, mass: 42 }, { id: "BK", edID: 128049307, eddbID: 781, + grp: "bh", cost: 14168270, mass: 42 }, { id: "BL", edID: 128049308, eddbID: 782, + grp: "bh", cost: 15700340, mass: 42 } ], @@ -207,30 +222,35 @@ module.exports = { id: "c1", edID: 128672278, eddbID: 1503, + grp: "bh", cost: 0, mass: 0 }, { id: "c2", edID: 128672279, eddbID: 1504, + grp: "bh", cost: 1584460, mass: 21 }, { id: "c3", edID: 128672280, eddbID: 1505, + grp: "bh", cost: 3565040, mass: 42 }, { id: "c4", edID: 128672281, eddbID: 1506, + grp: "bh", cost: 8425380, mass: 42 }, { id: "c5", edID: 128672282, eddbID: 1507, + grp: "bh", cost: 9336440, mass: 42 } ], @@ -270,30 +290,35 @@ module.exports = { id: "cl", edID: 128049346, eddbID: 1554, + grp: "bh", cost: 0, mass: 0 }, { id: "cm", edID: 128049347, eddbID: 1555, + grp: "bh", cost: 33813120, mass: 83 }, { id: "cn", edID: 128049348, eddbID: 1556, + grp: "bh", cost: 76079500, mass: 165 }, { id: "co", edID: 128049349, eddbID: 1557, + grp: "bh", cost: 179801200, mass: 165 }, { id: "cp", edID: 128049350, eddbID: 1558, + grp: "bh", cost: 199243730, mass: 165 } ], @@ -371,30 +396,35 @@ module.exports = { id: "bk", edID: 128049280, eddbID: 763, + grp: "bh", cost: 0, mass: 0 }, { id: "bl", edID: 128049281, eddbID: 764, + grp: "bh", cost: 151890, mass: 14 }, { id: "bm", edID: 128049282, eddbID: 765, + grp: "bh", cost: 341750, mass: 27 }, { id: "bn", edID: 128049283, eddbID: 766, + grp: "bh", cost: 797410, mass: 27 }, { id: "bo", edID: 128049284, eddbID: 767, + grp: "bh", cost: 895e3, mass: 27 } ], @@ -432,30 +462,35 @@ module.exports = { id: "cg", edID: 128672264, eddbID: 1518, + grp: "bh", cost: 0, mass: 0 }, { id: "ch", edID: 128672265, eddbID: 1519, + grp: "bh", cost: 305890, mass: 14 }, { id: "ci", edID: 128672266, eddbID: 1520, + grp: "bh", cost: 688250, mass: 27 }, { id: "cj", edID: 128672267, eddbID: 1521, + grp: "bh", cost: 1605910, mass: 27 }, { id: "ck", edID: 128672268, eddbID: 1522, + grp: "bh", cost: 1802440, mass: 27 } ], @@ -493,30 +528,35 @@ module.exports = { id: "ba", edID: 128671832, eddbID: 1456, + grp: "bh", cost: 0, mass: 0 }, { id: "bb", edID: 128671833, eddbID: 1457, + grp: "bh", cost: 8e5, mass: 23 }, { id: "bc", edID: 128671834, eddbID: 1458, + grp: "bh", cost: 18e5, mass: 47 }, { id: "bd", edID: 128671835, eddbID: 1459, + grp: "bh", cost: 42e5, mass: 26 }, { id: "be", edID: 128671836, eddbID: 1460, + grp: "bh", cost: 4714e3, mass: 47 } ], @@ -554,30 +594,35 @@ module.exports = { id: "b5", edID: 128671218, eddbID: 1384, + grp: "bh", cost: 0, mass: 0 }, { id: "b6", edID: 128671219, eddbID: 1385, + grp: "bh", cost: 225700, mass: 13 }, { id: "b7", edID: 128671220, eddbID: 1386, + grp: "bh", cost: 507900, mass: 26 }, { id: "b8", edID: 128671221, eddbID: 1387, + grp: "bh", cost: 1185100, mass: 26 }, { id: "b9", edID: 128671222, eddbID: 1388, + grp: "bh", cost: 1330100, mass: 26 } ], @@ -615,30 +660,35 @@ module.exports = { id: "bY", edID: 128049256, eddbID: 743, + grp: "bh", cost: 0, mass: 0 }, { id: "bZ", edID: 128049257, eddbID: 744, + grp: "bh", cost: 26880, mass: 4 }, { id: "B0", edID: 128049258, eddbID: 745, + grp: "bh", cost: 90050, mass: 8 }, { id: "B1", edID: 128049259, eddbID: 746, + grp: "bh", cost: 140090, mass: 8 }, { id: "B2", edID: 128049260, eddbID: 747, + grp: "bh", cost: 150390, mass: 8 } ], @@ -676,30 +726,35 @@ module.exports = { id: "bz", edID: 128672147, eddbID: 1466, + grp: "bh", cost: 0, mass: 0 }, { id: "bA", edID: 128672148, eddbID: 1467, + grp: "bh", cost: 7925680, mass: 44 }, { id: "bB", edID: 128672149, eddbID: 1468, + grp: "bh", cost: 17832780, mass: 87 }, { id: "bC", edID: 128672150, eddbID: 1469, + grp: "bh", cost: 42144810, mass: 87 }, { id: "bD", edID: 128672151, eddbID: 1470, + grp: "bh", cost: 46702080, mass: 87 } ], @@ -738,30 +793,35 @@ module.exports = { id: "BW", edID: 128049370, eddbID: 1498, + grp: "bh", cost: 0, mass: 0 }, { id: "BX", edID: 128049371, eddbID: 1499, + grp: "bh", cost: 75187790, mass: 30 }, { id: "BY", edID: 128049372, eddbID: 1500, + grp: "bh", cost: 169172510, mass: 60 }, { id: "BZ", edID: 128049373, eddbID: 1501, + grp: "bh", cost: 399811020, mass: 60 }, { id: "c0", edID: 128049374, eddbID: 1502, + grp: "bh", cost: 443044e3, mass: 60 } ], @@ -799,30 +859,35 @@ module.exports = { id: "bE", edID: 128049322, eddbID: 793, + grp: "bh", cost: 0, mass: 0 }, { id: "bF", edID: 128049323, eddbID: 794, + grp: "bh", cost: 5725680, mass: 44 }, { id: "bG", edID: 128049324, eddbID: 795, + grp: "bh", cost: 12882780, mass: 87 }, { id: "bH", edID: 128049325, eddbID: 796, + grp: "bh", cost: 30446310, mass: 87 }, { id: "bI", edID: 128049326, eddbID: 797, + grp: "bh", cost: 33738580, mass: 87 } ], @@ -861,30 +926,35 @@ module.exports = { id: "bJ", edID: 128672154, eddbID: 1471, + grp: "bh", cost: 0, mass: 0 }, { id: "bK", edID: 128672155, eddbID: 1472, + grp: "bh", cost: 14325690, mass: 44 }, { id: "bL", edID: 128672156, eddbID: 1473, + grp: "bh", cost: 32232790, mass: 87 }, { id: "bM", edID: 128672157, eddbID: 1474, + grp: "bh", cost: 76176810, mass: 87 }, { id: "bN", edID: 128672158, eddbID: 1475, + grp: "bh", cost: 84414090, mass: 87 } ], @@ -922,30 +992,35 @@ module.exports = { id: "Bd", edID: 128049352, eddbID: 813, + grp: "bh", cost: 0, mass: 0 }, { id: "Be", edID: 128049353, eddbID: 814, + grp: "bh", cost: 20626820, mass: 19 }, { id: "Bf", edID: 128049354, eddbID: 815, + grp: "bh", cost: 46410340, mass: 38 }, { id: "Bg", edID: 128049355, eddbID: 816, + grp: "bh", cost: 109683090, mass: 38 }, { id: "Bh", edID: 128049356, eddbID: 817, + grp: "bh", cost: 121543510, mass: 38 } ], @@ -983,30 +1058,35 @@ module.exports = { id: "Bi", edID: 128049262, eddbID: 748, + grp: "bh", cost: 0, mass: 0 }, { id: "Bj", edID: 128049263, eddbID: 749, + grp: "bh", cost: 42180, mass: 1 }, { id: "Bk", edID: 128049264, eddbID: 750, + grp: "bh", cost: 185050, mass: 2 }, { id: "Bl", edID: 128049265, eddbID: 751, + grp: "bh", cost: 270300, mass: 2 }, { id: "Bm", edID: 128049266, eddbID: 752, + grp: "bh", cost: 282420, mass: 2 } ], @@ -1044,30 +1124,35 @@ module.exports = { id: "bp", edID: 128049316, eddbID: 788, + grp: "bh", cost: 0, mass: 0 }, { id: "bq", edID: 128049317, eddbID: 789, + grp: "bh", cost: 8918340, mass: 30 }, { id: "br", edID: 128049318, eddbID: 790, + grp: "bh", cost: 20066270, mass: 60 }, { id: "bs", edID: 128049319, eddbID: 791, + grp: "bh", cost: 47423290, mass: 60 }, { id: "bt", edID: 128049320, eddbID: 792, + grp: "bh", cost: 52551340, mass: 60 } ], @@ -1105,30 +1190,35 @@ module.exports = { id: "bf", edID: 128671224, eddbID: 1389, + grp: "bh", cost: 0, mass: 0 }, { id: "bg", edID: 128671225, eddbID: 1390, + grp: "bh", cost: 1017200, mass: 4 }, { id: "bh", edID: 128671226, eddbID: 1391, + grp: "bh", cost: 2288600, mass: 8 }, { id: "bi", edID: 128671227, eddbID: 1392, + grp: "bh", cost: 5408800, mass: 8 }, { id: "bj", edID: 128671228, eddbID: 1393, + grp: "bh", cost: 5993700, mass: 8 } ], @@ -1167,30 +1257,35 @@ module.exports = { id: "BR", edID: 128049376, eddbID: 1493, + grp: "bh", cost: 0, mass: 0 }, { id: "BS", edID: 128049377, eddbID: 1494, + grp: "bh", cost: 83587790, mass: 30 }, { id: "BT", edID: 128049378, eddbID: 1495, + grp: "bh", cost: 188072510, mass: 60 }, { id: "BU", edID: 128049379, eddbID: 1496, + grp: "bh", cost: 444478020, mass: 60 }, { id: "BV", edID: 128049380, eddbID: 1497, + grp: "bh", cost: 492541e3, mass: 60 } ], @@ -1228,30 +1323,35 @@ module.exports = { id: "bu", edID: 128672140, eddbID: 1461, + grp: "bh", cost: 0, mass: 0 }, { id: "bv", edID: 128672141, eddbID: 1462, + grp: "bh", cost: 66500, mass: 4 }, { id: "bw", edID: 128672142, eddbID: 1463, + grp: "bh", cost: 222760, mass: 8 }, { id: "bx", edID: 128672143, eddbID: 1464, + grp: "bh", cost: 346550, mass: 8 }, { id: "by", edID: 128672144, eddbID: 1465, + grp: "bh", cost: 372040, mass: 8 } ], @@ -1290,30 +1390,35 @@ module.exports = { id: "cb", edID: 128672271, eddbID: 1513, + grp: "bh", cost: 0, mass: 0 }, { id: "cc", edID: 128672272, eddbID: 1514, + grp: "bh", cost: 1250460, mass: 12 }, { id: "cd", edID: 128672273, eddbID: 1515, + grp: "bh", cost: 2813540, mass: 23 }, { id: "ce", edID: 128672274, eddbID: 1516, + grp: "bh", cost: 6649330, mass: 23 }, { id: "cf", edID: 128672275, eddbID: 1517, + grp: "bh", cost: 7368340, mass: 23 } ], @@ -1352,30 +1457,35 @@ module.exports = { id: "BM", edID: 128049328, eddbID: 798, + grp: "bh", cost: 0, mass: 0 }, { id: "BN", edID: 128049329, eddbID: 799, + grp: "bh", cost: 19415950, mass: 21 }, { id: "BO", edID: 128049330, eddbID: 800, + grp: "bh", cost: 43685900, mass: 87 }, { id: "BP", edID: 128049331, eddbID: 801, + grp: "bh", cost: 103244340, mass: 87 }, { id: "BQ", edID: 128049332, eddbID: 802, + grp: "bh", cost: 114408510, mass: 87 } ], @@ -1433,30 +1543,35 @@ module.exports = { id: "bO", edID: 128049340, eddbID: 808, + grp: "bh", cost: 0, mass: 0 }, { id: "bP", edID: 128049341, eddbID: 809, + grp: "bh", cost: 22791270, mass: 26 }, { id: "bQ", edID: 128049342, eddbID: 810, + grp: "bh", cost: 51280360, mass: 53 }, { id: "bR", edID: 128049343, eddbID: 811, + grp: "bh", cost: 121192590, mass: 53 }, { id: "bS", edID: 128049344, eddbID: 812, + grp: "bh", cost: 134297570, mass: 53 } ], @@ -1494,30 +1609,35 @@ module.exports = { id: "b0", edID: 128049250, eddbID: 738, + grp: "bh", cost: 0, mass: 0 }, { id: "b1", edID: 128049251, eddbID: 739, + grp: "bh", cost: 25600, mass: 2 }, { id: "b2", edID: 128049252, eddbID: 740, + grp: "bh", cost: 80320, mass: 4 }, { id: "b3", edID: 128049253, eddbID: 741, + grp: "bh", cost: 132060, mass: 4 }, { id: "b4", edID: 128049254, eddbID: 742, + grp: "bh", cost: 139420, mass: 4 } ], @@ -1555,30 +1675,35 @@ module.exports = { id: "Bn", edID: 128049286, eddbID: 768, + grp: "bh", cost: 0, mass: 0 }, { id: "Bo", edID: 128049287, eddbID: 769, + grp: "bh", cost: 418380, mass: 12 }, { id: "Bp", edID: 128049288, eddbID: 770, + grp: "bh", cost: 941350, mass: 23 }, { id: "Bq", edID: 128049289, eddbID: 771, + grp: "bh", cost: 2224730, mass: 23 }, { id: "Br", edID: 128049290, eddbID: 772, + grp: "bh", cost: 2465290, mass: 23 } ], @@ -1616,30 +1741,35 @@ module.exports = { id: "Bs", edID: 128049298, eddbID: 773, + grp: "bh", cost: 0, mass: 0 }, { id: "Bt", edID: 128049299, eddbID: 774, + grp: "bh", cost: 6988900, mass: 32 }, { id: "Bu", edID: 128049300, eddbID: 775, + grp: "bh", cost: 15725030, mass: 63 }, { id: "Bv", edID: 128049301, eddbID: 776, + grp: "bh", cost: 37163480, mass: 63 }, { id: "Bw", edID: 128049302, eddbID: 777, + grp: "bh", cost: 41182100, mass: 63 } ], @@ -1678,30 +1808,35 @@ module.exports = { id: "Bx", edID: 128049334, eddbID: 803, + grp: "bh", cost: 0, mass: 0 }, { id: "By", edID: 128049335, eddbID: 804, + grp: "bh", cost: 30622340, mass: 75 }, { id: "Bz", edID: 128049336, eddbID: 805, + grp: "bh", cost: 68900260, mass: 150 }, { id: "BA", edID: 128049337, eddbID: 806, + grp: "bh", cost: 162834280, mass: 150 }, { id: "BB", edID: 128049338, eddbID: 807, + grp: "bh", cost: 180442120, mass: 150 } ], @@ -1739,30 +1874,35 @@ module.exports = { id: "B3", edID: 128049274, eddbID: 758, + grp: "bh", cost: 0, mass: 0 }, { id: "B4", edID: 128049275, eddbID: 759, + grp: "bh", cost: 57170, mass: 5 }, { id: "B5", edID: 128049276, eddbID: 760, + grp: "bh", cost: 128640, mass: 9 }, { id: "B6", edID: 128049277, eddbID: 761, + grp: "bh", cost: 304010, mass: 9 }, { id: "B7", edID: 128049278, eddbID: 762, + grp: "bh", cost: 336890, mass: 9 } ], @@ -1800,30 +1940,35 @@ module.exports = { id: "c6", edID: 128672257, eddbID: 1508, + grp: "bh", cost: 0, mass: 0 }, { id: "c7", edID: 128672258, eddbID: 1509, + grp: "bh", cost: 175180, mass: 5 }, { id: "c8", edID: 128672259, eddbID: 1510, + grp: "bh", cost: 394140, mass: 9 }, { id: "c9", edID: 128672260, eddbID: 1511, + grp: "bh", cost: 931490, mass: 9 }, { id: "ca", edID: 128672261, eddbID: 1512, + grp: "bh", cost: 1033210, mass: 9 } ], @@ -1861,30 +2006,35 @@ module.exports = { id: "B8", edID: 128049310, eddbID: 783, + grp: "bh", cost: 0, mass: 0 }, { id: "B9", edID: 128049311, eddbID: 784, + grp: "bh", cost: 1970250, mass: 17 }, { id: "Ba", edID: 128049312, eddbID: 785, + grp: "bh", cost: 4433050, mass: 35 }, { id: "Bb", edID: 128049313, eddbID: 786, + grp: "bh", cost: 10476780, mass: 35 }, { id: "Bc", edID: 128049314, eddbID: 787, + grp: "bh", cost: 11609670, mass: 35 } ], @@ -12325,6 +12475,7 @@ module.exports = { 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: { am: [ "boot", "integrity", "power" ], + bh: [ "armour", "explres", "kinres", "mass", "thermres" ], bl: [ "armourpen", "damage", "distdraw", "integrity", "mass", "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" ], diff --git a/dist/index.json b/dist/index.json index 21b5f17..c7d7df3 100644 --- a/dist/index.json +++ b/dist/index.json @@ -24,6 +24,7 @@ "id": "BC", "edID": 128049268, "eddbID": 753, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -31,6 +32,7 @@ "id": "BD", "edID": 128049269, "eddbID": 754, + "grp": "bh", "cost": 35120, "mass": 3 }, @@ -38,6 +40,7 @@ "id": "BE", "edID": 128049270, "eddbID": 755, + "grp": "bh", "cost": 79030, "mass": 5 }, @@ -45,6 +48,7 @@ "id": "BF", "edID": 128049271, "eddbID": 756, + "grp": "bh", "cost": 186770, "mass": 5 }, @@ -52,6 +56,7 @@ "id": "BG", "edID": 128049272, "eddbID": 757, + "grp": "bh", "cost": 206960, "mass": 5 } @@ -132,6 +137,7 @@ "id": "bT", "edID": 128049364, "eddbID": 818, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -139,6 +145,7 @@ "id": "bU", "edID": 128049365, "eddbID": 819, + "grp": "bh", "cost": 58787780, "mass": 30 }, @@ -146,6 +153,7 @@ "id": "bV", "edID": 128049366, "eddbID": 820, + "grp": "bh", "cost": 132272510, "mass": 60 }, @@ -153,6 +161,7 @@ "id": "bW", "edID": 128049367, "eddbID": 821, + "grp": "bh", "cost": 312604020, "mass": 60 }, @@ -160,6 +169,7 @@ "id": "bX", "edID": 128049368, "eddbID": 822, + "grp": "bh", "cost": 346407000, "mass": 60 } @@ -273,6 +283,7 @@ "id": "BH", "edID": 128049304, "eddbID": 778, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -280,6 +291,7 @@ "id": "BI", "edID": 128049305, "eddbID": 779, + "grp": "bh", "cost": 2664460, "mass": 21 }, @@ -287,6 +299,7 @@ "id": "BJ", "edID": 128049306, "eddbID": 780, + "grp": "bh", "cost": 5995040, "mass": 42 }, @@ -294,6 +307,7 @@ "id": "BK", "edID": 128049307, "eddbID": 781, + "grp": "bh", "cost": 14168270, "mass": 42 }, @@ -301,6 +315,7 @@ "id": "BL", "edID": 128049308, "eddbID": 782, + "grp": "bh", "cost": 15700340, "mass": 42 } @@ -394,6 +409,7 @@ "id": "c1", "edID": 128672278, "eddbID": 1503, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -401,6 +417,7 @@ "id": "c2", "edID": 128672279, "eddbID": 1504, + "grp": "bh", "cost": 1584460, "mass": 21 }, @@ -408,6 +425,7 @@ "id": "c3", "edID": 128672280, "eddbID": 1505, + "grp": "bh", "cost": 3565040, "mass": 42 }, @@ -415,6 +433,7 @@ "id": "c4", "edID": 128672281, "eddbID": 1506, + "grp": "bh", "cost": 8425380, "mass": 42 }, @@ -422,6 +441,7 @@ "id": "c5", "edID": 128672282, "eddbID": 1507, + "grp": "bh", "cost": 9336440, "mass": 42 } @@ -505,6 +525,7 @@ "id": "cl", "edID": 128049346, "eddbID": 1554, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -512,6 +533,7 @@ "id": "cm", "edID": 128049347, "eddbID": 1555, + "grp": "bh", "cost": 33813120, "mass": 83 }, @@ -519,6 +541,7 @@ "id": "cn", "edID": 128049348, "eddbID": 1556, + "grp": "bh", "cost": 76079500, "mass": 165 }, @@ -526,6 +549,7 @@ "id": "co", "edID": 128049349, "eddbID": 1557, + "grp": "bh", "cost": 179801200, "mass": 165 }, @@ -533,6 +557,7 @@ "id": "cp", "edID": 128049350, "eddbID": 1558, + "grp": "bh", "cost": 199243730, "mass": 165 } @@ -676,6 +701,7 @@ "id": "bk", "edID": 128049280, "eddbID": 763, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -683,6 +709,7 @@ "id": "bl", "edID": 128049281, "eddbID": 764, + "grp": "bh", "cost": 151890, "mass": 14 }, @@ -690,6 +717,7 @@ "id": "bm", "edID": 128049282, "eddbID": 765, + "grp": "bh", "cost": 341750, "mass": 27 }, @@ -697,6 +725,7 @@ "id": "bn", "edID": 128049283, "eddbID": 766, + "grp": "bh", "cost": 797410, "mass": 27 }, @@ -704,6 +733,7 @@ "id": "bo", "edID": 128049284, "eddbID": 767, + "grp": "bh", "cost": 895000, "mass": 27 } @@ -787,6 +817,7 @@ "id": "cg", "edID": 128672264, "eddbID": 1518, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -794,6 +825,7 @@ "id": "ch", "edID": 128672265, "eddbID": 1519, + "grp": "bh", "cost": 305890, "mass": 14 }, @@ -801,6 +833,7 @@ "id": "ci", "edID": 128672266, "eddbID": 1520, + "grp": "bh", "cost": 688250, "mass": 27 }, @@ -808,6 +841,7 @@ "id": "cj", "edID": 128672267, "eddbID": 1521, + "grp": "bh", "cost": 1605910, "mass": 27 }, @@ -815,6 +849,7 @@ "id": "ck", "edID": 128672268, "eddbID": 1522, + "grp": "bh", "cost": 1802440, "mass": 27 } @@ -904,6 +939,7 @@ "id": "ba", "edID": 128671832, "eddbID": 1456, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -911,6 +947,7 @@ "id": "bb", "edID": 128671833, "eddbID": 1457, + "grp": "bh", "cost": 800000, "mass": 23 }, @@ -918,6 +955,7 @@ "id": "bc", "edID": 128671834, "eddbID": 1458, + "grp": "bh", "cost": 1800000, "mass": 47 }, @@ -925,6 +963,7 @@ "id": "bd", "edID": 128671835, "eddbID": 1459, + "grp": "bh", "cost": 4200000, "mass": 26 }, @@ -932,6 +971,7 @@ "id": "be", "edID": 128671836, "eddbID": 1460, + "grp": "bh", "cost": 4714000, "mass": 47 } @@ -1015,6 +1055,7 @@ "id": "b5", "edID": 128671218, "eddbID": 1384, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1022,6 +1063,7 @@ "id": "b6", "edID": 128671219, "eddbID": 1385, + "grp": "bh", "cost": 225700, "mass": 13 }, @@ -1029,6 +1071,7 @@ "id": "b7", "edID": 128671220, "eddbID": 1386, + "grp": "bh", "cost": 507900, "mass": 26 }, @@ -1036,6 +1079,7 @@ "id": "b8", "edID": 128671221, "eddbID": 1387, + "grp": "bh", "cost": 1185100, "mass": 26 }, @@ -1043,6 +1087,7 @@ "id": "b9", "edID": 128671222, "eddbID": 1388, + "grp": "bh", "cost": 1330100, "mass": 26 } @@ -1126,6 +1171,7 @@ "id": "bY", "edID": 128049256, "eddbID": 743, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1133,6 +1179,7 @@ "id": "bZ", "edID": 128049257, "eddbID": 744, + "grp": "bh", "cost": 26880, "mass": 4 }, @@ -1140,6 +1187,7 @@ "id": "B0", "edID": 128049258, "eddbID": 745, + "grp": "bh", "cost": 90050, "mass": 8 }, @@ -1147,6 +1195,7 @@ "id": "B1", "edID": 128049259, "eddbID": 746, + "grp": "bh", "cost": 140090, "mass": 8 }, @@ -1154,6 +1203,7 @@ "id": "B2", "edID": 128049260, "eddbID": 747, + "grp": "bh", "cost": 150390, "mass": 8 } @@ -1229,6 +1279,7 @@ "id": "bz", "edID": 128672147, "eddbID": 1466, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1236,6 +1287,7 @@ "id": "bA", "edID": 128672148, "eddbID": 1467, + "grp": "bh", "cost": 7925680, "mass": 44 }, @@ -1243,6 +1295,7 @@ "id": "bB", "edID": 128672149, "eddbID": 1468, + "grp": "bh", "cost": 17832780, "mass": 87 }, @@ -1250,6 +1303,7 @@ "id": "bC", "edID": 128672150, "eddbID": 1469, + "grp": "bh", "cost": 42144810, "mass": 87 }, @@ -1257,6 +1311,7 @@ "id": "bD", "edID": 128672151, "eddbID": 1470, + "grp": "bh", "cost": 46702080, "mass": 87 } @@ -1345,6 +1400,7 @@ "id": "BW", "edID": 128049370, "eddbID": 1498, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1352,6 +1408,7 @@ "id": "BX", "edID": 128049371, "eddbID": 1499, + "grp": "bh", "cost": 75187790, "mass": 30 }, @@ -1359,6 +1416,7 @@ "id": "BY", "edID": 128049372, "eddbID": 1500, + "grp": "bh", "cost": 169172510, "mass": 60 }, @@ -1366,6 +1424,7 @@ "id": "BZ", "edID": 128049373, "eddbID": 1501, + "grp": "bh", "cost": 399811020, "mass": 60 }, @@ -1373,6 +1432,7 @@ "id": "c0", "edID": 128049374, "eddbID": 1502, + "grp": "bh", "cost": 443044000, "mass": 60 } @@ -1482,6 +1542,7 @@ "id": "bE", "edID": 128049322, "eddbID": 793, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1489,6 +1550,7 @@ "id": "bF", "edID": 128049323, "eddbID": 794, + "grp": "bh", "cost": 5725680, "mass": 44 }, @@ -1496,6 +1558,7 @@ "id": "bG", "edID": 128049324, "eddbID": 795, + "grp": "bh", "cost": 12882780, "mass": 87 }, @@ -1503,6 +1566,7 @@ "id": "bH", "edID": 128049325, "eddbID": 796, + "grp": "bh", "cost": 30446310, "mass": 87 }, @@ -1510,6 +1574,7 @@ "id": "bI", "edID": 128049326, "eddbID": 797, + "grp": "bh", "cost": 33738580, "mass": 87 } @@ -1602,6 +1667,7 @@ "id": "bJ", "edID": 128672154, "eddbID": 1471, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1609,6 +1675,7 @@ "id": "bK", "edID": 128672155, "eddbID": 1472, + "grp": "bh", "cost": 14325690, "mass": 44 }, @@ -1616,6 +1683,7 @@ "id": "bL", "edID": 128672156, "eddbID": 1473, + "grp": "bh", "cost": 32232790, "mass": 87 }, @@ -1623,6 +1691,7 @@ "id": "bM", "edID": 128672157, "eddbID": 1474, + "grp": "bh", "cost": 76176810, "mass": 87 }, @@ -1630,6 +1699,7 @@ "id": "bN", "edID": 128672158, "eddbID": 1475, + "grp": "bh", "cost": 84414090, "mass": 87 } @@ -1721,6 +1791,7 @@ "id": "Bd", "edID": 128049352, "eddbID": 813, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1728,6 +1799,7 @@ "id": "Be", "edID": 128049353, "eddbID": 814, + "grp": "bh", "cost": 20626820, "mass": 19 }, @@ -1735,6 +1807,7 @@ "id": "Bf", "edID": 128049354, "eddbID": 815, + "grp": "bh", "cost": 46410340, "mass": 38 }, @@ -1742,6 +1815,7 @@ "id": "Bg", "edID": 128049355, "eddbID": 816, + "grp": "bh", "cost": 109683090, "mass": 38 }, @@ -1749,6 +1823,7 @@ "id": "Bh", "edID": 128049356, "eddbID": 817, + "grp": "bh", "cost": 121543510, "mass": 38 } @@ -1840,6 +1915,7 @@ "id": "Bi", "edID": 128049262, "eddbID": 748, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1847,6 +1923,7 @@ "id": "Bj", "edID": 128049263, "eddbID": 749, + "grp": "bh", "cost": 42180, "mass": 1 }, @@ -1854,6 +1931,7 @@ "id": "Bk", "edID": 128049264, "eddbID": 750, + "grp": "bh", "cost": 185050, "mass": 2 }, @@ -1861,6 +1939,7 @@ "id": "Bl", "edID": 128049265, "eddbID": 751, + "grp": "bh", "cost": 270300, "mass": 2 }, @@ -1868,6 +1947,7 @@ "id": "Bm", "edID": 128049266, "eddbID": 752, + "grp": "bh", "cost": 282420, "mass": 2 } @@ -1941,6 +2021,7 @@ "id": "bp", "edID": 128049316, "eddbID": 788, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -1948,6 +2029,7 @@ "id": "bq", "edID": 128049317, "eddbID": 789, + "grp": "bh", "cost": 8918340, "mass": 30 }, @@ -1955,6 +2037,7 @@ "id": "br", "edID": 128049318, "eddbID": 790, + "grp": "bh", "cost": 20066270, "mass": 60 }, @@ -1962,6 +2045,7 @@ "id": "bs", "edID": 128049319, "eddbID": 791, + "grp": "bh", "cost": 47423290, "mass": 60 }, @@ -1969,6 +2053,7 @@ "id": "bt", "edID": 128049320, "eddbID": 792, + "grp": "bh", "cost": 52551340, "mass": 60 } @@ -2060,6 +2145,7 @@ "id": "bf", "edID": 128671224, "eddbID": 1389, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2067,6 +2153,7 @@ "id": "bg", "edID": 128671225, "eddbID": 1390, + "grp": "bh", "cost": 1017200, "mass": 4 }, @@ -2074,6 +2161,7 @@ "id": "bh", "edID": 128671226, "eddbID": 1391, + "grp": "bh", "cost": 2288600, "mass": 8 }, @@ -2081,6 +2169,7 @@ "id": "bi", "edID": 128671227, "eddbID": 1392, + "grp": "bh", "cost": 5408800, "mass": 8 }, @@ -2088,6 +2177,7 @@ "id": "bj", "edID": 128671228, "eddbID": 1393, + "grp": "bh", "cost": 5993700, "mass": 8 } @@ -2174,6 +2264,7 @@ "id": "BR", "edID": 128049376, "eddbID": 1493, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2181,6 +2272,7 @@ "id": "BS", "edID": 128049377, "eddbID": 1494, + "grp": "bh", "cost": 83587790, "mass": 30 }, @@ -2188,6 +2280,7 @@ "id": "BT", "edID": 128049378, "eddbID": 1495, + "grp": "bh", "cost": 188072510, "mass": 60 }, @@ -2195,6 +2288,7 @@ "id": "BU", "edID": 128049379, "eddbID": 1496, + "grp": "bh", "cost": 444478020, "mass": 60 }, @@ -2202,6 +2296,7 @@ "id": "BV", "edID": 128049380, "eddbID": 1497, + "grp": "bh", "cost": 492541000, "mass": 60 } @@ -2309,6 +2404,7 @@ "id": "bu", "edID": 128672140, "eddbID": 1461, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2316,6 +2412,7 @@ "id": "bv", "edID": 128672141, "eddbID": 1462, + "grp": "bh", "cost": 66500, "mass": 4 }, @@ -2323,6 +2420,7 @@ "id": "bw", "edID": 128672142, "eddbID": 1463, + "grp": "bh", "cost": 222760, "mass": 8 }, @@ -2330,6 +2428,7 @@ "id": "bx", "edID": 128672143, "eddbID": 1464, + "grp": "bh", "cost": 346550, "mass": 8 }, @@ -2337,6 +2436,7 @@ "id": "by", "edID": 128672144, "eddbID": 1465, + "grp": "bh", "cost": 372040, "mass": 8 } @@ -2413,6 +2513,7 @@ "id": "cb", "edID": 128672271, "eddbID": 1513, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2420,6 +2521,7 @@ "id": "cc", "edID": 128672272, "eddbID": 1514, + "grp": "bh", "cost": 1250460, "mass": 12 }, @@ -2427,6 +2529,7 @@ "id": "cd", "edID": 128672273, "eddbID": 1515, + "grp": "bh", "cost": 2813540, "mass": 23 }, @@ -2434,6 +2537,7 @@ "id": "ce", "edID": 128672274, "eddbID": 1516, + "grp": "bh", "cost": 6649330, "mass": 23 }, @@ -2441,6 +2545,7 @@ "id": "cf", "edID": 128672275, "eddbID": 1517, + "grp": "bh", "cost": 7368340, "mass": 23 } @@ -2527,6 +2632,7 @@ "id": "BM", "edID": 128049328, "eddbID": 798, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2534,6 +2640,7 @@ "id": "BN", "edID": 128049329, "eddbID": 799, + "grp": "bh", "cost": 19415950, "mass": 21 }, @@ -2541,6 +2648,7 @@ "id": "BO", "edID": 128049330, "eddbID": 800, + "grp": "bh", "cost": 43685900, "mass": 87 }, @@ -2548,6 +2656,7 @@ "id": "BP", "edID": 128049331, "eddbID": 801, + "grp": "bh", "cost": 103244340, "mass": 87 }, @@ -2555,6 +2664,7 @@ "id": "BQ", "edID": 128049332, "eddbID": 802, + "grp": "bh", "cost": 114408510, "mass": 87 } @@ -2664,6 +2774,7 @@ "id": "bO", "edID": 128049340, "eddbID": 808, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2671,6 +2782,7 @@ "id": "bP", "edID": 128049341, "eddbID": 809, + "grp": "bh", "cost": 22791270, "mass": 26 }, @@ -2678,6 +2790,7 @@ "id": "bQ", "edID": 128049342, "eddbID": 810, + "grp": "bh", "cost": 51280360, "mass": 53 }, @@ -2685,6 +2798,7 @@ "id": "bR", "edID": 128049343, "eddbID": 811, + "grp": "bh", "cost": 121192590, "mass": 53 }, @@ -2692,6 +2806,7 @@ "id": "bS", "edID": 128049344, "eddbID": 812, + "grp": "bh", "cost": 134297570, "mass": 53 } @@ -2787,6 +2902,7 @@ "id": "b0", "edID": 128049250, "eddbID": 738, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2794,6 +2910,7 @@ "id": "b1", "edID": 128049251, "eddbID": 739, + "grp": "bh", "cost": 25600, "mass": 2 }, @@ -2801,6 +2918,7 @@ "id": "b2", "edID": 128049252, "eddbID": 740, + "grp": "bh", "cost": 80320, "mass": 4 }, @@ -2808,6 +2926,7 @@ "id": "b3", "edID": 128049253, "eddbID": 741, + "grp": "bh", "cost": 132060, "mass": 4 }, @@ -2815,6 +2934,7 @@ "id": "b4", "edID": 128049254, "eddbID": 742, + "grp": "bh", "cost": 139420, "mass": 4 } @@ -2890,6 +3010,7 @@ "id": "Bn", "edID": 128049286, "eddbID": 768, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -2897,6 +3018,7 @@ "id": "Bo", "edID": 128049287, "eddbID": 769, + "grp": "bh", "cost": 418380, "mass": 12 }, @@ -2904,6 +3026,7 @@ "id": "Bp", "edID": 128049288, "eddbID": 770, + "grp": "bh", "cost": 941350, "mass": 23 }, @@ -2911,6 +3034,7 @@ "id": "Bq", "edID": 128049289, "eddbID": 771, + "grp": "bh", "cost": 2224730, "mass": 23 }, @@ -2918,6 +3042,7 @@ "id": "Br", "edID": 128049290, "eddbID": 772, + "grp": "bh", "cost": 2465290, "mass": 23 } @@ -3001,6 +3126,7 @@ "id": "Bs", "edID": 128049298, "eddbID": 773, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -3008,6 +3134,7 @@ "id": "Bt", "edID": 128049299, "eddbID": 774, + "grp": "bh", "cost": 6988900, "mass": 32 }, @@ -3015,6 +3142,7 @@ "id": "Bu", "edID": 128049300, "eddbID": 775, + "grp": "bh", "cost": 15725030, "mass": 63 }, @@ -3022,6 +3150,7 @@ "id": "Bv", "edID": 128049301, "eddbID": 776, + "grp": "bh", "cost": 37163480, "mass": 63 }, @@ -3029,6 +3158,7 @@ "id": "Bw", "edID": 128049302, "eddbID": 777, + "grp": "bh", "cost": 41182100, "mass": 63 } @@ -3121,6 +3251,7 @@ "id": "Bx", "edID": 128049334, "eddbID": 803, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -3128,6 +3259,7 @@ "id": "By", "edID": 128049335, "eddbID": 804, + "grp": "bh", "cost": 30622340, "mass": 75 }, @@ -3135,6 +3267,7 @@ "id": "Bz", "edID": 128049336, "eddbID": 805, + "grp": "bh", "cost": 68900260, "mass": 150 }, @@ -3142,6 +3275,7 @@ "id": "BA", "edID": 128049337, "eddbID": 806, + "grp": "bh", "cost": 162834280, "mass": 150 }, @@ -3149,6 +3283,7 @@ "id": "BB", "edID": 128049338, "eddbID": 807, + "grp": "bh", "cost": 180442120, "mass": 150 } @@ -3244,6 +3379,7 @@ "id": "B3", "edID": 128049274, "eddbID": 758, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -3251,6 +3387,7 @@ "id": "B4", "edID": 128049275, "eddbID": 759, + "grp": "bh", "cost": 57170, "mass": 5 }, @@ -3258,6 +3395,7 @@ "id": "B5", "edID": 128049276, "eddbID": 760, + "grp": "bh", "cost": 128640, "mass": 9 }, @@ -3265,6 +3403,7 @@ "id": "B6", "edID": 128049277, "eddbID": 761, + "grp": "bh", "cost": 304010, "mass": 9 }, @@ -3272,6 +3411,7 @@ "id": "B7", "edID": 128049278, "eddbID": 762, + "grp": "bh", "cost": 336890, "mass": 9 } @@ -3351,6 +3491,7 @@ "id": "c6", "edID": 128672257, "eddbID": 1508, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -3358,6 +3499,7 @@ "id": "c7", "edID": 128672258, "eddbID": 1509, + "grp": "bh", "cost": 175180, "mass": 5 }, @@ -3365,6 +3507,7 @@ "id": "c8", "edID": 128672259, "eddbID": 1510, + "grp": "bh", "cost": 394140, "mass": 9 }, @@ -3372,6 +3515,7 @@ "id": "c9", "edID": 128672260, "eddbID": 1511, + "grp": "bh", "cost": 931490, "mass": 9 }, @@ -3379,6 +3523,7 @@ "id": "ca", "edID": 128672261, "eddbID": 1512, + "grp": "bh", "cost": 1033210, "mass": 9 } @@ -3462,6 +3607,7 @@ "id": "B8", "edID": 128049310, "eddbID": 783, + "grp": "bh", "cost": 0, "mass": 0 }, @@ -3469,6 +3615,7 @@ "id": "B9", "edID": 128049311, "eddbID": 784, + "grp": "bh", "cost": 1970250, "mass": 17 }, @@ -3476,6 +3623,7 @@ "id": "Ba", "edID": 128049312, "eddbID": 785, + "grp": "bh", "cost": 4433050, "mass": 35 }, @@ -3483,6 +3631,7 @@ "id": "Bb", "edID": 128049313, "eddbID": 786, + "grp": "bh", "cost": 10476780, "mass": 35 }, @@ -3490,6 +3639,7 @@ "id": "Bc", "edID": 128049314, "eddbID": 787, + "grp": "bh", "cost": 11609670, "mass": 35 } @@ -14746,6 +14896,13 @@ "integrity", "power" ], + "bh": [ + "armour", + "explres", + "kinres", + "mass", + "thermres" + ], "bl": [ "armourpen", "damage", diff --git a/modifications/validity.json b/modifications/validity.json index dd8f70f..0d0d74f 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -4,6 +4,13 @@ "integrity", "power" ], + "bh": [ + "armour", + "explres", + "kinres", + "mass", + "thermres" + ], "bl": [ "armourpen", "damage", diff --git a/ships/adder.json b/ships/adder.json index d91b9d9..0ba7fb1 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -19,11 +19,11 @@ }, "retailCost": 87810, "bulkheads": [ - { "id": "BC", "edID": 128049268, "eddbID": 753, "cost": 0, "mass": 0 }, - { "id": "BD", "edID": 128049269, "eddbID": 754, "cost": 35120, "mass": 3 }, - { "id": "BE", "edID": 128049270, "eddbID": 755, "cost": 79030, "mass": 5 }, - { "id": "BF", "edID": 128049271, "eddbID": 756, "cost": 186770, "mass": 5 }, - { "id": "BG", "edID": 128049272, "eddbID": 757, "cost": 206960, "mass": 5 } + { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3 }, + { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5 }, + { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5 }, + { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5 } ], "slots": { "standard": [3, 3, 3, 1, 2, 3, 3], diff --git a/ships/anaconda.json b/ships/anaconda.json index 532e144..de13e04 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -20,11 +20,11 @@ }, "retailCost": 146969450, "bulkheads": [ - { "id": "bT", "edID": 128049364, "eddbID": 818, "cost": 0, "mass": 0 }, - { "id": "bU", "edID": 128049365, "eddbID": 819, "cost": 58787780, "mass": 30 }, - { "id": "bV", "edID": 128049366, "eddbID": 820, "cost": 132272510, "mass": 60 }, - { "id": "bW", "edID": 128049367, "eddbID": 821, "cost": 312604020, "mass": 60 }, - { "id": "bX", "edID": 128049368, "eddbID": 822, "cost": 346407000, "mass": 60 } + { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30 }, + { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60 }, + { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60 }, + { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60 } ], "slots": { "standard": [8, 7, 6, 5, 8, 8, 5], diff --git a/ships/asp.json b/ships/asp.json index 28fef6d..e212c9d 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -19,11 +19,11 @@ }, "retailCost": 6661150, "bulkheads": [ - { "id": "BH", "edID": 128049304, "eddbID": 778, "cost": 0, "mass": 0 }, - { "id": "BI", "edID": 128049305, "eddbID": 779, "cost": 2664460, "mass": 21 }, - { "id": "BJ", "edID": 128049306, "eddbID": 780, "cost": 5995040, "mass": 42 }, - { "id": "BK", "edID": 128049307, "eddbID": 781, "cost": 14168270, "mass": 42 }, - { "id": "BL", "edID": 128049308, "eddbID": 782, "cost": 15700340, "mass": 42 } + { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21 }, + { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42 }, + { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42 }, + { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42 } ], "slots": { "standard": [5, 5, 5, 4, 4, 5, 5], diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 40e2f55..f2ed2da 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -18,11 +18,11 @@ }, "retailCost": 3961150, "bulkheads": [ - { "id": "c1", "edID": 128672278, "eddbID": 1503, "cost": 0, "mass": 0 }, - { "id": "c2", "edID": 128672279, "eddbID": 1504, "cost": 1584460, "mass": 21 }, - { "id": "c3", "edID": 128672280, "eddbID": 1505, "cost": 3565040, "mass": 42 }, - { "id": "c4", "edID": 128672281, "eddbID": 1506, "cost": 8425380, "mass": 42 }, - { "id": "c5", "edID": 128672282, "eddbID": 1507, "cost": 9336440, "mass": 42 } + { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21 }, + { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42 }, + { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42 }, + { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42 } ], "slots": { "standard": [4, 4, 4, 3, 4, 4, 4], diff --git a/ships/beluga.json b/ships/beluga.json index 6a6774e..248d8e0 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -21,11 +21,11 @@ }, "retailCost": 84532770, "bulkheads": [ - { "id": "cl", "edID": 128049346, "eddbID": 1554,"cost": 0, "mass": 0 }, - { "id": "cm", "edID": 128049347, "eddbID": 1555,"cost": 33813120, "mass": 83 }, - { "id": "cn", "edID": 128049348, "eddbID": 1556,"cost": 76079500, "mass": 165 }, - { "id": "co", "edID": 128049349, "eddbID": 1557,"cost": 179801200, "mass": 165 }, - { "id": "cp", "edID": 128049350, "eddbID": 1558,"cost": 199243730, "mass": 165 } + { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0 }, + { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83 }, + { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165 }, + { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165 }, + { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165 } ], "slots": { "standard": [6, 7, 7, 8, 6, 5, 7], diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 95b8707..f1d89da 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -19,11 +19,11 @@ }, "retailCost": 349720, "bulkheads": [ - { "id": "bk", "edID": 128049280, "eddbID": 763, "cost": 0, "mass": 0 }, - { "id": "bl", "edID": 128049281, "eddbID": 764, "cost": 151890, "mass": 14 }, - { "id": "bm", "edID": 128049282, "eddbID": 765, "cost": 341750, "mass": 27 }, - { "id": "bn", "edID": 128049283, "eddbID": 766, "cost": 797410, "mass": 27 }, - { "id": "bo", "edID": 128049284, "eddbID": 767, "cost": 895000, "mass": 27 } + { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14 }, + { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27 }, + { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27 }, + { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27 } ], "slots": { "standard": [4, 4, 4, 3, 3, 3, 4], diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 5016555..54a1a9c 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -19,11 +19,11 @@ }, "retailCost": 747660, "bulkheads": [ - { "id": "cg", "edID": 128672264, "eddbID": 1518, "cost": 0, "mass": 0 }, - { "id": "ch", "edID": 128672265, "eddbID": 1519, "cost": 305890, "mass": 14 }, - { "id": "ci", "edID": 128672266, "eddbID": 1520, "cost": 688250, "mass": 27 }, - { "id": "cj", "edID": 128672267, "eddbID": 1521, "cost": 1605910, "mass": 27 }, - { "id": "ck", "edID": 128672268, "eddbID": 1522, "cost": 1802440, "mass": 27 } + { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14 }, + { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27 }, + { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27 }, + { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27 } ], "slots": { "standard": [4, 4, 4, 3, 3, 3, 4], diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index 5a92d00..a290d7b 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -18,11 +18,11 @@ }, "retailCost": 1894760, "bulkheads": [ - { "id": "ba", "edID": 128671832, "eddbID": 1456, "cost": 0, "mass": 0 }, - { "id": "bb", "edID": 128671833, "eddbID": 1457, "cost": 800000, "mass": 23 }, - { "id": "bc", "edID": 128671834, "eddbID": 1458, "cost": 1800000, "mass": 47 }, - { "id": "bd", "edID": 128671835, "eddbID": 1459, "cost": 4200000, "mass": 26 }, - { "id": "be", "edID": 128671836, "eddbID": 1460, "cost": 4714000, "mass": 47 } + { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23 }, + { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47 }, + { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26 }, + { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47 } ], "slots": { "standard": [ 4, 4, 5, 3, 4, 3, 5], diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index a70fa3a..1937056 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -19,11 +19,11 @@ }, "retailCost": 564330, "bulkheads": [ - { "id": "b5", "edID": 128671218, "eddbID": 1384, "cost": 0, "mass": 0 }, - { "id": "b6", "edID": 128671219, "eddbID": 1385, "cost": 225700, "mass": 13 }, - { "id": "b7", "edID": 128671220, "eddbID": 1386, "cost": 507900, "mass": 26 }, - { "id": "b8", "edID": 128671221, "eddbID": 1387, "cost": 1185100, "mass": 26 }, - { "id": "b9", "edID": 128671222, "eddbID": 1388, "cost": 1330100, "mass": 26 } + { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13 }, + { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26 }, + { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26 }, + { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26 } ], "slots": { "standard": [ 4, 4, 4, 2, 3, 2, 4], diff --git a/ships/eagle.json b/ships/eagle.json index f1a7db5..c2eb613 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -19,11 +19,11 @@ }, "retailCost": 44800, "bulkheads": [ - { "id": "bY", "edID": 128049256, "eddbID": 743, "cost": 0, "mass": 0 }, - { "id": "bZ", "edID": 128049257, "eddbID": 744, "cost": 26880, "mass": 4 }, - { "id": "B0", "edID": 128049258, "eddbID": 745, "cost": 90050, "mass": 8 }, - { "id": "B1", "edID": 128049259, "eddbID": 746, "cost": 140090, "mass": 8 }, - { "id": "B2", "edID": 128049260, "eddbID": 747, "cost": 150390, "mass": 8 } + { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4 }, + { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8 }, + { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8 }, + { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8 } ], "slots": { "standard": [2, 3, 3, 1, 2, 2, 2], diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index c9e9086..ab64185 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -18,11 +18,11 @@ }, "retailCost": 19814210, "bulkheads": [ - { "id": "bz", "edID": 128672147, "eddbID": 1466, "cost": 0, "mass": 0 }, - { "id": "bA", "edID": 128672148, "eddbID": 1467, "cost": 7925680, "mass": 44 }, - { "id": "bB", "edID": 128672149, "eddbID": 1468, "cost": 17832780, "mass": 87 }, - { "id": "bC", "edID": 128672150, "eddbID": 1469, "cost": 42144810, "mass": 87 }, - { "id": "bD", "edID": 128672151, "eddbID": 1470, "cost": 46702080, "mass": 87 } + { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44 }, + { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87 }, + { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87 }, + { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 621ef26..40c5f15 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -20,11 +20,11 @@ }, "retailCost": 187969450, "bulkheads": [ - { "id": "BW", "edID": 128049370, "eddbID": 1498, "cost": 0, "mass": 0 }, - { "id": "BX", "edID": 128049371, "eddbID": 1499, "cost": 75187790, "mass": 30 }, - { "id": "BY", "edID": 128049372, "eddbID": 1500, "cost": 169172510, "mass": 60 }, - { "id": "BZ", "edID": 128049373, "eddbID": 1501, "cost": 399811020, "mass": 60 }, - { "id": "c0", "edID": 128049374, "eddbID": 1502, "cost": 443044000, "mass": 60 } + { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30 }, + { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60 }, + { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60 }, + { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60 } ], "slots": { "standard": [8, 7, 6, 5, 8, 8, 5], diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 7d7a051..1b18c25 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -19,11 +19,11 @@ }, "retailCost": 14314210, "bulkheads": [ - { "id": "bE", "edID": 128049322, "eddbID": 793, "cost": 0, "mass": 0 }, - { "id": "bF", "edID": 128049323, "eddbID": 794, "cost": 5725680, "mass": 44 }, - { "id": "bG", "edID": 128049324, "eddbID": 795, "cost": 12882780, "mass": 87 }, - { "id": "bH", "edID": 128049325, "eddbID": 796, "cost": 30446310, "mass": 87 }, - { "id": "bI", "edID": 128049326, "eddbID": 797, "cost": 33738580, "mass": 87 } + { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44 }, + { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87 }, + { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87 }, + { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 9b9191b..73f58a2 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -20,11 +20,11 @@ }, "retailCost": 35814210, "bulkheads": [ - { "id": "bJ", "edID": 128672154, "eddbID": 1471, "cost": 0, "mass": 0 }, - { "id": "bK", "edID": 128672155, "eddbID": 1472, "cost": 14325690, "mass": 44 }, - { "id": "bL", "edID": 128672156, "eddbID": 1473, "cost": 32232790, "mass": 87 }, - { "id": "bM", "edID": 128672157, "eddbID": 1474, "cost": 76176810, "mass": 87 }, - { "id": "bN", "edID": 128672158, "eddbID": 1475, "cost": 84414090, "mass": 87 } + { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44 }, + { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87 }, + { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87 }, + { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87 } ], "slots": { "standard": [6, 6, 5, 5, 7, 5, 4], diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index 31695a7..879ab12 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -19,11 +19,11 @@ }, "retailCost": 51567040, "bulkheads": [ - { "id": "Bd", "edID": 128049352, "eddbID": 813, "cost": 0, "mass": 0 }, - { "id": "Be", "edID": 128049353, "eddbID": 814, "cost": 20626820, "mass": 19 }, - { "id": "Bf", "edID": 128049354, "eddbID": 815, "cost": 46410340, "mass": 38 }, - { "id": "Bg", "edID": 128049355, "eddbID": 816, "cost": 109683090, "mass": 38 }, - { "id": "Bh", "edID": 128049356, "eddbID": 817, "cost": 121543510, "mass": 38 } + { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19 }, + { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38 }, + { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38 }, + { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38 } ], "slots": { "standard": [6, 5, 4, 4, 6, 4, 3], diff --git a/ships/hauler.json b/ships/hauler.json index 8b472ad..ff8caee 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -19,11 +19,11 @@ }, "retailCost": 52720, "bulkheads": [ - { "id": "Bi", "edID": 128049262, "eddbID": 748, "cost": 0, "mass": 0 }, - { "id": "Bj", "edID": 128049263, "eddbID": 749, "cost": 42180, "mass": 1 }, - { "id": "Bk", "edID": 128049264, "eddbID": 750, "cost": 185050, "mass": 2 }, - { "id": "Bl", "edID": 128049265, "eddbID": 751, "cost": 270300, "mass": 2 }, - { "id": "Bm", "edID": 128049266, "eddbID": 752, "cost": 282420, "mass": 2 } + { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1 }, + { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2 }, + { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2 }, + { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2 } ], "slots": { "standard": [2, 2, 2, 1, 1, 1, 2], diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index a90ab4c..9db7e45 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -19,11 +19,11 @@ }, "retailCost": 22296860, "bulkheads": [ - { "id": "bp", "edID": 128049316, "eddbID": 788, "cost": 0, "mass": 0 }, - { "id": "bq", "edID": 128049317, "eddbID": 789, "cost": 8918340, "mass": 30 }, - { "id": "br", "edID": 128049318, "eddbID": 790, "cost": 20066270, "mass": 60 }, - { "id": "bs", "edID": 128049319, "eddbID": 791, "cost": 47423290, "mass": 60 }, - { "id": "bt", "edID": 128049320, "eddbID": 792, "cost": 52551340, "mass": 60 } + { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30 }, + { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60 }, + { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60 }, + { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60 } ], "slots": { "standard": [6, 6, 5, 5, 6, 5, 4], diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index ccc9e33..766cfcf 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -18,11 +18,11 @@ }, "retailCost": 2542930, "bulkheads": [ - { "id": "bf", "edID": 128671224, "eddbID": 1389, "cost": 0, "mass": 0 }, - { "id": "bg", "edID": 128671225, "eddbID": 1390, "cost": 1017200, "mass": 4 }, - { "id": "bh", "edID": 128671226, "eddbID": 1391, "cost": 2288600, "mass": 8 }, - { "id": "bi", "edID": 128671227, "eddbID": 1392, "cost": 5408800, "mass": 8 }, - { "id": "bj", "edID": 128671228, "eddbID": 1393, "cost": 5993700, "mass": 8 } + { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4 }, + { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8 }, + { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8 }, + { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8 } ], "slots": { "standard": [ 4, 3, 3, 1, 3, 2, 3], diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index c866894..89c3d14 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -19,11 +19,11 @@ }, "retailCost": 208969450, "bulkheads": [ - { "id": "BR", "edID": 128049376, "eddbID": 1493, "cost": 0, "mass": 0 }, - { "id": "BS", "edID": 128049377, "eddbID": 1494, "cost": 83587790, "mass": 30 }, - { "id": "BT", "edID": 128049378, "eddbID": 1495, "cost": 188072510, "mass": 60 }, - { "id": "BU", "edID": 128049379, "eddbID": 1496, "cost": 444478020, "mass": 60 }, - { "id": "BV", "edID": 128049380, "eddbID": 1497, "cost": 492541000, "mass": 60 } + { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30 }, + { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60 }, + { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60 }, + { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60 } ], "slots": { "standard": [8, 8, 7, 7, 7, 7, 6], diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 31b9000..5e448d7 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -19,11 +19,11 @@ }, "retailCost": 110830, "bulkheads": [ - { "id": "bu", "edID": 128672140, "eddbID": 1461, "cost": 0, "mass": 0 }, - { "id": "bv", "edID": 128672141, "eddbID": 1462, "cost": 66500, "mass": 4 }, - { "id": "bw", "edID": 128672142, "eddbID": 1463, "cost": 222760, "mass": 8 }, - { "id": "bx", "edID": 128672143, "eddbID": 1464, "cost": 346550, "mass": 8 }, - { "id": "by", "edID": 128672144, "eddbID": 1465, "cost": 372040, "mass": 8 } + { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4 }, + { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8 }, + { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8 }, + { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8 } ], "slots": { "standard": [3, 3, 3, 1, 2, 2, 2], diff --git a/ships/keelback.json b/ships/keelback.json index ba03717..eea97e2 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -20,11 +20,11 @@ }, "retailCost": 3126150, "bulkheads": [ - { "id": "cb", "edID": 128672271, "eddbID": 1513, "cost": 0, "mass": 0 }, - { "id": "cc", "edID": 128672272, "eddbID": 1514, "cost": 1250460, "mass": 12 }, - { "id": "cd", "edID": 128672273, "eddbID": 1515, "cost": 2813540, "mass": 23 }, - { "id": "ce", "edID": 128672274, "eddbID": 1516, "cost": 6649330, "mass": 23 }, - { "id": "cf", "edID": 128672275, "eddbID": 1517, "cost": 7368340, "mass": 23 } + { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12 }, + { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23 }, + { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23 }, + { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23 } ], "slots": { "standard": [4, 4, 4, 1, 3, 2, 4], diff --git a/ships/orca.json b/ships/orca.json index a28993f..0b9f78c 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -20,11 +20,11 @@ }, "retailCost": 48539890, "bulkheads": [ - { "id": "BM", "edID": 128049328, "eddbID": 798, "cost": 0, "mass": 0 }, - { "id": "BN", "edID": 128049329, "eddbID": 799, "cost": 19415950, "mass": 21 }, - { "id": "BO", "edID": 128049330, "eddbID": 800, "cost": 43685900, "mass": 87 }, - { "id": "BP", "edID": 128049331, "eddbID": 801, "cost": 103244340, "mass": 87 }, - { "id": "BQ", "edID": 128049332, "eddbID": 802, "cost": 114408510, "mass": 87 } + { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21 }, + { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87 }, + { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87 }, + { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87 } ], "slots": { "standard": [5, 6, 5, 6, 5, 4, 5], diff --git a/ships/python.json b/ships/python.json index b7f9cbe..1776c9a 100755 --- a/ships/python.json +++ b/ships/python.json @@ -19,11 +19,11 @@ }, "retailCost": 56978180, "bulkheads": [ - { "id": "bO", "edID": 128049340, "eddbID": 808, "cost": 0, "mass": 0 }, - { "id": "bP", "edID": 128049341, "eddbID": 809, "cost": 22791270, "mass": 26 }, - { "id": "bQ", "edID": 128049342, "eddbID": 810, "cost": 51280360, "mass": 53 }, - { "id": "bR", "edID": 128049343, "eddbID": 811, "cost": 121192590, "mass": 53 }, - { "id": "bS", "edID": 128049344, "eddbID": 812, "cost": 134297570, "mass": 53 } + { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26 }, + { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53 }, + { "id": "bR", "edID": 128049343, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 53 }, + { "id": "bS", "edID": 128049344, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 53 } ], "slots": { "standard": [7, 6, 5, 4, 7, 6, 5], diff --git a/ships/sidewinder.json b/ships/sidewinder.json index af0a6bb..fe0f259 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -19,11 +19,11 @@ }, "retailCost": 40800, "bulkheads": [ - { "id": "b0", "edID": 128049250, "eddbID": 738, "cost": 0, "mass": 0 }, - { "id": "b1", "edID": 128049251, "eddbID": 739, "cost": 25600, "mass": 2 }, - { "id": "b2", "edID": 128049252, "eddbID": 740, "cost": 80320, "mass": 4 }, - { "id": "b3", "edID": 128049253, "eddbID": 741, "cost": 132060, "mass": 4 }, - { "id": "b4", "edID": 128049254, "eddbID": 742, "cost": 139420, "mass": 4 } + { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2 }, + { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4 }, + { "id": "b3", "edID": 128049253, "eddbID": 741, "grp": "bh", "cost": 132060, "mass": 4 }, + { "id": "b4", "edID": 128049254, "eddbID": 742, "grp": "bh", "cost": 139420, "mass": 4 } ], "slots": { "standard": [2, 2, 2, 1, 1, 1, 1], diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 70fc260..19b285a 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -19,11 +19,11 @@ }, "retailCost": 1045950, "bulkheads": [ - { "id": "Bn", "edID": 128049286, "eddbID": 768, "cost": 0, "mass": 0 }, - { "id": "Bo", "edID": 128049287, "eddbID": 769, "cost": 418380, "mass": 12 }, - { "id": "Bp", "edID": 128049288, "eddbID": 770, "cost": 941350, "mass": 23 }, - { "id": "Bq", "edID": 128049289, "eddbID": 771, "cost": 2224730, "mass": 23 }, - { "id": "Br", "edID": 128049290, "eddbID": 772, "cost": 2465290, "mass": 23 } + { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12 }, + { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23 }, + { "id": "Bq", "edID": 128049289, "eddbID": 771, "grp": "bh", "cost": 2224730, "mass": 23 }, + { "id": "Br", "edID": 128049290, "eddbID": 772, "grp": "bh", "cost": 2465290, "mass": 23 } ], "slots": { "standard": [3, 4, 4, 2, 3, 2, 4], diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index e1cac0a..bbb43c5 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -19,11 +19,11 @@ }, "retailCost": 17472250, "bulkheads": [ - { "id": "Bs", "edID": 128049298, "eddbID": 773, "cost": 0, "mass": 0 }, - { "id": "Bt", "edID": 128049299, "eddbID": 774, "cost": 6988900, "mass": 32 }, - { "id": "Bu", "edID": 128049300, "eddbID": 775, "cost": 15725030, "mass": 63 }, - { "id": "Bv", "edID": 128049301, "eddbID": 776, "cost": 37163480, "mass": 63 }, - { "id": "Bw", "edID": 128049302, "eddbID": 777, "cost": 41182100, "mass": 63 } + { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32 }, + { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63 }, + { "id": "Bv", "edID": 128049301, "eddbID": 776, "grp": "bh", "cost": 37163480, "mass": 63 }, + { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63 } ], "slots": { "standard": [4, 5, 5, 4, 3, 3, 5], diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index c1b7ae7..5fb07b4 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -20,11 +20,11 @@ }, "retailCost": 76555840, "bulkheads": [ - { "id": "Bx", "edID": 128049334, "eddbID": 803, "cost": 0, "mass": 0 }, - { "id": "By", "edID": 128049335, "eddbID": 804, "cost": 30622340, "mass": 75 }, - { "id": "Bz", "edID": 128049336, "eddbID": 805, "cost": 68900260, "mass": 150 }, - { "id": "BA", "edID": 128049337, "eddbID": 806, "cost": 162834280, "mass": 150 }, - { "id": "BB", "edID": 128049338, "eddbID": 807, "cost": 180442120, "mass": 150 } + { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75 }, + { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150 }, + { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150 }, + { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150 } ], "slots": { "standard": [6, 7, 6, 5, 6, 4, 6], diff --git a/ships/viper.json b/ships/viper.json index 8dd469a..88127f1 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -19,11 +19,11 @@ }, "retailCost": 142930, "bulkheads": [ - { "id": "B3", "edID": 128049274, "eddbID": 758, "cost": 0, "mass": 0 }, - { "id": "B4", "edID": 128049275, "eddbID": 759, "cost": 57170, "mass": 5 }, - { "id": "B5", "edID": 128049276, "eddbID": 760, "cost": 128640, "mass": 9 }, - { "id": "B6", "edID": 128049277, "eddbID": 761, "cost": 304010, "mass": 9 }, - { "id": "B7", "edID": 128049278, "eddbID": 762, "cost": 336890, "mass": 9 } + { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5 }, + { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9 }, + { "id": "B6", "edID": 128049277, "eddbID": 761, "grp": "bh", "cost": 304010, "mass": 9 }, + { "id": "B7", "edID": 128049278, "eddbID": 762, "grp": "bh", "cost": 336890, "mass": 9 } ], "slots": { "standard": [3, 3, 3, 2, 3, 3, 2], diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index 4d95ee3..bf4d5f8 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -19,11 +19,11 @@ }, "retailCost": 437930, "bulkheads": [ - { "id": "c6", "edID": 128672257, "eddbID": 1508, "cost": 0, "mass": 0 }, - { "id": "c7", "edID": 128672258, "eddbID": 1509, "cost": 175180, "mass": 5 }, - { "id": "c8", "edID": 128672259, "eddbID": 1510, "cost": 394140, "mass": 9 }, - { "id": "c9", "edID": 128672260, "eddbID": 1511, "cost": 931490, "mass": 9 }, - { "id": "ca", "edID": 128672261, "eddbID": 1512, "cost": 1033210, "mass": 9 } + { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5 }, + { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9 }, + { "id": "c9", "edID": 128672260, "eddbID": 1511, "grp": "bh", "cost": 931490, "mass": 9 }, + { "id": "ca", "edID": 128672261, "eddbID": 1512, "grp": "bh", "cost": 1033210, "mass": 9 } ], "slots": { "standard": [4, 4, 4, 2, 3, 3, 4], diff --git a/ships/vulture.json b/ships/vulture.json index 19fc022..8d673e2 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -19,11 +19,11 @@ }, "retailCost": 4925620, "bulkheads": [ - { "id": "B8", "edID": 128049310, "eddbID": 783, "cost": 0, "mass": 0 }, - { "id": "B9", "edID": 128049311, "eddbID": 784, "cost": 1970250, "mass": 17 }, - { "id": "Ba", "edID": 128049312, "eddbID": 785, "cost": 4433050, "mass": 35 }, - { "id": "Bb", "edID": 128049313, "eddbID": 786, "cost": 10476780, "mass": 35 }, - { "id": "Bc", "edID": 128049314, "eddbID": 787, "cost": 11609670, "mass": 35 } + { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0 }, + { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17 }, + { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35 }, + { "id": "Bb", "edID": 128049313, "eddbID": 786, "grp": "bh", "cost": 10476780, "mass": 35 }, + { "id": "Bc", "edID": 128049314, "eddbID": 787, "grp": "bh", "cost": 11609670, "mass": 35 } ], "slots": { "standard": [4, 5, 4, 3, 5, 4, 3], From eb39326f1ac52683b643095314f74ee19e532945 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 09:53:49 +0000 Subject: [PATCH 38/49] Fixed hull boost --- dist/index.js | 2 +- dist/index.json | 2 +- modifications/validity.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/index.js b/dist/index.js index dda7bc4..4f839ac 100644 --- a/dist/index.js +++ b/dist/index.js @@ -12475,7 +12475,7 @@ module.exports = { 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: { am: [ "boot", "integrity", "power" ], - bh: [ "armour", "explres", "kinres", "mass", "thermres" ], + bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ], bl: [ "armourpen", "damage", "distdraw", "integrity", "mass", "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" ], diff --git a/dist/index.json b/dist/index.json index c7d7df3..2fc97e3 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14897,8 +14897,8 @@ "power" ], "bh": [ - "armour", "explres", + "hullboost", "kinres", "mass", "thermres" diff --git a/modifications/validity.json b/modifications/validity.json index 0d0d74f..25f435f 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -5,8 +5,8 @@ "power" ], "bh": [ - "armour", "explres", + "hullboost", "kinres", "mass", "thermres" From 31b0c3931bf1f9f189ea3d13c2aa6b0e934c8f78 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 10:30:45 +0000 Subject: [PATCH 39/49] Tidy up validities --- dist/index.js | 16 ++++++++-------- dist/index.json | 11 +---------- modifications/validity.json | 11 +---------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/dist/index.js b/dist/index.js index 4f839ac..5388db3 100644 --- a/dist/index.js +++ b/dist/index.js @@ -12474,23 +12474,23 @@ 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: { - am: [ "boot", "integrity", "power" ], + am: [ "integrity", "power" ], bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ], bl: [ "armourpen", "damage", "distdraw", "integrity", "mass", "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" ], - cc: [ "boot", "integrity", "mass", "power" ], + cc: [ "integrity", "mass", "power" ], cr: [], cs: [ "boot", "integrity", "mass", "power" ], dc: [], fc: [ "ammo", "armourpen", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], fh: [], fi: [ "boot", "facinglimit", "integrity", "mass", "power", "range" ], - fs: [ "boot", "integrity", "mass", "power" ], + fs: [ "integrity", "power" ], fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ], ft: [], - fx: [ "boot", "integrity", "mass", "power" ], - hb: [ "boot", "integrity", "mass", "power" ], + fx: [ "integrity", "mass", "power" ], + hb: [ "integrity", "mass", "power" ], hr: [ "armour", "explres", "hullboost", "kinres", "mass", "thermres" ], kw: [ "boot", "integrity", "mass", "power" ], ls: [ "boot", "integrity", "mass", "power" ], @@ -12499,7 +12499,7 @@ module.exports = { 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" ], + pc: [ "integrity", "mass", "power" ], pci: [], pcm: [], pcq: [], @@ -12508,12 +12508,12 @@ module.exports = { pp: [ "eff", "integrity", "mass", "pGen" ], psg: [ "boot", "brokenregen", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], pv: [], - rf: [ "boot", "integrity", "mass", "power" ], + rf: [ "integrity", "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", "shieldmul", "thermres" ], sc: [], - scb: [ "boot", "delay", "duration", "integrity", "power", "shield", "thermload" ], + 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" ], diff --git a/dist/index.json b/dist/index.json index 2fc97e3..73f9623 100644 --- a/dist/index.json +++ b/dist/index.json @@ -14892,7 +14892,6 @@ ], "validity": { "am": [ - "boot", "integrity", "power" ], @@ -14943,7 +14942,6 @@ "thermload" ], "cc": [ - "boot", "integrity", "mass", "power" @@ -14982,9 +14980,7 @@ "range" ], "fs": [ - "boot", "integrity", - "mass", "power" ], "fsd": [ @@ -14998,13 +14994,11 @@ ], "ft": [], "fx": [ - "boot", "integrity", "mass", "power" ], "hb": [ - "boot", "integrity", "mass", "power" @@ -15089,7 +15083,6 @@ "thermload" ], "pc": [ - "boot", "integrity", "mass", "power" @@ -15143,9 +15136,7 @@ ], "pv": [], "rf": [ - "boot", "integrity", - "mass", "power" ], "rg": [ @@ -15181,11 +15172,11 @@ "sc": [], "scb": [ "boot", - "delay", "duration", "integrity", "power", "shield", + "spinup", "thermload" ], "sg": [ diff --git a/modifications/validity.json b/modifications/validity.json index 25f435f..f397652 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -1,6 +1,5 @@ { "am": [ - "boot", "integrity", "power" ], @@ -51,7 +50,6 @@ "thermload" ], "cc": [ - "boot", "integrity", "mass", "power" @@ -90,9 +88,7 @@ "range" ], "fs": [ - "boot", "integrity", - "mass", "power" ], "fsd": [ @@ -106,13 +102,11 @@ ], "ft": [], "fx": [ - "boot", "integrity", "mass", "power" ], "hb": [ - "boot", "integrity", "mass", "power" @@ -197,7 +191,6 @@ "thermload" ], "pc": [ - "boot", "integrity", "mass", "power" @@ -251,9 +244,7 @@ ], "pv": [], "rf": [ - "boot", "integrity", - "mass", "power" ], "rg": [ @@ -289,11 +280,11 @@ "sc": [], "scb": [ "boot", - "delay", "duration", "integrity", "power", "shield", + "spinup", "thermload" ], "sg": [ From 2d307a5c8ade89be0b0673f321d1af75fbeb7d45 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 10:56:06 +0000 Subject: [PATCH 40/49] Updated FDSi stats --- dist/index.js | 382 ++++++++-------- dist/index.json | 412 ++++++++++-------- modifications/validity.json | 2 +- .../frame_shift_drive_interdictor.json | 410 +++++++++-------- 4 files changed, 663 insertions(+), 543 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5388db3..33879f7 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8952,224 +8952,264 @@ module.exports = { rebuildsperbay: 6 } ], fi: [ { - class: 4, - cost: 263420, - edID: 128666707, - eddbID: 1309, - grp: "fi", - id: "6p", - mass: 10, - power: .25, - rangeRating: "B", - rating: "E" - }, { - class: 4, - cost: 790270, - edID: 128666711, - eddbID: 1313, - grp: "fi", - id: "6o", - mass: 4, - power: .33, - rangeRating: "A", - rating: "D" - }, { - class: 4, - cost: 2370820, - edID: 128666715, - eddbID: 1317, - grp: "fi", - id: "6n", - mass: 10, - power: .41, - rangeRating: "A", - rating: "C" - }, { - class: 4, - cost: 7112450, - edID: 128666719, - eddbID: 1321, - grp: "fi", - id: "6m", - mass: 16, - power: .49, - rangeRating: "A", - rating: "B" - }, { - class: 4, - cost: 21337340, - edID: 128666723, - eddbID: 1325, - grp: "fi", - id: "6l", - mass: 10, - power: .57, - rangeRating: "A", - rating: "A" - }, { - class: 3, - cost: 94080, - edID: 128666706, - eddbID: 1308, - grp: "fi", - id: "6k", - mass: 5, - power: .2, - rangeRating: "C", - rating: "E" - }, { - class: 3, - cost: 282240, - edID: 128666710, - eddbID: 1312, - grp: "fi", - id: "6j", - mass: 2, - power: .27, - rangeRating: "B", - rating: "D" - }, { - class: 3, - cost: 846720, - edID: 128666714, - eddbID: 1316, - grp: "fi", - id: "6i", - mass: 5, - power: .34, - rangeRating: "B", - rating: "C" - }, { - class: 3, - cost: 2540160, - edID: 128666718, - eddbID: 1320, - grp: "fi", - id: "6h", - mass: 8, - power: .41, - rangeRating: "B", - rating: "B" - }, { - class: 3, - cost: 7620480, - edID: 128666722, - eddbID: 1324, - grp: "fi", - id: "6g", - mass: 5, - power: .48, - rangeRating: "A", - rating: "A" - }, { - class: 2, - cost: 33600, - edID: 128666705, - eddbID: 1307, - grp: "fi", - id: "6f", - mass: 2.5, - power: .17, - rangeRating: "D", - rating: "E" - }, { - class: 2, - cost: 100800, - edID: 128666709, - eddbID: 1311, - grp: "fi", - id: "6e", - mass: 1, - power: .22, - rangeRating: "C", - rating: "D" - }, { - class: 2, - cost: 302400, - edID: 128666713, - eddbID: 1315, - grp: "fi", - id: "6d", - mass: 2.5, - power: .28, - rangeRating: "C", - rating: "C" - }, { - class: 2, - cost: 907200, - edID: 128666717, - eddbID: 1319, - grp: "fi", - id: "6c", - mass: 4, - power: .34, - rangeRating: "C", - rating: "B" - }, { - class: 2, - cost: 2721600, - edID: 128666721, - eddbID: 1323, - grp: "fi", - id: "6b", - mass: 2.5, - power: .39, - rangeRating: "B", - rating: "A" - }, { + boot: 15, class: 1, cost: 12e3, edID: 128666704, eddbID: 1306, + facinglimit: 50, grp: "fi", id: "6a", mass: 1.3, power: .14, - rangeRating: "E", + ranget: 3, rating: "E" }, { + boot: 15, class: 1, cost: 36e3, edID: 128666708, eddbID: 1310, + facinglimit: 50, grp: "fi", id: "69", mass: .5, power: .18, - rangeRating: "D", + ranget: 4, rating: "D" }, { + boot: 15, class: 1, cost: 108e3, edID: 128666712, eddbID: 1314, + facinglimit: 50, grp: "fi", id: "68", mass: 1.3, power: .23, - rangeRating: "D", + ranget: 5, rating: "C" }, { + boot: 15, class: 1, cost: 324e3, edID: 128666716, eddbID: 1318, + facinglimit: 50, grp: "fi", id: "67", mass: 2, power: .28, - rangeRating: "D", + ranget: 6, rating: "B" }, { + boot: 15, class: 1, cost: 972e3, edID: 128666720, eddbID: 1322, + facinglimit: 50, grp: "fi", id: "66", mass: 1.3, power: .32, - rangeRating: "C", + ranget: 7, + rating: "A" + }, { + boot: 15, + class: 2, + cost: 33600, + edID: 128666705, + eddbID: 1307, + facinglimit: 50, + grp: "fi", + id: "6f", + mass: 2.5, + power: .17, + ranget: 6, + rating: "E" + }, { + boot: 15, + class: 2, + cost: 100800, + edID: 128666709, + eddbID: 1311, + facinglimit: 50, + grp: "fi", + id: "6e", + mass: 1, + power: .22, + ranget: 7, + rating: "D" + }, { + boot: 15, + class: 2, + cost: 302400, + edID: 128666713, + eddbID: 1315, + facinglimit: 50, + grp: "fi", + id: "6d", + mass: 2.5, + power: .28, + ranget: 8, + rating: "C" + }, { + boot: 15, + class: 2, + cost: 907200, + edID: 128666717, + eddbID: 1319, + facinglimit: 50, + grp: "fi", + id: "6c", + mass: 4, + power: .34, + ranget: 9, + rating: "B" + }, { + boot: 15, + class: 2, + cost: 2721600, + edID: 128666721, + eddbID: 1323, + facinglimit: 50, + grp: "fi", + id: "6b", + mass: 2.5, + power: .39, + ranget: 10, + rating: "A" + }, { + boot: 15, + class: 3, + cost: 94080, + edID: 128666706, + eddbID: 1308, + facinglimit: 50, + grp: "fi", + id: "6k", + mass: 5, + power: .2, + ranget: 9, + rating: "E" + }, { + boot: 15, + class: 3, + cost: 282240, + edID: 128666710, + eddbID: 1312, + facinglimit: 50, + grp: "fi", + id: "6j", + mass: 2, + power: .27, + ranget: 10, + rating: "D" + }, { + boot: 15, + class: 3, + cost: 846720, + edID: 128666714, + eddbID: 1316, + facinglimit: 50, + grp: "fi", + id: "6i", + mass: 5, + power: .34, + ranget: 11, + rating: "C" + }, { + boot: 15, + class: 3, + cost: 2540160, + edID: 128666718, + eddbID: 1320, + facinglimit: 50, + grp: "fi", + id: "6h", + mass: 8, + power: .41, + ranget: 12, + rating: "B" + }, { + boot: 15, + class: 3, + cost: 7620480, + edID: 128666722, + eddbID: 1324, + facinglimit: 50, + grp: "fi", + id: "6g", + mass: 5, + power: .48, + ranget: 13, + rating: "A" + }, { + boot: 15, + class: 4, + cost: 263420, + edID: 128666707, + eddbID: 1309, + facinglimit: 50, + grp: "fi", + id: "6p", + mass: 10, + power: .25, + ranget: 12, + rating: "E" + }, { + boot: 15, + class: 4, + cost: 790270, + edID: 128666711, + eddbID: 1313, + facinglimit: 50, + grp: "fi", + id: "6o", + mass: 4, + power: .33, + ranget: 13, + rating: "D" + }, { + boot: 15, + class: 4, + cost: 2370820, + edID: 128666715, + eddbID: 1317, + facinglimit: 50, + grp: "fi", + id: "6n", + mass: 10, + power: .41, + ranget: 14, + rating: "C" + }, { + boot: 15, + class: 4, + cost: 7112450, + edID: 128666719, + eddbID: 1321, + facinglimit: 50, + grp: "fi", + id: "6m", + mass: 16, + power: .49, + ranget: 15, + rating: "B" + }, { + boot: 15, + class: 4, + cost: 21337340, + edID: 128666723, + eddbID: 1325, + facinglimit: 50, + grp: "fi", + id: "6l", + mass: 10, + power: .57, + ranget: 16, rating: "A" } ], fs: [ { @@ -12485,7 +12525,7 @@ module.exports = { dc: [], fc: [ "ammo", "armourpen", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], fh: [], - fi: [ "boot", "facinglimit", "integrity", "mass", "power", "range" ], + fi: [ "boot", "facinglimit", "integrity", "mass", "power", "ranget" ], fs: [ "integrity", "power" ], fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ], ft: [], diff --git a/dist/index.json b/dist/index.json index 73f9623..fb46ccb 100644 --- a/dist/index.json +++ b/dist/index.json @@ -11063,243 +11063,283 @@ ], "fi": [ { - "class": 4, - "cost": 263420, - "edID": 128666707, - "eddbID": 1309, - "grp": "fi", - "id": "6p", - "mass": 10, - "power": 0.25, - "rangeRating": "B", - "rating": "E" - }, - { - "class": 4, - "cost": 790270, - "edID": 128666711, - "eddbID": 1313, - "grp": "fi", - "id": "6o", - "mass": 4, - "power": 0.33, - "rangeRating": "A", - "rating": "D" - }, - { - "class": 4, - "cost": 2370820, - "edID": 128666715, - "eddbID": 1317, - "grp": "fi", - "id": "6n", - "mass": 10, - "power": 0.41, - "rangeRating": "A", - "rating": "C" - }, - { - "class": 4, - "cost": 7112450, - "edID": 128666719, - "eddbID": 1321, - "grp": "fi", - "id": "6m", - "mass": 16, - "power": 0.49, - "rangeRating": "A", - "rating": "B" - }, - { - "class": 4, - "cost": 21337340, - "edID": 128666723, - "eddbID": 1325, - "grp": "fi", - "id": "6l", - "mass": 10, - "power": 0.57, - "rangeRating": "A", - "rating": "A" - }, - { - "class": 3, - "cost": 94080, - "edID": 128666706, - "eddbID": 1308, - "grp": "fi", - "id": "6k", - "mass": 5, - "power": 0.2, - "rangeRating": "C", - "rating": "E" - }, - { - "class": 3, - "cost": 282240, - "edID": 128666710, - "eddbID": 1312, - "grp": "fi", - "id": "6j", - "mass": 2, - "power": 0.27, - "rangeRating": "B", - "rating": "D" - }, - { - "class": 3, - "cost": 846720, - "edID": 128666714, - "eddbID": 1316, - "grp": "fi", - "id": "6i", - "mass": 5, - "power": 0.34, - "rangeRating": "B", - "rating": "C" - }, - { - "class": 3, - "cost": 2540160, - "edID": 128666718, - "eddbID": 1320, - "grp": "fi", - "id": "6h", - "mass": 8, - "power": 0.41, - "rangeRating": "B", - "rating": "B" - }, - { - "class": 3, - "cost": 7620480, - "edID": 128666722, - "eddbID": 1324, - "grp": "fi", - "id": "6g", - "mass": 5, - "power": 0.48, - "rangeRating": "A", - "rating": "A" - }, - { - "class": 2, - "cost": 33600, - "edID": 128666705, - "eddbID": 1307, - "grp": "fi", - "id": "6f", - "mass": 2.5, - "power": 0.17, - "rangeRating": "D", - "rating": "E" - }, - { - "class": 2, - "cost": 100800, - "edID": 128666709, - "eddbID": 1311, - "grp": "fi", - "id": "6e", - "mass": 1, - "power": 0.22, - "rangeRating": "C", - "rating": "D" - }, - { - "class": 2, - "cost": 302400, - "edID": 128666713, - "eddbID": 1315, - "grp": "fi", - "id": "6d", - "mass": 2.5, - "power": 0.28, - "rangeRating": "C", - "rating": "C" - }, - { - "class": 2, - "cost": 907200, - "edID": 128666717, - "eddbID": 1319, - "grp": "fi", - "id": "6c", - "mass": 4, - "power": 0.34, - "rangeRating": "C", - "rating": "B" - }, - { - "class": 2, - "cost": 2721600, - "edID": 128666721, - "eddbID": 1323, - "grp": "fi", - "id": "6b", - "mass": 2.5, - "power": 0.39, - "rangeRating": "B", - "rating": "A" - }, - { + "boot": 15, "class": 1, "cost": 12000, "edID": 128666704, "eddbID": 1306, + "facinglimit": 50, "grp": "fi", "id": "6a", "mass": 1.3, "power": 0.14, - "rangeRating": "E", + "ranget": 3, "rating": "E" }, { + "boot": 15, "class": 1, "cost": 36000, "edID": 128666708, "eddbID": 1310, + "facinglimit": 50, "grp": "fi", "id": "69", "mass": 0.5, "power": 0.18, - "rangeRating": "D", + "ranget": 4, "rating": "D" }, { + "boot": 15, "class": 1, "cost": 108000, "edID": 128666712, "eddbID": 1314, + "facinglimit": 50, "grp": "fi", "id": "68", "mass": 1.3, "power": 0.23, - "rangeRating": "D", + "ranget": 5, "rating": "C" }, { + "boot": 15, "class": 1, "cost": 324000, "edID": 128666716, "eddbID": 1318, + "facinglimit": 50, "grp": "fi", "id": "67", "mass": 2, "power": 0.28, - "rangeRating": "D", + "ranget": 6, "rating": "B" }, { + "boot": 15, "class": 1, "cost": 972000, "edID": 128666720, "eddbID": 1322, + "facinglimit": 50, "grp": "fi", "id": "66", "mass": 1.3, "power": 0.32, - "rangeRating": "C", + "ranget": 7, + "rating": "A" + }, + { + "boot": 15, + "class": 2, + "cost": 33600, + "edID": 128666705, + "eddbID": 1307, + "facinglimit": 50, + "grp": "fi", + "id": "6f", + "mass": 2.5, + "power": 0.17, + "ranget": 6, + "rating": "E" + }, + { + "boot": 15, + "class": 2, + "cost": 100800, + "edID": 128666709, + "eddbID": 1311, + "facinglimit": 50, + "grp": "fi", + "id": "6e", + "mass": 1, + "power": 0.22, + "ranget": 7, + "rating": "D" + }, + { + "boot": 15, + "class": 2, + "cost": 302400, + "edID": 128666713, + "eddbID": 1315, + "facinglimit": 50, + "grp": "fi", + "id": "6d", + "mass": 2.5, + "power": 0.28, + "ranget": 8, + "rating": "C" + }, + { + "boot": 15, + "class": 2, + "cost": 907200, + "edID": 128666717, + "eddbID": 1319, + "facinglimit": 50, + "grp": "fi", + "id": "6c", + "mass": 4, + "power": 0.34, + "ranget": 9, + "rating": "B" + }, + { + "boot": 15, + "class": 2, + "cost": 2721600, + "edID": 128666721, + "eddbID": 1323, + "facinglimit": 50, + "grp": "fi", + "id": "6b", + "mass": 2.5, + "power": 0.39, + "ranget": 10, + "rating": "A" + }, + { + "boot": 15, + "class": 3, + "cost": 94080, + "edID": 128666706, + "eddbID": 1308, + "facinglimit": 50, + "grp": "fi", + "id": "6k", + "mass": 5, + "power": 0.2, + "ranget": 9, + "rating": "E" + }, + { + "boot": 15, + "class": 3, + "cost": 282240, + "edID": 128666710, + "eddbID": 1312, + "facinglimit": 50, + "grp": "fi", + "id": "6j", + "mass": 2, + "power": 0.27, + "ranget": 10, + "rating": "D" + }, + { + "boot": 15, + "class": 3, + "cost": 846720, + "edID": 128666714, + "eddbID": 1316, + "facinglimit": 50, + "grp": "fi", + "id": "6i", + "mass": 5, + "power": 0.34, + "ranget": 11, + "rating": "C" + }, + { + "boot": 15, + "class": 3, + "cost": 2540160, + "edID": 128666718, + "eddbID": 1320, + "facinglimit": 50, + "grp": "fi", + "id": "6h", + "mass": 8, + "power": 0.41, + "ranget": 12, + "rating": "B" + }, + { + "boot": 15, + "class": 3, + "cost": 7620480, + "edID": 128666722, + "eddbID": 1324, + "facinglimit": 50, + "grp": "fi", + "id": "6g", + "mass": 5, + "power": 0.48, + "ranget": 13, + "rating": "A" + }, + { + "boot": 15, + "class": 4, + "cost": 263420, + "edID": 128666707, + "eddbID": 1309, + "facinglimit": 50, + "grp": "fi", + "id": "6p", + "mass": 10, + "power": 0.25, + "ranget": 12, + "rating": "E" + }, + { + "boot": 15, + "class": 4, + "cost": 790270, + "edID": 128666711, + "eddbID": 1313, + "facinglimit": 50, + "grp": "fi", + "id": "6o", + "mass": 4, + "power": 0.33, + "ranget": 13, + "rating": "D" + }, + { + "boot": 15, + "class": 4, + "cost": 2370820, + "edID": 128666715, + "eddbID": 1317, + "facinglimit": 50, + "grp": "fi", + "id": "6n", + "mass": 10, + "power": 0.41, + "ranget": 14, + "rating": "C" + }, + { + "boot": 15, + "class": 4, + "cost": 7112450, + "edID": 128666719, + "eddbID": 1321, + "facinglimit": 50, + "grp": "fi", + "id": "6m", + "mass": 16, + "power": 0.49, + "ranget": 15, + "rating": "B" + }, + { + "boot": 15, + "class": 4, + "cost": 21337340, + "edID": 128666723, + "eddbID": 1325, + "facinglimit": 50, + "grp": "fi", + "id": "6l", + "mass": 10, + "power": 0.57, + "ranget": 16, "rating": "A" } ], @@ -14977,7 +15017,7 @@ "integrity", "mass", "power", - "range" + "ranget" ], "fs": [ "integrity", diff --git a/modifications/validity.json b/modifications/validity.json index f397652..93b3ed8 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -85,7 +85,7 @@ "integrity", "mass", "power", - "range" + "ranget" ], "fs": [ "integrity", diff --git a/modules/internal/frame_shift_drive_interdictor.json b/modules/internal/frame_shift_drive_interdictor.json index abbdd14..fcef922 100644 --- a/modules/internal/frame_shift_drive_interdictor.json +++ b/modules/internal/frame_shift_drive_interdictor.json @@ -1,243 +1,283 @@ { "fi": [ { - "class": 4, - "cost": 263420, - "edID": 128666707, - "eddbID": 1309, - "grp": "fi", - "id": "6p", - "mass": 10, - "power": 0.25, - "rangeRating": "B", - "rating": "E" - }, - { - "class": 4, - "cost": 790270, - "edID": 128666711, - "eddbID": 1313, - "grp": "fi", - "id": "6o", - "mass": 4, - "power": 0.33, - "rangeRating": "A", - "rating": "D" - }, - { - "class": 4, - "cost": 2370820, - "edID": 128666715, - "eddbID": 1317, - "grp": "fi", - "id": "6n", - "mass": 10, - "power": 0.41, - "rangeRating": "A", - "rating": "C" - }, - { - "class": 4, - "cost": 7112450, - "edID": 128666719, - "eddbID": 1321, - "grp": "fi", - "id": "6m", - "mass": 16, - "power": 0.49, - "rangeRating": "A", - "rating": "B" - }, - { - "class": 4, - "cost": 21337340, - "edID": 128666723, - "eddbID": 1325, - "grp": "fi", - "id": "6l", - "mass": 10, - "power": 0.57, - "rangeRating": "A", - "rating": "A" - }, - { - "class": 3, - "cost": 94080, - "edID": 128666706, - "eddbID": 1308, - "grp": "fi", - "id": "6k", - "mass": 5, - "power": 0.2, - "rangeRating": "C", - "rating": "E" - }, - { - "class": 3, - "cost": 282240, - "edID": 128666710, - "eddbID": 1312, - "grp": "fi", - "id": "6j", - "mass": 2, - "power": 0.27, - "rangeRating": "B", - "rating": "D" - }, - { - "class": 3, - "cost": 846720, - "edID": 128666714, - "eddbID": 1316, - "grp": "fi", - "id": "6i", - "mass": 5, - "power": 0.34, - "rangeRating": "B", - "rating": "C" - }, - { - "class": 3, - "cost": 2540160, - "edID": 128666718, - "eddbID": 1320, - "grp": "fi", - "id": "6h", - "mass": 8, - "power": 0.41, - "rangeRating": "B", - "rating": "B" - }, - { - "class": 3, - "cost": 7620480, - "edID": 128666722, - "eddbID": 1324, - "grp": "fi", - "id": "6g", - "mass": 5, - "power": 0.48, - "rangeRating": "A", - "rating": "A" - }, - { - "class": 2, - "cost": 33600, - "edID": 128666705, - "eddbID": 1307, - "grp": "fi", - "id": "6f", - "mass": 2.5, - "power": 0.17, - "rangeRating": "D", - "rating": "E" - }, - { - "class": 2, - "cost": 100800, - "edID": 128666709, - "eddbID": 1311, - "grp": "fi", - "id": "6e", - "mass": 1, - "power": 0.22, - "rangeRating": "C", - "rating": "D" - }, - { - "class": 2, - "cost": 302400, - "edID": 128666713, - "eddbID": 1315, - "grp": "fi", - "id": "6d", - "mass": 2.5, - "power": 0.28, - "rangeRating": "C", - "rating": "C" - }, - { - "class": 2, - "cost": 907200, - "edID": 128666717, - "eddbID": 1319, - "grp": "fi", - "id": "6c", - "mass": 4, - "power": 0.34, - "rangeRating": "C", - "rating": "B" - }, - { - "class": 2, - "cost": 2721600, - "edID": 128666721, - "eddbID": 1323, - "grp": "fi", - "id": "6b", - "mass": 2.5, - "power": 0.39, - "rangeRating": "B", - "rating": "A" - }, - { + "boot": 15, "class": 1, "cost": 12000, "edID": 128666704, "eddbID": 1306, + "facinglimit": 50, "grp": "fi", "id": "6a", "mass": 1.3, "power": 0.14, - "rangeRating": "E", + "ranget": 3, "rating": "E" }, { + "boot": 15, "class": 1, "cost": 36000, "edID": 128666708, "eddbID": 1310, + "facinglimit": 50, "grp": "fi", "id": "69", "mass": 0.5, "power": 0.18, - "rangeRating": "D", + "ranget": 4, "rating": "D" }, { + "boot": 15, "class": 1, "cost": 108000, "edID": 128666712, "eddbID": 1314, + "facinglimit": 50, "grp": "fi", "id": "68", "mass": 1.3, "power": 0.23, - "rangeRating": "D", + "ranget": 5, "rating": "C" }, { + "boot": 15, "class": 1, "cost": 324000, "edID": 128666716, "eddbID": 1318, + "facinglimit": 50, "grp": "fi", "id": "67", "mass": 2, "power": 0.28, - "rangeRating": "D", + "ranget": 6, "rating": "B" }, { + "boot": 15, "class": 1, "cost": 972000, "edID": 128666720, "eddbID": 1322, + "facinglimit": 50, "grp": "fi", "id": "66", "mass": 1.3, "power": 0.32, - "rangeRating": "C", + "ranget": 7, + "rating": "A" + }, + { + "boot": 15, + "class": 2, + "cost": 33600, + "edID": 128666705, + "eddbID": 1307, + "facinglimit": 50, + "grp": "fi", + "id": "6f", + "mass": 2.5, + "power": 0.17, + "ranget": 6, + "rating": "E" + }, + { + "boot": 15, + "class": 2, + "cost": 100800, + "edID": 128666709, + "eddbID": 1311, + "facinglimit": 50, + "grp": "fi", + "id": "6e", + "mass": 1, + "power": 0.22, + "ranget": 7, + "rating": "D" + }, + { + "boot": 15, + "class": 2, + "cost": 302400, + "edID": 128666713, + "eddbID": 1315, + "facinglimit": 50, + "grp": "fi", + "id": "6d", + "mass": 2.5, + "power": 0.28, + "ranget": 8, + "rating": "C" + }, + { + "boot": 15, + "class": 2, + "cost": 907200, + "edID": 128666717, + "eddbID": 1319, + "facinglimit": 50, + "grp": "fi", + "id": "6c", + "mass": 4, + "power": 0.34, + "ranget": 9, + "rating": "B" + }, + { + "boot": 15, + "class": 2, + "cost": 2721600, + "edID": 128666721, + "eddbID": 1323, + "facinglimit": 50, + "grp": "fi", + "id": "6b", + "mass": 2.5, + "power": 0.39, + "ranget": 10, + "rating": "A" + }, + { + "boot": 15, + "class": 3, + "cost": 94080, + "edID": 128666706, + "eddbID": 1308, + "facinglimit": 50, + "grp": "fi", + "id": "6k", + "mass": 5, + "power": 0.2, + "ranget": 9, + "rating": "E" + }, + { + "boot": 15, + "class": 3, + "cost": 282240, + "edID": 128666710, + "eddbID": 1312, + "facinglimit": 50, + "grp": "fi", + "id": "6j", + "mass": 2, + "power": 0.27, + "ranget": 10, + "rating": "D" + }, + { + "boot": 15, + "class": 3, + "cost": 846720, + "edID": 128666714, + "eddbID": 1316, + "facinglimit": 50, + "grp": "fi", + "id": "6i", + "mass": 5, + "power": 0.34, + "ranget": 11, + "rating": "C" + }, + { + "boot": 15, + "class": 3, + "cost": 2540160, + "edID": 128666718, + "eddbID": 1320, + "facinglimit": 50, + "grp": "fi", + "id": "6h", + "mass": 8, + "power": 0.41, + "ranget": 12, + "rating": "B" + }, + { + "boot": 15, + "class": 3, + "cost": 7620480, + "edID": 128666722, + "eddbID": 1324, + "facinglimit": 50, + "grp": "fi", + "id": "6g", + "mass": 5, + "power": 0.48, + "ranget": 13, + "rating": "A" + }, + { + "boot": 15, + "class": 4, + "cost": 263420, + "edID": 128666707, + "eddbID": 1309, + "facinglimit": 50, + "grp": "fi", + "id": "6p", + "mass": 10, + "power": 0.25, + "ranget": 12, + "rating": "E" + }, + { + "boot": 15, + "class": 4, + "cost": 790270, + "edID": 128666711, + "eddbID": 1313, + "facinglimit": 50, + "grp": "fi", + "id": "6o", + "mass": 4, + "power": 0.33, + "ranget": 13, + "rating": "D" + }, + { + "boot": 15, + "class": 4, + "cost": 2370820, + "edID": 128666715, + "eddbID": 1317, + "facinglimit": 50, + "grp": "fi", + "id": "6n", + "mass": 10, + "power": 0.41, + "ranget": 14, + "rating": "C" + }, + { + "boot": 15, + "class": 4, + "cost": 7112450, + "edID": 128666719, + "eddbID": 1321, + "facinglimit": 50, + "grp": "fi", + "id": "6m", + "mass": 16, + "power": 0.49, + "ranget": 15, + "rating": "B" + }, + { + "boot": 15, + "class": 4, + "cost": 21337340, + "edID": 128666723, + "eddbID": 1325, + "facinglimit": 50, + "grp": "fi", + "id": "6l", + "mass": 10, + "power": 0.57, + "ranget": 16, "rating": "A" } ] From c36ffb9a8347fd7bbd444b54f843f58367877165 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 12:20:35 +0000 Subject: [PATCH 41/49] Break out countermeasures to allow for individual modifications --- dist/index.js | 179 ++++++++------- dist/index.json | 214 ++++++++++-------- modifications/validity.json | 36 ++- modules/hardpoints/chaff_launcher.json | 25 ++ modules/hardpoints/countermeasures.json | 85 ------- .../hardpoints/electronic_countermeasure.json | 23 ++ modules/hardpoints/heat_sink_launcher.json | 26 +++ modules/hardpoints/point_defence.json | 29 +++ modules/index.js | 7 +- spec/data-spec.js | 12 +- 10 files changed, 351 insertions(+), 285 deletions(-) create mode 100644 modules/hardpoints/chaff_launcher.json delete mode 100644 modules/hardpoints/countermeasures.json create mode 100644 modules/hardpoints/electronic_countermeasure.json create mode 100644 modules/hardpoints/heat_sink_launcher.json create mode 100644 modules/hardpoints/point_defence.json diff --git a/dist/index.js b/dist/index.js index 33879f7..463f8bf 100644 --- a/dist/index.js +++ b/dist/index.js @@ -7653,84 +7653,6 @@ module.exports = { rating: "A", time: 10 } ], - cm: [ { - ammo: 10, - class: 0, - clip: 1, - cost: 8500, - duration: 20, - edID: 128049513, - eddbID: 884, - eps: 4, - grp: "cm", - hps: 4, - id: "00", - integrity: 20, - mass: 1.3, - name: "Chaff Launcher", - passive: 1, - power: .2, - rating: "I", - reload: 10, - rof: 1 - }, { - activepower: 4, - chargeup: 4, - class: 0, - cooldown: 10, - cost: 12500, - edID: 128049516, - eddbID: 885, - grp: "cm", - id: "01", - integrity: 20, - mass: 1.3, - name: "Electronic Countermeasure", - power: .2, - range: 3e3, - rating: "F" - }, { - ammo: 2, - class: 0, - clip: 1, - cost: 3500, - duration: 10, - edID: 128049519, - eddbID: 886, - eps: .4, - grp: "cm", - id: "02", - integrity: 20, - mass: 1.3, - name: "Heat Sink Launcher", - passive: 1, - power: .2, - rating: "I", - reload: 10, - rof: .2 - }, { - ammo: 1e4, - burst: 4, - burstrof: 15, - class: 0, - clip: 50, - cost: 18550, - edID: 128049522, - eddbID: 887, - grp: "cm", - id: "03", - integrity: 20, - jitter: 1.5, - mass: .5, - name: "Point Defence", - passive: 1, - power: .2, - rating: "I", - reload: 0, - rof: 10, - speed: 1e3, - type: "K" - } ], ws: [ { class: 0, cost: 13540, @@ -7928,6 +7850,93 @@ module.exports = { power: 1.2, rating: "A", shieldmul: .2 + } ], + ch: [ { + ammo: 10, + class: 0, + clip: 1, + cost: 8500, + distdraw: 4, + duration: 20, + edID: 128049513, + eddbID: 884, + grp: "ch", + id: "00", + integrity: 20, + mass: 1.3, + name: "Chaff Launcher", + passive: 1, + power: .2, + rating: "I", + reload: 10, + thermload: 4, + rof: 1 + } ], + ec: [ { + activepower: 4, + chargeup: 3, + class: 0, + cooldown: 10, + cost: 12500, + edID: 128049516, + eddbID: 885, + grp: "ec", + id: "01", + integrity: 20, + mass: 1.3, + name: "Electronic Countermeasure", + power: .2, + range: 3e3, + reload: 10, + rating: "F", + thermload: 4 + } ], + hs: [ { + ammo: 2, + class: 0, + clip: 1, + cost: 3500, + distdraw: 2, + drain: 100, + duration: 10, + edID: 128049519, + eddbID: 886, + eps: .4, + grp: "hs", + id: "02", + integrity: 20, + mass: 1.3, + name: "Heat Sink Launcher", + passive: 1, + power: .2, + rating: "I", + reload: 10, + rof: .2 + } ], + po: [ { + ammo: 1e4, + burst: 4, + burstrof: 15, + class: 0, + clip: 50, + cost: 18550, + edID: 128049522, + eddbID: 887, + grp: "cm", + id: "03", + integrity: 30, + jitter: 1.5, + mass: .5, + name: "Point Defence", + passive: 1, + power: .2, + range: 2500, + rating: "I", + reload: 0, + rof: 10, + speed: 1e3, + thermload: .1, + type: "K" } ] }, internal: { @@ -12520,39 +12529,33 @@ module.exports = { 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" ], cc: [ "integrity", "mass", "power" ], - cr: [], + ch: [ "ammo", "integrity", "mass", "power", "reload" ], cs: [ "boot", "integrity", "mass", "power" ], - dc: [], + ec: [ "integrity", "mass", "power" ], fc: [ "ammo", "armourpen", "burst", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "power", "range", "reload", "rof", "thermload" ], - fh: [], fi: [ "boot", "facinglimit", "integrity", "mass", "power", "ranget" ], fs: [ "integrity", "power" ], fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ], - ft: [], fx: [ "integrity", "mass", "power" ], hb: [ "integrity", "mass", "power" ], hr: [ "armour", "explres", "hullboost", "kinres", "mass", "thermres" ], + 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" ], - 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: [ "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" ], + po: [ "ammo", "integrity", "mass", "power", "reload" ], pp: [ "eff", "integrity", "mass", "pGen" ], psg: [ "boot", "brokenregen", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], - pv: [], rf: [ "integrity", "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", "shieldmul", "thermres" ], - sc: [], 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" ], diff --git a/dist/index.json b/dist/index.json index fb46ccb..e2d56e5 100644 --- a/dist/index.json +++ b/dist/index.json @@ -9652,89 +9652,6 @@ "time": 10 } ], - "cm": [ - { - "ammo": 10, - "class": 0, - "clip": 1, - "cost": 8500, - "duration": 20, - "edID": 128049513, - "eddbID": 884, - "eps": 4, - "grp": "cm", - "hps": 4, - "id": "00", - "integrity": 20, - "mass": 1.3, - "name": "Chaff Launcher", - "passive": 1, - "power": 0.2, - "rating": "I", - "reload": 10, - "rof": 1 - }, - { - "activepower": 4, - "chargeup": 4, - "class": 0, - "cooldown": 10, - "cost": 12500, - "edID": 128049516, - "eddbID": 885, - "grp": "cm", - "id": "01", - "integrity": 20, - "mass": 1.3, - "name": "Electronic Countermeasure", - "power": 0.2, - "range": 3000, - "rating": "F" - }, - { - "ammo": 2, - "class": 0, - "clip": 1, - "cost": 3500, - "duration": 10, - "edID": 128049519, - "eddbID": 886, - "eps": 0.4, - "grp": "cm", - "id": "02", - "integrity": 20, - "mass": 1.3, - "name": "Heat Sink Launcher", - "passive": 1, - "power": 0.2, - "rating": "I", - "reload": 10, - "rof": 0.2 - }, - { - "ammo": 10000, - "burst": 4, - "burstrof": 15, - "class": 0, - "clip": 50, - "cost": 18550, - "edID": 128049522, - "eddbID": 887, - "grp": "cm", - "id": "03", - "integrity": 20, - "jitter": 1.5, - "mass": 0.5, - "name": "Point Defence", - "passive": 1, - "power": 0.2, - "rating": "I", - "reload": 0, - "rof": 10, - "speed": 1000, - "type": "K" - } - ], "ws": [ { "class": 0, @@ -9950,6 +9867,101 @@ "rating": "A", "shieldmul": 0.2 } + ], + "ch": [ + { + "ammo": 10, + "class": 0, + "clip": 1, + "cost": 8500, + "distdraw": 4, + "duration": 20, + "edID": 128049513, + "eddbID": 884, + "grp": "ch", + "id": "00", + "integrity": 20, + "mass": 1.3, + "name": "Chaff Launcher", + "passive": 1, + "power": 0.2, + "rating": "I", + "reload": 10, + "thermload": 4, + "rof": 1 + } + ], + "ec": [ + { + "activepower": 4, + "chargeup": 3, + "class": 0, + "cooldown": 10, + "cost": 12500, + "edID": 128049516, + "eddbID": 885, + "grp": "ec", + "id": "01", + "integrity": 20, + "mass": 1.3, + "name": "Electronic Countermeasure", + "power": 0.2, + "range": 3000, + "reload": 10, + "rating": "F", + "thermload": 4 + } + ], + "hs": [ + { + "ammo": 2, + "class": 0, + "clip": 1, + "cost": 3500, + "distdraw": 2, + "drain": 100, + "duration": 10, + "edID": 128049519, + "eddbID": 886, + "eps": 0.4, + "grp": "hs", + "id": "02", + "integrity": 20, + "mass": 1.3, + "name": "Heat Sink Launcher", + "passive": 1, + "power": 0.2, + "rating": "I", + "reload": 10, + "rof": 0.2 + } + ], + "po": [ + { + "ammo": 10000, + "burst": 4, + "burstrof": 15, + "class": 0, + "clip": 50, + "cost": 18550, + "edID": 128049522, + "eddbID": 887, + "grp": "cm", + "id": "03", + "integrity": 30, + "jitter": 1.5, + "mass": 0.5, + "name": "Point Defence", + "passive": 1, + "power": 0.2, + "range": 2500, + "rating": "I", + "reload": 0, + "rof": 10, + "speed": 1000, + "thermload": 0.1, + "type": "K" + } ] }, "internal": { @@ -14986,14 +14998,24 @@ "mass", "power" ], - "cr": [], + "ch": [ + "ammo", + "integrity", + "mass", + "power", + "reload" + ], "cs": [ "boot", "integrity", "mass", "power" ], - "dc": [], + "ec": [ + "integrity", + "mass", + "power" + ], "fc": [ "ammo", "armourpen", @@ -15010,7 +15032,6 @@ "rof", "thermload" ], - "fh": [], "fi": [ "boot", "facinglimit", @@ -15032,7 +15053,6 @@ "power", "thermload" ], - "ft": [], "fx": [ "integrity", "mass", @@ -15051,6 +15071,13 @@ "mass", "thermres" ], + "hs": [ + "ammo", + "integrity", + "mass", + "power", + "reload" + ], "kw": [ "boot", "integrity", @@ -15078,7 +15105,6 @@ "rof", "thermload" ], - "ml": [], "mr": [ "ammo", "armourpen", @@ -15127,9 +15153,6 @@ "mass", "power" ], - "pci": [], - "pcm": [], - "pcq": [], "pd": [ "boot", "engcap", @@ -15154,6 +15177,13 @@ "rof", "thermload" ], + "po": [ + "ammo", + "integrity", + "mass", + "power", + "reload" + ], "pp": [ "eff", "integrity", @@ -15174,7 +15204,6 @@ "thermload", "thermres" ], - "pv": [], "rf": [ "integrity", "power" @@ -15209,7 +15238,6 @@ "shieldmul", "thermres" ], - "sc": [], "scb": [ "boot", "duration", diff --git a/modifications/validity.json b/modifications/validity.json index 93b3ed8..6837f61 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -54,14 +54,24 @@ "mass", "power" ], - "cr": [], + "ch": [ + "ammo", + "integrity", + "mass", + "power", + "reload" + ], "cs": [ "boot", "integrity", "mass", "power" ], - "dc": [], + "ec": [ + "integrity", + "mass", + "power" + ], "fc": [ "ammo", "armourpen", @@ -78,7 +88,6 @@ "rof", "thermload" ], - "fh": [], "fi": [ "boot", "facinglimit", @@ -100,7 +109,6 @@ "power", "thermload" ], - "ft": [], "fx": [ "integrity", "mass", @@ -119,6 +127,13 @@ "mass", "thermres" ], + "hs": [ + "ammo", + "integrity", + "mass", + "power", + "reload" + ], "kw": [ "boot", "integrity", @@ -146,7 +161,6 @@ "rof", "thermload" ], - "ml": [], "mr": [ "ammo", "armourpen", @@ -195,9 +209,6 @@ "mass", "power" ], - "pci": [], - "pcm": [], - "pcq": [], "pd": [ "boot", "engcap", @@ -222,6 +233,13 @@ "rof", "thermload" ], + "po": [ + "ammo", + "integrity", + "mass", + "power", + "reload" + ], "pp": [ "eff", "integrity", @@ -242,7 +260,6 @@ "thermload", "thermres" ], - "pv": [], "rf": [ "integrity", "power" @@ -277,7 +294,6 @@ "shieldmul", "thermres" ], - "sc": [], "scb": [ "boot", "duration", diff --git a/modules/hardpoints/chaff_launcher.json b/modules/hardpoints/chaff_launcher.json new file mode 100644 index 0000000..3a071c9 --- /dev/null +++ b/modules/hardpoints/chaff_launcher.json @@ -0,0 +1,25 @@ +{ + "ch": [ + { + "ammo": 10, + "class": 0, + "clip": 1, + "cost": 8500, + "distdraw": 4, + "duration": 20, + "edID": 128049513, + "eddbID": 884, + "grp": "ch", + "id": "00", + "integrity": 20, + "mass": 1.3, + "name": "Chaff Launcher", + "passive": 1, + "power": 0.2, + "rating": "I", + "reload": 10, + "thermload": 4, + "rof": 1 + } + ] +} diff --git a/modules/hardpoints/countermeasures.json b/modules/hardpoints/countermeasures.json deleted file mode 100644 index a91b0d2..0000000 --- a/modules/hardpoints/countermeasures.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "cm": [ - { - "ammo": 10, - "class": 0, - "clip": 1, - "cost": 8500, - "duration": 20, - "edID": 128049513, - "eddbID": 884, - "eps": 4, - "grp": "cm", - "hps": 4, - "id": "00", - "integrity": 20, - "mass": 1.3, - "name": "Chaff Launcher", - "passive": 1, - "power": 0.2, - "rating": "I", - "reload": 10, - "rof": 1 - }, - { - "activepower": 4, - "chargeup": 4, - "class": 0, - "cooldown": 10, - "cost": 12500, - "edID": 128049516, - "eddbID": 885, - "grp": "cm", - "id": "01", - "integrity": 20, - "mass": 1.3, - "name": "Electronic Countermeasure", - "power": 0.2, - "range": 3000, - "rating": "F" - }, - { - "ammo": 2, - "class": 0, - "clip": 1, - "cost": 3500, - "duration": 10, - "edID": 128049519, - "eddbID": 886, - "eps": 0.4, - "grp": "cm", - "id": "02", - "integrity": 20, - "mass": 1.3, - "name": "Heat Sink Launcher", - "passive": 1, - "power": 0.2, - "rating": "I", - "reload": 10, - "rof": 0.2 - }, - { - "ammo": 10000, - "burst": 4, - "burstrof": 15, - "class": 0, - "clip": 50, - "cost": 18550, - "edID": 128049522, - "eddbID": 887, - "grp": "cm", - "id": "03", - "integrity": 20, - "jitter": 1.5, - "mass": 0.5, - "name": "Point Defence", - "passive": 1, - "power": 0.2, - "rating": "I", - "reload": 0, - "rof": 10, - "speed": 1000, - "type": "K" - } - ] -} diff --git a/modules/hardpoints/electronic_countermeasure.json b/modules/hardpoints/electronic_countermeasure.json new file mode 100644 index 0000000..585ca85 --- /dev/null +++ b/modules/hardpoints/electronic_countermeasure.json @@ -0,0 +1,23 @@ +{ + "ec": [ + { + "activepower": 4, + "chargeup": 3, + "class": 0, + "cooldown": 10, + "cost": 12500, + "edID": 128049516, + "eddbID": 885, + "grp": "ec", + "id": "01", + "integrity": 20, + "mass": 1.3, + "name": "Electronic Countermeasure", + "power": 0.2, + "range": 3000, + "reload": 10, + "rating": "F", + "thermload": 4 + } + ] +} diff --git a/modules/hardpoints/heat_sink_launcher.json b/modules/hardpoints/heat_sink_launcher.json new file mode 100644 index 0000000..14a6790 --- /dev/null +++ b/modules/hardpoints/heat_sink_launcher.json @@ -0,0 +1,26 @@ +{ + "hs": [ + { + "ammo": 2, + "class": 0, + "clip": 1, + "cost": 3500, + "distdraw": 2, + "drain": 100, + "duration": 10, + "edID": 128049519, + "eddbID": 886, + "eps": 0.4, + "grp": "hs", + "id": "02", + "integrity": 20, + "mass": 1.3, + "name": "Heat Sink Launcher", + "passive": 1, + "power": 0.2, + "rating": "I", + "reload": 10, + "rof": 0.2 + } + ] +} diff --git a/modules/hardpoints/point_defence.json b/modules/hardpoints/point_defence.json new file mode 100644 index 0000000..35b9956 --- /dev/null +++ b/modules/hardpoints/point_defence.json @@ -0,0 +1,29 @@ +{ + "po": [ + { + "ammo": 10000, + "burst": 4, + "burstrof": 15, + "class": 0, + "clip": 50, + "cost": 18550, + "edID": 128049522, + "eddbID": 887, + "grp": "cm", + "id": "03", + "integrity": 30, + "jitter": 1.5, + "mass": 0.5, + "name": "Point Defence", + "passive": 1, + "power": 0.2, + "range": 2500, + "rating": "I", + "reload": 0, + "rof": 10, + "speed": 1000, + "thermload": 0.1, + "type": "K" + } + ] +} diff --git a/modules/index.js b/modules/index.js index 196e637..94532a3 100644 --- a/modules/index.js +++ b/modules/index.js @@ -23,10 +23,13 @@ module.exports = { nl: require('./hardpoints/mine_launcher').nl, ml: require('./hardpoints/mining_laser').ml, cs: require('./hardpoints/cargo_scanner').cs, - cm: require('./hardpoints/countermeasures').cm, ws: require('./hardpoints/frame_shift_wake_scanner').ws, kw: require('./hardpoints/kill_warrant_scanner').kw, - sb: require('./hardpoints/shield_booster').sb + sb: require('./hardpoints/shield_booster').sb, + ch: require('./hardpoints/chaff_launcher').ch, + ec: require('./hardpoints/electronic_countermeasure').ec, + hs: require('./hardpoints/heat_sink_launcher').hs, + po: require('./hardpoints/point_defence').po }, internal: { am: require('./internal/auto_field_maintenance_unit').am, diff --git a/spec/data-spec.js b/spec/data-spec.js index af7cacc..3b65d26 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -56,10 +56,9 @@ describe('JSON Data', function() { it('has valid hardpoints', function() { var ids = {}; - var groups = Modules.hardpoints; - for (var g in groups) { - var group = groups[g]; + for (var g in Modules.hardpoints) { + var group = Modules.hardpoints[g]; for (var i = 0; i < group.length; i++) { var id = group[i].id; expect(ids[id]).toBeFalsy('ID already exists: ' + id); @@ -85,7 +84,7 @@ describe('JSON Data', function() { expect(group[i].eps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing eps`); expect(group[i].hps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing hps`); } - if (group[i].ammo || group[i].reload || group[i].clip) { + if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') { expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`); expect(group[i].clip).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing clip`); expect(group[i].reload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing reload`); @@ -97,10 +96,9 @@ describe('JSON Data', function() { it('has valid internal modules', function() { var ids = {}; - var groups = Modules.internal; - for (var g in groups) { - var group = groups[g]; + for (var g in Modules.internal) { + var group = Modules.internal[g]; for (var i = 0; i < group.length; i++) { var id = group[i].id; expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`); From 932d31908f74bd50804ed415c16c6b8677121317 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 12:36:49 +0000 Subject: [PATCH 42/49] Added resistances for bulkheads --- dist/index.js | 900 ++++++++++++++++++++++++++------ dist/index.json | 900 ++++++++++++++++++++++++++------ ships/adder.json | 10 +- ships/anaconda.json | 10 +- ships/asp.json | 10 +- ships/asp_scout.json | 10 +- ships/beluga.json | 10 +- ships/cobra_mk_iii.json | 10 +- ships/cobra_mk_iv.json | 10 +- ships/diamondback_explorer.json | 10 +- ships/diamondback_scout.json | 10 +- ships/eagle.json | 10 +- ships/federal_assault_ship.json | 10 +- ships/federal_corvette.json | 10 +- ships/federal_dropship.json | 10 +- ships/federal_gunship.json | 10 +- ships/fer_de_lance.json | 10 +- ships/hauler.json | 10 +- ships/imperial_clipper.json | 10 +- ships/imperial_courier.json | 10 +- ships/imperial_cutter.json | 10 +- ships/imperial_eagle.json | 10 +- ships/keelback.json | 10 +- ships/orca.json | 10 +- ships/python.json | 10 +- ships/sidewinder.json | 10 +- ships/type_6_transporter.json | 10 +- ships/type_7_transport.json | 10 +- ships/type_9_heavy.json | 10 +- ships/viper.json | 10 +- ships/viper_mk_iv.json | 10 +- ships/vulture.json | 10 +- 32 files changed, 1650 insertions(+), 450 deletions(-) diff --git a/dist/index.js b/dist/index.js index 463f8bf..d0fdd78 100644 --- a/dist/index.js +++ b/dist/index.js @@ -25,35 +25,55 @@ module.exports = { eddbID: 753, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "BD", edID: 128049269, eddbID: 754, grp: "bh", cost: 35120, - mass: 3 + mass: 3, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "BE", edID: 128049270, eddbID: 755, grp: "bh", cost: 79030, - mass: 5 + mass: 5, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "BF", edID: 128049271, eddbID: 756, grp: "bh", cost: 186770, - mass: 5 + mass: 5, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "BG", edID: 128049272, eddbID: 757, grp: "bh", cost: 206960, - mass: 5 + mass: 5, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 3, 3, 3, 1, 2, 3, 3 ], @@ -92,35 +112,55 @@ module.exports = { eddbID: 818, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bU", edID: 128049365, eddbID: 819, grp: "bh", cost: 58787780, - mass: 30 + mass: 30, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bV", edID: 128049366, eddbID: 820, grp: "bh", cost: 132272510, - mass: 60 + mass: 60, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bW", edID: 128049367, eddbID: 821, grp: "bh", cost: 312604020, - mass: 60 + mass: 60, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bX", edID: 128049368, eddbID: 822, grp: "bh", cost: 346407e3, - mass: 60 + mass: 60, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 8, 7, 6, 5, 8, 8, 5 ], @@ -158,35 +198,55 @@ module.exports = { eddbID: 778, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "BI", edID: 128049305, eddbID: 779, grp: "bh", cost: 2664460, - mass: 21 + mass: 21, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "BJ", edID: 128049306, eddbID: 780, grp: "bh", cost: 5995040, - mass: 42 + mass: 42, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "BK", edID: 128049307, eddbID: 781, grp: "bh", cost: 14168270, - mass: 42 + mass: 42, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "BL", edID: 128049308, eddbID: 782, grp: "bh", cost: 15700340, - mass: 42 + mass: 42, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 5, 5, 5, 4, 4, 5, 5 ], @@ -224,35 +284,55 @@ module.exports = { eddbID: 1503, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "c2", edID: 128672279, eddbID: 1504, grp: "bh", cost: 1584460, - mass: 21 + mass: 21, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "c3", edID: 128672280, eddbID: 1505, grp: "bh", cost: 3565040, - mass: 42 + mass: 42, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "c4", edID: 128672281, eddbID: 1506, grp: "bh", cost: 8425380, - mass: 42 + mass: 42, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "c5", edID: 128672282, eddbID: 1507, grp: "bh", cost: 9336440, - mass: 42 + mass: 42, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 4, 4, 3, 4, 4, 4 ], @@ -292,35 +372,55 @@ module.exports = { eddbID: 1554, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "cm", edID: 128049347, eddbID: 1555, grp: "bh", cost: 33813120, - mass: 83 + mass: 83, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "cn", edID: 128049348, eddbID: 1556, grp: "bh", cost: 76079500, - mass: 165 + mass: 165, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "co", edID: 128049349, eddbID: 1557, grp: "bh", cost: 179801200, - mass: 165 + mass: 165, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "cp", edID: 128049350, eddbID: 1558, grp: "bh", cost: 199243730, - mass: 165 + mass: 165, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 6, 7, 7, 8, 6, 5, 7 ], @@ -398,35 +498,55 @@ module.exports = { eddbID: 763, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bl", edID: 128049281, eddbID: 764, grp: "bh", cost: 151890, - mass: 14 + mass: 14, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bm", edID: 128049282, eddbID: 765, grp: "bh", cost: 341750, - mass: 27 + mass: 27, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bn", edID: 128049283, eddbID: 766, grp: "bh", cost: 797410, - mass: 27 + mass: 27, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bo", edID: 128049284, eddbID: 767, grp: "bh", cost: 895e3, - mass: 27 + mass: 27, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 4, 4, 3, 3, 3, 4 ], @@ -464,35 +584,55 @@ module.exports = { eddbID: 1518, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "ch", edID: 128672265, eddbID: 1519, grp: "bh", cost: 305890, - mass: 14 + mass: 14, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "ci", edID: 128672266, eddbID: 1520, grp: "bh", cost: 688250, - mass: 27 + mass: 27, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "cj", edID: 128672267, eddbID: 1521, grp: "bh", cost: 1605910, - mass: 27 + mass: 27, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "ck", edID: 128672268, eddbID: 1522, grp: "bh", cost: 1802440, - mass: 27 + mass: 27, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 4, 4, 3, 3, 3, 4 ], @@ -530,35 +670,55 @@ module.exports = { eddbID: 1456, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bb", edID: 128671833, eddbID: 1457, grp: "bh", cost: 8e5, - mass: 23 + mass: 23, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bc", edID: 128671834, eddbID: 1458, grp: "bh", cost: 18e5, - mass: 47 + mass: 47, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bd", edID: 128671835, eddbID: 1459, grp: "bh", cost: 42e5, - mass: 26 + mass: 26, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "be", edID: 128671836, eddbID: 1460, grp: "bh", cost: 4714e3, - mass: 47 + mass: 47, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 4, 5, 3, 4, 3, 5 ], @@ -596,35 +756,55 @@ module.exports = { eddbID: 1384, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "b6", edID: 128671219, eddbID: 1385, grp: "bh", cost: 225700, - mass: 13 + mass: 13, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "b7", edID: 128671220, eddbID: 1386, grp: "bh", cost: 507900, - mass: 26 + mass: 26, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "b8", edID: 128671221, eddbID: 1387, grp: "bh", cost: 1185100, - mass: 26 + mass: 26, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "b9", edID: 128671222, eddbID: 1388, grp: "bh", cost: 1330100, - mass: 26 + mass: 26, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 4, 4, 2, 3, 2, 4 ], @@ -662,35 +842,55 @@ module.exports = { eddbID: 743, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bZ", edID: 128049257, eddbID: 744, grp: "bh", cost: 26880, - mass: 4 + mass: 4, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "B0", edID: 128049258, eddbID: 745, grp: "bh", cost: 90050, - mass: 8 + mass: 8, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "B1", edID: 128049259, eddbID: 746, grp: "bh", cost: 140090, - mass: 8 + mass: 8, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "B2", edID: 128049260, eddbID: 747, grp: "bh", cost: 150390, - mass: 8 + mass: 8, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 2, 3, 3, 1, 2, 2, 2 ], @@ -728,35 +928,55 @@ module.exports = { eddbID: 1466, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bA", edID: 128672148, eddbID: 1467, grp: "bh", cost: 7925680, - mass: 44 + mass: 44, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bB", edID: 128672149, eddbID: 1468, grp: "bh", cost: 17832780, - mass: 87 + mass: 87, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bC", edID: 128672150, eddbID: 1469, grp: "bh", cost: 42144810, - mass: 87 + mass: 87, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bD", edID: 128672151, eddbID: 1470, grp: "bh", cost: 46702080, - mass: 87 + mass: 87, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 6, 6, 5, 5, 6, 4, 4 ], @@ -795,35 +1015,55 @@ module.exports = { eddbID: 1498, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "BX", edID: 128049371, eddbID: 1499, grp: "bh", cost: 75187790, - mass: 30 + mass: 30, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "BY", edID: 128049372, eddbID: 1500, grp: "bh", cost: 169172510, - mass: 60 + mass: 60, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "BZ", edID: 128049373, eddbID: 1501, grp: "bh", cost: 399811020, - mass: 60 + mass: 60, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "c0", edID: 128049374, eddbID: 1502, grp: "bh", cost: 443044e3, - mass: 60 + mass: 60, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 8, 7, 6, 5, 8, 8, 5 ], @@ -861,35 +1101,55 @@ module.exports = { eddbID: 793, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bF", edID: 128049323, eddbID: 794, grp: "bh", cost: 5725680, - mass: 44 + mass: 44, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bG", edID: 128049324, eddbID: 795, grp: "bh", cost: 12882780, - mass: 87 + mass: 87, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bH", edID: 128049325, eddbID: 796, grp: "bh", cost: 30446310, - mass: 87 + mass: 87, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bI", edID: 128049326, eddbID: 797, grp: "bh", cost: 33738580, - mass: 87 + mass: 87, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 6, 6, 5, 5, 6, 4, 4 ], @@ -928,35 +1188,55 @@ module.exports = { eddbID: 1471, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bK", edID: 128672155, eddbID: 1472, grp: "bh", cost: 14325690, - mass: 44 + mass: 44, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bL", edID: 128672156, eddbID: 1473, grp: "bh", cost: 32232790, - mass: 87 + mass: 87, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bM", edID: 128672157, eddbID: 1474, grp: "bh", cost: 76176810, - mass: 87 + mass: 87, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bN", edID: 128672158, eddbID: 1475, grp: "bh", cost: 84414090, - mass: 87 + mass: 87, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 6, 6, 5, 5, 7, 5, 4 ], @@ -994,35 +1274,55 @@ module.exports = { eddbID: 813, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "Be", edID: 128049353, eddbID: 814, grp: "bh", cost: 20626820, - mass: 19 + mass: 19, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "Bf", edID: 128049354, eddbID: 815, grp: "bh", cost: 46410340, - mass: 38 + mass: 38, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "Bg", edID: 128049355, eddbID: 816, grp: "bh", cost: 109683090, - mass: 38 + mass: 38, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "Bh", edID: 128049356, eddbID: 817, grp: "bh", cost: 121543510, - mass: 38 + mass: 38, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 6, 5, 4, 4, 6, 4, 3 ], @@ -1060,35 +1360,55 @@ module.exports = { eddbID: 748, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "Bj", edID: 128049263, eddbID: 749, grp: "bh", cost: 42180, - mass: 1 + mass: 1, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "Bk", edID: 128049264, eddbID: 750, grp: "bh", cost: 185050, - mass: 2 + mass: 2, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "Bl", edID: 128049265, eddbID: 751, grp: "bh", cost: 270300, - mass: 2 + mass: 2, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "Bm", edID: 128049266, eddbID: 752, grp: "bh", cost: 282420, - mass: 2 + mass: 2, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 2, 2, 2, 1, 1, 1, 2 ], @@ -1126,35 +1446,55 @@ module.exports = { eddbID: 788, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bq", edID: 128049317, eddbID: 789, grp: "bh", cost: 8918340, - mass: 30 + mass: 30, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "br", edID: 128049318, eddbID: 790, grp: "bh", cost: 20066270, - mass: 60 + mass: 60, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bs", edID: 128049319, eddbID: 791, grp: "bh", cost: 47423290, - mass: 60 + mass: 60, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bt", edID: 128049320, eddbID: 792, grp: "bh", cost: 52551340, - mass: 60 + mass: 60, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 6, 6, 5, 5, 6, 5, 4 ], @@ -1192,35 +1532,55 @@ module.exports = { eddbID: 1389, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bg", edID: 128671225, eddbID: 1390, grp: "bh", cost: 1017200, - mass: 4 + mass: 4, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bh", edID: 128671226, eddbID: 1391, grp: "bh", cost: 2288600, - mass: 8 + mass: 8, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bi", edID: 128671227, eddbID: 1392, grp: "bh", cost: 5408800, - mass: 8 + mass: 8, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bj", edID: 128671228, eddbID: 1393, grp: "bh", cost: 5993700, - mass: 8 + mass: 8, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 3, 3, 1, 3, 2, 3 ], @@ -1259,35 +1619,55 @@ module.exports = { eddbID: 1493, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "BS", edID: 128049377, eddbID: 1494, grp: "bh", cost: 83587790, - mass: 30 + mass: 30, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "BT", edID: 128049378, eddbID: 1495, grp: "bh", cost: 188072510, - mass: 60 + mass: 60, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "BU", edID: 128049379, eddbID: 1496, grp: "bh", cost: 444478020, - mass: 60 + mass: 60, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "BV", edID: 128049380, eddbID: 1497, grp: "bh", cost: 492541e3, - mass: 60 + mass: 60, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 8, 8, 7, 7, 7, 7, 6 ], @@ -1325,35 +1705,55 @@ module.exports = { eddbID: 1461, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bv", edID: 128672141, eddbID: 1462, grp: "bh", cost: 66500, - mass: 4 + mass: 4, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bw", edID: 128672142, eddbID: 1463, grp: "bh", cost: 222760, - mass: 8 + mass: 8, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bx", edID: 128672143, eddbID: 1464, grp: "bh", cost: 346550, - mass: 8 + mass: 8, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "by", edID: 128672144, eddbID: 1465, grp: "bh", cost: 372040, - mass: 8 + mass: 8, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 3, 3, 3, 1, 2, 2, 2 ], @@ -1392,35 +1792,55 @@ module.exports = { eddbID: 1513, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "cc", edID: 128672272, eddbID: 1514, grp: "bh", cost: 1250460, - mass: 12 + mass: 12, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "cd", edID: 128672273, eddbID: 1515, grp: "bh", cost: 2813540, - mass: 23 + mass: 23, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "ce", edID: 128672274, eddbID: 1516, grp: "bh", cost: 6649330, - mass: 23 + mass: 23, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "cf", edID: 128672275, eddbID: 1517, grp: "bh", cost: 7368340, - mass: 23 + mass: 23, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 4, 4, 1, 3, 2, 4 ], @@ -1459,35 +1879,55 @@ module.exports = { eddbID: 798, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "BN", edID: 128049329, eddbID: 799, grp: "bh", cost: 19415950, - mass: 21 + mass: 21, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "BO", edID: 128049330, eddbID: 800, grp: "bh", cost: 43685900, - mass: 87 + mass: 87, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "BP", edID: 128049331, eddbID: 801, grp: "bh", cost: 103244340, - mass: 87 + mass: 87, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "BQ", edID: 128049332, eddbID: 802, grp: "bh", cost: 114408510, - mass: 87 + mass: 87, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 5, 6, 5, 6, 5, 4, 5 ], @@ -1545,35 +1985,55 @@ module.exports = { eddbID: 808, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "bP", edID: 128049341, eddbID: 809, grp: "bh", cost: 22791270, - mass: 26 + mass: 26, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "bQ", edID: 128049342, eddbID: 810, grp: "bh", cost: 51280360, - mass: 53 + mass: 53, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "bR", edID: 128049343, eddbID: 811, grp: "bh", cost: 121192590, - mass: 53 + mass: 53, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "bS", edID: 128049344, eddbID: 812, grp: "bh", cost: 134297570, - mass: 53 + mass: 53, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 7, 6, 5, 4, 7, 6, 5 ], @@ -1611,35 +2071,55 @@ module.exports = { eddbID: 738, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "b1", edID: 128049251, eddbID: 739, grp: "bh", cost: 25600, - mass: 2 + mass: 2, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "b2", edID: 128049252, eddbID: 740, grp: "bh", cost: 80320, - mass: 4 + mass: 4, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "b3", edID: 128049253, eddbID: 741, grp: "bh", cost: 132060, - mass: 4 + mass: 4, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "b4", edID: 128049254, eddbID: 742, grp: "bh", cost: 139420, - mass: 4 + mass: 4, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 2, 2, 2, 1, 1, 1, 1 ], @@ -1677,35 +2157,55 @@ module.exports = { eddbID: 768, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "Bo", edID: 128049287, eddbID: 769, grp: "bh", cost: 418380, - mass: 12 + mass: 12, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "Bp", edID: 128049288, eddbID: 770, grp: "bh", cost: 941350, - mass: 23 + mass: 23, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "Bq", edID: 128049289, eddbID: 771, grp: "bh", cost: 2224730, - mass: 23 + mass: 23, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "Br", edID: 128049290, eddbID: 772, grp: "bh", cost: 2465290, - mass: 23 + mass: 23, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 3, 4, 4, 2, 3, 2, 4 ], @@ -1743,35 +2243,55 @@ module.exports = { eddbID: 773, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "Bt", edID: 128049299, eddbID: 774, grp: "bh", cost: 6988900, - mass: 32 + mass: 32, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "Bu", edID: 128049300, eddbID: 775, grp: "bh", cost: 15725030, - mass: 63 + mass: 63, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "Bv", edID: 128049301, eddbID: 776, grp: "bh", cost: 37163480, - mass: 63 + mass: 63, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "Bw", edID: 128049302, eddbID: 777, grp: "bh", cost: 41182100, - mass: 63 + mass: 63, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 5, 5, 4, 3, 3, 5 ], @@ -1810,35 +2330,55 @@ module.exports = { eddbID: 803, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "By", edID: 128049335, eddbID: 804, grp: "bh", cost: 30622340, - mass: 75 + mass: 75, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "Bz", edID: 128049336, eddbID: 805, grp: "bh", cost: 68900260, - mass: 150 + mass: 150, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "BA", edID: 128049337, eddbID: 806, grp: "bh", cost: 162834280, - mass: 150 + mass: 150, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "BB", edID: 128049338, eddbID: 807, grp: "bh", cost: 180442120, - mass: 150 + mass: 150, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 6, 7, 6, 5, 6, 4, 6 ], @@ -1876,35 +2416,55 @@ module.exports = { eddbID: 758, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "B4", edID: 128049275, eddbID: 759, grp: "bh", cost: 57170, - mass: 5 + mass: 5, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "B5", edID: 128049276, eddbID: 760, grp: "bh", cost: 128640, - mass: 9 + mass: 9, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "B6", edID: 128049277, eddbID: 761, grp: "bh", cost: 304010, - mass: 9 + mass: 9, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "B7", edID: 128049278, eddbID: 762, grp: "bh", cost: 336890, - mass: 9 + mass: 9, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 3, 3, 3, 2, 3, 3, 2 ], @@ -1942,35 +2502,55 @@ module.exports = { eddbID: 1508, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "c7", edID: 128672258, eddbID: 1509, grp: "bh", cost: 175180, - mass: 5 + mass: 5, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "c8", edID: 128672259, eddbID: 1510, grp: "bh", cost: 394140, - mass: 9 + mass: 9, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "c9", edID: 128672260, eddbID: 1511, grp: "bh", cost: 931490, - mass: 9 + mass: 9, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "ca", edID: 128672261, eddbID: 1512, grp: "bh", cost: 1033210, - mass: 9 + mass: 9, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 4, 4, 2, 3, 3, 4 ], @@ -2008,35 +2588,55 @@ module.exports = { eddbID: 783, grp: "bh", cost: 0, - mass: 0 + mass: 0, + explres: -.4, + kinres: -.2, + thermres: .2, + hullboost: .8 }, { id: "B9", edID: 128049311, eddbID: 784, grp: "bh", cost: 1970250, - mass: 17 + mass: 17, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 1.52 }, { id: "Ba", edID: 128049312, eddbID: 785, grp: "bh", cost: 4433050, - mass: 35 + mass: 35, + explres: -.4, + kinres: .2, + thermres: 0, + hullboost: 2.5 }, { id: "Bb", edID: 128049313, eddbID: 786, grp: "bh", cost: 10476780, - mass: 35 + mass: 35, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 }, { id: "Bc", edID: 128049314, eddbID: 787, grp: "bh", cost: 11609670, - mass: 35 + mass: 35, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 } ], slots: { standard: [ 4, 5, 4, 3, 5, 4, 3 ], diff --git a/dist/index.json b/dist/index.json index e2d56e5..74c0279 100644 --- a/dist/index.json +++ b/dist/index.json @@ -26,7 +26,11 @@ "eddbID": 753, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "BD", @@ -34,7 +38,11 @@ "eddbID": 754, "grp": "bh", "cost": 35120, - "mass": 3 + "mass": 3, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "BE", @@ -42,7 +50,11 @@ "eddbID": 755, "grp": "bh", "cost": 79030, - "mass": 5 + "mass": 5, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "BF", @@ -50,7 +62,11 @@ "eddbID": 756, "grp": "bh", "cost": 186770, - "mass": 5 + "mass": 5, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "BG", @@ -58,7 +74,11 @@ "eddbID": 757, "grp": "bh", "cost": 206960, - "mass": 5 + "mass": 5, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -139,7 +159,11 @@ "eddbID": 818, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bU", @@ -147,7 +171,11 @@ "eddbID": 819, "grp": "bh", "cost": 58787780, - "mass": 30 + "mass": 30, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bV", @@ -155,7 +183,11 @@ "eddbID": 820, "grp": "bh", "cost": 132272510, - "mass": 60 + "mass": 60, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bW", @@ -163,7 +195,11 @@ "eddbID": 821, "grp": "bh", "cost": 312604020, - "mass": 60 + "mass": 60, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bX", @@ -171,7 +207,11 @@ "eddbID": 822, "grp": "bh", "cost": 346407000, - "mass": 60 + "mass": 60, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -285,7 +325,11 @@ "eddbID": 778, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "BI", @@ -293,7 +337,11 @@ "eddbID": 779, "grp": "bh", "cost": 2664460, - "mass": 21 + "mass": 21, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "BJ", @@ -301,7 +349,11 @@ "eddbID": 780, "grp": "bh", "cost": 5995040, - "mass": 42 + "mass": 42, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "BK", @@ -309,7 +361,11 @@ "eddbID": 781, "grp": "bh", "cost": 14168270, - "mass": 42 + "mass": 42, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "BL", @@ -317,7 +373,11 @@ "eddbID": 782, "grp": "bh", "cost": 15700340, - "mass": 42 + "mass": 42, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -411,7 +471,11 @@ "eddbID": 1503, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "c2", @@ -419,7 +483,11 @@ "eddbID": 1504, "grp": "bh", "cost": 1584460, - "mass": 21 + "mass": 21, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "c3", @@ -427,7 +495,11 @@ "eddbID": 1505, "grp": "bh", "cost": 3565040, - "mass": 42 + "mass": 42, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "c4", @@ -435,7 +507,11 @@ "eddbID": 1506, "grp": "bh", "cost": 8425380, - "mass": 42 + "mass": 42, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "c5", @@ -443,7 +519,11 @@ "eddbID": 1507, "grp": "bh", "cost": 9336440, - "mass": 42 + "mass": 42, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -527,7 +607,11 @@ "eddbID": 1554, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "cm", @@ -535,7 +619,11 @@ "eddbID": 1555, "grp": "bh", "cost": 33813120, - "mass": 83 + "mass": 83, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "cn", @@ -543,7 +631,11 @@ "eddbID": 1556, "grp": "bh", "cost": 76079500, - "mass": 165 + "mass": 165, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "co", @@ -551,7 +643,11 @@ "eddbID": 1557, "grp": "bh", "cost": 179801200, - "mass": 165 + "mass": 165, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "cp", @@ -559,7 +655,11 @@ "eddbID": 1558, "grp": "bh", "cost": 199243730, - "mass": 165 + "mass": 165, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -703,7 +803,11 @@ "eddbID": 763, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bl", @@ -711,7 +815,11 @@ "eddbID": 764, "grp": "bh", "cost": 151890, - "mass": 14 + "mass": 14, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bm", @@ -719,7 +827,11 @@ "eddbID": 765, "grp": "bh", "cost": 341750, - "mass": 27 + "mass": 27, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bn", @@ -727,7 +839,11 @@ "eddbID": 766, "grp": "bh", "cost": 797410, - "mass": 27 + "mass": 27, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bo", @@ -735,7 +851,11 @@ "eddbID": 767, "grp": "bh", "cost": 895000, - "mass": 27 + "mass": 27, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -819,7 +939,11 @@ "eddbID": 1518, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "ch", @@ -827,7 +951,11 @@ "eddbID": 1519, "grp": "bh", "cost": 305890, - "mass": 14 + "mass": 14, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "ci", @@ -835,7 +963,11 @@ "eddbID": 1520, "grp": "bh", "cost": 688250, - "mass": 27 + "mass": 27, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "cj", @@ -843,7 +975,11 @@ "eddbID": 1521, "grp": "bh", "cost": 1605910, - "mass": 27 + "mass": 27, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "ck", @@ -851,7 +987,11 @@ "eddbID": 1522, "grp": "bh", "cost": 1802440, - "mass": 27 + "mass": 27, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -941,7 +1081,11 @@ "eddbID": 1456, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bb", @@ -949,7 +1093,11 @@ "eddbID": 1457, "grp": "bh", "cost": 800000, - "mass": 23 + "mass": 23, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bc", @@ -957,7 +1105,11 @@ "eddbID": 1458, "grp": "bh", "cost": 1800000, - "mass": 47 + "mass": 47, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bd", @@ -965,7 +1117,11 @@ "eddbID": 1459, "grp": "bh", "cost": 4200000, - "mass": 26 + "mass": 26, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "be", @@ -973,7 +1129,11 @@ "eddbID": 1460, "grp": "bh", "cost": 4714000, - "mass": 47 + "mass": 47, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1057,7 +1217,11 @@ "eddbID": 1384, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "b6", @@ -1065,7 +1229,11 @@ "eddbID": 1385, "grp": "bh", "cost": 225700, - "mass": 13 + "mass": 13, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "b7", @@ -1073,7 +1241,11 @@ "eddbID": 1386, "grp": "bh", "cost": 507900, - "mass": 26 + "mass": 26, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "b8", @@ -1081,7 +1253,11 @@ "eddbID": 1387, "grp": "bh", "cost": 1185100, - "mass": 26 + "mass": 26, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "b9", @@ -1089,7 +1265,11 @@ "eddbID": 1388, "grp": "bh", "cost": 1330100, - "mass": 26 + "mass": 26, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1173,7 +1353,11 @@ "eddbID": 743, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bZ", @@ -1181,7 +1365,11 @@ "eddbID": 744, "grp": "bh", "cost": 26880, - "mass": 4 + "mass": 4, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "B0", @@ -1189,7 +1377,11 @@ "eddbID": 745, "grp": "bh", "cost": 90050, - "mass": 8 + "mass": 8, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "B1", @@ -1197,7 +1389,11 @@ "eddbID": 746, "grp": "bh", "cost": 140090, - "mass": 8 + "mass": 8, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "B2", @@ -1205,7 +1401,11 @@ "eddbID": 747, "grp": "bh", "cost": 150390, - "mass": 8 + "mass": 8, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1281,7 +1481,11 @@ "eddbID": 1466, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bA", @@ -1289,7 +1493,11 @@ "eddbID": 1467, "grp": "bh", "cost": 7925680, - "mass": 44 + "mass": 44, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bB", @@ -1297,7 +1505,11 @@ "eddbID": 1468, "grp": "bh", "cost": 17832780, - "mass": 87 + "mass": 87, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bC", @@ -1305,7 +1517,11 @@ "eddbID": 1469, "grp": "bh", "cost": 42144810, - "mass": 87 + "mass": 87, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bD", @@ -1313,7 +1529,11 @@ "eddbID": 1470, "grp": "bh", "cost": 46702080, - "mass": 87 + "mass": 87, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1402,7 +1622,11 @@ "eddbID": 1498, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "BX", @@ -1410,7 +1634,11 @@ "eddbID": 1499, "grp": "bh", "cost": 75187790, - "mass": 30 + "mass": 30, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "BY", @@ -1418,7 +1646,11 @@ "eddbID": 1500, "grp": "bh", "cost": 169172510, - "mass": 60 + "mass": 60, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "BZ", @@ -1426,7 +1658,11 @@ "eddbID": 1501, "grp": "bh", "cost": 399811020, - "mass": 60 + "mass": 60, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "c0", @@ -1434,7 +1670,11 @@ "eddbID": 1502, "grp": "bh", "cost": 443044000, - "mass": 60 + "mass": 60, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1544,7 +1784,11 @@ "eddbID": 793, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bF", @@ -1552,7 +1796,11 @@ "eddbID": 794, "grp": "bh", "cost": 5725680, - "mass": 44 + "mass": 44, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bG", @@ -1560,7 +1808,11 @@ "eddbID": 795, "grp": "bh", "cost": 12882780, - "mass": 87 + "mass": 87, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bH", @@ -1568,7 +1820,11 @@ "eddbID": 796, "grp": "bh", "cost": 30446310, - "mass": 87 + "mass": 87, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bI", @@ -1576,7 +1832,11 @@ "eddbID": 797, "grp": "bh", "cost": 33738580, - "mass": 87 + "mass": 87, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1669,7 +1929,11 @@ "eddbID": 1471, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bK", @@ -1677,7 +1941,11 @@ "eddbID": 1472, "grp": "bh", "cost": 14325690, - "mass": 44 + "mass": 44, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bL", @@ -1685,7 +1953,11 @@ "eddbID": 1473, "grp": "bh", "cost": 32232790, - "mass": 87 + "mass": 87, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bM", @@ -1693,7 +1965,11 @@ "eddbID": 1474, "grp": "bh", "cost": 76176810, - "mass": 87 + "mass": 87, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bN", @@ -1701,7 +1977,11 @@ "eddbID": 1475, "grp": "bh", "cost": 84414090, - "mass": 87 + "mass": 87, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1793,7 +2073,11 @@ "eddbID": 813, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "Be", @@ -1801,7 +2085,11 @@ "eddbID": 814, "grp": "bh", "cost": 20626820, - "mass": 19 + "mass": 19, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "Bf", @@ -1809,7 +2097,11 @@ "eddbID": 815, "grp": "bh", "cost": 46410340, - "mass": 38 + "mass": 38, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "Bg", @@ -1817,7 +2109,11 @@ "eddbID": 816, "grp": "bh", "cost": 109683090, - "mass": 38 + "mass": 38, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "Bh", @@ -1825,7 +2121,11 @@ "eddbID": 817, "grp": "bh", "cost": 121543510, - "mass": 38 + "mass": 38, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -1917,7 +2217,11 @@ "eddbID": 748, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "Bj", @@ -1925,7 +2229,11 @@ "eddbID": 749, "grp": "bh", "cost": 42180, - "mass": 1 + "mass": 1, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "Bk", @@ -1933,7 +2241,11 @@ "eddbID": 750, "grp": "bh", "cost": 185050, - "mass": 2 + "mass": 2, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "Bl", @@ -1941,7 +2253,11 @@ "eddbID": 751, "grp": "bh", "cost": 270300, - "mass": 2 + "mass": 2, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "Bm", @@ -1949,7 +2265,11 @@ "eddbID": 752, "grp": "bh", "cost": 282420, - "mass": 2 + "mass": 2, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2023,7 +2343,11 @@ "eddbID": 788, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bq", @@ -2031,7 +2355,11 @@ "eddbID": 789, "grp": "bh", "cost": 8918340, - "mass": 30 + "mass": 30, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "br", @@ -2039,7 +2367,11 @@ "eddbID": 790, "grp": "bh", "cost": 20066270, - "mass": 60 + "mass": 60, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bs", @@ -2047,7 +2379,11 @@ "eddbID": 791, "grp": "bh", "cost": 47423290, - "mass": 60 + "mass": 60, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bt", @@ -2055,7 +2391,11 @@ "eddbID": 792, "grp": "bh", "cost": 52551340, - "mass": 60 + "mass": 60, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2147,7 +2487,11 @@ "eddbID": 1389, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bg", @@ -2155,7 +2499,11 @@ "eddbID": 1390, "grp": "bh", "cost": 1017200, - "mass": 4 + "mass": 4, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bh", @@ -2163,7 +2511,11 @@ "eddbID": 1391, "grp": "bh", "cost": 2288600, - "mass": 8 + "mass": 8, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bi", @@ -2171,7 +2523,11 @@ "eddbID": 1392, "grp": "bh", "cost": 5408800, - "mass": 8 + "mass": 8, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bj", @@ -2179,7 +2535,11 @@ "eddbID": 1393, "grp": "bh", "cost": 5993700, - "mass": 8 + "mass": 8, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2266,7 +2626,11 @@ "eddbID": 1493, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "BS", @@ -2274,7 +2638,11 @@ "eddbID": 1494, "grp": "bh", "cost": 83587790, - "mass": 30 + "mass": 30, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "BT", @@ -2282,7 +2650,11 @@ "eddbID": 1495, "grp": "bh", "cost": 188072510, - "mass": 60 + "mass": 60, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "BU", @@ -2290,7 +2662,11 @@ "eddbID": 1496, "grp": "bh", "cost": 444478020, - "mass": 60 + "mass": 60, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "BV", @@ -2298,7 +2674,11 @@ "eddbID": 1497, "grp": "bh", "cost": 492541000, - "mass": 60 + "mass": 60, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2406,7 +2786,11 @@ "eddbID": 1461, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bv", @@ -2414,7 +2798,11 @@ "eddbID": 1462, "grp": "bh", "cost": 66500, - "mass": 4 + "mass": 4, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bw", @@ -2422,7 +2810,11 @@ "eddbID": 1463, "grp": "bh", "cost": 222760, - "mass": 8 + "mass": 8, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bx", @@ -2430,7 +2822,11 @@ "eddbID": 1464, "grp": "bh", "cost": 346550, - "mass": 8 + "mass": 8, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "by", @@ -2438,7 +2834,11 @@ "eddbID": 1465, "grp": "bh", "cost": 372040, - "mass": 8 + "mass": 8, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2515,7 +2915,11 @@ "eddbID": 1513, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "cc", @@ -2523,7 +2927,11 @@ "eddbID": 1514, "grp": "bh", "cost": 1250460, - "mass": 12 + "mass": 12, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "cd", @@ -2531,7 +2939,11 @@ "eddbID": 1515, "grp": "bh", "cost": 2813540, - "mass": 23 + "mass": 23, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "ce", @@ -2539,7 +2951,11 @@ "eddbID": 1516, "grp": "bh", "cost": 6649330, - "mass": 23 + "mass": 23, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "cf", @@ -2547,7 +2963,11 @@ "eddbID": 1517, "grp": "bh", "cost": 7368340, - "mass": 23 + "mass": 23, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2634,7 +3054,11 @@ "eddbID": 798, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "BN", @@ -2642,7 +3066,11 @@ "eddbID": 799, "grp": "bh", "cost": 19415950, - "mass": 21 + "mass": 21, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "BO", @@ -2650,7 +3078,11 @@ "eddbID": 800, "grp": "bh", "cost": 43685900, - "mass": 87 + "mass": 87, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "BP", @@ -2658,7 +3090,11 @@ "eddbID": 801, "grp": "bh", "cost": 103244340, - "mass": 87 + "mass": 87, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "BQ", @@ -2666,7 +3102,11 @@ "eddbID": 802, "grp": "bh", "cost": 114408510, - "mass": 87 + "mass": 87, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2776,7 +3216,11 @@ "eddbID": 808, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "bP", @@ -2784,7 +3228,11 @@ "eddbID": 809, "grp": "bh", "cost": 22791270, - "mass": 26 + "mass": 26, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "bQ", @@ -2792,7 +3240,11 @@ "eddbID": 810, "grp": "bh", "cost": 51280360, - "mass": 53 + "mass": 53, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "bR", @@ -2800,7 +3252,11 @@ "eddbID": 811, "grp": "bh", "cost": 121192590, - "mass": 53 + "mass": 53, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "bS", @@ -2808,7 +3264,11 @@ "eddbID": 812, "grp": "bh", "cost": 134297570, - "mass": 53 + "mass": 53, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -2904,7 +3364,11 @@ "eddbID": 738, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "b1", @@ -2912,7 +3376,11 @@ "eddbID": 739, "grp": "bh", "cost": 25600, - "mass": 2 + "mass": 2, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "b2", @@ -2920,7 +3388,11 @@ "eddbID": 740, "grp": "bh", "cost": 80320, - "mass": 4 + "mass": 4, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "b3", @@ -2928,7 +3400,11 @@ "eddbID": 741, "grp": "bh", "cost": 132060, - "mass": 4 + "mass": 4, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "b4", @@ -2936,7 +3412,11 @@ "eddbID": 742, "grp": "bh", "cost": 139420, - "mass": 4 + "mass": 4, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -3012,7 +3492,11 @@ "eddbID": 768, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "Bo", @@ -3020,7 +3504,11 @@ "eddbID": 769, "grp": "bh", "cost": 418380, - "mass": 12 + "mass": 12, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "Bp", @@ -3028,7 +3516,11 @@ "eddbID": 770, "grp": "bh", "cost": 941350, - "mass": 23 + "mass": 23, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "Bq", @@ -3036,7 +3528,11 @@ "eddbID": 771, "grp": "bh", "cost": 2224730, - "mass": 23 + "mass": 23, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "Br", @@ -3044,7 +3540,11 @@ "eddbID": 772, "grp": "bh", "cost": 2465290, - "mass": 23 + "mass": 23, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -3128,7 +3628,11 @@ "eddbID": 773, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "Bt", @@ -3136,7 +3640,11 @@ "eddbID": 774, "grp": "bh", "cost": 6988900, - "mass": 32 + "mass": 32, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "Bu", @@ -3144,7 +3652,11 @@ "eddbID": 775, "grp": "bh", "cost": 15725030, - "mass": 63 + "mass": 63, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "Bv", @@ -3152,7 +3664,11 @@ "eddbID": 776, "grp": "bh", "cost": 37163480, - "mass": 63 + "mass": 63, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "Bw", @@ -3160,7 +3676,11 @@ "eddbID": 777, "grp": "bh", "cost": 41182100, - "mass": 63 + "mass": 63, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -3253,7 +3773,11 @@ "eddbID": 803, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "By", @@ -3261,7 +3785,11 @@ "eddbID": 804, "grp": "bh", "cost": 30622340, - "mass": 75 + "mass": 75, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "Bz", @@ -3269,7 +3797,11 @@ "eddbID": 805, "grp": "bh", "cost": 68900260, - "mass": 150 + "mass": 150, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "BA", @@ -3277,7 +3809,11 @@ "eddbID": 806, "grp": "bh", "cost": 162834280, - "mass": 150 + "mass": 150, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "BB", @@ -3285,7 +3821,11 @@ "eddbID": 807, "grp": "bh", "cost": 180442120, - "mass": 150 + "mass": 150, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -3381,7 +3921,11 @@ "eddbID": 758, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "B4", @@ -3389,7 +3933,11 @@ "eddbID": 759, "grp": "bh", "cost": 57170, - "mass": 5 + "mass": 5, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "B5", @@ -3397,7 +3945,11 @@ "eddbID": 760, "grp": "bh", "cost": 128640, - "mass": 9 + "mass": 9, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "B6", @@ -3405,7 +3957,11 @@ "eddbID": 761, "grp": "bh", "cost": 304010, - "mass": 9 + "mass": 9, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "B7", @@ -3413,7 +3969,11 @@ "eddbID": 762, "grp": "bh", "cost": 336890, - "mass": 9 + "mass": 9, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -3493,7 +4053,11 @@ "eddbID": 1508, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "c7", @@ -3501,7 +4065,11 @@ "eddbID": 1509, "grp": "bh", "cost": 175180, - "mass": 5 + "mass": 5, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "c8", @@ -3509,7 +4077,11 @@ "eddbID": 1510, "grp": "bh", "cost": 394140, - "mass": 9 + "mass": 9, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "c9", @@ -3517,7 +4089,11 @@ "eddbID": 1511, "grp": "bh", "cost": 931490, - "mass": 9 + "mass": 9, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "ca", @@ -3525,7 +4101,11 @@ "eddbID": 1512, "grp": "bh", "cost": 1033210, - "mass": 9 + "mass": 9, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { @@ -3609,7 +4189,11 @@ "eddbID": 783, "grp": "bh", "cost": 0, - "mass": 0 + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0.2, + "hullboost": 0.8 }, { "id": "B9", @@ -3617,7 +4201,11 @@ "eddbID": 784, "grp": "bh", "cost": 1970250, - "mass": 17 + "mass": 17, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 1.52 }, { "id": "Ba", @@ -3625,7 +4213,11 @@ "eddbID": 785, "grp": "bh", "cost": 4433050, - "mass": 35 + "mass": 35, + "explres": -0.4, + "kinres": 0.2, + "thermres": 0, + "hullboost": 2.5 }, { "id": "Bb", @@ -3633,7 +4225,11 @@ "eddbID": 786, "grp": "bh", "cost": 10476780, - "mass": 35 + "mass": 35, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 }, { "id": "Bc", @@ -3641,7 +4237,11 @@ "eddbID": 787, "grp": "bh", "cost": 11609670, - "mass": 35 + "mass": 35, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 } ], "slots": { diff --git a/ships/adder.json b/ships/adder.json index 0ba7fb1..d1528a8 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -19,11 +19,11 @@ }, "retailCost": 87810, "bulkheads": [ - { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3 }, - { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5 }, - { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5 }, - { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5 } + { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [3, 3, 3, 1, 2, 3, 3], diff --git a/ships/anaconda.json b/ships/anaconda.json index de13e04..49c8480 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -20,11 +20,11 @@ }, "retailCost": 146969450, "bulkheads": [ - { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30 }, - { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60 }, - { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60 }, - { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60 } + { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [8, 7, 6, 5, 8, 8, 5], diff --git a/ships/asp.json b/ships/asp.json index e212c9d..316468d 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -19,11 +19,11 @@ }, "retailCost": 6661150, "bulkheads": [ - { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21 }, - { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42 }, - { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42 }, - { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42 } + { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [5, 5, 5, 4, 4, 5, 5], diff --git a/ships/asp_scout.json b/ships/asp_scout.json index f2ed2da..c3b8dec 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -18,11 +18,11 @@ }, "retailCost": 3961150, "bulkheads": [ - { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21 }, - { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42 }, - { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42 }, - { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42 } + { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [4, 4, 4, 3, 4, 4, 4], diff --git a/ships/beluga.json b/ships/beluga.json index 248d8e0..45f44d3 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -21,11 +21,11 @@ }, "retailCost": 84532770, "bulkheads": [ - { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0 }, - { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83 }, - { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165 }, - { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165 }, - { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165 } + { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 7, 7, 8, 6, 5, 7], diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index f1d89da..99c65b5 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -19,11 +19,11 @@ }, "retailCost": 349720, "bulkheads": [ - { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14 }, - { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27 }, - { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27 }, - { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27 } + { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [4, 4, 4, 3, 3, 3, 4], diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 54a1a9c..cc1d770 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -19,11 +19,11 @@ }, "retailCost": 747660, "bulkheads": [ - { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14 }, - { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27 }, - { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27 }, - { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27 } + { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [4, 4, 4, 3, 3, 3, 4], diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index a290d7b..973b650 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -18,11 +18,11 @@ }, "retailCost": 1894760, "bulkheads": [ - { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23 }, - { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47 }, - { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26 }, - { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47 } + { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [ 4, 4, 5, 3, 4, 3, 5], diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 1937056..a625e4e 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -19,11 +19,11 @@ }, "retailCost": 564330, "bulkheads": [ - { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13 }, - { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26 }, - { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26 }, - { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26 } + { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [ 4, 4, 4, 2, 3, 2, 4], diff --git a/ships/eagle.json b/ships/eagle.json index c2eb613..4945318 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -19,11 +19,11 @@ }, "retailCost": 44800, "bulkheads": [ - { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4 }, - { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8 }, - { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8 }, - { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8 } + { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [2, 3, 3, 1, 2, 2, 2], diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index ab64185..19dc3ed 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -18,11 +18,11 @@ }, "retailCost": 19814210, "bulkheads": [ - { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44 }, - { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87 }, - { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87 }, - { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87 } + { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index 40c5f15..9bf0712 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -20,11 +20,11 @@ }, "retailCost": 187969450, "bulkheads": [ - { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30 }, - { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60 }, - { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60 }, - { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60 } + { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [8, 7, 6, 5, 8, 8, 5], diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 1b18c25..f095c0e 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -19,11 +19,11 @@ }, "retailCost": 14314210, "bulkheads": [ - { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44 }, - { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87 }, - { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87 }, - { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87 } + { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index 73f58a2..b0bbfca 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -20,11 +20,11 @@ }, "retailCost": 35814210, "bulkheads": [ - { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44 }, - { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87 }, - { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87 }, - { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87 } + { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 6, 5, 5, 7, 5, 4], diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index 879ab12..e385cff 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -19,11 +19,11 @@ }, "retailCost": 51567040, "bulkheads": [ - { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19 }, - { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38 }, - { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38 }, - { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38 } + { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 5, 4, 4, 6, 4, 3], diff --git a/ships/hauler.json b/ships/hauler.json index ff8caee..4505e79 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -19,11 +19,11 @@ }, "retailCost": 52720, "bulkheads": [ - { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1 }, - { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2 }, - { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2 }, - { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2 } + { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [2, 2, 2, 1, 1, 1, 2], diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index 9db7e45..39e6e94 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -19,11 +19,11 @@ }, "retailCost": 22296860, "bulkheads": [ - { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30 }, - { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60 }, - { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60 }, - { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60 } + { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 6, 5, 5, 6, 5, 4], diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index 766cfcf..d107787 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -18,11 +18,11 @@ }, "retailCost": 2542930, "bulkheads": [ - { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4 }, - { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8 }, - { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8 }, - { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8 } + { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [ 4, 3, 3, 1, 3, 2, 3], diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 89c3d14..f0e2797 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -19,11 +19,11 @@ }, "retailCost": 208969450, "bulkheads": [ - { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30 }, - { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60 }, - { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60 }, - { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60 } + { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [8, 8, 7, 7, 7, 7, 6], diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 5e448d7..d2e668c 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -19,11 +19,11 @@ }, "retailCost": 110830, "bulkheads": [ - { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4 }, - { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8 }, - { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8 }, - { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8 } + { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [3, 3, 3, 1, 2, 2, 2], diff --git a/ships/keelback.json b/ships/keelback.json index eea97e2..3688fd9 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -20,11 +20,11 @@ }, "retailCost": 3126150, "bulkheads": [ - { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12 }, - { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23 }, - { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23 }, - { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23 } + { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [4, 4, 4, 1, 3, 2, 4], diff --git a/ships/orca.json b/ships/orca.json index 0b9f78c..3d6ca9f 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -20,11 +20,11 @@ }, "retailCost": 48539890, "bulkheads": [ - { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21 }, - { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87 }, - { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87 }, - { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87 } + { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [5, 6, 5, 6, 5, 4, 5], diff --git a/ships/python.json b/ships/python.json index 1776c9a..e308ef1 100755 --- a/ships/python.json +++ b/ships/python.json @@ -19,11 +19,11 @@ }, "retailCost": 56978180, "bulkheads": [ - { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26 }, - { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53 }, - { "id": "bR", "edID": 128049343, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 53 }, - { "id": "bS", "edID": 128049344, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 53 } + { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "bR", "edID": 128049343, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 53, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "bS", "edID": 128049344, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 53, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [7, 6, 5, 4, 7, 6, 5], diff --git a/ships/sidewinder.json b/ships/sidewinder.json index fe0f259..dc6611d 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -19,11 +19,11 @@ }, "retailCost": 40800, "bulkheads": [ - { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2 }, - { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4 }, - { "id": "b3", "edID": 128049253, "eddbID": 741, "grp": "bh", "cost": 132060, "mass": 4 }, - { "id": "b4", "edID": 128049254, "eddbID": 742, "grp": "bh", "cost": 139420, "mass": 4 } + { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "b3", "edID": 128049253, "eddbID": 741, "grp": "bh", "cost": 132060, "mass": 4, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "b4", "edID": 128049254, "eddbID": 742, "grp": "bh", "cost": 139420, "mass": 4, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [2, 2, 2, 1, 1, 1, 1], diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 19b285a..3764a5f 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -19,11 +19,11 @@ }, "retailCost": 1045950, "bulkheads": [ - { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12 }, - { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23 }, - { "id": "Bq", "edID": 128049289, "eddbID": 771, "grp": "bh", "cost": 2224730, "mass": 23 }, - { "id": "Br", "edID": 128049290, "eddbID": 772, "grp": "bh", "cost": 2465290, "mass": 23 } + { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "Bq", "edID": 128049289, "eddbID": 771, "grp": "bh", "cost": 2224730, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "Br", "edID": 128049290, "eddbID": 772, "grp": "bh", "cost": 2465290, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [3, 4, 4, 2, 3, 2, 4], diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index bbb43c5..0dae4c0 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -19,11 +19,11 @@ }, "retailCost": 17472250, "bulkheads": [ - { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32 }, - { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63 }, - { "id": "Bv", "edID": 128049301, "eddbID": 776, "grp": "bh", "cost": 37163480, "mass": 63 }, - { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63 } + { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "Bv", "edID": 128049301, "eddbID": 776, "grp": "bh", "cost": 37163480, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [4, 5, 5, 4, 3, 3, 5], diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index 5fb07b4..e87df9b 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -20,11 +20,11 @@ }, "retailCost": 76555840, "bulkheads": [ - { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75 }, - { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150 }, - { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150 }, - { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150 } + { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 7, 6, 5, 6, 4, 6], diff --git a/ships/viper.json b/ships/viper.json index 88127f1..f800e57 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -19,11 +19,11 @@ }, "retailCost": 142930, "bulkheads": [ - { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5 }, - { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9 }, - { "id": "B6", "edID": 128049277, "eddbID": 761, "grp": "bh", "cost": 304010, "mass": 9 }, - { "id": "B7", "edID": 128049278, "eddbID": 762, "grp": "bh", "cost": 336890, "mass": 9 } + { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "B6", "edID": 128049277, "eddbID": 761, "grp": "bh", "cost": 304010, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "B7", "edID": 128049278, "eddbID": 762, "grp": "bh", "cost": 336890, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [3, 3, 3, 2, 3, 3, 2], diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index bf4d5f8..42b8bb5 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -19,11 +19,11 @@ }, "retailCost": 437930, "bulkheads": [ - { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5 }, - { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9 }, - { "id": "c9", "edID": 128672260, "eddbID": 1511, "grp": "bh", "cost": 931490, "mass": 9 }, - { "id": "ca", "edID": 128672261, "eddbID": 1512, "grp": "bh", "cost": 1033210, "mass": 9 } + { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "c9", "edID": 128672260, "eddbID": 1511, "grp": "bh", "cost": 931490, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "ca", "edID": 128672261, "eddbID": 1512, "grp": "bh", "cost": 1033210, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [4, 4, 4, 2, 3, 3, 4], diff --git a/ships/vulture.json b/ships/vulture.json index 8d673e2..380881b 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -19,11 +19,11 @@ }, "retailCost": 4925620, "bulkheads": [ - { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0 }, - { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17 }, - { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35 }, - { "id": "Bb", "edID": 128049313, "eddbID": 786, "grp": "bh", "cost": 10476780, "mass": 35 }, - { "id": "Bc", "edID": 128049314, "eddbID": 787, "grp": "bh", "cost": 11609670, "mass": 35 } + { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, + { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "Bb", "edID": 128049313, "eddbID": 786, "grp": "bh", "cost": 10476780, "mass": 35, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "Bc", "edID": 128049314, "eddbID": 787, "grp": "bh", "cost": 11609670, "mass": 35, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [4, 5, 4, 3, 5, 4, 3], From 85580d11f6d5531245b9034796f3633c973f8f2e Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 2 Nov 2016 13:32:35 +0000 Subject: [PATCH 43/49] Updated HRPs --- dist/index.js | 22 +++++++++---------- dist/index.json | 22 +++++++++---------- modifications/validity.json | 2 +- .../internal/hull_reinforcement_package.json | 20 ++++++++--------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dist/index.js b/dist/index.js index d0fdd78..47c4e64 100644 --- a/dist/index.js +++ b/dist/index.js @@ -10798,7 +10798,7 @@ module.exports = { time: 18 } ], hr: [ { - armouradd: 360, + hullreinforcement: 360, class: 5, cost: 15e4, edID: 128668545, @@ -10808,7 +10808,7 @@ module.exports = { mass: 64, rating: "E" }, { - armouradd: 390, + hullreinforcement: 390, class: 5, cost: 45e4, edID: 128668546, @@ -10818,7 +10818,7 @@ module.exports = { mass: 32, rating: "D" }, { - armouradd: 300, + hullreinforcement: 300, class: 4, cost: 65e3, edID: 128668543, @@ -10828,7 +10828,7 @@ module.exports = { mass: 32, rating: "E" }, { - armouradd: 330, + hullreinforcement: 330, class: 4, cost: 195e3, edID: 128668544, @@ -10838,7 +10838,7 @@ module.exports = { mass: 16, rating: "D" }, { - armouradd: 230, + hullreinforcement: 230, class: 3, cost: 28e3, edID: 128668541, @@ -10848,7 +10848,7 @@ module.exports = { mass: 16, rating: "E" }, { - armouradd: 260, + hullreinforcement: 260, class: 3, cost: 84e3, edID: 128668542, @@ -10858,7 +10858,7 @@ module.exports = { mass: 8, rating: "D" }, { - armouradd: 150, + hullreinforcement: 150, class: 2, cost: 12e3, edID: 128668539, @@ -10868,7 +10868,7 @@ module.exports = { mass: 8, rating: "E" }, { - armouradd: 190, + hullreinforcement: 190, class: 2, cost: 36e3, edID: 128668540, @@ -10878,7 +10878,7 @@ module.exports = { mass: 4, rating: "D" }, { - armouradd: 80, + hullreinforcement: 80, class: 1, cost: 5e3, edID: 128668537, @@ -10888,7 +10888,7 @@ module.exports = { mass: 4, rating: "E" }, { - armouradd: 110, + hullreinforcement: 110, class: 1, cost: 15e3, edID: 128668538, @@ -13138,7 +13138,7 @@ module.exports = { fsd: [ "boot", "integrity", "mass", "maxfuel", "optmass", "power", "thermload" ], fx: [ "integrity", "mass", "power" ], hb: [ "integrity", "mass", "power" ], - hr: [ "armour", "explres", "hullboost", "kinres", "mass", "thermres" ], + hr: [ "hullreinforcement", "explres", "hullboost", "kinres", "mass", "thermres" ], hs: [ "ammo", "integrity", "mass", "power", "reload" ], kw: [ "boot", "integrity", "mass", "power" ], ls: [ "boot", "integrity", "mass", "power" ], diff --git a/dist/index.json b/dist/index.json index 74c0279..e50d030 100644 --- a/dist/index.json +++ b/dist/index.json @@ -13025,7 +13025,7 @@ ], "hr": [ { - "armouradd": 360, + "hullreinforcement": 360, "class": 5, "cost": 150000, "edID": 128668545, @@ -13036,7 +13036,7 @@ "rating": "E" }, { - "armouradd": 390, + "hullreinforcement": 390, "class": 5, "cost": 450000, "edID": 128668546, @@ -13047,7 +13047,7 @@ "rating": "D" }, { - "armouradd": 300, + "hullreinforcement": 300, "class": 4, "cost": 65000, "edID": 128668543, @@ -13058,7 +13058,7 @@ "rating": "E" }, { - "armouradd": 330, + "hullreinforcement": 330, "class": 4, "cost": 195000, "edID": 128668544, @@ -13069,7 +13069,7 @@ "rating": "D" }, { - "armouradd": 230, + "hullreinforcement": 230, "class": 3, "cost": 28000, "edID": 128668541, @@ -13080,7 +13080,7 @@ "rating": "E" }, { - "armouradd": 260, + "hullreinforcement": 260, "class": 3, "cost": 84000, "edID": 128668542, @@ -13091,7 +13091,7 @@ "rating": "D" }, { - "armouradd": 150, + "hullreinforcement": 150, "class": 2, "cost": 12000, "edID": 128668539, @@ -13102,7 +13102,7 @@ "rating": "E" }, { - "armouradd": 190, + "hullreinforcement": 190, "class": 2, "cost": 36000, "edID": 128668540, @@ -13113,7 +13113,7 @@ "rating": "D" }, { - "armouradd": 80, + "hullreinforcement": 80, "class": 1, "cost": 5000, "edID": 128668537, @@ -13124,7 +13124,7 @@ "rating": "E" }, { - "armouradd": 110, + "hullreinforcement": 110, "class": 1, "cost": 15000, "edID": 128668538, @@ -15664,7 +15664,7 @@ "power" ], "hr": [ - "armour", + "hullreinforcement", "explres", "hullboost", "kinres", diff --git a/modifications/validity.json b/modifications/validity.json index 6837f61..d8aa2c8 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -120,7 +120,7 @@ "power" ], "hr": [ - "armour", + "hullreinforcement", "explres", "hullboost", "kinres", diff --git a/modules/internal/hull_reinforcement_package.json b/modules/internal/hull_reinforcement_package.json index e205627..78e595a 100644 --- a/modules/internal/hull_reinforcement_package.json +++ b/modules/internal/hull_reinforcement_package.json @@ -1,7 +1,7 @@ { "hr": [ { - "armouradd": 360, + "hullreinforcement": 360, "class": 5, "cost": 150000, "edID": 128668545, @@ -12,7 +12,7 @@ "rating": "E" }, { - "armouradd": 390, + "hullreinforcement": 390, "class": 5, "cost": 450000, "edID": 128668546, @@ -23,7 +23,7 @@ "rating": "D" }, { - "armouradd": 300, + "hullreinforcement": 300, "class": 4, "cost": 65000, "edID": 128668543, @@ -34,7 +34,7 @@ "rating": "E" }, { - "armouradd": 330, + "hullreinforcement": 330, "class": 4, "cost": 195000, "edID": 128668544, @@ -45,7 +45,7 @@ "rating": "D" }, { - "armouradd": 230, + "hullreinforcement": 230, "class": 3, "cost": 28000, "edID": 128668541, @@ -56,7 +56,7 @@ "rating": "E" }, { - "armouradd": 260, + "hullreinforcement": 260, "class": 3, "cost": 84000, "edID": 128668542, @@ -67,7 +67,7 @@ "rating": "D" }, { - "armouradd": 150, + "hullreinforcement": 150, "class": 2, "cost": 12000, "edID": 128668539, @@ -78,7 +78,7 @@ "rating": "E" }, { - "armouradd": 190, + "hullreinforcement": 190, "class": 2, "cost": 36000, "edID": 128668540, @@ -89,7 +89,7 @@ "rating": "D" }, { - "armouradd": 80, + "hullreinforcement": 80, "class": 1, "cost": 5000, "edID": 128668537, @@ -100,7 +100,7 @@ "rating": "E" }, { - "armouradd": 110, + "hullreinforcement": 110, "class": 1, "cost": 15000, "edID": 128668538, From ecfc5157f2315b5f55507b6d66a0dcc53b4f2c9e Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 3 Nov 2016 10:47:16 +0000 Subject: [PATCH 44/49] Move hardpoints to using pure damage/dist/therm numbers --- dist/index.js | 2730 +++++++++---------- dist/index.json | 2820 ++++++++++---------- modules/hardpoints/beam_laser.json | 382 +-- modules/hardpoints/burst_laser.json | 440 +-- modules/hardpoints/cannon.json | 502 ++-- modules/hardpoints/fragment_cannon.json | 221 +- modules/hardpoints/mine_launcher.json | 66 +- modules/hardpoints/mining_laser.json | 59 +- modules/hardpoints/missile_rack.json | 143 +- modules/hardpoints/multi_cannon.json | 427 +-- modules/hardpoints/plasma_accelerator.json | 130 +- modules/hardpoints/point_defence.json | 2 +- modules/hardpoints/pulse_laser.json | 406 +-- modules/hardpoints/rail_gun.json | 29 +- modules/hardpoints/torpedo_pylon.json | 12 +- 15 files changed, 4221 insertions(+), 4148 deletions(-) diff --git a/dist/index.js b/dist/index.js index 47c4e64..b69504c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -6001,194 +6001,17 @@ module.exports = { }, hardpoints: { pl: [ { - armourpen: 65, - breachdps: 22.62, - breachmax: .8, - breachmin: .4, - class: 4, - cost: 177600, - dps: 26.9, - edID: 128049384, - eddbID: 1539, - eps: 4.264, - grp: "pl", - hps: 4.16, - id: "7q", - integrity: 80, - mass: 16, - mount: "F", - power: 1.33, - range: 3e3, - rating: "A", - rof: 2.6, - type: "T" - }, { - armourpen: 65, - breachdps: 18.48, - breachmax: .8, - breachmin: .4, - class: 4, - cost: 877600, - dps: 21.7, - edID: 128681995, - eddbID: 1545, - eps: 4.368, - grp: "pl", - hps: 4.48, - id: "7r", - integrity: 80, - mass: 16, - mount: "G", - power: 1.37, - range: 3e3, - rating: "A", - rof: 2.8, - type: "T" - }, { - armourpen: 52, - breachdps: 15.3, - breachmax: .8, - breachmin: .4, - class: 3, - cost: 70400, - dps: 18.1, - edID: 128049383, - eddbID: 825, - eps: 2.88, - grp: "pl", - hps: 3, - id: "1d", - integrity: 64, - mass: 8, - mount: "F", - power: .9, - range: 3e3, - rating: "D", - rof: 3, - type: "T" - }, { - armourpen: 52, - breachdps: 12.48, - breachmax: .8, - breachmin: .4, - class: 3, - cost: 140600, - dps: 14.8, - edID: 128049387, - eddbID: 828, - eps: 2.944, - grp: "pl", - hps: 2.88, - id: "1e", - integrity: 64, - mass: 8, - mount: "G", - power: .92, - range: 3e3, - rating: "E", - rof: 3.2, - type: "T" - }, { - armourpen: 52, - breachdps: 8.1, - breachmax: .8, - breachmin: .4, - class: 3, - cost: 400400, - dps: 9.5, - edID: 128049390, - eddbID: 831, - eps: 1.512, - grp: "pl", - hps: 1.62, - id: "1f", - integrity: 64, - mass: 8, - mount: "T", - power: .89, - range: 3e3, - rating: "F", - rof: 2.7, - type: "T" - }, { - armourpen: 35, - breachdps: 10.2, - breachmax: .8, - breachmin: .4, - class: 2, - cost: 17600, - dps: 12.1, - edID: 128049382, - eddbID: 824, - eps: 1.904, - grp: "pl", - hps: 2.04, - id: "1a", - integrity: 51, - mass: 4, - mount: "F", - power: .6, - range: 3e3, - rating: "F", - rof: 3.4, - type: "T" - }, { - armourpen: 35, - breachdps: 8.28, - breachmax: .8, - breachmin: .4, - class: 2, - cost: 35400, - dps: 9.6, - edID: 128049386, - eddbID: 827, - eps: 1.944, - grp: "pl", - hps: 1.8, - id: "1b", - integrity: 51, - mass: 4, - mount: "G", - power: .6, - range: 3e3, - rating: "F", - rof: 3.6, - type: "T" - }, { - armourpen: 35, - breachdps: 5.1, - breachmax: .8, - breachmin: .4, - class: 2, - cost: 132800, - dps: 6.2, - edID: 128049389, - eddbID: 830, - eps: 1, - grp: "pl", - hps: .9, - id: "1c", - integrity: 51, - mass: 4, - mount: "T", - power: .58, - range: 3e3, - rating: "F", - rof: 3, - type: "T" - }, { armourpen: 20, - breachdps: 6.46, + breachdmg: 2.04, breachmax: .8, breachmin: .4, class: 1, cost: 2200, - dps: 7.9, + damage: 2.04, + distdraw: .33, edID: 128049381, eddbID: 823, - eps: 1.254, grp: "pl", - hps: 1.14, id: "17", integrity: 40, mass: 2, @@ -6196,21 +6019,21 @@ module.exports = { power: .39, range: 3e3, rating: "F", - rof: 3.8, + rof: 3.847, + thermload: .3, type: "T" }, { armourpen: 20, - breachdps: 5.2, + breachdmg: 1.3, breachmax: .8, breachmin: .4, class: 1, cost: 6600, - dps: 6.2, + damage: 1.56, + distdraw: .31, edID: 128049385, eddbID: 826, - eps: 1.24, grp: "pl", - hps: 1.2, id: "18", integrity: 40, mass: 2, @@ -6218,21 +6041,21 @@ module.exports = { power: .39, range: 3e3, rating: "G", - rof: 4, + rof: 3.987, + thermload: .3, type: "T" }, { armourpen: 20, - breachdps: 3.3, + breachdmg: 1, breachmax: .8, breachmin: .4, class: 1, cost: 26e3, - dps: 4, + damage: 1.18, + distdraw: .19, edID: 128049388, eddbID: 829, - eps: .627, grp: "pl", - hps: 6.6, id: "19", integrity: 40, mass: 2, @@ -6240,14 +6063,84 @@ module.exports = { power: .38, range: 3e3, rating: "G", - rof: 3.3, + rof: 3.339, + thermload: .2, + type: "T" + }, { + armourpen: 35, + breachdmg: 3, + breachmax: .8, + breachmin: .4, + class: 2, + cost: 17600, + damage: 3.49, + distdraw: .56, + edID: 128049382, + eddbID: 824, + grp: "pl", + id: "1a", + integrity: 51, + mass: 4, + mount: "F", + power: .6, + range: 3e3, + rating: "F", + rof: 3.448, + thermload: .6, + type: "T" + }, { + armourpen: 35, + breachdmg: 2.3, + breachmax: .8, + breachmin: .4, + class: 2, + cost: 35400, + damage: 2.68, + distdraw: .54, + edID: 128049386, + eddbID: 827, + grp: "pl", + id: "1b", + integrity: 51, + mass: 4, + mount: "G", + power: .6, + range: 3e3, + rating: "F", + rof: 3.567, + thermload: .5, + type: "T" + }, { + armourpen: 35, + breachdmg: 1.7, + breachmax: .8, + breachmin: .4, + class: 2, + cost: 132800, + damage: 2.04, + distdraw: .33, + edID: 128049389, + eddbID: 830, + grp: "pl", + id: "1c", + integrity: 51, + mass: 4, + mount: "T", + power: .58, + range: 3e3, + rating: "F", + rof: 3.037, + thermload: .3, type: "T" }, { armourpen: "A", + breachdmg: 2.4, + breachmax: .8, + breachmin: .4, class: 2, cost: 26400, - damage: 2, - dps: 2, + damage: 2.8, + distdraw: 1, eddbID: 1483, grp: "pl", id: "PL", @@ -6257,217 +6150,134 @@ module.exports = { power: .7, pp: "Felicia Winters", rating: "E", - rof: 1.6, + rof: 1.664, thermload: 1, type: "T" + }, { + armourpen: 52, + breachdmg: 5.1, + breachmax: .8, + breachmin: .4, + class: 3, + cost: 70400, + damage: 5.98, + distdraw: .96, + edID: 128049383, + eddbID: 825, + grp: "pl", + id: "1d", + integrity: 64, + mass: 8, + mount: "F", + power: .9, + range: 3e3, + rating: "D", + rof: 3.3, + thermload: 1, + type: "T" + }, { + armourpen: 52, + breachdmg: 3.9, + breachmax: .8, + breachmin: .4, + class: 3, + cost: 140600, + damage: 4.58, + distdraw: .92, + edID: 128049387, + eddbID: 828, + grp: "pl", + id: "1e", + integrity: 64, + mass: 8, + mount: "G", + power: .92, + range: 3e3, + rating: "E", + rof: 3.223, + thermload: .9, + type: "T" + }, { + armourpen: 52, + breachdmg: 3, + breachmax: .8, + breachmin: .4, + class: 3, + cost: 400400, + damage: 3.49, + distdraw: .56, + edID: 128049390, + eddbID: 831, + grp: "pl", + id: "1f", + integrity: 64, + mass: 8, + mount: "T", + power: .89, + range: 3e3, + rating: "F", + rof: 2.705, + thermload: .6, + type: "T" + }, { + armourpen: 65, + breachdmg: 8.7, + breachmax: .8, + breachmin: .4, + class: 4, + cost: 177600, + damage: 10.23, + distdraw: 1.64, + edID: 128049384, + eddbID: 1539, + grp: "pl", + id: "7q", + integrity: 80, + mass: 16, + mount: "F", + power: 1.33, + range: 3e3, + rating: "A", + rof: 2.633, + thermload: 1.6, + type: "T" + }, { + armourpen: 65, + breachdmg: 6.6, + breachmax: .8, + breachmin: .4, + class: 4, + cost: 877600, + damage: 7.82, + distdraw: 1.56, + edID: 128681995, + eddbID: 1545, + grp: "pl", + id: "7r", + integrity: 80, + mass: 16, + mount: "G", + power: 1.37, + range: 3e3, + rating: "A", + rof: 2.777, + thermload: 1.6, + type: "T" } ], ul: [ { - armourpen: 65, - breachdps: 28, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 3, - class: 4, - cost: 281600, - dps: 32.3, - edID: 128049403, - eddbID: 1549, - eps: 5.936, - grp: "ul", - hps: 7.2, - id: "7s", - integrity: 80, - mass: 16, - mount: "F", - power: 2.58, - range: 3e3, - rating: "E", - rof: 1.6, - type: "T" - }, { - armourpen: 65, - breachdps: 21.63, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 5, - class: 4, - cost: 1245600, - dps: 25.9, - edID: 128727920, - eddbID: 1550, - eps: 5.712, - grp: "ul", - hps: 6.93, - id: "7t", - integrity: 80, - mass: 16, - mount: "G", - power: 2.59, - range: 3e3, - rating: "E", - rof: 2.1, - type: "T" - }, { - armourpen: 52, - breachdps: 10.53, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 7, - class: 3, - cost: 140400, - dps: 20.8, - edID: 128049402, - eddbID: 834, - eps: 3.753, - grp: "ul", - hps: 4.59, - id: "14", - integrity: 64, - mass: 8, - mount: "F", - power: 1.66, - range: 3e3, - rating: "D", - rof: 2.7, - type: "T" - }, { - armourpen: 52, - breachdps: 14.08, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 9, - class: 3, - cost: 281600, - dps: 16.6, - edID: 128049406, - eddbID: 837, - eps: 3.712, - grp: "ul", - hps: 4.48, - id: "15", - integrity: 64, - mass: 8, - mount: "G", - power: 1.65, - range: 3e3, - rating: "E", - rof: 3.2, - type: "T" - }, { - armourpen: 52, - breachdps: 5.58, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 11, - class: 3, - cost: 800400, - dps: 11, - edID: 128049409, - eddbID: 840, - eps: 1.913, - grp: "ul", - hps: 2.48, - id: "16", - integrity: 64, - mass: 8, - mount: "T", - power: 1.57, - range: 3e3, - rating: "E", - rof: 3.1, - type: "T" - }, { - armourpen: 35, - breachdps: 11.1, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 11, - class: 2, - cost: 23e3, - dps: 13, - edID: 128049401, - eddbID: 833, - eps: 2.331, - grp: "ul", - hps: 2.96, - id: "7h", - integrity: 40, - mass: 4, - mount: "F", - power: 1.05, - range: 3e3, - rating: "E", - rof: 3.7, - type: "T" - }, { - armourpen: 35, - breachdps: 8.82, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 13, - class: 2, - cost: 48500, - dps: 10.3, - edID: 128049405, - eddbID: 836, - eps: 2.31, - grp: "ul", - hps: 2.94, - id: "7i", - integrity: 40, - mass: 4, - mount: "G", - power: 1.04, - range: 3e3, - rating: "F", - rof: 4.2, - type: "T" - }, { - armourpen: 35, - breachdps: 3.51, - breachmax: .8, - breachmin: .4, - burst: 3, - burstrof: 15, - class: 2, - cost: 162800, - dps: 6.8, - edID: 128049408, - eddbID: 839, - eps: 1.209, - grp: "ul", - hps: 1.56, - id: "7j", - integrity: 40, - mass: 4, - mount: "T", - power: .98, - range: 3e3, - rating: "F", - rof: 3.9, - type: "T" - }, { armourpen: 20, - breachdps: 7.05, + breachdmg: 7.05, breachmax: .8, breachmin: .4, burst: 3, burstrof: 15, class: 1, cost: 4400, - dps: 8.1, + damage: 1.72, + distdraw: .31, edID: 128049400, eddbID: 832, - eps: 1.457, grp: "ul", - hps: 1.88, id: "11", integrity: 40, mass: 2, @@ -6475,23 +6285,23 @@ module.exports = { power: .65, range: 3e3, rating: "F", - rof: 4.7, + rof: 4.735, + thermload: .4, type: "T" }, { armourpen: 20, - breachdps: 5.3, + breachdmg: 5.3, breachmax: .8, breachmin: .4, burst: 3, burstrof: 17, class: 1, cost: 8600, - dps: 6.4, + damage: 1.22, + distdraw: .27, edID: 128049404, eddbID: 835, - eps: 1.4, grp: "ul", - hps: 1.6, id: "12", integrity: 40, mass: 2, @@ -6499,23 +6309,23 @@ module.exports = { power: .64, range: 3e3, rating: "G", - rof: 5.3, + rof: 5.28, + thermload: .3, type: "T" }, { armourpen: 20, - breachdps: 1.92, + breachdmg: 1.92, breachmax: .8, breachmin: .4, burst: 3, burstrof: 19, class: 1, cost: 52800, - dps: 4.2, + damage: .87, + distdraw: .16, edID: 128049407, eddbID: 838, - eps: .768, grp: "ul", - hps: .96, id: "13", integrity: 40, mass: 2, @@ -6523,23 +6333,23 @@ module.exports = { power: .6, range: 3e3, rating: "G", - rof: 4.8, + rof: 4.795, + thermload: .2, type: "T" }, { armourpen: 1, - breachdps: 15.25, + breachdmg: 15.25, breachmax: 0, breachmin: 0, burst: 8, burstrof: 20, class: 1, cost: 8800, - dps: 18.3, + damage: 18, + distdraw: .4, edID: 128671449, eddbID: 1477, - eps: 3.05, grp: "ul", - hps: 2.29, id: "cy", integrity: 40, mass: 2, @@ -6549,190 +6359,214 @@ module.exports = { pp: "Archon Delaine", range: 600, rating: "F", - rof: 7.6, + rof: 7.615, + thermload: .3, + type: "T" + }, { + armourpen: 35, + breachdmg: 11.1, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 11, + class: 2, + cost: 23e3, + damage: 3.53, + distdraw: .63, + edID: 128049401, + eddbID: 833, + grp: "ul", + id: "7h", + integrity: 40, + mass: 4, + mount: "F", + power: 1.05, + range: 3e3, + rating: "E", + rof: 3.695, + thermload: .8, + type: "T" + }, { + armourpen: 35, + breachdmg: 8.82, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 13, + class: 2, + cost: 48500, + damage: 2.45, + distdraw: .55, + edID: 128049405, + eddbID: 836, + grp: "ul", + id: "7i", + integrity: 40, + mass: 4, + mount: "G", + power: 1.04, + range: 3e3, + rating: "F", + rof: 4.2, + thermload: .7, + type: "T" + }, { + armourpen: 35, + breachdmg: 3.51, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 15, + class: 2, + cost: 162800, + damage: 1.72, + distdraw: .31, + edID: 128049408, + eddbID: 839, + grp: "ul", + id: "7j", + integrity: 40, + mass: 4, + mount: "T", + power: .98, + range: 3e3, + rating: "F", + rof: 3.93, + thermload: .4, + type: "T" + }, { + armourpen: 52, + breachdmg: 10.53, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 7, + class: 3, + cost: 140400, + damage: 7.74, + distdraw: 1.39, + edID: 128049402, + eddbID: 834, + grp: "ul", + id: "14", + integrity: 64, + mass: 8, + mount: "F", + power: 1.66, + range: 3e3, + rating: "D", + rof: 2.685, + thermload: 1.7, + type: "T" + }, { + armourpen: 52, + breachdmg: 14.08, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 9, + class: 3, + cost: 281600, + damage: 5.16, + distdraw: 1.16, + edID: 128049406, + eddbID: 837, + grp: "ul", + id: "15", + integrity: 64, + mass: 8, + mount: "G", + power: 1.65, + range: 3e3, + rating: "E", + rof: 3.215, + thermload: 1.4, + type: "T" + }, { + armourpen: 52, + breachdmg: 5.58, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 11, + class: 3, + cost: 800400, + damage: 3.53, + distdraw: .63, + edID: 128049409, + eddbID: 840, + grp: "ul", + id: "16", + integrity: 64, + mass: 8, + mount: "T", + power: 1.57, + range: 3e3, + rating: "E", + rof: 3.115, + thermload: .8, + type: "T" + }, { + armourpen: 65, + breachdmg: 28, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 3, + class: 4, + cost: 281600, + damage: 20.6, + distdraw: 3.71, + edID: 128049403, + eddbID: 1549, + grp: "ul", + id: "7s", + integrity: 80, + mass: 16, + mount: "F", + power: 2.58, + range: 3e3, + rating: "E", + rof: 1.565, + thermload: 4.5, + type: "T" + }, { + armourpen: 65, + breachdmg: 21.63, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 5, + class: 4, + cost: 1245600, + damage: 12.1, + distdraw: 2.72, + edID: 128727920, + eddbID: 1550, + grp: "ul", + id: "7t", + integrity: 80, + mass: 16, + mount: "G", + power: 2.59, + range: 3e3, + rating: "E", + rof: 2.14, + thermload: 3.3, type: "T" } ], bl: [ { - armourpen: 60, - breachdps: 33.1, - breachmax: .8, - breachmin: .4, - class: 4, - cost: 2396160, - dps: 41.4, - edID: 128049431, - eddbID: 1540, - eps: 9.1, - grp: "bl", - hps: 9.9, - id: "0w", - integrity: 80, - mass: 16, - mount: "F", - power: 2.9, - range: 3e3, - rating: "A", - type: "T" - }, { - armourpen: 60, - breachdps: 26.1, - breachmax: .8, - breachmin: .4, - class: 4, - cost: 8746160, - dps: 32.7, - edID: 128681994, - eddbID: 1544, - eps: 8.99, - grp: "bl", - hps: 10.6, - id: "0x", - integrity: 80, - mass: 16, - mount: "G", - power: 2.86, - range: 3e3, - rating: "A", - type: "T" - }, { - armourpen: 50, - breachdps: 20.6, - breachmax: .8, - breachmin: .4, - class: 3, - cost: 1177600, - dps: 25.8, - edID: 128049430, - eddbID: 843, - eps: 5.67, - grp: "bl", - hps: 7.2, - id: "0u", - integrity: 64, - mass: 8, - mount: "F", - power: 1.8, - range: 3e3, - rating: "C", - type: "T" - }, { - armourpen: 50, - breachdps: 16.2, - breachmax: .8, - breachmin: .4, - class: 3, - cost: 2396160, - dps: 20.3, - edID: 128049434, - eddbID: 846, - eps: 5.58, - grp: "bl", - hps: 7.6, - id: "0v", - integrity: 64, - mass: 8, - mount: "G", - power: 1.78, - range: 3e3, - rating: "C", - type: "T" - }, { - armourpen: 50, - breachdps: 11.5, - breachmax: .8, - breachmin: .4, - class: 3, - cost: 19399600, - dps: 14.4, - edID: 128049437, - eddbID: 849, - eps: 3.51, - grp: "bl", - hps: 5.1, - id: "0o", - integrity: 64, - mass: 8, - mount: "T", - power: 1.68, - range: 3e3, - rating: "D", - type: "T" - }, { - armourpen: 35, - breachdps: 12.8, - breachmax: .8, - breachmin: .4, - class: 2, - cost: 299520, - dps: 16, - edID: 128049429, - eddbID: 842, - eps: 3.51, - grp: "bl", - hps: 5.1, - id: "0r", - integrity: 51, - mass: 4, - mount: "F", - power: 1.12, - range: 3e3, - rating: "D", - type: "T" - }, { - armourpen: 35, - breachdps: 10, - breachmax: .8, - breachmin: .4, - class: 2, - cost: 500600, - dps: 12.5, - edID: 128049433, - eddbID: 845, - eps: 3.44, - grp: "bl", - hps: 5.3, - id: "0s", - integrity: 51, - mass: 4, - mount: "G", - power: 1.1, - range: 3e3, - rating: "D", - type: "T" - }, { - armourpen: 35, - breachdps: 7.1, - breachmax: .8, - breachmin: .4, - class: 2, - cost: 2099900, - dps: 8.8, - edID: 128049436, - eddbID: 848, - eps: 2.16, - grp: "bl", - hps: 3.5, - id: "0t", - integrity: 51, - mass: 4, - mount: "T", - power: 1.03, - range: 3e3, - rating: "E", - type: "T" - }, { armourpen: 18, - breachdps: 7.9, + breachdmg: 7.9, breachmax: .8, breachmin: .4, class: 1, cost: 37430, - dps: 9.8, + damage: 9.8, + distdraw: 2.16, edID: 128049428, eddbID: 841, - eps: 2.16, grp: "bl", - hps: 3.5, id: "10", integrity: 40, mass: 2, @@ -6740,20 +6574,20 @@ module.exports = { power: .69, range: 3e3, rating: "E", + thermload: 3.5, type: "T" }, { armourpen: 18, - breachdps: 6.1, + breachdmg: 6.1, breachmax: .8, breachmin: .4, class: 1, cost: 74650, - dps: 7.7, + damage: 7.66, + distdraw: 2.11, edID: 128049432, eddbID: 844, - eps: 2.11, grp: "bl", - hps: 3.7, id: "0p", integrity: 40, mass: 2, @@ -6761,15 +6595,17 @@ module.exports = { power: .67, range: 3e3, rating: "E", + thermload: 3.6, type: "T" }, { armourpen: 18, - breachdps: 4.3, + breachdmg: 4.3, breachmax: .8, breachmin: .4, class: 1, cost: 5e5, - dps: 5.4, + damage: 5.4, + distdraw: 1.32, edID: 128049435, eddbID: 847, eps: 1.32, @@ -6782,20 +6618,20 @@ module.exports = { power: .63, range: 3e3, rating: "F", + thermload: 2.4, type: "T" }, { armourpen: 18, - breachdps: 3.9, + breachdmg: 3.9, breachmax: .8, breachmin: .4, class: 1, cost: 56150, - dps: 4.9, + damage: 4.9, + distdraw: 2.8, edID: 128671346, eddbID: 1476, - eps: 2.8, grp: "bl", - hps: 2.7, id: "b0", integrity: 40, mass: 2, @@ -6805,210 +6641,191 @@ module.exports = { pp: "Edmund Mahon", range: 3e3, rating: "E", + thermload: 2.7, + type: "T" + }, { + armourpen: 35, + breachdmg: 12.8, + breachmax: .8, + breachmin: .4, + class: 2, + cost: 299520, + damage: 15.96, + distdraw: 3.51, + edID: 128049429, + eddbID: 842, + grp: "bl", + id: "0r", + integrity: 51, + mass: 4, + mount: "F", + power: 1.12, + range: 3e3, + rating: "D", + thermload: 5.1, + type: "T" + }, { + armourpen: 35, + breachdmg: 10, + breachmax: .8, + breachmin: .4, + class: 2, + cost: 500600, + damage: 12.52, + distdraw: 3.44, + edID: 128049433, + eddbID: 845, + grp: "bl", + id: "0s", + integrity: 51, + mass: 4, + mount: "G", + power: 1.1, + range: 3e3, + rating: "D", + thermload: 5.3, + type: "T" + }, { + armourpen: 35, + breachdmg: 7.1, + breachmax: .8, + breachmin: .4, + class: 2, + cost: 2099900, + damage: 8.82, + distdraw: 2.16, + edID: 128049436, + eddbID: 848, + grp: "bl", + id: "0t", + integrity: 51, + mass: 4, + mount: "T", + power: 1.03, + range: 3e3, + rating: "E", + thermload: 3.5, + type: "T" + }, { + armourpen: 50, + breachdmg: 20.6, + breachmax: .8, + breachmin: .4, + class: 3, + cost: 1177600, + damage: 25.78, + distdraw: 5.67, + edID: 128049430, + eddbID: 843, + grp: "bl", + id: "0u", + integrity: 64, + mass: 8, + mount: "F", + power: 1.8, + range: 3e3, + rating: "C", + thermload: 7.2, + type: "T" + }, { + armourpen: 50, + breachdmg: 16.2, + breachmax: .8, + breachmin: .4, + class: 3, + cost: 2396160, + damage: 20.28, + distdraw: 5.58, + edID: 128049434, + eddbID: 846, + grp: "bl", + id: "0v", + integrity: 64, + mass: 8, + mount: "G", + power: 1.78, + range: 3e3, + rating: "C", + thermload: 7.6, + type: "T" + }, { + armourpen: 50, + breachdmg: 11.5, + breachmax: .8, + breachmin: .4, + class: 3, + cost: 19399600, + damage: 14.34, + distdraw: 3.51, + edID: 128049437, + eddbID: 849, + grp: "bl", + id: "0o", + integrity: 64, + mass: 8, + mount: "T", + power: 1.68, + range: 3e3, + rating: "D", + thermload: 5.1, + type: "T" + }, { + armourpen: 60, + breachdmg: 33.1, + breachmax: .8, + breachmin: .4, + class: 4, + cost: 2396160, + damage: 41.38, + distdraw: 9.1, + edID: 128049431, + eddbID: 1540, + grp: "bl", + id: "0w", + integrity: 80, + mass: 16, + mount: "F", + power: 2.9, + range: 3e3, + rating: "A", + thermload: 9.9, + type: "T" + }, { + armourpen: 60, + breachdmg: 26.1, + breachmax: .8, + breachmin: .4, + class: 4, + cost: 8746160, + damage: 32.68, + distdraw: 8.99, + edID: 128681994, + eddbID: 1544, + grp: "bl", + id: "0x", + integrity: 80, + mass: 16, + mount: "G", + power: 2.86, + range: 3e3, + rating: "A", + thermload: 10.6, type: "T" } ], mc: [ { - ammo: 2100, - armourpen: 68, - breachdps: 25.2, - breachmax: .8, - breachmin: .4, - class: 4, - clip: 90, - cost: 1177600, - dps: 28, - edID: 128049458, - eddbID: 1542, - eps: 1.44, - grp: "mc", - hps: 2.4, - id: "7n", - integrity: 80, - mass: 16, - mount: "F", - power: .73, - range: 4e3, - rating: "A", - reload: 4, - rof: 3, - roundspershot: 2, - speed: 1600, - type: "K" - }, { - ammo: 2100, - armourpen: 68, - breachdps: 21.08, - breachmax: .8, - breachmin: .4, - class: 4, - clip: 90, - cost: 6377600, - dps: 23.3, - edID: 128681996, - eddbID: 1546, - eps: 2.516, - grp: "mc", - hps: 3.4, - id: "7o", - integrity: 80, - mass: 16, - mount: "G", - power: 1.22, - range: 4e3, - rating: "A", - reload: 4, - rof: 3.4, - roundspershot: 2, - speed: 1600, - type: "K" - }, { - ammo: 2100, - armourpen: 54, - breachdps: 20.65, - breachmax: .8, - breachmin: .4, - class: 3, - clip: 90, - cost: 140400, - dps: 23.1, - edID: 128049457, - eddbID: 1541, - eps: 1.062, - grp: "mc", - hps: 1.77, - id: "7k", - integrity: 64, - mass: 8, - mount: "F", - power: .64, - range: 4e3, - rating: "C", - reload: 4, - rof: 5.9, - speed: 1600, - type: "K" - }, { - ammo: 2100, - armourpen: 54, - breachdps: 17.42, - breachmax: .8, - breachmin: .4, - class: 3, - clip: 90, - cost: 578436, - damage: 2.83, - distdraw: .25, - dps: 18.9, - edID: 128049461, - eddbID: 1543, - eps: 1.675, - grp: "mc", - hps: 2.22, - id: "7l", - integrity: 64, - mass: 8, - mount: "G", - power: .97, - range: 4e3, - rating: "C", - reload: 4, - rof: 6.667, - speed: 1600, - thermload: .333, - type: "K" - }, { - ammo: 2100, - armourpen: 37, - breachdps: 14.2, - breachmax: .8, - breachmin: .4, - class: 2, - clip: 90, - cost: 38e3, - dps: 15.6, - edID: 128049456, - eddbID: 868, - eps: .781, - grp: "mc", - hps: 1.42, - id: "26", - integrity: 51, - mass: 4, - mount: "F", - power: .46, - range: 4e3, - rating: "E", - reload: 4, - rof: 7.1, - speed: 1600, - type: "K" - }, { - ammo: 2100, - armourpen: 37, - breachdps: 11.55, - breachmax: .8, - breachmin: .4, - class: 2, - clip: 90, - cost: 57e3, - dps: 12.6, - edID: 128049460, - eddbID: 870, - eps: 1.078, - grp: "mc", - hps: 1.54, - id: "27", - integrity: 51, - mass: 4, - mount: "G", - power: .64, - range: 4e3, - rating: "F", - reload: 4, - rof: 7.7, - speed: 1600, - type: "K" - }, { - ammo: 2100, - armourpen: 37, - breachdps: 6.82, - breachmax: .8, - breachmin: .4, - class: 2, - clip: 90, - cost: 1292800, - dps: 7.3, - edID: 128049463, - eddbID: 872, - eps: .372, - grp: "mc", - hps: .62, - id: "28", - integrity: 51, - mass: 4, - mount: "T", - power: .5, - range: 4e3, - rating: "F", - reload: 4, - rof: 6.2, - speed: 1600, - type: "K" - }, { ammo: 2100, armourpen: 22, - breachdps: 7.7, + breachdmg: 1, breachmax: .8, breachmin: .4, class: 1, clip: 90, cost: 9500, - dps: 8.6, + damage: 1.12, + distdraw: .06, edID: 128049455, eddbID: 867, - eps: .462, grp: "mc", - hps: .77, id: "23", integrity: 40, mass: 2, @@ -7017,24 +6834,24 @@ module.exports = { range: 4e3, rating: "F", reload: 4, - rof: 7.7, + rof: 7.69, speed: 1600, + thermload: .1, type: "K" }, { ammo: 2100, armourpen: 22, - breachdps: 5.8, + breachdmg: .7, breachmax: .8, breachmin: .4, class: 1, clip: 90, cost: 14250, - dps: 6.8, + damage: .82, + distdraw: .07, edID: 128049459, eddbID: 869, - eps: .58, grp: "mc", - hps: .83, id: "24", integrity: 40, mass: 2, @@ -7043,24 +6860,24 @@ module.exports = { range: 4e3, rating: "G", reload: 4, - rof: 8.3, + rof: 8.33, speed: 1600, + thermload: .1, type: "K" }, { ammo: 2100, armourpen: 22, - breachdps: 3.55, + breachdmg: .5, breachmax: .8, breachmin: .4, class: 1, clip: 90, cost: 81600, - dps: 4, + damage: .56, + distdraw: .03, edID: 128049462, eddbID: 871, - eps: .213, grp: "mc", - hps: 0, id: "25", integrity: 40, mass: 2, @@ -7069,17 +6886,21 @@ module.exports = { range: 4e3, rating: "G", reload: 4, - rof: 7.1, + rof: 7.14, speed: 1600, + thermload: 0, type: "K" }, { ammo: 1e3, armourpen: "A", + breachdmg: 2.7, + breachmax: .8, + breachmin: .4, class: 1, clip: 60, cost: 13980, - damage: 4, - dps: 4, + damage: 3, + distdraw: .12, eddbID: 1481, grp: "mc", id: "e0", @@ -7088,21 +6909,445 @@ module.exports = { name: "Enforcer", power: .28, pp: "Pranav Antal", + range: 4500, rating: "F", + reload: 8, rof: 4.3, - thermload: 1, + speed: 1800, + thermload: .2, + type: "K" + }, { + ammo: 2100, + armourpen: 37, + breachdmg: 2, + breachmax: .8, + breachmin: .4, + class: 2, + clip: 90, + cost: 38e3, + damage: 2.19, + distdraw: .11, + edID: 128049456, + eddbID: 868, + grp: "mc", + id: "26", + integrity: 51, + mass: 4, + mount: "F", + power: .46, + range: 4e3, + rating: "E", + reload: 4, + rof: 7.14, + speed: 1600, + thermload: .2, + type: "K" + }, { + ammo: 2100, + armourpen: 37, + breachdmg: 1.5, + breachmax: .8, + breachmin: .4, + class: 2, + clip: 90, + cost: 57e3, + damage: 1.64, + distdraw: .14, + edID: 128049460, + eddbID: 870, + grp: "mc", + id: "27", + integrity: 51, + mass: 4, + mount: "G", + power: .64, + range: 4e3, + rating: "F", + reload: 4, + rof: 7.69, + speed: 1600, + thermload: .2, + type: "K" + }, { + ammo: 2100, + armourpen: 37, + breachdmg: 1.1, + breachmax: .8, + breachmin: .4, + class: 2, + clip: 90, + cost: 1292800, + damage: 1.17, + distdraw: .06, + edID: 128049463, + eddbID: 872, + grp: "mc", + id: "28", + integrity: 51, + mass: 4, + mount: "T", + power: .5, + range: 4e3, + rating: "F", + reload: 4, + rof: 6.25, + speed: 1600, + thermload: .1, + type: "K" + }, { + ammo: 2100, + armourpen: 54, + breachdmg: 3.5, + breachmax: .8, + breachmin: .4, + class: 3, + clip: 90, + cost: 140400, + damage: 3.93, + distdraw: .18, + edID: 128049457, + eddbID: 1541, + grp: "mc", + id: "7k", + integrity: 64, + mass: 8, + mount: "F", + power: .64, + range: 4e3, + rating: "C", + reload: 4, + rof: 5.88, + speed: 1600, + thermload: .3, + type: "K" + }, { + ammo: 2100, + armourpen: 54, + breachdmg: 2.6, + breachmax: .8, + breachmin: .4, + class: 3, + clip: 90, + cost: 578436, + damage: 2.84, + distdraw: .25, + edID: 128049461, + eddbID: 1543, + grp: "mc", + id: "7l", + integrity: 64, + mass: 8, + mount: "G", + power: .97, + range: 4e3, + rating: "C", + reload: 4, + rof: 6.665, + speed: 1600, + thermload: .3, + type: "K" + }, { + ammo: 2100, + armourpen: 68, + breachdmg: 4.2, + breachmax: .8, + breachmin: .4, + class: 4, + clip: 90, + cost: 1177600, + damage: 4.62, + distdraw: .24, + edID: 128049458, + eddbID: 1542, + grp: "mc", + id: "7n", + integrity: 80, + mass: 16, + mount: "F", + power: .73, + range: 4e3, + rating: "A", + reload: 4, + rof: 3.03, + roundspershot: 2, + speed: 1600, + thermload: .4, + type: "K" + }, { + ammo: 2100, + armourpen: 68, + breachdmg: 3.1, + breachmax: .8, + breachmin: .4, + class: 4, + clip: 90, + cost: 6377600, + damage: 3.46, + distdraw: .37, + edID: 128681996, + eddbID: 1546, + grp: "mc", + id: "7o", + integrity: 80, + mass: 16, + mount: "G", + power: 1.22, + range: 4e3, + rating: "A", + reload: 4, + rof: 3.365, + roundspershot: 2, + speed: 1600, + thermload: .5, type: "K" } ], c: [ { + ammo: 100, + armourpen: 35, + breachdmg: 17.1, + breachmax: .8, + breachmin: .6, + class: 1, + clip: 5, + cost: 21100, + damage: 18, + distdraw: .46, + edID: 128049438, + eddbID: 850, + grp: "c", + id: "1h", + integrity: 40, + mass: 2, + mount: "F", + power: .34, + range: 3e3, + rating: "D", + reload: 4, + rof: .5, + speed: 1200, + thermload: 1.4, + type: "K" + }, { + ammo: 100, + armourpen: 35, + breachdmg: 13.2, + breachmax: .9, + breachmin: .6, + class: 1, + clip: 5, + cost: 42200, + damage: 13.9, + distdraw: .48, + edID: 128049442, + eddbID: 854, + grp: "c", + id: "1i", + integrity: 40, + mass: 2, + mount: "G", + power: .38, + range: 3e3, + rating: "E", + reload: 4, + rof: .52, + speed: 1e3, + thermload: 1.3, + type: "K" + }, { ammo: 100, armourpen: 90, - breachdps: 25.28, + breachdmg: 10.6, + breachmax: .8, + breachmin: .6, + class: 1, + clip: 5, + cost: 506400, + damage: 11.1, + distdraw: .22, + edID: 128049445, + eddbID: 857, + grp: "c", + id: "1j", + integrity: 40, + mass: 2, + mount: "T", + power: .32, + range: 3e3, + rating: "F", + reload: 4, + rof: .435, + speed: 1e3, + thermload: .7, + type: "K" + }, { + ammo: 100, + armourpen: 90, + breachdmg: 28, + breachmax: .8, + breachmin: .6, + class: 2, + clip: 5, + cost: 168430, + damage: 29.2, + distdraw: .7, + edID: 128049439, + eddbID: 851, + grp: "c", + id: "1k", + integrity: 51, + mass: 4, + mount: "F", + power: .49, + range: 3500, + rating: "D", + reload: 4, + rof: .465, + speed: 1051, + thermload: 2.1, + type: "K" + }, { + ammo: 100, + armourpen: 90, + breachdmg: 20.3, + breachmax: .8, + breachmin: .6, + class: 2, + clip: 5, + cost: 337600, + damage: 21.3, + distdraw: .75, + edID: 128049443, + eddbID: 855, + grp: "c", + id: "1l", + integrity: 51, + mass: 4, + mount: "G", + power: .54, + range: 3500, + rating: "D", + reload: 4, + rof: .485, + speed: 875, + thermload: 1.9, + type: "K" + }, { + ammo: 100, + armourpen: 90, + breachdmg: 16.3, + breachmax: .8, + breachmin: .6, + class: 2, + clip: 5, + cost: 4051200, + damage: 17.19, + distdraw: .34, + edID: 128049446, + eddbID: 858, + grp: "c", + id: "1m", + integrity: 51, + mass: 4, + mount: "T", + power: .45, + range: 3500, + rating: "E", + reload: 4, + rof: .405, + speed: 875, + thermload: 1, + type: "K" + }, { + ammo: 100, + armourpen: 90, + breachdmg: 42.3, + breachmax: .8, + breachmin: .6, + class: 3, + clip: 5, + cost: 675200, + damage: 43.95, + distdraw: 1.07, + edID: 128049440, + eddbID: 852, + grp: "c", + id: "1n", + integrity: 64, + mass: 8, + mount: "F", + power: .67, + range: 4e3, + rating: "C", + reload: 4, + rof: .425, + speed: 959, + thermload: 3.2, + type: "K" + }, { + ammo: 100, + armourpen: 90, + breachdmg: 30.9, + breachmax: .8, + breachmin: .6, + class: 3, + clip: 5, + cost: 1350400, + damage: 32.51, + distdraw: 1.14, + edID: 128671120, + eddbID: 1383, + eps: .456, + grp: "c", + hps: 1.16, + id: "1o", + integrity: 64, + mass: 8, + mount: "G", + power: .75, + range: 4e3, + rating: "C", + reload: 4, + rof: .445, + speed: 800, + thermload: 2.9, + type: "K" + }, { + ammo: 100, + armourpen: 90, + breachdmg: 25.14, + breachmax: .8, + breachmin: .6, + class: 3, + clip: 5, + cost: 16204800, + damage: 26.4, + distdraw: .53, + edID: 128049447, + eddbID: 859, + grp: "c", + id: "1p", + integrity: 64, + mass: 8, + mount: "T", + power: .64, + range: 4e3, + rating: "D", + reload: 4, + rof: .37, + speed: 800, + thermload: 1.6, + type: "K" + }, { + ammo: 100, + armourpen: 90, + breachdmg: 63.2, breachmax: .8, breachmin: .6, class: 4, clip: 5, cost: 2700800, - dps: 25.3, + damage: 65.66, + distdraw: 1.61, edID: 128049441, eddbID: 853, eps: .644, @@ -7116,19 +7361,21 @@ module.exports = { range: 4500, rating: "B", reload: 5, - rof: .4, + rof: .385, speed: 900, + thermload: 4.8, type: "K" }, { ammo: 100, armourpen: 90, - breachdps: 16.92, + breachdmg: 46.7, breachmax: .8, breachmin: .6, class: 4, clip: 5, cost: 5401600, - dps: 19.7, + damage: 49.2, + distdraw: 1.72, edID: 128049444, eddbID: 856, eps: .688, @@ -7144,341 +7391,107 @@ module.exports = { reload: 4, rof: .4, speed: 750, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 16.92, - breachmax: .8, - breachmin: .6, - class: 3, - clip: 5, - cost: 675200, - dps: 18.7, - edID: 128049440, - eddbID: 852, - eps: .428, - grp: "c", - hps: 1.28, - id: "1n", - integrity: 64, - mass: 8, - mount: "F", - power: .67, - range: 4e3, - rating: "C", - reload: 4, - rof: .4, - speed: 959, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 30.9, - breachmax: .8, - breachmin: .6, - class: 3, - clip: 5, - cost: 1350400, - dps: 14.3, - edID: 128671120, - eddbID: 1383, - eps: .456, - grp: "c", - hps: 1.16, - id: "1o", - integrity: 64, - mass: 8, - mount: "G", - power: .75, - range: 4e3, - rating: "C", - reload: 4, - rof: .4, - speed: 800, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 10.04, - breachmax: .8, - breachmin: .6, - class: 3, - clip: 5, - cost: 16204800, - dps: 9.7, - edID: 128049447, - eddbID: 859, - eps: .212, - grp: "c", - hps: .64, - id: "1p", - integrity: 64, - mass: 8, - mount: "T", - power: .64, - range: 4e3, - rating: "D", - reload: 4, - rof: .4, - speed: 800, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 14, - breachmax: .8, - breachmin: .6, - class: 2, - clip: 5, - cost: 168430, - dps: 13.6, - edID: 128049439, - eddbID: 851, - eps: .35, - grp: "c", - hps: 1.05, - id: "1k", - integrity: 51, - mass: 4, - mount: "F", - power: .49, - range: 3500, - rating: "D", - reload: 4, - rof: .5, - speed: 1051, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 101.5, - breachmax: .8, - breachmin: .6, - class: 2, - clip: 5, - cost: 337600, - dps: 10.3, - edID: 128049443, - eddbID: 855, - eps: .375, - grp: "c", - hps: .95, - id: "1l", - integrity: 51, - mass: 4, - mount: "G", - power: .54, - range: 3500, - rating: "D", - reload: 4, - rof: .5, - speed: 875, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 6.52, - breachmax: .8, - breachmin: .6, - class: 2, - clip: 5, - cost: 4051200, - dps: 6.9, - edID: 128049446, - eddbID: 858, - eps: .136, - grp: "c", - hps: .4, - id: "1m", - integrity: 51, - mass: 4, - mount: "T", - power: .45, - range: 3500, - rating: "E", - reload: 4, - rof: .4, - speed: 875, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 8.55, - breachmax: .8, - breachmin: .6, - class: 1, - clip: 5, - cost: 21100, - dps: 9, - edID: 128049438, - eddbID: 850, - eps: .23, - grp: "c", - hps: .7, - id: "1h", - integrity: 40, - mass: 2, - mount: "F", - power: .34, - range: 3e3, - rating: "D", - reload: 4, - rof: .5, - speed: 1200, - type: "K" - }, { - ammo: 100, - armourpen: 35, - breachdps: 6.6, - breachmax: .9, - breachmin: .6, - class: 1, - clip: 5, - cost: 42200, - dps: 7.2, - edID: 128049442, - eddbID: 854, - eps: .24, - grp: "c", - hps: .65, - id: "1i", - integrity: 40, - mass: 2, - mount: "G", - power: .38, - range: 3e3, - rating: "E", - reload: 4, - rof: .5, - speed: 1e3, - type: "K" - }, { - ammo: 100, - armourpen: 90, - breachdps: 4.24, - breachmax: .8, - breachmin: .6, - class: 1, - clip: 5, - cost: 506400, - dps: 4.8, - edID: 128049445, - eddbID: 857, - eps: .088, - grp: "c", - hps: .28, - id: "1j", - integrity: 40, - mass: 2, - mount: "T", - power: .32, - range: 3e3, - rating: "F", - reload: 4, - rof: .4, - speed: 1e3, + thermload: 4.4, type: "K" } ], fc: [ { ammo: 90, - armourpen: 52, - breachdps: 189, + armourpen: 20, + breachdmg: 1.3, breachmax: .8, breachmin: .4, - class: 3, + class: 1, clip: 3, - cost: 1167360, - dps: 113.8, - edID: 128049450, - eddbID: 862, - eps: 30.78, + cost: 36e3, + damage: 1.43, + distdraw: .21, + edID: 128049448, + eddbID: 860, grp: "fc", - hps: 59.4, - id: "1t", - integrity: 80, + id: "20", + integrity: 40, jitter: .5, - mass: 8, + mass: 2, mount: "F", - power: 1.02, + power: .45, range: 2e3, - rating: "C", + rating: "E", reload: 5, - rof: 4.5, + rof: 5.555, roundspershot: 12, speed: 667, + thermload: .4, type: "K" }, { ammo: 90, - armourpen: 52, - breachdps: 167.04, + armourpen: 20, + breachdmg: .9, breachmax: .8, breachmin: .4, - class: 3, + class: 1, clip: 3, - cost: 1751040, - dps: 184.6, - edID: 128671321, - eddbID: 1454, - eps: 46.66, + cost: 54720, + damage: 1.01, + distdraw: .26, + edID: 128049451, + eddbID: 863, grp: "fc", - hps: 80.64, - id: "1u", - integrity: 80, + id: "21", + integrity: 40, jitter: .5, - mass: 8, + mass: 2, mount: "G", - power: 1.55, + power: .59, range: 2e3, - rating: "C", + rating: "E", reload: 5, - rof: 4.8, + rof: 5.88, roundspershot: 12, speed: 667, + thermload: .4, type: "K" }, { ammo: 90, - armourpen: 52, - breachdps: 110.4, + armourpen: 20, + breachdmg: .5, breachmax: .8, breachmin: .4, - class: 3, + class: 1, clip: 3, - cost: 5836800, - dps: 122.9, - edID: 128671322, - eddbID: 1455, - eps: 17.76, + cost: 182400, + damage: .69, + distdraw: .1, + edID: 128049453, + eddbID: 865, grp: "fc", - hps: 33.6, - id: "1v", - integrity: 80, + id: "22", + integrity: 40, jitter: .5, - mass: 8, + mass: 2, mount: "T", - power: 1.29, + power: .42, range: 2e3, - rating: "C", + rating: "E", reload: 5, - rof: 4, + rof: 4.76, roundspershot: 12, speed: 667, + thermload: .2, type: "K" }, { ammo: 90, armourpen: 35, - breachdps: 138, + breachdmg: 2.3, breachmax: .8, breachmin: .4, class: 2, clip: 3, cost: 291840, - dps: 122.9, + damage: 2.56, + distdraw: .37, edID: 128049449, eddbID: 861, - eps: 22.2, grp: "fc", - hps: 42, id: "1s", integrity: 80, jitter: .5, @@ -7491,22 +7504,22 @@ module.exports = { rof: 5, roundspershot: 12, speed: 667, + thermload: .7, type: "K" }, { ammo: 90, armourpen: 35, - breachdps: 114.48, + breachdmg: 1.8, breachmax: .8, breachmin: .4, class: 2, clip: 3, cost: 437800, - dps: 153.6, + damage: 1.95, + distdraw: .49, edID: 128049452, eddbID: 864, - eps: 31.6, grp: "fc", - hps: 50.88, id: "7e", integrity: 80, jitter: .5, @@ -7516,25 +7529,25 @@ module.exports = { range: 2e3, rating: "D", reload: 5, - rof: 5.3, + rof: 5.26, roundspershot: 12, speed: 667, + thermload: .8, type: "K" }, { ammo: 90, armourpen: 35, - breachdps: 67.08, + breachdmg: 1.3, breachmax: .8, breachmin: .4, class: 2, clip: 3, cost: 1459200, - dps: 123.2, + damage: 1.43, + distdraw: .21, edID: 128049454, eddbID: 866, - eps: 10.84, grp: "fc", - hps: 20.64, id: "7f", integrity: 80, jitter: .5, @@ -7544,106 +7557,111 @@ module.exports = { range: 2e3, rating: "D", reload: 5, - rof: 3.7, + rof: 4.345, roundspershot: 12, speed: 667, + thermload: .4, type: "K" }, { ammo: 90, - armourpen: 20, - breachdps: 87.36, + armourpen: 52, + breachdmg: 3.5, breachmax: .8, breachmin: .4, - class: 1, + class: 3, clip: 3, - cost: 36e3, - dps: 95.3, - edID: 128049448, - eddbID: 860, - eps: 14.112, + cost: 1167360, + damage: 3.92, + distdraw: .57, + edID: 128049450, + eddbID: 862, grp: "fc", - hps: 26.88, - id: "20", - integrity: 40, + id: "1t", + integrity: 80, jitter: .5, - mass: 2, + mass: 8, mount: "F", - power: .45, + power: 1.02, range: 2e3, - rating: "E", + rating: "C", reload: 5, - rof: 5.6, + rof: 4.545, roundspershot: 12, speed: 667, + thermload: 1.1, type: "K" }, { ammo: 90, - armourpen: 20, - breachdps: 63.4, + armourpen: 52, + breachdmg: 2.9, breachmax: .8, breachmin: .4, - class: 1, + class: 3, clip: 3, - cost: 54720, - dps: 71.3, - edID: 128049451, - eddbID: 863, - eps: 18.408, + cost: 1751040, + damage: 3.23, + distdraw: .81, + edID: 128671321, + eddbID: 1454, grp: "fc", - hps: 28.32, - id: "21", - integrity: 40, + id: "1u", + integrity: 80, jitter: .5, - mass: 2, + mass: 8, mount: "G", - power: .59, + power: 1.55, range: 2e3, - rating: "E", + rating: "C", reload: 5, - rof: 5.9, + rof: 4.76, roundspershot: 12, speed: 667, + thermload: 1.4, type: "K" }, { ammo: 90, - armourpen: 20, - breachdps: 34.56, + armourpen: 52, + breachdmg: 2.3, breachmax: .8, breachmin: .4, - class: 1, + class: 3, clip: 3, - cost: 182400, - dps: 39.4, - edID: 128049453, - eddbID: 865, - eps: 6.72, + cost: 5836800, + damage: 2.56, + distdraw: .37, + edID: 128671322, + eddbID: 1455, grp: "fc", - hps: 13.44, - id: "22", - integrity: 40, + id: "1v", + integrity: 80, jitter: .5, - mass: 2, + mass: 8, mount: "T", - power: .42, + power: 1.29, range: 2e3, - rating: "E", + rating: "C", reload: 5, - rof: 4.8, + rof: 4, roundspershot: 12, speed: 667, + thermload: .7, type: "K" }, { ammo: 90, - armourpen: "A", + armourpen: 52, + breachdmg: 3.1, + breachmax: .8, + breachmin: .4, class: 3, clip: 3, cost: 1400830, - damage: 3, - dps: 9, + damage: 3.4, + distdraw: .57, edID: 128671343, eddbID: 1478, grp: "fc", id: "pa", + integrity: 64, mass: 8, mount: "F", name: "Pacifier", @@ -7651,24 +7669,24 @@ module.exports = { pp: "Zachary Hudson", rating: "C", rof: 4.5, - thermload: 1, + speed: 1e3, + thermload: 1.1, type: "K" } ], rg: [ { ammo: 30, armourpen: 30, - breachdps: 35.2, + breachdmg: 22.2, breachmax: .8, breachmin: .4, class: 1, clip: 1, cost: 51600, - dps: 37, + damage: 23.3, + distdraw: 2.69, edID: 128049488, eddbID: 876, - eps: 4.3, grp: "rg", - hps: 28.48, id: "29", integrity: 40, mass: 2, @@ -7678,22 +7696,22 @@ module.exports = { rating: "D", reload: 1, rof: 1.6, + thermload: 17.8, type: "KT" }, { ammo: 30, armourpen: 48, - breachdps: 47.4, + breachdmg: 39.5, breachmax: .8, breachmin: .4, class: 2, clip: 1, cost: 412800, - dps: 50, + damage: 41.5, + distdraw: 5.11, edID: 128049489, eddbID: 877, - eps: 6.132, grp: "rg", - hps: 36, id: "2a", integrity: 51, mass: 4, @@ -7703,15 +7721,21 @@ module.exports = { rating: "B", reload: 1, rof: 1.2, + thermload: 30, type: "KT" }, { ammo: 90, armourpen: "A", + breachdmg: 14.3, + breachmax: .8, + breachmin: .4, + burst: 3, + burstrof: 6, class: 2, clip: 3, cost: 619200, - damage: 5, - dps: 5, + damage: 15, + distdraw: 2, edID: 128671341, eddbID: 1484, grp: "rg", @@ -7722,79 +7746,24 @@ module.exports = { power: 1.63, pp: "Arissa Lavigny-Duval", rating: "B", - rof: .6, - thermload: 3, + rof: 4.1, + thermload: 16, type: "KT" } ], pa: [ { - ammo: 100, - armourpen: 85, - breachdps: 30.62, - breachmax: .8, - breachmin: .4, - class: 4, - clip: 5, - cost: 13793600, - dps: 30, - edID: 128049467, - eddbID: 875, - eps: 6.312, - grp: "pa", - hps: 8.85, - id: "2c", - integrity: 80, - mass: 16, - mount: "F", - power: 2.63, - range: 3500, - rating: "A", - reload: 8, - rof: .3, - roundspershot: 1, - speed: 875, - type: "KT" - }, { - ammo: 100, - armourpen: 70, - breachdps: 20.4, - breachmax: .8, - breachmin: .4, - class: 3, - clip: 5, - cost: 3051200, - dps: 23.2, - edID: 128049466, - eddbID: 874, - eps: 4.08, - grp: "pa", - hps: 6.54, - id: "2b", - integrity: 64, - mass: 8, - mount: "F", - power: 1.97, - range: 3500, - rating: "B", - reload: 8, - rof: .3, - roundspershot: 1, - speed: 875, - type: "KT" - }, { ammo: 100, armourpen: 55, - breachdps: 13.26, + breachdmg: 44.2, breachmax: .8, breachmin: .4, class: 2, clip: 5, cost: 834200, - dps: 17.2, + damage: 52, + distdraw: 8.65, edID: 128049465, eddbID: 873, - eps: 2.595, grp: "pa", - hps: 4.68, id: "1g", integrity: 51, mass: 4, @@ -7803,25 +7772,50 @@ module.exports = { range: 3500, rating: "C", reload: 8, - rof: .3, - roundspershot: 1, + rof: .33, speed: 875, + thermload: 15.6, + type: "KT" + }, { + ammo: 100, + armourpen: 70, + breachdmg: 68, + breachmax: .8, + breachmin: .4, + class: 3, + clip: 5, + cost: 3051200, + damage: 79.93, + distdraw: 13.6, + edID: 128049466, + eddbID: 874, + grp: "pa", + id: "2b", + integrity: 64, + mass: 8, + mount: "F", + power: 1.97, + range: 3500, + rating: "B", + reload: 8, + rof: .29, + speed: 875, + thermload: 21.8, type: "KT" }, { ammo: 300, armourpen: 70, - breachdps: 22.48, + breachdmg: 28.1, breachmax: .8, breachmin: .4, class: 3, clip: 20, cost: 4119120, - dps: 27.5, + damage: 33, + distdraw: 5.5, edID: 128671339, eddbID: 1482, - eps: 4.4, grp: "pa", - hps: 8.8, id: "Ap", integrity: 64, mass: 8, @@ -7833,42 +7827,94 @@ module.exports = { rating: "B", reload: 8, rof: .8, - roundspershot: 1, speed: 875, + thermload: 11, + type: "KT" + }, { + ammo: 100, + armourpen: 85, + breachdmg: 102, + breachmax: .8, + breachmin: .4, + class: 4, + clip: 5, + cost: 13793600, + damage: 120, + distdraw: 21.04, + edID: 128049467, + eddbID: 875, + grp: "pa", + id: "2c", + integrity: 80, + mass: 16, + mount: "F", + power: 2.63, + range: 3500, + rating: "A", + reload: 8, + rof: .25, + speed: 875, + thermload: 29.5, type: "KT" } ], mr: [ { - ammo: 48, + ammo: 16, armourpen: 60, - breachdps: 4.8, - breachmax: 0, - breachmin: 0, - class: 2, - clip: 12, - cost: 190227, - dps: 25, - eddbID: 1559, - eps: .12, + breachdmg: 20, + breachmax: 1, + breachmin: 1, + class: 1, + clip: 8, + cost: 32180, + damage: 50, + distdraw: .24, + edID: 128666724, + eddbID: 1326, grp: "mr", - hps: 1.08, - id: "1z", - integrity: 51, - mass: 4, + id: "2d", + integrity: 40, + mass: 2, missile: "D", mount: "F", - name: "Rocket Propelled FSD Disruptor", - power: 1.2, - pp: "Yuri Grom", + power: .4, rating: "B", + reload: 5, rof: .5, speed: 750, + thermload: 3.6, + type: "E" + }, { + ammo: 6, + armourpen: 60, + breachdmg: 16, + breachmax: 0, + breachmin: 0, + class: 1, + clip: 6, + cost: 72600, + damage: 40, + distdraw: .24, + edID: 128049492, + eddbID: 878, + grp: "mr", + id: "2e", + integrity: 40, + mass: 2, + missile: "S", + mount: "F", + power: .6, + rating: "B", + reload: 12, + rof: .333, + speed: 625, + thermload: 3.6, type: "E" }, { ammo: 48, armourpen: 60, - breachdps: 0, - breachmax: 0, - breachmin: 0, + breachdmg: 20, + breachmax: 1, + breachmin: 1, class: 2, clip: 12, cost: 240400, @@ -7886,19 +7932,20 @@ module.exports = { power: 1.2, rating: "B", reload: 5, - roundspershot: 1, + rof: .5, speed: 750, type: "E" }, { ammo: 18, armourpen: 60, - breachdps: 0, + breachdmg: 16, breachmax: 0, breachmin: 0, class: 2, clip: 6, cost: 512400, - dps: 13.3, + damage: 40, + distdraw: .24, edID: 128049493, eddbID: 879, eps: .07, @@ -7912,73 +7959,48 @@ module.exports = { power: 1.2, rating: "B", reload: 12, - roundspershot: 1, + rof: .333, speed: 625, + thermload: 3.6, type: "E" }, { - ammo: 16, + ammo: 48, armourpen: 60, - breachdps: 0, + breachdmg: 16, breachmax: 0, breachmin: 0, - class: 1, - clip: 8, - cost: 32180, - dps: 25, - edID: 128666724, - eddbID: 1326, - eps: .12, + class: 2, + clip: 12, + cost: 190227, + damage: 40, + distdraw: .24, + eddbID: 1559, grp: "mr", - hps: 1.8, - id: "2d", - integrity: 40, - mass: 2, + id: "1z", + integrity: 51, + mass: 4, missile: "D", mount: "F", - power: .4, + name: "Rocket Propelled FSD Disruptor", + power: 1.2, + pp: "Yuri Grom", rating: "B", reload: 5, - rof: .5, - roundspershot: 1, + rof: .333, speed: 750, - type: "E" - }, { - ammo: 6, - armourpen: 60, - breachdps: 0, - breachmax: 0, - breachmin: 0, - class: 1, - clip: 6, - cost: 72600, - dps: 13.3, - edID: 128049492, - eddbID: 878, - eps: .07, - grp: "mr", - hps: 1.08, - id: "2e", - integrity: 40, - mass: 2, - missile: "S", - mount: "F", - power: .6, - rating: "B", - reload: 12, - rof: .3, - roundspershot: 1, - speed: 625, + thermload: 3.6, type: "E" }, { ammo: 120, armourpen: 60, - breachdps: 6, + breachdmg: 6, breachmax: 0, breachmin: 0, class: 2, clip: 12, cost: 768600, - dps: 60, + damage: 7.5, + distdraw: .24, edID: 128671344, eddbID: 1480, eps: 1.92, @@ -7997,23 +8019,22 @@ module.exports = { rof: 2, roundspershot: 4, speed: 600, + thermload: 3.6, type: "E" } ], tp: [ { ammo: 1, armourpen: 1e4, - breachdps: 60, + breachdmg: 60, breachmax: .8, breachmin: .6, class: 1, clip: 1, cost: 11200, - dps: 120, + damage: 120, edID: 128049509, eddbID: 882, - eps: 0, grp: "tp", - hps: 45, id: "2h", integrity: 40, mass: 2, @@ -8024,11 +8045,12 @@ module.exports = { reload: 5, rof: 1, speed: 250, + thermload: 45, type: "E" }, { ammo: 2, armourpen: 1e4, - breachdps: 60, + breachdmg: 60, breachmax: .8, breachmin: .6, class: 2, @@ -8037,9 +8059,7 @@ module.exports = { dps: 120, edID: 128049510, eddbID: 883, - eps: 0, grp: "tp", - hps: 50, id: "2i", integrity: 51, mass: 4, @@ -8050,23 +8070,23 @@ module.exports = { reload: 5, rof: 1, speed: 250, + thermload: 50, type: "E" } ], nl: [ { ammo: 36, armourpen: 60, - breachdps: 0, + breachdmg: 0, breachmax: 0, breachmin: 0, class: 1, clip: 3, cost: 24260, - dps: 44, + damage: 44, + distdraw: 0, edID: 128049500, eddbID: 880, - eps: 0, grp: "nl", - hps: 5, id: "2j", integrity: 40, mass: 2, @@ -8075,46 +8095,22 @@ module.exports = { rating: "I", reload: 2, rof: 1, + thermload: 5, type: "ET" }, { ammo: 36, armourpen: 60, - breachdps: 0, - breachmax: 0, - breachmin: 0, - class: 2, - clip: 3, - cost: 294080, - dps: 44, - edID: 128049501, - eddbID: 881, - eps: 0, - grp: "nl", - hps: 7.5, - id: "2k", - integrity: 51, - mass: 4, - mount: "F", - power: .4, - rating: "I", - reload: 2, - rof: 1, - type: "ET" - }, { - ammo: 36, - armourpen: "C", - breachdps: 0, + breachdmg: 0, breachmax: 0, breachmin: 0, class: 1, clip: 3, cost: 36400, - dps: 32, - eps: 0, + damage: 32, + distdraw: 0, edID: 128671448, eddbID: 1523, grp: "nl", - hps: 5, id: "kp", integrity: 40, mass: 2, @@ -8124,52 +8120,61 @@ module.exports = { rating: "I", reload: 2, rof: 1, + thermload: 5, + type: "ET" + }, { + ammo: 36, + armourpen: 60, + breachdmg: 0, + breachmax: 0, + breachmin: 0, + class: 2, + clip: 3, + cost: 294080, + damage: 44, + distdraw: 0, + edID: 128049501, + eddbID: 881, + grp: "nl", + id: "2k", + integrity: 51, + mass: 4, + mount: "F", + power: .4, + rating: "I", + reload: 2, + rof: 1, + thermload: 7.5, type: "ET" } ], ml: [ { armourpen: 18, - breachdps: .3, + breachdmg: .3, breachmax: .2, breachmin: .1, class: 1, cost: 6800, - dps: 2, + damage: 2, + distdraw: 1.5, edID: 128049525, eddbID: 888, - eps: 1.5, grp: "ml", - hps: 2, id: "2l", integrity: 40, mass: 2, mount: "F", power: .5, - rating: "D" - }, { - armourpen: 18, - breachdps: .6, - breachmax: .2, - breachmin: .1, - class: 2, - cost: 22580, - dps: 4, - edID: 128049526, - eddbID: 889, - eps: 3, - grp: "ml", - hps: 4, - id: "2m", - integrity: 51, - mass: 2, - mount: "F", - power: .75, - rating: "D" + rating: "D", + thermload: 2 }, { armourpen: "D", + breachdmg: .6, + breachmax: .2, + breachmin: .1, class: 1, cost: 13600, - damage: 3, - dps: 3, + damage: 8, + distdraw: 1.75, eddbID: 1479, grp: "ml", id: "ml", @@ -8179,8 +8184,27 @@ module.exports = { power: .7, pp: "Zemina Torval", rating: "D", - thermload: 3, + thermload: 6, type: "T" + }, { + armourpen: 18, + breachdmg: 1.2, + breachmax: .2, + breachmin: .1, + class: 2, + cost: 22580, + damage: 8, + distdraw: 1.75, + edID: 128049526, + eddbID: 889, + grp: "ml", + id: "2m", + integrity: 51, + mass: 2, + mount: "F", + power: .75, + rating: "D", + thermload: 4 } ], cs: [ { angle: 15, @@ -8522,7 +8546,7 @@ module.exports = { cost: 18550, edID: 128049522, eddbID: 887, - grp: "cm", + grp: "po", id: "03", integrity: 30, jitter: 1.5, diff --git a/dist/index.json b/dist/index.json index e50d030..5b4308c 100644 --- a/dist/index.json +++ b/dist/index.json @@ -7893,203 +7893,18 @@ }, "hardpoints": { "pl": [ - { - "armourpen": 65, - "breachdps": 22.62, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 177600, - "dps": 26.9, - "edID": 128049384, - "eddbID": 1539, - "eps": 4.264, - "grp": "pl", - "hps": 4.16, - "id": "7q", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 1.33, - "range": 3000, - "rating": "A", - "rof": 2.6, - "type": "T" - }, - { - "armourpen": 65, - "breachdps": 18.48, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 877600, - "dps": 21.7, - "edID": 128681995, - "eddbID": 1545, - "eps": 4.368, - "grp": "pl", - "hps": 4.48, - "id": "7r", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 1.37, - "range": 3000, - "rating": "A", - "rof": 2.8, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 15.3, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 70400, - "dps": 18.1, - "edID": 128049383, - "eddbID": 825, - "eps": 2.88, - "grp": "pl", - "hps": 3, - "id": "1d", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 0.9, - "range": 3000, - "rating": "D", - "rof": 3, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 12.48, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 140600, - "dps": 14.8, - "edID": 128049387, - "eddbID": 828, - "eps": 2.944, - "grp": "pl", - "hps": 2.88, - "id": "1e", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 0.92, - "range": 3000, - "rating": "E", - "rof": 3.2, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 8.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 400400, - "dps": 9.5, - "edID": 128049390, - "eddbID": 831, - "eps": 1.512, - "grp": "pl", - "hps": 1.62, - "id": "1f", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 0.89, - "range": 3000, - "rating": "F", - "rof": 2.7, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 10.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 17600, - "dps": 12.1, - "edID": 128049382, - "eddbID": 824, - "eps": 1.904, - "grp": "pl", - "hps": 2.04, - "id": "1a", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.6, - "range": 3000, - "rating": "F", - "rof": 3.4, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 8.28, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 35400, - "dps": 9.6, - "edID": 128049386, - "eddbID": 827, - "eps": 1.944, - "grp": "pl", - "hps": 1.8, - "id": "1b", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 0.6, - "range": 3000, - "rating": "F", - "rof": 3.6, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 5.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 132800, - "dps": 6.2, - "edID": 128049389, - "eddbID": 830, - "eps": 1, - "grp": "pl", - "hps": 0.9, - "id": "1c", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 0.58, - "range": 3000, - "rating": "F", - "rof": 3, - "type": "T" - }, { "armourpen": 20, - "breachdps": 6.46, + "breachdmg": 2.04, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 2200, - "dps": 7.9, + "damage": 2.04, + "distdraw": 0.33, "edID": 128049381, "eddbID": 823, - "eps": 1.254, "grp": "pl", - "hps": 1.14, "id": "17", "integrity": 40, "mass": 2, @@ -8097,22 +7912,22 @@ "power": 0.39, "range": 3000, "rating": "F", - "rof": 3.8, + "rof": 3.847, + "thermload": 0.3, "type": "T" }, { "armourpen": 20, - "breachdps": 5.2, + "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 6600, - "dps": 6.2, + "damage": 1.56, + "distdraw": 0.31, "edID": 128049385, "eddbID": 826, - "eps": 1.24, "grp": "pl", - "hps": 1.2, "id": "18", "integrity": 40, "mass": 2, @@ -8120,22 +7935,22 @@ "power": 0.39, "range": 3000, "rating": "G", - "rof": 4, + "rof": 3.987, + "thermload": 0.3, "type": "T" }, { "armourpen": 20, - "breachdps": 3.3, + "breachdmg": 1, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 26000, - "dps": 4, + "damage": 1.18, + "distdraw": 0.19, "edID": 128049388, "eddbID": 829, - "eps": 0.627, "grp": "pl", - "hps": 6.6, "id": "19", "integrity": 40, "mass": 2, @@ -8143,15 +7958,88 @@ "power": 0.38, "range": 3000, "rating": "G", - "rof": 3.3, + "rof": 3.339, + "thermload": 0.2, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 3, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 17600, + "damage": 3.49, + "distdraw": 0.56, + "edID": 128049382, + "eddbID": 824, + "grp": "pl", + "id": "1a", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.6, + "range": 3000, + "rating": "F", + "rof": 3.448, + "thermload": 0.6, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 2.3, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 35400, + "damage": 2.68, + "distdraw": 0.54, + "edID": 128049386, + "eddbID": 827, + "grp": "pl", + "id": "1b", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 0.6, + "range": 3000, + "rating": "F", + "rof": 3.567, + "thermload": 0.5, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 1.7, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 132800, + "damage": 2.04, + "distdraw": 0.33, + "edID": 128049389, + "eddbID": 830, + "grp": "pl", + "id": "1c", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 0.58, + "range": 3000, + "rating": "F", + "rof": 3.037, + "thermload": 0.3, "type": "T" }, { "armourpen": "A", + "breachdmg": 2.4, + "breachmax": 0.8, + "breachmin": 0.4, "class": 2, "cost": 26400, - "damage": 2, - "dps": 2, + "damage": 2.8, + "distdraw": 1, "eddbID": 1483, "grp": "pl", "id": "PL", @@ -8161,227 +8049,141 @@ "power": 0.7, "pp": "Felicia Winters", "rating": "E", - "rof": 1.6, + "rof": 1.664, "thermload": 1, "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 5.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 70400, + "damage": 5.98, + "distdraw": 0.96, + "edID": 128049383, + "eddbID": 825, + "grp": "pl", + "id": "1d", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 0.9, + "range": 3000, + "rating": "D", + "rof": 3.3, + "thermload": 1, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 3.9, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 140600, + "damage": 4.58, + "distdraw": 0.92, + "edID": 128049387, + "eddbID": 828, + "grp": "pl", + "id": "1e", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 0.92, + "range": 3000, + "rating": "E", + "rof": 3.223, + "thermload": 0.9, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 3, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 400400, + "damage": 3.49, + "distdraw": 0.56, + "edID": 128049390, + "eddbID": 831, + "grp": "pl", + "id": "1f", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 0.89, + "range": 3000, + "rating": "F", + "rof": 2.705, + "thermload": 0.6, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 8.7, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 177600, + "damage": 10.23, + "distdraw": 1.64, + "edID": 128049384, + "eddbID": 1539, + "grp": "pl", + "id": "7q", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 1.33, + "range": 3000, + "rating": "A", + "rof": 2.633, + "thermload": 1.6, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 6.6, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 877600, + "damage": 7.82, + "distdraw": 1.56, + "edID": 128681995, + "eddbID": 1545, + "grp": "pl", + "id": "7r", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 1.37, + "range": 3000, + "rating": "A", + "rof": 2.777, + "thermload": 1.6, + "type": "T" } ], "ul": [ - { - "armourpen": 65, - "breachdps": 28, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 3, - "class": 4, - "cost": 281600, - "dps": 32.3, - "edID": 128049403, - "eddbID": 1549, - "eps": 5.936, - "grp": "ul", - "hps": 7.2, - "id": "7s", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 2.58, - "range": 3000, - "rating": "E", - "rof": 1.6, - "type": "T" - }, - { - "armourpen": 65, - "breachdps": 21.63, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 5, - "class": 4, - "cost": 1245600, - "dps": 25.9, - "edID": 128727920, - "eddbID": 1550, - "eps": 5.712, - "grp": "ul", - "hps": 6.93, - "id": "7t", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 2.59, - "range": 3000, - "rating": "E", - "rof": 2.1, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 10.53, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 7, - "class": 3, - "cost": 140400, - "dps": 20.8, - "edID": 128049402, - "eddbID": 834, - "eps": 3.753, - "grp": "ul", - "hps": 4.59, - "id": "14", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 1.66, - "range": 3000, - "rating": "D", - "rof": 2.7, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 14.08, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 9, - "class": 3, - "cost": 281600, - "dps": 16.6, - "edID": 128049406, - "eddbID": 837, - "eps": 3.712, - "grp": "ul", - "hps": 4.48, - "id": "15", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 1.65, - "range": 3000, - "rating": "E", - "rof": 3.2, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 5.58, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 11, - "class": 3, - "cost": 800400, - "dps": 11, - "edID": 128049409, - "eddbID": 840, - "eps": 1.913, - "grp": "ul", - "hps": 2.48, - "id": "16", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 1.57, - "range": 3000, - "rating": "E", - "rof": 3.1, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 11.1, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 11, - "class": 2, - "cost": 23000, - "dps": 13, - "edID": 128049401, - "eddbID": 833, - "eps": 2.331, - "grp": "ul", - "hps": 2.96, - "id": "7h", - "integrity": 40, - "mass": 4, - "mount": "F", - "power": 1.05, - "range": 3000, - "rating": "E", - "rof": 3.7, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 8.82, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 13, - "class": 2, - "cost": 48500, - "dps": 10.3, - "edID": 128049405, - "eddbID": 836, - "eps": 2.31, - "grp": "ul", - "hps": 2.94, - "id": "7i", - "integrity": 40, - "mass": 4, - "mount": "G", - "power": 1.04, - "range": 3000, - "rating": "F", - "rof": 4.2, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 3.51, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 15, - "class": 2, - "cost": 162800, - "dps": 6.8, - "edID": 128049408, - "eddbID": 839, - "eps": 1.209, - "grp": "ul", - "hps": 1.56, - "id": "7j", - "integrity": 40, - "mass": 4, - "mount": "T", - "power": 0.98, - "range": 3000, - "rating": "F", - "rof": 3.9, - "type": "T" - }, { "armourpen": 20, - "breachdps": 7.05, + "breachdmg": 7.05, "breachmax": 0.8, "breachmin": 0.4, "burst": 3, "burstrof": 15, "class": 1, "cost": 4400, - "dps": 8.1, + "damage": 1.72, + "distdraw": 0.31, "edID": 128049400, "eddbID": 832, - "eps": 1.457, "grp": "ul", - "hps": 1.88, "id": "11", "integrity": 40, "mass": 2, @@ -8389,24 +8191,24 @@ "power": 0.65, "range": 3000, "rating": "F", - "rof": 4.7, + "rof": 4.735, + "thermload": 0.4, "type": "T" }, { "armourpen": 20, - "breachdps": 5.3, + "breachdmg": 5.3, "breachmax": 0.8, "breachmin": 0.4, "burst": 3, "burstrof": 17, "class": 1, "cost": 8600, - "dps": 6.4, + "damage": 1.22, + "distdraw": 0.27, "edID": 128049404, "eddbID": 835, - "eps": 1.4, "grp": "ul", - "hps": 1.6, "id": "12", "integrity": 40, "mass": 2, @@ -8414,24 +8216,24 @@ "power": 0.64, "range": 3000, "rating": "G", - "rof": 5.3, + "rof": 5.28, + "thermload": 0.3, "type": "T" }, { "armourpen": 20, - "breachdps": 1.92, + "breachdmg": 1.92, "breachmax": 0.8, "breachmin": 0.4, "burst": 3, "burstrof": 19, "class": 1, "cost": 52800, - "dps": 4.2, + "damage": 0.87, + "distdraw": 0.16, "edID": 128049407, "eddbID": 838, - "eps": 0.768, "grp": "ul", - "hps": 0.96, "id": "13", "integrity": 40, "mass": 2, @@ -8439,24 +8241,24 @@ "power": 0.6, "range": 3000, "rating": "G", - "rof": 4.8, + "rof": 4.795, + "thermload": 0.2, "type": "T" }, { "armourpen": 1, - "breachdps": 15.25, + "breachdmg": 15.25, "breachmax": 0, "breachmin": 0, "burst": 8, "burstrof": 20, "class": 1, "cost": 8800, - "dps": 18.3, + "damage": 18, + "distdraw": 0.4, "edID": 128671449, "eddbID": 1477, - "eps": 3.05, "grp": "ul", - "hps": 2.29, "id": "cy", "integrity": 40, "mass": 2, @@ -8466,200 +8268,224 @@ "pp": "Archon Delaine", "range": 600, "rating": "F", - "rof": 7.6, + "rof": 7.615, + "thermload": 0.3, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 11.1, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 11, + "class": 2, + "cost": 23000, + "damage": 3.53, + "distdraw": 0.63, + "edID": 128049401, + "eddbID": 833, + "grp": "ul", + "id": "7h", + "integrity": 40, + "mass": 4, + "mount": "F", + "power": 1.05, + "range": 3000, + "rating": "E", + "rof": 3.695, + "thermload": 0.8, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 8.82, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 13, + "class": 2, + "cost": 48500, + "damage": 2.45, + "distdraw": 0.55, + "edID": 128049405, + "eddbID": 836, + "grp": "ul", + "id": "7i", + "integrity": 40, + "mass": 4, + "mount": "G", + "power": 1.04, + "range": 3000, + "rating": "F", + "rof": 4.2, + "thermload": 0.7, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 3.51, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 15, + "class": 2, + "cost": 162800, + "damage": 1.72, + "distdraw": 0.31, + "edID": 128049408, + "eddbID": 839, + "grp": "ul", + "id": "7j", + "integrity": 40, + "mass": 4, + "mount": "T", + "power": 0.98, + "range": 3000, + "rating": "F", + "rof": 3.93, + "thermload": 0.4, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 10.53, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 7, + "class": 3, + "cost": 140400, + "damage": 7.74, + "distdraw": 1.39, + "edID": 128049402, + "eddbID": 834, + "grp": "ul", + "id": "14", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 1.66, + "range": 3000, + "rating": "D", + "rof": 2.685, + "thermload": 1.7, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 14.08, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 9, + "class": 3, + "cost": 281600, + "damage": 5.16, + "distdraw": 1.16, + "edID": 128049406, + "eddbID": 837, + "grp": "ul", + "id": "15", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 1.65, + "range": 3000, + "rating": "E", + "rof": 3.215, + "thermload": 1.4, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 5.58, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 11, + "class": 3, + "cost": 800400, + "damage": 3.53, + "distdraw": 0.63, + "edID": 128049409, + "eddbID": 840, + "grp": "ul", + "id": "16", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 1.57, + "range": 3000, + "rating": "E", + "rof": 3.115, + "thermload": 0.8, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 28, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 3, + "class": 4, + "cost": 281600, + "damage": 20.6, + "distdraw": 3.71, + "edID": 128049403, + "eddbID": 1549, + "grp": "ul", + "id": "7s", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 2.58, + "range": 3000, + "rating": "E", + "rof": 1.565, + "thermload": 4.5, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 21.63, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 5, + "class": 4, + "cost": 1245600, + "damage": 12.1, + "distdraw": 2.72, + "edID": 128727920, + "eddbID": 1550, + "grp": "ul", + "id": "7t", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 2.59, + "range": 3000, + "rating": "E", + "rof": 2.14, + "thermload": 3.3, "type": "T" } ], "bl": [ - { - "armourpen": 60, - "breachdps": 33.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 2396160, - "dps": 41.4, - "edID": 128049431, - "eddbID": 1540, - "eps": 9.1, - "grp": "bl", - "hps": 9.9, - "id": "0w", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 2.9, - "range": 3000, - "rating": "A", - "type": "T" - }, - { - "armourpen": 60, - "breachdps": 26.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 8746160, - "dps": 32.7, - "edID": 128681994, - "eddbID": 1544, - "eps": 8.99, - "grp": "bl", - "hps": 10.6, - "id": "0x", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 2.86, - "range": 3000, - "rating": "A", - "type": "T" - }, - { - "armourpen": 50, - "breachdps": 20.6, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 1177600, - "dps": 25.8, - "edID": 128049430, - "eddbID": 843, - "eps": 5.67, - "grp": "bl", - "hps": 7.2, - "id": "0u", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 1.8, - "range": 3000, - "rating": "C", - "type": "T" - }, - { - "armourpen": 50, - "breachdps": 16.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 2396160, - "dps": 20.3, - "edID": 128049434, - "eddbID": 846, - "eps": 5.58, - "grp": "bl", - "hps": 7.6, - "id": "0v", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 1.78, - "range": 3000, - "rating": "C", - "type": "T" - }, - { - "armourpen": 50, - "breachdps": 11.5, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 19399600, - "dps": 14.4, - "edID": 128049437, - "eddbID": 849, - "eps": 3.51, - "grp": "bl", - "hps": 5.1, - "id": "0o", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 1.68, - "range": 3000, - "rating": "D", - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 12.8, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 299520, - "dps": 16, - "edID": 128049429, - "eddbID": 842, - "eps": 3.51, - "grp": "bl", - "hps": 5.1, - "id": "0r", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 1.12, - "range": 3000, - "rating": "D", - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 10, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 500600, - "dps": 12.5, - "edID": 128049433, - "eddbID": 845, - "eps": 3.44, - "grp": "bl", - "hps": 5.3, - "id": "0s", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 1.1, - "range": 3000, - "rating": "D", - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 7.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 2099900, - "dps": 8.8, - "edID": 128049436, - "eddbID": 848, - "eps": 2.16, - "grp": "bl", - "hps": 3.5, - "id": "0t", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 1.03, - "range": 3000, - "rating": "E", - "type": "T" - }, { "armourpen": 18, - "breachdps": 7.9, + "breachdmg": 7.9, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 37430, - "dps": 9.8, + "damage": 9.8, + "distdraw": 2.16, "edID": 128049428, "eddbID": 841, - "eps": 2.16, "grp": "bl", - "hps": 3.5, "id": "10", "integrity": 40, "mass": 2, @@ -8667,21 +8493,21 @@ "power": 0.69, "range": 3000, "rating": "E", + "thermload": 3.5, "type": "T" }, { "armourpen": 18, - "breachdps": 6.1, + "breachdmg": 6.1, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 74650, - "dps": 7.7, + "damage": 7.66, + "distdraw": 2.11, "edID": 128049432, "eddbID": 844, - "eps": 2.11, "grp": "bl", - "hps": 3.7, "id": "0p", "integrity": 40, "mass": 2, @@ -8689,16 +8515,18 @@ "power": 0.67, "range": 3000, "rating": "E", + "thermload": 3.6, "type": "T" }, { "armourpen": 18, - "breachdps": 4.3, + "breachdmg": 4.3, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 500000, - "dps": 5.4, + "damage": 5.4, + "distdraw": 1.32, "edID": 128049435, "eddbID": 847, "eps": 1.32, @@ -8711,21 +8539,21 @@ "power": 0.63, "range": 3000, "rating": "F", + "thermload": 2.4, "type": "T" }, { "armourpen": 18, - "breachdps": 3.9, + "breachdmg": 3.9, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 56150, - "dps": 4.9, + "damage": 4.9, + "distdraw": 2.8, "edID": 128671346, "eddbID": 1476, - "eps": 2.8, "grp": "bl", - "hps": 2.7, "id": "b0", "integrity": 40, "mass": 2, @@ -8735,219 +8563,201 @@ "pp": "Edmund Mahon", "range": 3000, "rating": "E", + "thermload": 2.7, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 12.8, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 299520, + "damage": 15.96, + "distdraw": 3.51, + "edID": 128049429, + "eddbID": 842, + "grp": "bl", + "id": "0r", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 1.12, + "range": 3000, + "rating": "D", + "thermload": 5.1, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 10, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 500600, + "damage": 12.52, + "distdraw": 3.44, + "edID": 128049433, + "eddbID": 845, + "grp": "bl", + "id": "0s", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 1.1, + "range": 3000, + "rating": "D", + "thermload": 5.3, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 7.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 2099900, + "damage": 8.82, + "distdraw": 2.16, + "edID": 128049436, + "eddbID": 848, + "grp": "bl", + "id": "0t", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 1.03, + "range": 3000, + "rating": "E", + "thermload": 3.5, + "type": "T" + }, + { + "armourpen": 50, + "breachdmg": 20.6, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 1177600, + "damage": 25.78, + "distdraw": 5.67, + "edID": 128049430, + "eddbID": 843, + "grp": "bl", + "id": "0u", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 1.8, + "range": 3000, + "rating": "C", + "thermload": 7.2, + "type": "T" + }, + { + "armourpen": 50, + "breachdmg": 16.2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 2396160, + "damage": 20.28, + "distdraw": 5.58, + "edID": 128049434, + "eddbID": 846, + "grp": "bl", + "id": "0v", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 1.78, + "range": 3000, + "rating": "C", + "thermload": 7.6, + "type": "T" + }, + { + "armourpen": 50, + "breachdmg": 11.5, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 19399600, + "damage": 14.34, + "distdraw": 3.51, + "edID": 128049437, + "eddbID": 849, + "grp": "bl", + "id": "0o", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 1.68, + "range": 3000, + "rating": "D", + "thermload": 5.1, + "type": "T" + }, + { + "armourpen": 60, + "breachdmg": 33.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 2396160, + "damage": 41.38, + "distdraw": 9.1, + "edID": 128049431, + "eddbID": 1540, + "grp": "bl", + "id": "0w", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 2.9, + "range": 3000, + "rating": "A", + "thermload": 9.9, + "type": "T" + }, + { + "armourpen": 60, + "breachdmg": 26.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 8746160, + "damage": 32.68, + "distdraw": 8.99, + "edID": 128681994, + "eddbID": 1544, + "grp": "bl", + "id": "0x", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 2.86, + "range": 3000, + "rating": "A", + "thermload": 10.6, "type": "T" } ], "mc": [ - { - "ammo": 2100, - "armourpen": 68, - "breachdps": 25.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "clip": 90, - "cost": 1177600, - "dps": 28, - "edID": 128049458, - "eddbID": 1542, - "eps": 1.44, - "grp": "mc", - "hps": 2.4, - "id": "7n", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 0.73, - "range": 4000, - "rating": "A", - "reload": 4, - "rof": 3, - "roundspershot": 2, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 68, - "breachdps": 21.08, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "clip": 90, - "cost": 6377600, - "dps": 23.3, - "edID": 128681996, - "eddbID": 1546, - "eps": 2.516, - "grp": "mc", - "hps": 3.4, - "id": "7o", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 1.22, - "range": 4000, - "rating": "A", - "reload": 4, - "rof": 3.4, - "roundspershot": 2, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 54, - "breachdps": 20.65, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "clip": 90, - "cost": 140400, - "dps": 23.1, - "edID": 128049457, - "eddbID": 1541, - "eps": 1.062, - "grp": "mc", - "hps": 1.77, - "id": "7k", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 0.64, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 5.9, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 54, - "breachdps": 17.42, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "clip": 90, - "cost": 578436, - "damage": 2.83, - "distdraw": 0.25, - "dps": 18.9, - "edID": 128049461, - "eddbID": 1543, - "eps": 1.675, - "grp": "mc", - "hps": 2.22, - "id": "7l", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 0.97, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 6.667, - "speed": 1600, - "thermload": 0.333, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 37, - "breachdps": 14.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "clip": 90, - "cost": 38000, - "dps": 15.6, - "edID": 128049456, - "eddbID": 868, - "eps": 0.781, - "grp": "mc", - "hps": 1.42, - "id": "26", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.46, - "range": 4000, - "rating": "E", - "reload": 4, - "rof": 7.1, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 37, - "breachdps": 11.55, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "clip": 90, - "cost": 57000, - "dps": 12.6, - "edID": 128049460, - "eddbID": 870, - "eps": 1.078, - "grp": "mc", - "hps": 1.54, - "id": "27", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 0.64, - "range": 4000, - "rating": "F", - "reload": 4, - "rof": 7.7, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 37, - "breachdps": 6.82, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "clip": 90, - "cost": 1292800, - "dps": 7.3, - "edID": 128049463, - "eddbID": 872, - "eps": 0.372, - "grp": "mc", - "hps": 0.62, - "id": "28", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 0.5, - "range": 4000, - "rating": "F", - "reload": 4, - "rof": 6.2, - "speed": 1600, - "type": "K" - }, { "ammo": 2100, "armourpen": 22, - "breachdps": 7.7, + "breachdmg": 1, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 90, "cost": 9500, - "dps": 8.6, + "damage": 1.12, + "distdraw": 0.06, "edID": 128049455, "eddbID": 867, - "eps": 0.462, "grp": "mc", - "hps": 0.77, "id": "23", "integrity": 40, "mass": 2, @@ -8956,25 +8766,25 @@ "range": 4000, "rating": "F", "reload": 4, - "rof": 7.7, + "rof": 7.69, "speed": 1600, + "thermload": 0.1, "type": "K" }, { "ammo": 2100, "armourpen": 22, - "breachdps": 5.8, + "breachdmg": 0.7, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 90, "cost": 14250, - "dps": 6.8, + "damage": 0.82, + "distdraw": 0.07, "edID": 128049459, "eddbID": 869, - "eps": 0.58, "grp": "mc", - "hps": 0.83, "id": "24", "integrity": 40, "mass": 2, @@ -8983,25 +8793,25 @@ "range": 4000, "rating": "G", "reload": 4, - "rof": 8.3, + "rof": 8.33, "speed": 1600, + "thermload": 0.1, "type": "K" }, { "ammo": 2100, "armourpen": 22, - "breachdps": 3.55, + "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 90, "cost": 81600, - "dps": 4, + "damage": 0.56, + "distdraw": 0.03, "edID": 128049462, "eddbID": 871, - "eps": 0.213, "grp": "mc", - "hps": 0, "id": "25", "integrity": 40, "mass": 2, @@ -9010,18 +8820,22 @@ "range": 4000, "rating": "G", "reload": 4, - "rof": 7.1, + "rof": 7.14, "speed": 1600, + "thermload": 0, "type": "K" }, { "ammo": 1000, "armourpen": "A", + "breachdmg": 2.7, + "breachmax": 0.8, + "breachmin": 0.4, "class": 1, "clip": 60, "cost": 13980, - "damage": 4, - "dps": 4, + "damage": 3, + "distdraw": 0.12, "eddbID": 1481, "grp": "mc", "id": "e0", @@ -9030,23 +8844,463 @@ "name": "Enforcer", "power": 0.28, "pp": "Pranav Antal", + "range": 4500, "rating": "F", + "reload": 8, "rof": 4.3, - "thermload": 1, + "speed": 1800, + "thermload": 0.2, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 37, + "breachdmg": 2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 90, + "cost": 38000, + "damage": 2.19, + "distdraw": 0.11, + "edID": 128049456, + "eddbID": 868, + "grp": "mc", + "id": "26", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "rof": 7.14, + "speed": 1600, + "thermload": 0.2, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 37, + "breachdmg": 1.5, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 90, + "cost": 57000, + "damage": 1.64, + "distdraw": 0.14, + "edID": 128049460, + "eddbID": 870, + "grp": "mc", + "id": "27", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 0.64, + "range": 4000, + "rating": "F", + "reload": 4, + "rof": 7.69, + "speed": 1600, + "thermload": 0.2, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 37, + "breachdmg": 1.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 90, + "cost": 1292800, + "damage": 1.17, + "distdraw": 0.06, + "edID": 128049463, + "eddbID": 872, + "grp": "mc", + "id": "28", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 0.5, + "range": 4000, + "rating": "F", + "reload": 4, + "rof": 6.25, + "speed": 1600, + "thermload": 0.1, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 54, + "breachdmg": 3.5, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "clip": 90, + "cost": 140400, + "damage": 3.93, + "distdraw": 0.18, + "edID": 128049457, + "eddbID": 1541, + "grp": "mc", + "id": "7k", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 0.64, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 5.88, + "speed": 1600, + "thermload": 0.3, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 54, + "breachdmg": 2.6, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "clip": 90, + "cost": 578436, + "damage": 2.84, + "distdraw": 0.25, + "edID": 128049461, + "eddbID": 1543, + "grp": "mc", + "id": "7l", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 0.97, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 6.665, + "speed": 1600, + "thermload": 0.3, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 68, + "breachdmg": 4.2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "clip": 90, + "cost": 1177600, + "damage": 4.62, + "distdraw": 0.24, + "edID": 128049458, + "eddbID": 1542, + "grp": "mc", + "id": "7n", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 0.73, + "range": 4000, + "rating": "A", + "reload": 4, + "rof": 3.03, + "roundspershot": 2, + "speed": 1600, + "thermload": 0.4, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 68, + "breachdmg": 3.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "clip": 90, + "cost": 6377600, + "damage": 3.46, + "distdraw": 0.37, + "edID": 128681996, + "eddbID": 1546, + "grp": "mc", + "id": "7o", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 1.22, + "range": 4000, + "rating": "A", + "reload": 4, + "rof": 3.365, + "roundspershot": 2, + "speed": 1600, + "thermload": 0.5, "type": "K" } ], "c": [ + { + "ammo": 100, + "armourpen": 35, + "breachdmg": 17.1, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 1, + "clip": 5, + "cost": 21100, + "damage": 18, + "distdraw": 0.46, + "edID": 128049438, + "eddbID": 850, + "grp": "c", + "id": "1h", + "integrity": 40, + "mass": 2, + "mount": "F", + "power": 0.34, + "range": 3000, + "rating": "D", + "reload": 4, + "rof": 0.5, + "speed": 1200, + "thermload": 1.4, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 35, + "breachdmg": 13.2, + "breachmax": 0.9, + "breachmin": 0.6, + "class": 1, + "clip": 5, + "cost": 42200, + "damage": 13.9, + "distdraw": 0.48, + "edID": 128049442, + "eddbID": 854, + "grp": "c", + "id": "1i", + "integrity": 40, + "mass": 2, + "mount": "G", + "power": 0.38, + "range": 3000, + "rating": "E", + "reload": 4, + "rof": 0.52, + "speed": 1000, + "thermload": 1.3, + "type": "K" + }, { "ammo": 100, "armourpen": 90, - "breachdps": 25.28, + "breachdmg": 10.6, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 1, + "clip": 5, + "cost": 506400, + "damage": 11.1, + "distdraw": 0.22, + "edID": 128049445, + "eddbID": 857, + "grp": "c", + "id": "1j", + "integrity": 40, + "mass": 2, + "mount": "T", + "power": 0.32, + "range": 3000, + "rating": "F", + "reload": 4, + "rof": 0.435, + "speed": 1000, + "thermload": 0.7, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 28, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 2, + "clip": 5, + "cost": 168430, + "damage": 29.2, + "distdraw": 0.7, + "edID": 128049439, + "eddbID": 851, + "grp": "c", + "id": "1k", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.49, + "range": 3500, + "rating": "D", + "reload": 4, + "rof": 0.465, + "speed": 1051, + "thermload": 2.1, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 20.3, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 2, + "clip": 5, + "cost": 337600, + "damage": 21.3, + "distdraw": 0.75, + "edID": 128049443, + "eddbID": 855, + "grp": "c", + "id": "1l", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 0.54, + "range": 3500, + "rating": "D", + "reload": 4, + "rof": 0.485, + "speed": 875, + "thermload": 1.9, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 16.3, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 2, + "clip": 5, + "cost": 4051200, + "damage": 17.19, + "distdraw": 0.34, + "edID": 128049446, + "eddbID": 858, + "grp": "c", + "id": "1m", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 0.45, + "range": 3500, + "rating": "E", + "reload": 4, + "rof": 0.405, + "speed": 875, + "thermload": 1, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 42.3, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 3, + "clip": 5, + "cost": 675200, + "damage": 43.95, + "distdraw": 1.07, + "edID": 128049440, + "eddbID": 852, + "grp": "c", + "id": "1n", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 0.67, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 0.425, + "speed": 959, + "thermload": 3.2, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 30.9, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 3, + "clip": 5, + "cost": 1350400, + "damage": 32.51, + "distdraw": 1.14, + "edID": 128671120, + "eddbID": 1383, + "eps": 0.456, + "grp": "c", + "hps": 1.16, + "id": "1o", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 0.75, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 0.445, + "speed": 800, + "thermload": 2.9, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 25.14, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 3, + "clip": 5, + "cost": 16204800, + "damage": 26.4, + "distdraw": 0.53, + "edID": 128049447, + "eddbID": 859, + "grp": "c", + "id": "1p", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 0.64, + "range": 4000, + "rating": "D", + "reload": 4, + "rof": 0.37, + "speed": 800, + "thermload": 1.6, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 63.2, "breachmax": 0.8, "breachmin": 0.6, "class": 4, "clip": 5, "cost": 2700800, - "dps": 25.3, + "damage": 65.66, + "distdraw": 1.61, "edID": 128049441, "eddbID": 853, "eps": 0.644, @@ -9060,20 +9314,22 @@ "range": 4500, "rating": "B", "reload": 5, - "rof": 0.4, + "rof": 0.385, "speed": 900, + "thermload": 4.8, "type": "K" }, { "ammo": 100, "armourpen": 90, - "breachdps": 16.92, + "breachdmg": 46.7, "breachmax": 0.8, "breachmin": 0.6, "class": 4, "clip": 5, "cost": 5401600, - "dps": 19.7, + "damage": 49.2, + "distdraw": 1.72, "edID": 128049444, "eddbID": 856, "eps": 0.688, @@ -9089,355 +9345,112 @@ "reload": 4, "rof": 0.4, "speed": 750, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 16.92, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 3, - "clip": 5, - "cost": 675200, - "dps": 18.7, - "edID": 128049440, - "eddbID": 852, - "eps": 0.428, - "grp": "c", - "hps": 1.28, - "id": "1n", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 0.67, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 0.4, - "speed": 959, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 30.9, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 3, - "clip": 5, - "cost": 1350400, - "dps": 14.3, - "edID": 128671120, - "eddbID": 1383, - "eps": 0.456, - "grp": "c", - "hps": 1.16, - "id": "1o", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 0.75, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 0.4, - "speed": 800, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 10.04, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 3, - "clip": 5, - "cost": 16204800, - "dps": 9.7, - "edID": 128049447, - "eddbID": 859, - "eps": 0.212, - "grp": "c", - "hps": 0.64, - "id": "1p", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 0.64, - "range": 4000, - "rating": "D", - "reload": 4, - "rof": 0.4, - "speed": 800, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 14, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 2, - "clip": 5, - "cost": 168430, - "dps": 13.6, - "edID": 128049439, - "eddbID": 851, - "eps": 0.35, - "grp": "c", - "hps": 1.05, - "id": "1k", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.49, - "range": 3500, - "rating": "D", - "reload": 4, - "rof": 0.5, - "speed": 1051, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 101.5, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 2, - "clip": 5, - "cost": 337600, - "dps": 10.3, - "edID": 128049443, - "eddbID": 855, - "eps": 0.375, - "grp": "c", - "hps": 0.95, - "id": "1l", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 0.54, - "range": 3500, - "rating": "D", - "reload": 4, - "rof": 0.5, - "speed": 875, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 6.52, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 2, - "clip": 5, - "cost": 4051200, - "dps": 6.9, - "edID": 128049446, - "eddbID": 858, - "eps": 0.136, - "grp": "c", - "hps": 0.4, - "id": "1m", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 0.45, - "range": 3500, - "rating": "E", - "reload": 4, - "rof": 0.4, - "speed": 875, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 8.55, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 1, - "clip": 5, - "cost": 21100, - "dps": 9, - "edID": 128049438, - "eddbID": 850, - "eps": 0.23, - "grp": "c", - "hps": 0.7, - "id": "1h", - "integrity": 40, - "mass": 2, - "mount": "F", - "power": 0.34, - "range": 3000, - "rating": "D", - "reload": 4, - "rof": 0.5, - "speed": 1200, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 35, - "breachdps": 6.6, - "breachmax": 0.9, - "breachmin": 0.6, - "class": 1, - "clip": 5, - "cost": 42200, - "dps": 7.2, - "edID": 128049442, - "eddbID": 854, - "eps": 0.24, - "grp": "c", - "hps": 0.65, - "id": "1i", - "integrity": 40, - "mass": 2, - "mount": "G", - "power": 0.38, - "range": 3000, - "rating": "E", - "reload": 4, - "rof": 0.5, - "speed": 1000, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 4.24, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 1, - "clip": 5, - "cost": 506400, - "dps": 4.8, - "edID": 128049445, - "eddbID": 857, - "eps": 0.088, - "grp": "c", - "hps": 0.28, - "id": "1j", - "integrity": 40, - "mass": 2, - "mount": "T", - "power": 0.32, - "range": 3000, - "rating": "F", - "reload": 4, - "rof": 0.4, - "speed": 1000, + "thermload": 4.4, "type": "K" } ], "fc": [ { "ammo": 90, - "armourpen": 52, - "breachdps": 189, + "armourpen": 20, + "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, - "class": 3, + "class": 1, "clip": 3, - "cost": 1167360, - "dps": 113.8, - "edID": 128049450, - "eddbID": 862, - "eps": 30.78, + "cost": 36000, + "damage": 1.43, + "distdraw": 0.21, + "edID": 128049448, + "eddbID": 860, "grp": "fc", - "hps": 59.4, - "id": "1t", - "integrity": 80, + "id": "20", + "integrity": 40, "jitter": 0.5, - "mass": 8, + "mass": 2, "mount": "F", - "power": 1.02, + "power": 0.45, "range": 2000, - "rating": "C", + "rating": "E", "reload": 5, - "rof": 4.5, + "rof": 5.555, "roundspershot": 12, "speed": 667, + "thermload": 0.4, "type": "K" }, { "ammo": 90, - "armourpen": 52, - "breachdps": 167.04, + "armourpen": 20, + "breachdmg": 0.9, "breachmax": 0.8, "breachmin": 0.4, - "class": 3, + "class": 1, "clip": 3, - "cost": 1751040, - "dps": 184.6, - "edID": 128671321, - "eddbID": 1454, - "eps": 46.66, + "cost": 54720, + "damage": 1.01, + "distdraw": 0.26, + "edID": 128049451, + "eddbID": 863, "grp": "fc", - "hps": 80.64, - "id": "1u", - "integrity": 80, + "id": "21", + "integrity": 40, "jitter": 0.5, - "mass": 8, + "mass": 2, "mount": "G", - "power": 1.55, + "power": 0.59, "range": 2000, - "rating": "C", + "rating": "E", "reload": 5, - "rof": 4.8, + "rof": 5.88, "roundspershot": 12, "speed": 667, + "thermload": 0.4, "type": "K" }, { "ammo": 90, - "armourpen": 52, - "breachdps": 110.4, + "armourpen": 20, + "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, - "class": 3, + "class": 1, "clip": 3, - "cost": 5836800, - "dps": 122.9, - "edID": 128671322, - "eddbID": 1455, - "eps": 17.76, + "cost": 182400, + "damage": 0.69, + "distdraw": 0.1, + "edID": 128049453, + "eddbID": 865, "grp": "fc", - "hps": 33.6, - "id": "1v", - "integrity": 80, + "id": "22", + "integrity": 40, "jitter": 0.5, - "mass": 8, + "mass": 2, "mount": "T", - "power": 1.29, + "power": 0.42, "range": 2000, - "rating": "C", + "rating": "E", "reload": 5, - "rof": 4, + "rof": 4.76, "roundspershot": 12, "speed": 667, + "thermload": 0.2, "type": "K" }, { "ammo": 90, "armourpen": 35, - "breachdps": 138, + "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 3, "cost": 291840, - "dps": 122.9, + "damage": 2.56, + "distdraw": 0.37, "edID": 128049449, "eddbID": 861, - "eps": 22.2, "grp": "fc", - "hps": 42, "id": "1s", "integrity": 80, "jitter": 0.5, @@ -9450,23 +9463,23 @@ "rof": 5, "roundspershot": 12, "speed": 667, + "thermload": 0.7, "type": "K" }, { "ammo": 90, "armourpen": 35, - "breachdps": 114.48, + "breachdmg": 1.8, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 3, "cost": 437800, - "dps": 153.6, + "damage": 1.95, + "distdraw": 0.49, "edID": 128049452, "eddbID": 864, - "eps": 31.6, "grp": "fc", - "hps": 50.88, "id": "7e", "integrity": 80, "jitter": 0.5, @@ -9476,26 +9489,26 @@ "range": 2000, "rating": "D", "reload": 5, - "rof": 5.3, + "rof": 5.26, "roundspershot": 12, "speed": 667, + "thermload": 0.8, "type": "K" }, { "ammo": 90, "armourpen": 35, - "breachdps": 67.08, + "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 3, "cost": 1459200, - "dps": 123.2, + "damage": 1.43, + "distdraw": 0.21, "edID": 128049454, "eddbID": 866, - "eps": 10.84, "grp": "fc", - "hps": 20.64, "id": "7f", "integrity": 80, "jitter": 0.5, @@ -9505,110 +9518,115 @@ "range": 2000, "rating": "D", "reload": 5, - "rof": 3.7, + "rof": 4.345, "roundspershot": 12, "speed": 667, + "thermload": 0.4, "type": "K" }, { "ammo": 90, - "armourpen": 20, - "breachdps": 87.36, + "armourpen": 52, + "breachdmg": 3.5, "breachmax": 0.8, "breachmin": 0.4, - "class": 1, + "class": 3, "clip": 3, - "cost": 36000, - "dps": 95.3, - "edID": 128049448, - "eddbID": 860, - "eps": 14.112, + "cost": 1167360, + "damage": 3.92, + "distdraw": 0.57, + "edID": 128049450, + "eddbID": 862, "grp": "fc", - "hps": 26.88, - "id": "20", - "integrity": 40, + "id": "1t", + "integrity": 80, "jitter": 0.5, - "mass": 2, + "mass": 8, "mount": "F", - "power": 0.45, + "power": 1.02, "range": 2000, - "rating": "E", + "rating": "C", "reload": 5, - "rof": 5.6, + "rof": 4.545, "roundspershot": 12, "speed": 667, + "thermload": 1.1, "type": "K" }, { "ammo": 90, - "armourpen": 20, - "breachdps": 63.4, + "armourpen": 52, + "breachdmg": 2.9, "breachmax": 0.8, "breachmin": 0.4, - "class": 1, + "class": 3, "clip": 3, - "cost": 54720, - "dps": 71.3, - "edID": 128049451, - "eddbID": 863, - "eps": 18.408, + "cost": 1751040, + "damage": 3.23, + "distdraw": 0.81, + "edID": 128671321, + "eddbID": 1454, "grp": "fc", - "hps": 28.32, - "id": "21", - "integrity": 40, + "id": "1u", + "integrity": 80, "jitter": 0.5, - "mass": 2, + "mass": 8, "mount": "G", - "power": 0.59, + "power": 1.55, "range": 2000, - "rating": "E", + "rating": "C", "reload": 5, - "rof": 5.9, + "rof": 4.76, "roundspershot": 12, "speed": 667, + "thermload": 1.4, "type": "K" }, { "ammo": 90, - "armourpen": 20, - "breachdps": 34.56, + "armourpen": 52, + "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, - "class": 1, + "class": 3, "clip": 3, - "cost": 182400, - "dps": 39.4, - "edID": 128049453, - "eddbID": 865, - "eps": 6.72, + "cost": 5836800, + "damage": 2.56, + "distdraw": 0.37, + "edID": 128671322, + "eddbID": 1455, "grp": "fc", - "hps": 13.44, - "id": "22", - "integrity": 40, + "id": "1v", + "integrity": 80, "jitter": 0.5, - "mass": 2, + "mass": 8, "mount": "T", - "power": 0.42, + "power": 1.29, "range": 2000, - "rating": "E", + "rating": "C", "reload": 5, - "rof": 4.8, + "rof": 4, "roundspershot": 12, "speed": 667, + "thermload": 0.7, "type": "K" }, { "ammo": 90, - "armourpen": "A", + "armourpen": 52, + "breachdmg": 3.1, + "breachmax": 0.8, + "breachmin": 0.4, "class": 3, "clip": 3, "cost": 1400830, - "damage": 3, - "dps": 9, + "damage": 3.4, + "distdraw": 0.57, "edID": 128671343, "eddbID": 1478, "grp": "fc", "id": "pa", + "integrity": 64, "mass": 8, "mount": "F", "name": "Pacifier", @@ -9616,7 +9634,8 @@ "pp": "Zachary Hudson", "rating": "C", "rof": 4.5, - "thermload": 1, + "speed": 1000, + "thermload": 1.1, "type": "K" } ], @@ -9624,18 +9643,17 @@ { "ammo": 30, "armourpen": 30, - "breachdps": 35.2, + "breachdmg": 22.2, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 1, "cost": 51600, - "dps": 37, + "damage": 23.3, + "distdraw": 2.69, "edID": 128049488, "eddbID": 876, - "eps": 4.3, "grp": "rg", - "hps": 28.48, "id": "29", "integrity": 40, "mass": 2, @@ -9645,23 +9663,23 @@ "rating": "D", "reload": 1, "rof": 1.6, + "thermload": 17.8, "type": "KT" }, { "ammo": 30, "armourpen": 48, - "breachdps": 47.4, + "breachdmg": 39.5, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 1, "cost": 412800, - "dps": 50, + "damage": 41.5, + "distdraw": 5.11, "edID": 128049489, "eddbID": 877, - "eps": 6.132, "grp": "rg", - "hps": 36, "id": "2a", "integrity": 51, "mass": 4, @@ -9671,16 +9689,22 @@ "rating": "B", "reload": 1, "rof": 1.2, + "thermload": 30, "type": "KT" }, { "ammo": 90, "armourpen": "A", + "breachdmg": 14.3, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 6, "class": 2, "clip": 3, "cost": 619200, - "damage": 5, - "dps": 5, + "damage": 15, + "distdraw": 2, "edID": 128671341, "eddbID": 1484, "grp": "rg", @@ -9691,83 +9715,26 @@ "power": 1.63, "pp": "Arissa Lavigny-Duval", "rating": "B", - "rof": 0.6, - "thermload": 3, + "rof": 4.1, + "thermload": 16, "type": "KT" } ], "pa": [ - { - "ammo": 100, - "armourpen": 85, - "breachdps": 30.62, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "clip": 5, - "cost": 13793600, - "dps": 30, - "edID": 128049467, - "eddbID": 875, - "eps": 6.312, - "grp": "pa", - "hps": 8.85, - "id": "2c", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 2.63, - "range": 3500, - "rating": "A", - "reload": 8, - "rof": 0.3, - "roundspershot": 1, - "speed": 875, - "type": "KT" - }, - { - "ammo": 100, - "armourpen": 70, - "breachdps": 20.4, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "clip": 5, - "cost": 3051200, - "dps": 23.2, - "edID": 128049466, - "eddbID": 874, - "eps": 4.08, - "grp": "pa", - "hps": 6.54, - "id": "2b", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 1.97, - "range": 3500, - "rating": "B", - "reload": 8, - "rof": 0.3, - "roundspershot": 1, - "speed": 875, - "type": "KT" - }, { "ammo": 100, "armourpen": 55, - "breachdps": 13.26, + "breachdmg": 44.2, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 5, "cost": 834200, - "dps": 17.2, + "damage": 52, + "distdraw": 8.65, "edID": 128049465, "eddbID": 873, - "eps": 2.595, "grp": "pa", - "hps": 4.68, "id": "1g", "integrity": 51, "mass": 4, @@ -9776,26 +9743,52 @@ "range": 3500, "rating": "C", "reload": 8, - "rof": 0.3, - "roundspershot": 1, + "rof": 0.33, "speed": 875, + "thermload": 15.6, + "type": "KT" + }, + { + "ammo": 100, + "armourpen": 70, + "breachdmg": 68, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "clip": 5, + "cost": 3051200, + "damage": 79.93, + "distdraw": 13.6, + "edID": 128049466, + "eddbID": 874, + "grp": "pa", + "id": "2b", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 1.97, + "range": 3500, + "rating": "B", + "reload": 8, + "rof": 0.29, + "speed": 875, + "thermload": 21.8, "type": "KT" }, { "ammo": 300, "armourpen": 70, - "breachdps": 22.48, + "breachdmg": 28.1, "breachmax": 0.8, "breachmin": 0.4, "class": 3, "clip": 20, "cost": 4119120, - "dps": 27.5, + "damage": 33, + "distdraw": 5.5, "edID": 128671339, "eddbID": 1482, - "eps": 4.4, "grp": "pa", - "hps": 8.8, "id": "Ap", "integrity": 64, "mass": 8, @@ -9807,45 +9800,99 @@ "rating": "B", "reload": 8, "rof": 0.8, - "roundspershot": 1, "speed": 875, + "thermload": 11, + "type": "KT" + }, + { + "ammo": 100, + "armourpen": 85, + "breachdmg": 102, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "clip": 5, + "cost": 13793600, + "damage": 120, + "distdraw": 21.04, + "edID": 128049467, + "eddbID": 875, + "grp": "pa", + "id": "2c", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 2.63, + "range": 3500, + "rating": "A", + "reload": 8, + "rof": 0.25, + "speed": 875, + "thermload": 29.5, "type": "KT" } ], "mr": [ { - "ammo": 48, + "ammo": 16, "armourpen": 60, - "breachdps": 4.8, - "breachmax": 0, - "breachmin": 0, - "class": 2, - "clip": 12, - "cost": 190227, - "dps": 25, - "eddbID": 1559, - "eps": 0.12, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 1, + "clip": 8, + "cost": 32180, + "damage": 50, + "distdraw": 0.24, + "edID": 128666724, + "eddbID": 1326, "grp": "mr", - "hps": 1.08, - "id": "1z", - "integrity": 51, - "mass": 4, + "id": "2d", + "integrity": 40, + "mass": 2, "missile": "D", "mount": "F", - "name": "Rocket Propelled FSD Disruptor", - "power": 1.2, - "pp": "Yuri Grom", + "power": 0.4, "rating": "B", + "reload": 5, "rof": 0.5, "speed": 750, + "thermload": 3.6, + "type": "E" + }, + { + "ammo": 6, + "armourpen": 60, + "breachdmg": 16, + "breachmax": 0, + "breachmin": 0, + "class": 1, + "clip": 6, + "cost": 72600, + "damage": 40, + "distdraw": 0.24, + "edID": 128049492, + "eddbID": 878, + "grp": "mr", + "id": "2e", + "integrity": 40, + "mass": 2, + "missile": "S", + "mount": "F", + "power": 0.6, + "rating": "B", + "reload": 12, + "rof": 0.333, + "speed": 625, + "thermload": 3.6, "type": "E" }, { "ammo": 48, "armourpen": 60, - "breachdps": 0, - "breachmax": 0, - "breachmin": 0, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, "class": 2, "clip": 12, "cost": 240400, @@ -9863,20 +9910,21 @@ "power": 1.2, "rating": "B", "reload": 5, - "roundspershot": 1, + "rof": 0.5, "speed": 750, "type": "E" }, { "ammo": 18, "armourpen": 60, - "breachdps": 0, + "breachdmg": 16, "breachmax": 0, "breachmin": 0, "class": 2, "clip": 6, "cost": 512400, - "dps": 13.3, + "damage": 40, + "distdraw": 0.24, "edID": 128049493, "eddbID": 879, "eps": 0.07, @@ -9890,76 +9938,50 @@ "power": 1.2, "rating": "B", "reload": 12, - "roundspershot": 1, + "rof": 0.333, "speed": 625, + "thermload": 3.6, "type": "E" }, { - "ammo": 16, + "ammo": 48, "armourpen": 60, - "breachdps": 0, + "breachdmg": 16, "breachmax": 0, "breachmin": 0, - "class": 1, - "clip": 8, - "cost": 32180, - "dps": 25, - "edID": 128666724, - "eddbID": 1326, - "eps": 0.12, + "class": 2, + "clip": 12, + "cost": 190227, + "damage": 40, + "distdraw": 0.24, + "eddbID": 1559, "grp": "mr", - "hps": 1.8, - "id": "2d", - "integrity": 40, - "mass": 2, + "id": "1z", + "integrity": 51, + "mass": 4, "missile": "D", "mount": "F", - "power": 0.4, + "name": "Rocket Propelled FSD Disruptor", + "power": 1.2, + "pp": "Yuri Grom", "rating": "B", "reload": 5, - "rof": 0.5, - "roundspershot": 1, + "rof": 0.333, "speed": 750, - "type": "E" - }, - { - "ammo": 6, - "armourpen": 60, - "breachdps": 0, - "breachmax": 0, - "breachmin": 0, - "class": 1, - "clip": 6, - "cost": 72600, - "dps": 13.3, - "edID": 128049492, - "eddbID": 878, - "eps": 0.07, - "grp": "mr", - "hps": 1.08, - "id": "2e", - "integrity": 40, - "mass": 2, - "missile": "S", - "mount": "F", - "power": 0.6, - "rating": "B", - "reload": 12, - "rof": 0.3, - "roundspershot": 1, - "speed": 625, + "thermload": 3.6, "type": "E" }, { "ammo": 120, "armourpen": 60, - "breachdps": 6, + "breachdmg": 6, "breachmax": 0, "breachmin": 0, "class": 2, "clip": 12, "cost": 768600, - "dps": 60, + "damage": 7.5, + "distdraw": 0.24, "edID": 128671344, "eddbID": 1480, "eps": 1.92, @@ -9978,6 +10000,7 @@ "rof": 2, "roundspershot": 4, "speed": 600, + "thermload": 3.6, "type": "E" } ], @@ -9985,18 +10008,16 @@ { "ammo": 1, "armourpen": 10000, - "breachdps": 60, + "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, "class": 1, "clip": 1, "cost": 11200, - "dps": 120, + "damage": 120, "edID": 128049509, "eddbID": 882, - "eps": 0, "grp": "tp", - "hps": 45, "id": "2h", "integrity": 40, "mass": 2, @@ -10007,12 +10028,13 @@ "reload": 5, "rof": 1, "speed": 250, + "thermload": 45, "type": "E" }, { "ammo": 2, "armourpen": 10000, - "breachdps": 60, + "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, "class": 2, @@ -10021,9 +10043,7 @@ "dps": 120, "edID": 128049510, "eddbID": 883, - "eps": 0, "grp": "tp", - "hps": 50, "id": "2i", "integrity": 51, "mass": 4, @@ -10034,6 +10054,7 @@ "reload": 5, "rof": 1, "speed": 250, + "thermload": 50, "type": "E" } ], @@ -10041,18 +10062,17 @@ { "ammo": 36, "armourpen": 60, - "breachdps": 0, + "breachdmg": 0, "breachmax": 0, "breachmin": 0, "class": 1, "clip": 3, "cost": 24260, - "dps": 44, + "damage": 44, + "distdraw": 0, "edID": 128049500, "eddbID": 880, - "eps": 0, "grp": "nl", - "hps": 5, "id": "2j", "integrity": 40, "mass": 2, @@ -10061,48 +10081,23 @@ "rating": "I", "reload": 2, "rof": 1, + "thermload": 5, "type": "ET" }, { "ammo": 36, "armourpen": 60, - "breachdps": 0, - "breachmax": 0, - "breachmin": 0, - "class": 2, - "clip": 3, - "cost": 294080, - "dps": 44, - "edID": 128049501, - "eddbID": 881, - "eps": 0, - "grp": "nl", - "hps": 7.5, - "id": "2k", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.4, - "rating": "I", - "reload": 2, - "rof": 1, - "type": "ET" - }, - { - "ammo": 36, - "armourpen": "C", - "breachdps": 0, + "breachdmg": 0, "breachmax": 0, "breachmin": 0, "class": 1, "clip": 3, "cost": 36400, - "dps": 32, - "eps": 0, + "damage": 32, + "distdraw": 0, "edID": 128671448, "eddbID": 1523, "grp": "nl", - "hps": 5, "id": "kp", "integrity": 40, "mass": 2, @@ -10112,56 +10107,65 @@ "rating": "I", "reload": 2, "rof": 1, + "thermload": 5, + "type": "ET" + }, + { + "ammo": 36, + "armourpen": 60, + "breachdmg": 0, + "breachmax": 0, + "breachmin": 0, + "class": 2, + "clip": 3, + "cost": 294080, + "damage": 44, + "distdraw": 0, + "edID": 128049501, + "eddbID": 881, + "grp": "nl", + "id": "2k", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.4, + "rating": "I", + "reload": 2, + "rof": 1, + "thermload": 7.5, "type": "ET" } ], "ml": [ { "armourpen": 18, - "breachdps": 0.3, + "breachdmg": 0.3, "breachmax": 0.2, "breachmin": 0.1, "class": 1, "cost": 6800, - "dps": 2, + "damage": 2, + "distdraw": 1.5, "edID": 128049525, "eddbID": 888, - "eps": 1.5, "grp": "ml", - "hps": 2, "id": "2l", "integrity": 40, "mass": 2, "mount": "F", "power": 0.5, - "rating": "D" - }, - { - "armourpen": 18, - "breachdps": 0.6, - "breachmax": 0.2, - "breachmin": 0.1, - "class": 2, - "cost": 22580, - "dps": 4, - "edID": 128049526, - "eddbID": 889, - "eps": 3, - "grp": "ml", - "hps": 4, - "id": "2m", - "integrity": 51, - "mass": 2, - "mount": "F", - "power": 0.75, - "rating": "D" + "rating": "D", + "thermload": 2 }, { "armourpen": "D", + "breachdmg": 0.6, + "breachmax": 0.2, + "breachmin": 0.1, "class": 1, "cost": 13600, - "damage": 3, - "dps": 3, + "damage": 8, + "distdraw": 1.75, "eddbID": 1479, "grp": "ml", "id": "ml", @@ -10171,8 +10175,28 @@ "power": 0.7, "pp": "Zemina Torval", "rating": "D", - "thermload": 3, + "thermload": 6, "type": "T" + }, + { + "armourpen": 18, + "breachdmg": 1.2, + "breachmax": 0.2, + "breachmin": 0.1, + "class": 2, + "cost": 22580, + "damage": 8, + "distdraw": 1.75, + "edID": 128049526, + "eddbID": 889, + "grp": "ml", + "id": "2m", + "integrity": 51, + "mass": 2, + "mount": "F", + "power": 0.75, + "rating": "D", + "thermload": 4 } ], "cs": [ @@ -10546,7 +10570,7 @@ "cost": 18550, "edID": 128049522, "eddbID": 887, - "grp": "cm", + "grp": "po", "id": "03", "integrity": 30, "jitter": 1.5, diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json index c1244bb..c72581d 100644 --- a/modules/hardpoints/beam_laser.json +++ b/modules/hardpoints/beam_laser.json @@ -1,194 +1,17 @@ { "bl": [ - { - "armourpen": 60, - "breachdps": 33.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 2396160, - "dps": 41.4, - "edID": 128049431, - "eddbID": 1540, - "eps": 9.1, - "grp": "bl", - "hps": 9.9, - "id": "0w", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 2.9, - "range": 3000, - "rating": "A", - "type": "T" - }, - { - "armourpen": 60, - "breachdps": 26.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 8746160, - "dps": 32.7, - "edID": 128681994, - "eddbID": 1544, - "eps": 8.99, - "grp": "bl", - "hps": 10.6, - "id": "0x", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 2.86, - "range": 3000, - "rating": "A", - "type": "T" - }, - { - "armourpen": 50, - "breachdps": 20.6, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 1177600, - "dps": 25.8, - "edID": 128049430, - "eddbID": 843, - "eps": 5.67, - "grp": "bl", - "hps": 7.2, - "id": "0u", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 1.8, - "range": 3000, - "rating": "C", - "type": "T" - }, - { - "armourpen": 50, - "breachdps": 16.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 2396160, - "dps": 20.3, - "edID": 128049434, - "eddbID": 846, - "eps": 5.58, - "grp": "bl", - "hps": 7.6, - "id": "0v", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 1.78, - "range": 3000, - "rating": "C", - "type": "T" - }, - { - "armourpen": 50, - "breachdps": 11.5, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 19399600, - "dps": 14.4, - "edID": 128049437, - "eddbID": 849, - "eps": 3.51, - "grp": "bl", - "hps": 5.1, - "id": "0o", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 1.68, - "range": 3000, - "rating": "D", - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 12.8, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 299520, - "dps": 16, - "edID": 128049429, - "eddbID": 842, - "eps": 3.51, - "grp": "bl", - "hps": 5.1, - "id": "0r", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 1.12, - "range": 3000, - "rating": "D", - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 10, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 500600, - "dps": 12.5, - "edID": 128049433, - "eddbID": 845, - "eps": 3.44, - "grp": "bl", - "hps": 5.3, - "id": "0s", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 1.1, - "range": 3000, - "rating": "D", - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 7.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 2099900, - "dps": 8.8, - "edID": 128049436, - "eddbID": 848, - "eps": 2.16, - "grp": "bl", - "hps": 3.5, - "id": "0t", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 1.03, - "range": 3000, - "rating": "E", - "type": "T" - }, { "armourpen": 18, - "breachdps": 7.9, + "breachdmg": 7.9, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 37430, - "dps": 9.8, + "damage": 9.8, + "distdraw": 2.16, "edID": 128049428, "eddbID": 841, - "eps": 2.16, "grp": "bl", - "hps": 3.5, "id": "10", "integrity": 40, "mass": 2, @@ -196,21 +19,21 @@ "power": 0.69, "range": 3000, "rating": "E", + "thermload": 3.5, "type": "T" }, { "armourpen": 18, - "breachdps": 6.1, + "breachdmg": 6.1, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 74650, - "dps": 7.7, + "damage": 7.66, + "distdraw": 2.11, "edID": 128049432, "eddbID": 844, - "eps": 2.11, "grp": "bl", - "hps": 3.7, "id": "0p", "integrity": 40, "mass": 2, @@ -218,16 +41,18 @@ "power": 0.67, "range": 3000, "rating": "E", + "thermload": 3.6, "type": "T" }, { "armourpen": 18, - "breachdps": 4.3, + "breachdmg": 4.3, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 500000, - "dps": 5.4, + "damage": 5.4, + "distdraw": 1.32, "edID": 128049435, "eddbID": 847, "eps": 1.32, @@ -240,21 +65,21 @@ "power": 0.63, "range": 3000, "rating": "F", + "thermload": 2.4, "type": "T" }, { "armourpen": 18, - "breachdps": 3.9, + "breachdmg": 3.9, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 56150, - "dps": 4.9, + "damage": 4.9, + "distdraw": 2.80, "edID": 128671346, "eddbID": 1476, - "eps": 2.8, "grp": "bl", - "hps": 2.7, "id": "b0", "integrity": 40, "mass": 2, @@ -264,6 +89,183 @@ "pp": "Edmund Mahon", "range": 3000, "rating": "E", + "thermload": 2.7, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 12.8, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 299520, + "damage": 15.96, + "distdraw": 3.51, + "edID": 128049429, + "eddbID": 842, + "grp": "bl", + "id": "0r", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 1.12, + "range": 3000, + "rating": "D", + "thermload": 5.1, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 10, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 500600, + "damage": 12.52, + "distdraw": 3.44, + "edID": 128049433, + "eddbID": 845, + "grp": "bl", + "id": "0s", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 1.1, + "range": 3000, + "rating": "D", + "thermload": 5.3, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 7.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 2099900, + "damage": 8.82, + "distdraw": 2.16, + "edID": 128049436, + "eddbID": 848, + "grp": "bl", + "id": "0t", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 1.03, + "range": 3000, + "rating": "E", + "thermload": 3.5, + "type": "T" + }, + { + "armourpen": 50, + "breachdmg": 20.6, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 1177600, + "damage": 25.78, + "distdraw": 5.67, + "edID": 128049430, + "eddbID": 843, + "grp": "bl", + "id": "0u", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 1.8, + "range": 3000, + "rating": "C", + "thermload": 7.2, + "type": "T" + }, + { + "armourpen": 50, + "breachdmg": 16.2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 2396160, + "damage": 20.28, + "distdraw": 5.58, + "edID": 128049434, + "eddbID": 846, + "grp": "bl", + "id": "0v", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 1.78, + "range": 3000, + "rating": "C", + "thermload": 7.6, + "type": "T" + }, + { + "armourpen": 50, + "breachdmg": 11.5, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 19399600, + "damage": 14.34, + "distdraw": 3.51, + "edID": 128049437, + "eddbID": 849, + "grp": "bl", + "id": "0o", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 1.68, + "range": 3000, + "rating": "D", + "thermload": 5.1, + "type": "T" + }, + { + "armourpen": 60, + "breachdmg": 33.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 2396160, + "damage": 41.38, + "distdraw": 9.10, + "edID": 128049431, + "eddbID": 1540, + "grp": "bl", + "id": "0w", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 2.9, + "range": 3000, + "rating": "A", + "thermload": 9.9, + "type": "T" + }, + { + "armourpen": 60, + "breachdmg": 26.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 8746160, + "damage": 32.68, + "distdraw": 8.99, + "edID": 128681994, + "eddbID": 1544, + "grp": "bl", + "id": "0x", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 2.86, + "range": 3000, + "rating": "A", + "thermload": 10.6, "type": "T" } ] diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json index 45857e0..07ebca0 100644 --- a/modules/hardpoints/burst_laser.json +++ b/modules/hardpoints/burst_laser.json @@ -1,220 +1,19 @@ { "ul": [ - { - "armourpen": 65, - "breachdps": 28, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 3, - "class": 4, - "cost": 281600, - "dps": 32.3, - "edID": 128049403, - "eddbID": 1549, - "eps": 5.936, - "grp": "ul", - "hps": 7.2, - "id": "7s", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 2.58, - "range": 3000, - "rating": "E", - "rof": 1.6, - "type": "T" - }, - { - "armourpen": 65, - "breachdps": 21.63, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 5, - "class": 4, - "cost": 1245600, - "dps": 25.9, - "edID": 128727920, - "eddbID": 1550, - "eps": 5.712, - "grp": "ul", - "hps": 6.93, - "id": "7t", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 2.59, - "range": 3000, - "rating": "E", - "rof": 2.1, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 10.53, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 7, - "class": 3, - "cost": 140400, - "dps": 20.8, - "edID": 128049402, - "eddbID": 834, - "eps": 3.753, - "grp": "ul", - "hps": 4.59, - "id": "14", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 1.66, - "range": 3000, - "rating": "D", - "rof": 2.7, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 14.08, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 9, - "class": 3, - "cost": 281600, - "dps": 16.6, - "edID": 128049406, - "eddbID": 837, - "eps": 3.712, - "grp": "ul", - "hps": 4.48, - "id": "15", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 1.65, - "range": 3000, - "rating": "E", - "rof": 3.2, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 5.58, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 11, - "class": 3, - "cost": 800400, - "dps": 11, - "edID": 128049409, - "eddbID": 840, - "eps": 1.913, - "grp": "ul", - "hps": 2.48, - "id": "16", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 1.57, - "range": 3000, - "rating": "E", - "rof": 3.1, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 11.1, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 11, - "class": 2, - "cost": 23000, - "dps": 13, - "edID": 128049401, - "eddbID": 833, - "eps": 2.331, - "grp": "ul", - "hps": 2.96, - "id": "7h", - "integrity": 40, - "mass": 4, - "mount": "F", - "power": 1.05, - "range": 3000, - "rating": "E", - "rof": 3.7, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 8.82, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 13, - "class": 2, - "cost": 48500, - "dps": 10.3, - "edID": 128049405, - "eddbID": 836, - "eps": 2.31, - "grp": "ul", - "hps": 2.94, - "id": "7i", - "integrity": 40, - "mass": 4, - "mount": "G", - "power": 1.04, - "range": 3000, - "rating": "F", - "rof": 4.2, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 3.51, - "breachmax": 0.8, - "breachmin": 0.4, - "burst": 3, - "burstrof": 15, - "class": 2, - "cost": 162800, - "dps": 6.8, - "edID": 128049408, - "eddbID": 839, - "eps": 1.209, - "grp": "ul", - "hps": 1.56, - "id": "7j", - "integrity": 40, - "mass": 4, - "mount": "T", - "power": 0.98, - "range": 3000, - "rating": "F", - "rof": 3.9, - "type": "T" - }, { "armourpen": 20, - "breachdps": 7.05, + "breachdmg": 7.05, "breachmax": 0.8, "breachmin": 0.4, "burst": 3, "burstrof": 15, "class": 1, "cost": 4400, - "dps": 8.1, + "damage": 1.72, + "distdraw": 0.31, "edID": 128049400, "eddbID": 832, - "eps": 1.457, "grp": "ul", - "hps": 1.88, "id": "11", "integrity": 40, "mass": 2, @@ -222,24 +21,24 @@ "power": 0.65, "range": 3000, "rating": "F", - "rof": 4.7, + "rof": 4.735, + "thermload": 0.4, "type": "T" }, { "armourpen": 20, - "breachdps": 5.3, + "breachdmg": 5.3, "breachmax": 0.8, "breachmin": 0.4, "burst": 3, "burstrof": 17, "class": 1, "cost": 8600, - "dps": 6.4, + "damage": 1.22, + "distdraw": 0.27, "edID": 128049404, "eddbID": 835, - "eps": 1.4, "grp": "ul", - "hps": 1.6, "id": "12", "integrity": 40, "mass": 2, @@ -247,24 +46,24 @@ "power": 0.64, "range": 3000, "rating": "G", - "rof": 5.3, + "rof": 5.28, + "thermload": 0.3, "type": "T" }, { "armourpen": 20, - "breachdps": 1.92, + "breachdmg": 1.92, "breachmax": 0.8, "breachmin": 0.4, "burst": 3, "burstrof": 19, "class": 1, "cost": 52800, - "dps": 4.2, + "damage": 0.87, + "distdraw": 0.16, "edID": 128049407, "eddbID": 838, - "eps": 0.768, "grp": "ul", - "hps": 0.96, "id": "13", "integrity": 40, "mass": 2, @@ -272,24 +71,24 @@ "power": 0.6, "range": 3000, "rating": "G", - "rof": 4.8, + "rof": 4.795, + "thermload": 0.2, "type": "T" }, { "armourpen": 1, - "breachdps": 15.25, + "breachdmg": 15.25, "breachmax": 0, "breachmin": 0, "burst": 8, "burstrof": 20, "class": 1, "cost": 8800, - "dps": 18.3, + "damage": 18, + "distdraw": 0.4, "edID": 128671449, "eddbID": 1477, - "eps": 3.05, "grp": "ul", - "hps": 2.29, "id": "cy", "integrity": 40, "mass": 2, @@ -299,7 +98,208 @@ "pp": "Archon Delaine", "range": 600, "rating": "F", - "rof": 7.6, + "rof": 7.615, + "thermload": 0.3, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 11.1, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 11, + "class": 2, + "cost": 23000, + "damage": 3.53, + "distdraw": 0.63, + "edID": 128049401, + "eddbID": 833, + "grp": "ul", + "id": "7h", + "integrity": 40, + "mass": 4, + "mount": "F", + "power": 1.05, + "range": 3000, + "rating": "E", + "rof": 3.695, + "thermload": 0.8, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 8.82, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 13, + "class": 2, + "cost": 48500, + "damage": 2.45, + "distdraw": 0.55, + "edID": 128049405, + "eddbID": 836, + "grp": "ul", + "id": "7i", + "integrity": 40, + "mass": 4, + "mount": "G", + "power": 1.04, + "range": 3000, + "rating": "F", + "rof": 4.2, + "thermload": 0.7, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 3.51, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 15, + "class": 2, + "cost": 162800, + "damage": 1.72, + "distdraw": 0.31, + "edID": 128049408, + "eddbID": 839, + "grp": "ul", + "id": "7j", + "integrity": 40, + "mass": 4, + "mount": "T", + "power": 0.98, + "range": 3000, + "rating": "F", + "rof": 3.93, + "thermload": 0.4, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 10.53, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 7, + "class": 3, + "cost": 140400, + "damage": 7.74, + "distdraw": 1.39, + "edID": 128049402, + "eddbID": 834, + "grp": "ul", + "id": "14", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 1.66, + "range": 3000, + "rating": "D", + "rof": 2.685, + "thermload": 1.7, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 14.08, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 9, + "class": 3, + "cost": 281600, + "damage": 5.16, + "distdraw": 1.16, + "edID": 128049406, + "eddbID": 837, + "grp": "ul", + "id": "15", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 1.65, + "range": 3000, + "rating": "E", + "rof": 3.215, + "thermload": 1.4, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 5.58, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 11, + "class": 3, + "cost": 800400, + "damage": 3.53, + "distdraw": 0.63, + "edID": 128049409, + "eddbID": 840, + "grp": "ul", + "id": "16", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 1.57, + "range": 3000, + "rating": "E", + "rof": 3.115, + "thermload": 0.8, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 28, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 3, + "class": 4, + "cost": 281600, + "damage": 20.6, + "distdraw": 3.71, + "edID": 128049403, + "eddbID": 1549, + "grp": "ul", + "id": "7s", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 2.58, + "range": 3000, + "rating": "E", + "rof": 1.565, + "thermload": 4.5, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 21.63, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 5, + "class": 4, + "cost": 1245600, + "damage": 12.10, + "distdraw": 2.72, + "edID": 128727920, + "eddbID": 1550, + "grp": "ul", + "id": "7t", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 2.59, + "range": 3000, + "rating": "E", + "rof": 2.14, + "thermload": 3.3, "type": "T" } ] diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index ba5eb42..8772004 100644 --- a/modules/hardpoints/cannon.json +++ b/modules/hardpoints/cannon.json @@ -1,15 +1,261 @@ { "c": [ + { + "ammo": 100, + "armourpen": 35, + "breachdmg": 17.1, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 1, + "clip": 5, + "cost": 21100, + "damage": 18, + "distdraw": 0.46, + "edID": 128049438, + "eddbID": 850, + "grp": "c", + "id": "1h", + "integrity": 40, + "mass": 2, + "mount": "F", + "power": 0.34, + "range": 3000, + "rating": "D", + "reload": 4, + "rof": 0.5, + "speed": 1200, + "thermload": 1.4, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 35, + "breachdmg": 13.2, + "breachmax": 0.9, + "breachmin": 0.6, + "class": 1, + "clip": 5, + "cost": 42200, + "damage": 13.9, + "distdraw": 0.48, + "edID": 128049442, + "eddbID": 854, + "grp": "c", + "id": "1i", + "integrity": 40, + "mass": 2, + "mount": "G", + "power": 0.38, + "range": 3000, + "rating": "E", + "reload": 4, + "rof": 0.52, + "speed": 1000, + "thermload": 1.3, + "type": "K" + }, { "ammo": 100, "armourpen": 90, - "breachdps": 25.28, + "breachdmg": 10.6, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 1, + "clip": 5, + "cost": 506400, + "damage": 11.1, + "distdraw": 0.22, + "edID": 128049445, + "eddbID": 857, + "grp": "c", + "id": "1j", + "integrity": 40, + "mass": 2, + "mount": "T", + "power": 0.32, + "range": 3000, + "rating": "F", + "reload": 4, + "rof": 0.435, + "speed": 1000, + "thermload": 0.7, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 28, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 2, + "clip": 5, + "cost": 168430, + "damage": 29.2, + "distdraw": 0.7, + "edID": 128049439, + "eddbID": 851, + "grp": "c", + "id": "1k", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.49, + "range": 3500, + "rating": "D", + "reload": 4, + "rof": 0.465, + "speed": 1051, + "thermload": 2.1, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 20.3, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 2, + "clip": 5, + "cost": 337600, + "damage": 21.3, + "distdraw": 0.75, + "edID": 128049443, + "eddbID": 855, + "grp": "c", + "id": "1l", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 0.54, + "range": 3500, + "rating": "D", + "reload": 4, + "rof": 0.485, + "speed": 875, + "thermload": 1.9, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 16.3, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 2, + "clip": 5, + "cost": 4051200, + "damage": 17.19, + "distdraw": 0.34, + "edID": 128049446, + "eddbID": 858, + "grp": "c", + "id": "1m", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 0.45, + "range": 3500, + "rating": "E", + "reload": 4, + "rof": 0.405, + "speed": 875, + "thermload": 1, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 42.3, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 3, + "clip": 5, + "cost": 675200, + "damage": 43.95, + "distdraw": 1.07, + "edID": 128049440, + "eddbID": 852, + "grp": "c", + "id": "1n", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 0.67, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 0.425, + "speed": 959, + "thermload": 3.2, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 30.9, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 3, + "clip": 5, + "cost": 1350400, + "damage": 32.51, + "distdraw": 1.14, + "edID": 128671120, + "eddbID": 1383, + "eps": 0.456, + "grp": "c", + "hps": 1.16, + "id": "1o", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 0.75, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 0.445, + "speed": 800, + "thermload": 2.9, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 25.14, + "breachmax": 0.8, + "breachmin": 0.6, + "class": 3, + "clip": 5, + "cost": 16204800, + "damage": 26.4, + "distdraw": 0.53, + "edID": 128049447, + "eddbID": 859, + "grp": "c", + "id": "1p", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 0.64, + "range": 4000, + "rating": "D", + "reload": 4, + "rof": 0.37, + "speed": 800, + "thermload": 1.6, + "type": "K" + }, + { + "ammo": 100, + "armourpen": 90, + "breachdmg": 63.2, "breachmax": 0.8, "breachmin": 0.6, "class": 4, "clip": 5, "cost": 2700800, - "dps": 25.3, + "damage": 65.66, + "distdraw": 1.61, "edID": 128049441, "eddbID": 853, "eps": 0.644, @@ -23,20 +269,22 @@ "range": 4500, "rating": "B", "reload": 5, - "rof": 0.4, + "rof": 0.385, "speed": 900, + "thermload": 4.8, "type": "K" }, { "ammo": 100, "armourpen": 90, - "breachdps": 16.92, + "breachdmg": 46.7, "breachmax": 0.8, "breachmin": 0.6, "class": 4, "clip": 5, "cost": 5401600, - "dps": 19.7, + "damage": 49.2, + "distdraw": 1.72, "edID": 128049444, "eddbID": 856, "eps": 0.688, @@ -52,249 +300,7 @@ "reload": 4, "rof": 0.4, "speed": 750, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 16.92, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 3, - "clip": 5, - "cost": 675200, - "dps": 18.7, - "edID": 128049440, - "eddbID": 852, - "eps": 0.428, - "grp": "c", - "hps": 1.28, - "id": "1n", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 0.67, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 0.4, - "speed": 959, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 30.9, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 3, - "clip": 5, - "cost": 1350400, - "dps": 14.3, - "edID": 128671120, - "eddbID": 1383, - "eps": 0.456, - "grp": "c", - "hps": 1.16, - "id": "1o", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 0.75, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 0.4, - "speed": 800, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 10.04, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 3, - "clip": 5, - "cost": 16204800, - "dps": 9.7, - "edID": 128049447, - "eddbID": 859, - "eps": 0.212, - "grp": "c", - "hps": 0.64, - "id": "1p", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 0.64, - "range": 4000, - "rating": "D", - "reload": 4, - "rof": 0.4, - "speed": 800, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 14, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 2, - "clip": 5, - "cost": 168430, - "dps": 13.6, - "edID": 128049439, - "eddbID": 851, - "eps": 0.35, - "grp": "c", - "hps": 1.05, - "id": "1k", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.49, - "range": 3500, - "rating": "D", - "reload": 4, - "rof": 0.5, - "speed": 1051, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 101.5, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 2, - "clip": 5, - "cost": 337600, - "dps": 10.3, - "edID": 128049443, - "eddbID": 855, - "eps": 0.375, - "grp": "c", - "hps": 0.95, - "id": "1l", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 0.54, - "range": 3500, - "rating": "D", - "reload": 4, - "rof": 0.5, - "speed": 875, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 6.52, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 2, - "clip": 5, - "cost": 4051200, - "dps": 6.9, - "edID": 128049446, - "eddbID": 858, - "eps": 0.136, - "grp": "c", - "hps": 0.4, - "id": "1m", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 0.45, - "range": 3500, - "rating": "E", - "reload": 4, - "rof": 0.4, - "speed": 875, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 8.55, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 1, - "clip": 5, - "cost": 21100, - "dps": 9, - "edID": 128049438, - "eddbID": 850, - "eps": 0.23, - "grp": "c", - "hps": 0.7, - "id": "1h", - "integrity": 40, - "mass": 2, - "mount": "F", - "power": 0.34, - "range": 3000, - "rating": "D", - "reload": 4, - "rof": 0.5, - "speed": 1200, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 35, - "breachdps": 6.6, - "breachmax": 0.9, - "breachmin": 0.6, - "class": 1, - "clip": 5, - "cost": 42200, - "dps": 7.2, - "edID": 128049442, - "eddbID": 854, - "eps": 0.24, - "grp": "c", - "hps": 0.65, - "id": "1i", - "integrity": 40, - "mass": 2, - "mount": "G", - "power": 0.38, - "range": 3000, - "rating": "E", - "reload": 4, - "rof": 0.5, - "speed": 1000, - "type": "K" - }, - { - "ammo": 100, - "armourpen": 90, - "breachdps": 4.24, - "breachmax": 0.8, - "breachmin": 0.6, - "class": 1, - "clip": 5, - "cost": 506400, - "dps": 4.8, - "edID": 128049445, - "eddbID": 857, - "eps": 0.088, - "grp": "c", - "hps": 0.28, - "id": "1j", - "integrity": 40, - "mass": 2, - "mount": "T", - "power": 0.32, - "range": 3000, - "rating": "F", - "reload": 4, - "rof": 0.4, - "speed": 1000, + "thermload": 4.4, "type": "K" } ] diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index 107958a..30dda4b 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -2,106 +2,105 @@ "fc": [ { "ammo": 90, - "armourpen": 52, - "breachdps": 189, + "armourpen": 20, + "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, - "class": 3, + "class": 1, "clip": 3, - "cost": 1167360, - "dps": 113.8, - "edID": 128049450, - "eddbID": 862, - "eps": 30.78, + "cost": 36000, + "damage": 1.43, + "distdraw": 0.21, + "edID": 128049448, + "eddbID": 860, "grp": "fc", - "hps": 59.4, - "id": "1t", - "integrity": 80, + "id": "20", + "integrity": 40, "jitter": 0.5, - "mass": 8, + "mass": 2, "mount": "F", - "power": 1.02, + "power": 0.45, "range": 2000, - "rating": "C", + "rating": "E", "reload": 5, - "rof": 4.5, + "rof": 5.555, "roundspershot": 12, "speed": 667, + "thermload": 0.4, "type": "K" }, { "ammo": 90, - "armourpen": 52, - "breachdps": 167.04, + "armourpen": 20, + "breachdmg": 0.9, "breachmax": 0.8, "breachmin": 0.4, - "class": 3, + "class": 1, "clip": 3, - "cost": 1751040, - "dps": 184.6, - "edID": 128671321, - "eddbID": 1454, - "eps": 46.66, + "cost": 54720, + "damage": 1.01, + "distdraw": 0.26, + "edID": 128049451, + "eddbID": 863, "grp": "fc", - "hps": 80.64, - "id": "1u", - "integrity": 80, + "id": "21", + "integrity": 40, "jitter": 0.5, - "mass": 8, + "mass": 2, "mount": "G", - "power": 1.55, + "power": 0.59, "range": 2000, - "rating": "C", + "rating": "E", "reload": 5, - "rof": 4.8, + "rof": 5.88, "roundspershot": 12, "speed": 667, + "thermload": 0.4, "type": "K" }, { "ammo": 90, - "armourpen": 52, - "breachdps": 110.4, + "armourpen": 20, + "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, - "class": 3, + "class": 1, "clip": 3, - "cost": 5836800, - "dps": 122.9, - "edID": 128671322, - "eddbID": 1455, - "eps": 17.76, + "cost": 182400, + "damage": 0.69, + "distdraw": 0.1, + "edID": 128049453, + "eddbID": 865, "grp": "fc", - "hps": 33.6, - "id": "1v", - "integrity": 80, + "id": "22", + "integrity": 40, "jitter": 0.5, - "mass": 8, + "mass": 2, "mount": "T", - "power": 1.29, + "power": 0.42, "range": 2000, - "rating": "C", + "rating": "E", "reload": 5, - "rof": 4, + "rof": 4.76, "roundspershot": 12, "speed": 667, + "thermload": 0.2, "type": "K" }, { "ammo": 90, "armourpen": 35, - "breachdps": 138, + "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 3, "cost": 291840, - "dps": 122.9, + "damage": 2.56, + "distdraw": 0.37, "edID": 128049449, "eddbID": 861, - "eps": 22.2, "grp": "fc", - "hps": 42, "id": "1s", "integrity": 80, "jitter": 0.5, @@ -114,23 +113,23 @@ "rof": 5, "roundspershot": 12, "speed": 667, + "thermload": 0.7, "type": "K" }, { "ammo": 90, "armourpen": 35, - "breachdps": 114.48, + "breachdmg": 1.8, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 3, "cost": 437800, - "dps": 153.6, + "damage": 1.95, + "distdraw": 0.49, "edID": 128049452, "eddbID": 864, - "eps": 31.6, "grp": "fc", - "hps": 50.88, "id": "7e", "integrity": 80, "jitter": 0.5, @@ -140,26 +139,26 @@ "range": 2000, "rating": "D", "reload": 5, - "rof": 5.3, + "rof": 5.26, "roundspershot": 12, "speed": 667, + "thermload": 0.8, "type": "K" }, { "ammo": 90, "armourpen": 35, - "breachdps": 67.08, + "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 3, "cost": 1459200, - "dps": 123.2, + "damage": 1.43, + "distdraw": 0.21, "edID": 128049454, "eddbID": 866, - "eps": 10.84, "grp": "fc", - "hps": 20.64, "id": "7f", "integrity": 80, "jitter": 0.5, @@ -169,110 +168,115 @@ "range": 2000, "rating": "D", "reload": 5, - "rof": 3.7, + "rof": 4.345, "roundspershot": 12, "speed": 667, + "thermload": 0.4, "type": "K" }, { "ammo": 90, - "armourpen": 20, - "breachdps": 87.36, + "armourpen": 52, + "breachdmg": 3.5, "breachmax": 0.8, "breachmin": 0.4, - "class": 1, + "class": 3, "clip": 3, - "cost": 36000, - "dps": 95.3, - "edID": 128049448, - "eddbID": 860, - "eps": 14.112, + "cost": 1167360, + "damage": 3.92, + "distdraw": 0.57, + "edID": 128049450, + "eddbID": 862, "grp": "fc", - "hps": 26.88, - "id": "20", - "integrity": 40, + "id": "1t", + "integrity": 80, "jitter": 0.5, - "mass": 2, + "mass": 8, "mount": "F", - "power": 0.45, + "power": 1.02, "range": 2000, - "rating": "E", + "rating": "C", "reload": 5, - "rof": 5.6, + "rof": 4.545, "roundspershot": 12, "speed": 667, + "thermload": 1.1, "type": "K" }, { "ammo": 90, - "armourpen": 20, - "breachdps": 63.4, + "armourpen": 52, + "breachdmg": 2.9, "breachmax": 0.8, "breachmin": 0.4, - "class": 1, + "class": 3, "clip": 3, - "cost": 54720, - "dps": 71.3, - "edID": 128049451, - "eddbID": 863, - "eps": 18.408, + "cost": 1751040, + "damage": 3.23, + "distdraw": 0.81, + "edID": 128671321, + "eddbID": 1454, "grp": "fc", - "hps": 28.32, - "id": "21", - "integrity": 40, + "id": "1u", + "integrity": 80, "jitter": 0.5, - "mass": 2, + "mass": 8, "mount": "G", - "power": 0.59, + "power": 1.55, "range": 2000, - "rating": "E", + "rating": "C", "reload": 5, - "rof": 5.9, + "rof": 4.76, "roundspershot": 12, "speed": 667, + "thermload": 1.4, "type": "K" }, { "ammo": 90, - "armourpen": 20, - "breachdps": 34.56, + "armourpen": 52, + "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, - "class": 1, + "class": 3, "clip": 3, - "cost": 182400, - "dps": 39.4, - "edID": 128049453, - "eddbID": 865, - "eps": 6.72, + "cost": 5836800, + "damage": 2.56, + "distdraw": 0.37, + "edID": 128671322, + "eddbID": 1455, "grp": "fc", - "hps": 13.44, - "id": "22", - "integrity": 40, + "id": "1v", + "integrity": 80, "jitter": 0.5, - "mass": 2, + "mass": 8, "mount": "T", - "power": 0.42, + "power": 1.29, "range": 2000, - "rating": "E", + "rating": "C", "reload": 5, - "rof": 4.8, + "rof": 4, "roundspershot": 12, "speed": 667, + "thermload": 0.7, "type": "K" }, { "ammo": 90, - "armourpen": "A", + "armourpen": 52, + "breachdmg": 3.1, + "breachmax": 0.8, + "breachmin": 0.4, "class": 3, "clip": 3, "cost": 1400830, - "damage": 3, - "dps": 9, + "damage": 3.4, + "distdraw": 0.57, "edID": 128671343, "eddbID": 1478, "grp": "fc", "id": "pa", + "integrity": 64, "mass": 8, "mount": "F", "name": "Pacifier", @@ -280,7 +284,8 @@ "pp": "Zachary Hudson", "rating": "C", "rof": 4.5, - "thermload": 1, + "speed": 1000, + "thermload": 1.1, "type": "K" } ] diff --git a/modules/hardpoints/mine_launcher.json b/modules/hardpoints/mine_launcher.json index 7533a7b..71d199d 100644 --- a/modules/hardpoints/mine_launcher.json +++ b/modules/hardpoints/mine_launcher.json @@ -3,18 +3,17 @@ { "ammo": 36, "armourpen": 60, - "breachdps": 0, + "breachdmg": 0, "breachmax": 0, "breachmin": 0, "class": 1, "clip": 3, "cost": 24260, - "dps": 44, + "damage": 44, + "distdraw": 0, "edID": 128049500, "eddbID": 880, - "eps": 0, "grp": "nl", - "hps": 5, "id": "2j", "integrity": 40, "mass": 2, @@ -23,48 +22,23 @@ "rating": "I", "reload": 2, "rof": 1, + "thermload": 5, "type": "ET" }, { "ammo": 36, "armourpen": 60, - "breachdps": 0, - "breachmax": 0, - "breachmin": 0, - "class": 2, - "clip": 3, - "cost": 294080, - "dps": 44, - "edID": 128049501, - "eddbID": 881, - "eps": 0, - "grp": "nl", - "hps": 7.5, - "id": "2k", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.4, - "rating": "I", - "reload": 2, - "rof": 1, - "type": "ET" - }, - { - "ammo": 36, - "armourpen": "C", - "breachdps": 0, + "breachdmg": 0, "breachmax": 0, "breachmin": 0, "class": 1, "clip": 3, "cost": 36400, - "dps": 32, - "eps": 0, + "damage": 32, + "distdraw": 0, "edID": 128671448, "eddbID": 1523, "grp": "nl", - "hps": 5, "id": "kp", "integrity": 40, "mass": 2, @@ -74,6 +48,32 @@ "rating": "I", "reload": 2, "rof": 1, + "thermload": 5, + "type": "ET" + }, + { + "ammo": 36, + "armourpen": 60, + "breachdmg": 0, + "breachmax": 0, + "breachmin": 0, + "class": 2, + "clip": 3, + "cost": 294080, + "damage": 44, + "distdraw": 0, + "edID": 128049501, + "eddbID": 881, + "grp": "nl", + "id": "2k", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.4, + "rating": "I", + "reload": 2, + "rof": 1, + "thermload": 7.5, "type": "ET" } ] diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index 12a5543..d60a8b1 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -2,50 +2,33 @@ "ml": [ { "armourpen": 18, - "breachdps": 0.3, + "breachdmg": 0.3, "breachmax": 0.2, "breachmin": 0.1, "class": 1, "cost": 6800, - "dps": 2, + "damage": 2, + "distdraw": 1.5, "edID": 128049525, "eddbID": 888, - "eps": 1.5, "grp": "ml", - "hps": 2, "id": "2l", "integrity": 40, "mass": 2, "mount": "F", "power": 0.5, - "rating": "D" - }, - { - "armourpen": 18, - "breachdps": 0.6, - "breachmax": 0.2, - "breachmin": 0.1, - "class": 2, - "cost": 22580, - "dps": 4, - "edID": 128049526, - "eddbID": 889, - "eps": 3, - "grp": "ml", - "hps": 4, - "id": "2m", - "integrity": 51, - "mass": 2, - "mount": "F", - "power": 0.75, - "rating": "D" + "rating": "D", + "thermload": 2 }, { "armourpen": "D", + "breachdmg": 0.6, + "breachmax": 0.2, + "breachmin": 0.1, "class": 1, "cost": 13600, - "damage": 3, - "dps": 3, + "damage": 8, + "distdraw": 1.75, "eddbID": 1479, "grp": "ml", "id": "ml", @@ -55,8 +38,28 @@ "power": 0.7, "pp": "Zemina Torval", "rating": "D", - "thermload": 3, + "thermload": 6, "type": "T" + }, + { + "armourpen": 18, + "breachdmg": 1.2, + "breachmax": 0.2, + "breachmin": 0.1, + "class": 2, + "cost": 22580, + "damage": 8, + "distdraw": 1.75, + "edID": 128049526, + "eddbID": 889, + "grp": "ml", + "id": "2m", + "integrity": 51, + "mass": 2, + "mount": "F", + "power": 0.75, + "rating": "D", + "thermload": 4 } ] } diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index 0785b38..a16052c 100644 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -1,38 +1,65 @@ { "mr": [ { - "ammo": 48, + "ammo": 16, "armourpen": 60, - "breachdps": 4.8, - "breachmax": 0, - "breachmin": 0, - "class": 2, - "clip": 12, - "cost": 190227, - "dps": 25, - "eddbID": 1559, - "eps": 0.12, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, + "class": 1, + "clip": 8, + "cost": 32180, + "damage": 50, + "distdraw": 0.24, + "edID": 128666724, + "eddbID": 1326, "grp": "mr", - "hps": 1.08, - "id": "1z", - "integrity": 51, - "mass": 4, + "id": "2d", + "integrity": 40, + "mass": 2, "missile": "D", "mount": "F", - "name": "Rocket Propelled FSD Disruptor", - "power": 1.2, - "pp": "Yuri Grom", + "power": 0.4, "rating": "B", + "reload": 5, "rof": 0.5, "speed": 750, + "thermload": 3.6, + "type": "E" + }, + { + "ammo": 6, + "armourpen": 60, + "breachdmg": 16, + "breachmax": 0, + "breachmin": 0, + "class": 1, + "clip": 6, + "cost": 72600, + "damage": 40, + "distdraw": 0.24, + "edID": 128049492, + "eddbID": 878, + "grp": "mr", + "id": "2e", + "integrity": 40, + "mass": 2, + "missile": "S", + "mount": "F", + "power": 0.6, + "rating": "B", + "reload": 12, + "rof": 0.333, + "speed": 625, + "thermload": 3.6, "type": "E" }, { "ammo": 48, "armourpen": 60, - "breachdps": 0, - "breachmax": 0, - "breachmin": 0, + "breachdmg": 20, + "breachmax": 1, + "breachmin": 1, "class": 2, "clip": 12, "cost": 240400, @@ -50,20 +77,21 @@ "power": 1.2, "rating": "B", "reload": 5, - "roundspershot": 1, + "rof": 0.5, "speed": 750, "type": "E" }, { "ammo": 18, "armourpen": 60, - "breachdps": 0, + "breachdmg": 16, "breachmax": 0, "breachmin": 0, "class": 2, "clip": 6, "cost": 512400, - "dps": 13.3, + "damage": 40, + "distdraw": 0.24, "edID": 128049493, "eddbID": 879, "eps": 0.07, @@ -77,76 +105,50 @@ "power": 1.2, "rating": "B", "reload": 12, - "roundspershot": 1, + "rof": 0.333, "speed": 625, + "thermload": 3.6, "type": "E" }, { - "ammo": 16, + "ammo": 48, "armourpen": 60, - "breachdps": 0, + "breachdmg": 16, "breachmax": 0, "breachmin": 0, - "class": 1, - "clip": 8, - "cost": 32180, - "dps": 25, - "edID": 128666724, - "eddbID": 1326, - "eps": 0.12, + "class": 2, + "clip": 12, + "cost": 190227, + "damage": 40, + "distdraw": 0.24, + "eddbID": 1559, "grp": "mr", - "hps": 1.8, - "id": "2d", - "integrity": 40, - "mass": 2, + "id": "1z", + "integrity": 51, + "mass": 4, "missile": "D", "mount": "F", - "power": 0.4, + "name": "Rocket Propelled FSD Disruptor", + "power": 1.2, + "pp": "Yuri Grom", "rating": "B", "reload": 5, - "rof": 0.5, - "roundspershot": 1, + "rof": 0.333, "speed": 750, - "type": "E" - }, - { - "ammo": 6, - "armourpen": 60, - "breachdps": 0, - "breachmax": 0, - "breachmin": 0, - "class": 1, - "clip": 6, - "cost": 72600, - "dps": 13.3, - "edID": 128049492, - "eddbID": 878, - "eps": 0.07, - "grp": "mr", - "hps": 1.08, - "id": "2e", - "integrity": 40, - "mass": 2, - "missile": "S", - "mount": "F", - "power": 0.6, - "rating": "B", - "reload": 12, - "rof": 0.3, - "roundspershot": 1, - "speed": 625, + "thermload": 3.6, "type": "E" }, { "ammo": 120, "armourpen": 60, - "breachdps": 6, + "breachdmg": 6, "breachmax": 0, "breachmin": 0, "class": 2, "clip": 12, "cost": 768600, - "dps": 60, + "damage": 7.5, + "distdraw": 0.24, "edID": 128671344, "eddbID": 1480, "eps": 1.92, @@ -165,6 +167,7 @@ "rof": 2, "roundspershot": 4, "speed": 600, + "thermload": 3.6, "type": "E" } ] diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index b8aca62..f1ec9fc 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -1,214 +1,19 @@ { "mc": [ - { - "ammo": 2100, - "armourpen": 68, - "breachdps": 25.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "clip": 90, - "cost": 1177600, - "dps": 28, - "edID": 128049458, - "eddbID": 1542, - "eps": 1.44, - "grp": "mc", - "hps": 2.4, - "id": "7n", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 0.73, - "range": 4000, - "rating": "A", - "reload": 4, - "rof": 3, - "roundspershot": 2, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 68, - "breachdps": 21.08, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "clip": 90, - "cost": 6377600, - "dps": 23.3, - "edID": 128681996, - "eddbID": 1546, - "eps": 2.516, - "grp": "mc", - "hps": 3.4, - "id": "7o", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 1.22, - "range": 4000, - "rating": "A", - "reload": 4, - "rof": 3.4, - "roundspershot": 2, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 54, - "breachdps": 20.65, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "clip": 90, - "cost": 140400, - "dps": 23.1, - "edID": 128049457, - "eddbID": 1541, - "eps": 1.062, - "grp": "mc", - "hps": 1.77, - "id": "7k", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 0.64, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 5.9, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 54, - "breachdps": 17.42, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "clip": 90, - "cost": 578436, - "damage": 2.83, - "distdraw": 0.25, - "dps": 18.9, - "edID": 128049461, - "eddbID": 1543, - "eps": 1.675, - "grp": "mc", - "hps": 2.22, - "id": "7l", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 0.97, - "range": 4000, - "rating": "C", - "reload": 4, - "rof": 6.667, - "speed": 1600, - "thermload": 0.333, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 37, - "breachdps": 14.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "clip": 90, - "cost": 38000, - "dps": 15.6, - "edID": 128049456, - "eddbID": 868, - "eps": 0.781, - "grp": "mc", - "hps": 1.42, - "id": "26", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.46, - "range": 4000, - "rating": "E", - "reload": 4, - "rof": 7.1, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 37, - "breachdps": 11.55, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "clip": 90, - "cost": 57000, - "dps": 12.6, - "edID": 128049460, - "eddbID": 870, - "eps": 1.078, - "grp": "mc", - "hps": 1.54, - "id": "27", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 0.64, - "range": 4000, - "rating": "F", - "reload": 4, - "rof": 7.7, - "speed": 1600, - "type": "K" - }, - { - "ammo": 2100, - "armourpen": 37, - "breachdps": 6.82, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "clip": 90, - "cost": 1292800, - "dps": 7.3, - "edID": 128049463, - "eddbID": 872, - "eps": 0.372, - "grp": "mc", - "hps": 0.62, - "id": "28", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 0.5, - "range": 4000, - "rating": "F", - "reload": 4, - "rof": 6.2, - "speed": 1600, - "type": "K" - }, { "ammo": 2100, "armourpen": 22, - "breachdps": 7.7, + "breachdmg": 1, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 90, "cost": 9500, - "dps": 8.6, + "damage": 1.12, + "distdraw": 0.06, "edID": 128049455, "eddbID": 867, - "eps": 0.462, "grp": "mc", - "hps": 0.77, "id": "23", "integrity": 40, "mass": 2, @@ -217,25 +22,25 @@ "range": 4000, "rating": "F", "reload": 4, - "rof": 7.7, + "rof": 7.69, "speed": 1600, + "thermload": 0.1, "type": "K" }, { "ammo": 2100, "armourpen": 22, - "breachdps": 5.8, + "breachdmg": 0.7, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 90, "cost": 14250, - "dps": 6.8, + "damage": 0.82, + "distdraw": 0.07, "edID": 128049459, "eddbID": 869, - "eps": 0.58, "grp": "mc", - "hps": 0.83, "id": "24", "integrity": 40, "mass": 2, @@ -244,25 +49,25 @@ "range": 4000, "rating": "G", "reload": 4, - "rof": 8.3, + "rof": 8.33, "speed": 1600, + "thermload": 0.1, "type": "K" }, { "ammo": 2100, "armourpen": 22, - "breachdps": 3.55, + "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 90, "cost": 81600, - "dps": 4, + "damage": 0.56, + "distdraw": 0.03, "edID": 128049462, "eddbID": 871, - "eps": 0.213, "grp": "mc", - "hps": 0, "id": "25", "integrity": 40, "mass": 2, @@ -271,18 +76,22 @@ "range": 4000, "rating": "G", "reload": 4, - "rof": 7.1, + "rof": 7.14, "speed": 1600, + "thermload": 0, "type": "K" }, { "ammo": 1000, "armourpen": "A", + "breachdmg": 2.7, + "breachmax": 0.8, + "breachmin": 0.4, "class": 1, "clip": 60, "cost": 13980, - "damage": 4, - "dps": 4, + "damage": 3, + "distdraw": 0.12, "eddbID": 1481, "grp": "mc", "id": "e0", @@ -291,9 +100,203 @@ "name": "Enforcer", "power": 0.28, "pp": "Pranav Antal", + "range": 4500, "rating": "F", + "reload": 8, "rof": 4.3, - "thermload": 1, + "speed": 1800, + "thermload": 0.2, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 37, + "breachdmg": 2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 90, + "cost": 38000, + "damage": 2.19, + "distdraw": 0.11, + "edID": 128049456, + "eddbID": 868, + "grp": "mc", + "id": "26", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "rof": 7.14, + "speed": 1600, + "thermload": 0.2, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 37, + "breachdmg": 1.5, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 90, + "cost": 57000, + "damage": 1.64, + "distdraw": 0.14, + "edID": 128049460, + "eddbID": 870, + "grp": "mc", + "id": "27", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 0.64, + "range": 4000, + "rating": "F", + "reload": 4, + "rof": 7.69, + "speed": 1600, + "thermload": 0.2, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 37, + "breachdmg": 1.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "clip": 90, + "cost": 1292800, + "damage": 1.17, + "distdraw": 0.06, + "edID": 128049463, + "eddbID": 872, + "grp": "mc", + "id": "28", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 0.5, + "range": 4000, + "rating": "F", + "reload": 4, + "rof": 6.25, + "speed": 1600, + "thermload": 0.1, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 54, + "breachdmg": 3.5, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "clip": 90, + "cost": 140400, + "damage": 3.93, + "distdraw": 0.18, + "edID": 128049457, + "eddbID": 1541, + "grp": "mc", + "id": "7k", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 0.64, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 5.88, + "speed": 1600, + "thermload": 0.3, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 54, + "breachdmg": 2.6, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "clip": 90, + "cost": 578436, + "damage": 2.84, + "distdraw": 0.25, + "edID": 128049461, + "eddbID": 1543, + "grp": "mc", + "id": "7l", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 0.97, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 6.665, + "speed": 1600, + "thermload": 0.3, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 68, + "breachdmg": 4.2, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "clip": 90, + "cost": 1177600, + "damage": 4.62, + "distdraw": 0.24, + "edID": 128049458, + "eddbID": 1542, + "grp": "mc", + "id": "7n", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 0.73, + "range": 4000, + "rating": "A", + "reload": 4, + "rof": 3.03, + "roundspershot": 2, + "speed": 1600, + "thermload": 0.4, + "type": "K" + }, + { + "ammo": 2100, + "armourpen": 68, + "breachdmg": 3.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "clip": 90, + "cost": 6377600, + "damage": 3.46, + "distdraw": 0.37, + "edID": 128681996, + "eddbID": 1546, + "grp": "mc", + "id": "7o", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 1.22, + "range": 4000, + "rating": "A", + "reload": 4, + "rof": 3.365, + "roundspershot": 2, + "speed": 1600, + "thermload": 0.5, "type": "K" } ] diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index 260f653..13b5362 100644 --- a/modules/hardpoints/plasma_accelerator.json +++ b/modules/hardpoints/plasma_accelerator.json @@ -1,76 +1,19 @@ { "pa": [ - { - "ammo": 100, - "armourpen": 85, - "breachdps": 30.62, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "clip": 5, - "cost": 13793600, - "dps": 30, - "edID": 128049467, - "eddbID": 875, - "eps": 6.312, - "grp": "pa", - "hps": 8.85, - "id": "2c", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 2.63, - "range": 3500, - "rating": "A", - "reload": 8, - "rof": 0.3, - "roundspershot": 1, - "speed": 875, - "type": "KT" - }, - { - "ammo": 100, - "armourpen": 70, - "breachdps": 20.4, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "clip": 5, - "cost": 3051200, - "dps": 23.2, - "edID": 128049466, - "eddbID": 874, - "eps": 4.08, - "grp": "pa", - "hps": 6.54, - "id": "2b", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 1.97, - "range": 3500, - "rating": "B", - "reload": 8, - "rof": 0.3, - "roundspershot": 1, - "speed": 875, - "type": "KT" - }, { "ammo": 100, "armourpen": 55, - "breachdps": 13.26, + "breachdmg": 44.2, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 5, "cost": 834200, - "dps": 17.2, + "damage": 52, + "distdraw": 8.65, "edID": 128049465, "eddbID": 873, - "eps": 2.595, "grp": "pa", - "hps": 4.68, "id": "1g", "integrity": 51, "mass": 4, @@ -79,26 +22,52 @@ "range": 3500, "rating": "C", "reload": 8, - "rof": 0.3, - "roundspershot": 1, + "rof": 0.33, "speed": 875, + "thermload": 15.6, + "type": "KT" + }, + { + "ammo": 100, + "armourpen": 70, + "breachdmg": 68, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "clip": 5, + "cost": 3051200, + "damage": 79.93, + "distdraw": 13.6, + "edID": 128049466, + "eddbID": 874, + "grp": "pa", + "id": "2b", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 1.97, + "range": 3500, + "rating": "B", + "reload": 8, + "rof": 0.29, + "speed": 875, + "thermload": 21.8, "type": "KT" }, { "ammo": 300, "armourpen": 70, - "breachdps": 22.48, + "breachdmg": 28.1, "breachmax": 0.8, "breachmin": 0.4, "class": 3, "clip": 20, "cost": 4119120, - "dps": 27.5, + "damage": 33, + "distdraw": 5.5, "edID": 128671339, "eddbID": 1482, - "eps": 4.4, "grp": "pa", - "hps": 8.8, "id": "Ap", "integrity": 64, "mass": 8, @@ -110,8 +79,35 @@ "rating": "B", "reload": 8, "rof": 0.8, - "roundspershot": 1, "speed": 875, + "thermload": 11, + "type": "KT" + }, + { + "ammo": 100, + "armourpen": 85, + "breachdmg": 102, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "clip": 5, + "cost": 13793600, + "damage": 120, + "distdraw": 21.04, + "edID": 128049467, + "eddbID": 875, + "grp": "pa", + "id": "2c", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 2.63, + "range": 3500, + "rating": "A", + "reload": 8, + "rof": 0.25, + "speed": 875, + "thermload": 29.5, "type": "KT" } ] diff --git a/modules/hardpoints/point_defence.json b/modules/hardpoints/point_defence.json index 35b9956..3cc8195 100644 --- a/modules/hardpoints/point_defence.json +++ b/modules/hardpoints/point_defence.json @@ -9,7 +9,7 @@ "cost": 18550, "edID": 128049522, "eddbID": 887, - "grp": "cm", + "grp": "po", "id": "03", "integrity": 30, "jitter": 1.5, diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json index cff32b1..3fa0701 100644 --- a/modules/hardpoints/pulse_laser.json +++ b/modules/hardpoints/pulse_laser.json @@ -1,202 +1,17 @@ { "pl": [ - { - "armourpen": 65, - "breachdps": 22.62, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 177600, - "dps": 26.9, - "edID": 128049384, - "eddbID": 1539, - "eps": 4.264, - "grp": "pl", - "hps": 4.16, - "id": "7q", - "integrity": 80, - "mass": 16, - "mount": "F", - "power": 1.33, - "range": 3000, - "rating": "A", - "rof": 2.6, - "type": "T" - }, - { - "armourpen": 65, - "breachdps": 18.48, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 4, - "cost": 877600, - "dps": 21.7, - "edID": 128681995, - "eddbID": 1545, - "eps": 4.368, - "grp": "pl", - "hps": 4.48, - "id": "7r", - "integrity": 80, - "mass": 16, - "mount": "G", - "power": 1.37, - "range": 3000, - "rating": "A", - "rof": 2.8, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 15.3, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 70400, - "dps": 18.1, - "edID": 128049383, - "eddbID": 825, - "eps": 2.88, - "grp": "pl", - "hps": 3, - "id": "1d", - "integrity": 64, - "mass": 8, - "mount": "F", - "power": 0.9, - "range": 3000, - "rating": "D", - "rof": 3, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 12.48, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 140600, - "dps": 14.8, - "edID": 128049387, - "eddbID": 828, - "eps": 2.944, - "grp": "pl", - "hps": 2.88, - "id": "1e", - "integrity": 64, - "mass": 8, - "mount": "G", - "power": 0.92, - "range": 3000, - "rating": "E", - "rof": 3.2, - "type": "T" - }, - { - "armourpen": 52, - "breachdps": 8.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 3, - "cost": 400400, - "dps": 9.5, - "edID": 128049390, - "eddbID": 831, - "eps": 1.512, - "grp": "pl", - "hps": 1.62, - "id": "1f", - "integrity": 64, - "mass": 8, - "mount": "T", - "power": 0.89, - "range": 3000, - "rating": "F", - "rof": 2.7, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 10.2, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 17600, - "dps": 12.1, - "edID": 128049382, - "eddbID": 824, - "eps": 1.904, - "grp": "pl", - "hps": 2.04, - "id": "1a", - "integrity": 51, - "mass": 4, - "mount": "F", - "power": 0.6, - "range": 3000, - "rating": "F", - "rof": 3.4, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 8.28, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 35400, - "dps": 9.6, - "edID": 128049386, - "eddbID": 827, - "eps": 1.944, - "grp": "pl", - "hps": 1.8, - "id": "1b", - "integrity": 51, - "mass": 4, - "mount": "G", - "power": 0.6, - "range": 3000, - "rating": "F", - "rof": 3.6, - "type": "T" - }, - { - "armourpen": 35, - "breachdps": 5.1, - "breachmax": 0.8, - "breachmin": 0.4, - "class": 2, - "cost": 132800, - "dps": 6.2, - "edID": 128049389, - "eddbID": 830, - "eps": 1, - "grp": "pl", - "hps": 0.9, - "id": "1c", - "integrity": 51, - "mass": 4, - "mount": "T", - "power": 0.58, - "range": 3000, - "rating": "F", - "rof": 3, - "type": "T" - }, { "armourpen": 20, - "breachdps": 6.46, + "breachdmg": 2.04, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 2200, - "dps": 7.9, + "damage": 2.04, + "distdraw": 0.33, "edID": 128049381, "eddbID": 823, - "eps": 1.254, "grp": "pl", - "hps": 1.14, "id": "17", "integrity": 40, "mass": 2, @@ -204,22 +19,22 @@ "power": 0.39, "range": 3000, "rating": "F", - "rof": 3.8, + "rof": 3.847, + "thermload": 0.3, "type": "T" }, { "armourpen": 20, - "breachdps": 5.2, + "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 6600, - "dps": 6.2, + "damage": 1.56, + "distdraw": 0.31, "edID": 128049385, "eddbID": 826, - "eps": 1.24, "grp": "pl", - "hps": 1.2, "id": "18", "integrity": 40, "mass": 2, @@ -227,22 +42,22 @@ "power": 0.39, "range": 3000, "rating": "G", - "rof": 4, + "rof": 3.987, + "thermload": 0.3, "type": "T" }, { "armourpen": 20, - "breachdps": 3.3, + "breachdmg": 1.0, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 26000, - "dps": 4, + "damage": 1.18, + "distdraw": 0.19, "edID": 128049388, "eddbID": 829, - "eps": 0.627, "grp": "pl", - "hps": 6.6, "id": "19", "integrity": 40, "mass": 2, @@ -250,15 +65,89 @@ "power": 0.38, "range": 3000, "rating": "G", - "rof": 3.3, + "rof": 3.339, + "thermload": 0.2, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 3.0, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 17600, + "damage": 3.49, + "distdraw": 0.56, + "edID": 128049382, + "eddbID": 824, + "grp": "pl", + "id": "1a", + "integrity": 51, + "mass": 4, + "mount": "F", + "power": 0.6, + "range": 3000, + "rating": "F", + "rof": 3.448, + "thermload": 0.6, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 2.3, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 35400, + "damage": 2.68, + "distdraw": 0.54, + "edID": 128049386, + "eddbID": 827, + "grp": "pl", + "id": "1b", + "integrity": 51, + "mass": 4, + "mount": "G", + "power": 0.6, + "range": 3000, + "rating": "F", + "rof": 3.567, + "thermload": 0.5, + "type": "T" + }, + { + "armourpen": 35, + "breachdmg": 1.7, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 2, + "cost": 132800, + "damage": 2.04, + "distdraw": 0.33, + "edID": 128049389, + "eddbID": 830, + "grp": "pl", + "id": "1c", + "integrity": 51, + "mass": 4, + "mount": "T", + "power": 0.58, + "range": 3000, + "rating": "F", + "rof": 3.037, + "thermload": 0.3, "type": "T" }, { "armourpen": "A", + "breachdmg": 2.4, + "breachmax": 0.8, + "breachmin": 0.4, "class": 2, "cost": 26400, "damage": 2, - "dps": 2, + "damage": 2.8, + "distdraw": 1, "eddbID": 1483, "grp": "pl", "id": "PL", @@ -268,9 +157,124 @@ "power": 0.7, "pp": "Felicia Winters", "rating": "E", - "rof": 1.6, + "rof": 1.664, "thermload": 1, "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 5.1, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 70400, + "damage": 5.98, + "distdraw": 0.96, + "edID": 128049383, + "eddbID": 825, + "grp": "pl", + "id": "1d", + "integrity": 64, + "mass": 8, + "mount": "F", + "power": 0.9, + "range": 3000, + "rating": "D", + "rof": 3.3, + "thermload": 1, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 3.9, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 140600, + "damage": 4.58, + "distdraw": 0.92, + "edID": 128049387, + "eddbID": 828, + "grp": "pl", + "id": "1e", + "integrity": 64, + "mass": 8, + "mount": "G", + "power": 0.92, + "range": 3000, + "rating": "E", + "rof": 3.223, + "thermload": 0.9, + "type": "T" + }, + { + "armourpen": 52, + "breachdmg": 3.0, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 3, + "cost": 400400, + "damage": 3.49, + "distdraw": 0.56, + "edID": 128049390, + "eddbID": 831, + "grp": "pl", + "id": "1f", + "integrity": 64, + "mass": 8, + "mount": "T", + "power": 0.89, + "range": 3000, + "rating": "F", + "rof": 2.705, + "thermload": 0.6, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 8.7, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 177600, + "damage": 10.23, + "distdraw": 1.64, + "edID": 128049384, + "eddbID": 1539, + "grp": "pl", + "id": "7q", + "integrity": 80, + "mass": 16, + "mount": "F", + "power": 1.33, + "range": 3000, + "rating": "A", + "rof": 2.633, + "thermload": 1.6, + "type": "T" + }, + { + "armourpen": 65, + "breachdmg": 6.6, + "breachmax": 0.8, + "breachmin": 0.4, + "class": 4, + "cost": 877600, + "damage": 7.82, + "distdraw": 1.56, + "edID": 128681995, + "eddbID": 1545, + "grp": "pl", + "id": "7r", + "integrity": 80, + "mass": 16, + "mount": "G", + "power": 1.37, + "range": 3000, + "rating": "A", + "rof": 2.777, + "thermload": 1.6, + "type": "T" } ] } diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json index 73ef3f3..49406ce 100644 --- a/modules/hardpoints/rail_gun.json +++ b/modules/hardpoints/rail_gun.json @@ -3,18 +3,17 @@ { "ammo": 30, "armourpen": 30, - "breachdps": 35.2, + "breachdmg": 22.2, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "clip": 1, "cost": 51600, - "dps": 37, + "damage": 23.3, + "distdraw": 2.69, "edID": 128049488, "eddbID": 876, - "eps": 4.3, "grp": "rg", - "hps": 28.48, "id": "29", "integrity": 40, "mass": 2, @@ -24,23 +23,23 @@ "rating": "D", "reload": 1, "rof": 1.6, + "thermload": 17.8, "type": "KT" }, { "ammo": 30, "armourpen": 48, - "breachdps": 47.4, + "breachdmg": 39.5, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "clip": 1, "cost": 412800, - "dps": 50, + "damage": 41.5, + "distdraw": 5.11, "edID": 128049489, "eddbID": 877, - "eps": 6.132, "grp": "rg", - "hps": 36, "id": "2a", "integrity": 51, "mass": 4, @@ -50,16 +49,22 @@ "rating": "B", "reload": 1, "rof": 1.2, + "thermload": 30, "type": "KT" }, { "ammo": 90, "armourpen": "A", + "breachdmg": 14.3, + "breachmax": 0.8, + "breachmin": 0.4, + "burst": 3, + "burstrof": 6, "class": 2, "clip": 3, "cost": 619200, - "damage": 5, - "dps": 5, + "damage": 15, + "distdraw": 2, "edID": 128671341, "eddbID": 1484, "grp": "rg", @@ -70,8 +75,8 @@ "power": 1.63, "pp": "Arissa Lavigny-Duval", "rating": "B", - "rof": 0.6, - "thermload": 3, + "rof": 4.1, + "thermload": 16, "type": "KT" } ] diff --git a/modules/hardpoints/torpedo_pylon.json b/modules/hardpoints/torpedo_pylon.json index 6f5e35f..7bd0029 100644 --- a/modules/hardpoints/torpedo_pylon.json +++ b/modules/hardpoints/torpedo_pylon.json @@ -3,18 +3,16 @@ { "ammo": 1, "armourpen": 10000, - "breachdps": 60, + "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, "class": 1, "clip": 1, "cost": 11200, - "dps": 120, + "damage": 120, "edID": 128049509, "eddbID": 882, - "eps": 0, "grp": "tp", - "hps": 45, "id": "2h", "integrity": 40, "mass": 2, @@ -25,12 +23,13 @@ "reload": 5, "rof": 1, "speed": 250, + "thermload": 45, "type": "E" }, { "ammo": 2, "armourpen": 10000, - "breachdps": 60, + "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, "class": 2, @@ -39,9 +38,7 @@ "dps": 120, "edID": 128049510, "eddbID": 883, - "eps": 0, "grp": "tp", - "hps": 50, "id": "2i", "integrity": 51, "mass": 4, @@ -52,6 +49,7 @@ "reload": 5, "rof": 1, "speed": 250, + "thermload": 50, "type": "E" } ] From 99b67614f053213d3a320ff4222b3765ca255f35 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 3 Nov 2016 14:20:37 +0000 Subject: [PATCH 45/49] Updates for naming --- dist/index.js | 264 +++++++++--------- dist/index.json | 264 +++++++++--------- modules/hardpoints/beam_laser.json | 28 +- modules/hardpoints/burst_laser.json | 26 +- modules/hardpoints/cannon.json | 22 +- modules/hardpoints/chaff_launcher.json | 4 +- .../hardpoints/electronic_countermeasure.json | 2 +- modules/hardpoints/fragment_cannon.json | 21 +- modules/hardpoints/mine_launcher.json | 6 +- modules/hardpoints/mining_laser.json | 7 +- modules/hardpoints/missile_rack.json | 12 +- modules/hardpoints/multi_cannon.json | 23 +- modules/hardpoints/plasma_accelerator.json | 8 +- modules/hardpoints/pulse_laser.json | 32 +-- modules/hardpoints/rail_gun.json | 8 +- modules/hardpoints/torpedo_pylon.json | 8 +- modules/standard/power_plant.json | 70 ++--- spec/data-spec.js | 12 +- 18 files changed, 420 insertions(+), 397 deletions(-) diff --git a/dist/index.js b/dist/index.js index b69504c..4101d52 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2662,7 +2662,7 @@ module.exports = { id: "py", integrity: 135, mass: 160, - pGen: 24, + pgen: 24, rating: "E" }, { class: 8, @@ -2674,7 +2674,7 @@ module.exports = { id: "px", integrity: 120, mass: 64, - pGen: 27, + pgen: 27, rating: "D" }, { class: 8, @@ -2686,7 +2686,7 @@ module.exports = { id: "pw", integrity: 150, mass: 80, - pGen: 30, + pgen: 30, rating: "C" }, { class: 8, @@ -2698,7 +2698,7 @@ module.exports = { id: "pv", integrity: 180, mass: 128, - pGen: 33, + pgen: 33, rating: "B" }, { class: 8, @@ -2710,7 +2710,7 @@ module.exports = { id: "pu", integrity: 165, mass: 80, - pGen: 36, + pgen: 36, rating: "A" }, { class: 7, @@ -2722,7 +2722,7 @@ module.exports = { id: "pt", integrity: 118, mass: 80, - pGen: 20, + pgen: 20, rating: "E" }, { class: 7, @@ -2734,7 +2734,7 @@ module.exports = { id: "ps", integrity: 105, mass: 32, - pGen: 22.5, + pgen: 22.5, rating: "D" }, { class: 7, @@ -2746,7 +2746,7 @@ module.exports = { id: "pr", integrity: 131, mass: 40, - pGen: 25, + pgen: 25, rating: "C" }, { class: 7, @@ -2758,7 +2758,7 @@ module.exports = { id: "pq", integrity: 157, mass: 64, - pGen: 27.5, + pgen: 27.5, rating: "B" }, { class: 7, @@ -2770,7 +2770,7 @@ module.exports = { id: "pp", integrity: 144, mass: 40, - pGen: 30, + pgen: 30, rating: "A" }, { class: 6, @@ -2782,7 +2782,7 @@ module.exports = { id: "po", integrity: 90, mass: 40, - pGen: 16.8, + pgen: 16.8, rating: "E" }, { class: 6, @@ -2794,7 +2794,7 @@ module.exports = { id: "pn", integrity: 113, mass: 16, - pGen: 18.9, + pgen: 18.9, rating: "D" }, { class: 6, @@ -2806,7 +2806,7 @@ module.exports = { id: "pm", integrity: 136, mass: 20, - pGen: 21, + pgen: 21, rating: "C" }, { class: 6, @@ -2818,7 +2818,7 @@ module.exports = { id: "pl", integrity: 124, mass: 32, - pGen: 23.1, + pgen: 23.1, rating: "B" }, { class: 6, @@ -2830,7 +2830,7 @@ module.exports = { id: "pk", integrity: 118, mass: 20, - pGen: 25.2, + pgen: 25.2, rating: "A" }, { class: 5, @@ -2842,7 +2842,7 @@ module.exports = { id: "pj", integrity: 86, mass: 20, - pGen: 13.6, + pgen: 13.6, rating: "E" }, { class: 5, @@ -2854,7 +2854,7 @@ module.exports = { id: "pi", integrity: 77, mass: 8, - pGen: 15.3, + pgen: 15.3, rating: "D" }, { class: 5, @@ -2866,7 +2866,7 @@ module.exports = { id: "ph", integrity: 96, mass: 10, - pGen: 17, + pgen: 17, rating: "C" }, { class: 5, @@ -2878,7 +2878,7 @@ module.exports = { id: "pg", integrity: 114, mass: 16, - pGen: 18.7, + pgen: 18.7, rating: "B" }, { class: 5, @@ -2890,7 +2890,7 @@ module.exports = { id: "pf", integrity: 106, mass: 10, - pGen: 20.4, + pgen: 20.4, rating: "A" }, { class: 4, @@ -2902,7 +2902,7 @@ module.exports = { id: "pe", integrity: 72, mass: 10, - pGen: 10.4, + pgen: 10.4, rating: "E" }, { class: 4, @@ -2914,7 +2914,7 @@ module.exports = { id: "pd", integrity: 64, mass: 4, - pGen: 11.7, + pgen: 11.7, rating: "D" }, { class: 4, @@ -2926,7 +2926,7 @@ module.exports = { id: "pc", integrity: 80, mass: 5, - pGen: 13, + pgen: 13, rating: "C" }, { class: 4, @@ -2938,7 +2938,7 @@ module.exports = { id: "pb", integrity: 96, mass: 8, - pGen: 14.3, + pgen: 14.3, rating: "B" }, { class: 4, @@ -2950,7 +2950,7 @@ module.exports = { id: "pa", integrity: 88, mass: 5, - pGen: 15.6, + pgen: 15.6, rating: "A" }, { class: 3, @@ -2962,7 +2962,7 @@ module.exports = { id: "p9", integrity: 58, mass: 5, - pGen: 8, + pgen: 8, rating: "E" }, { class: 3, @@ -2974,7 +2974,7 @@ module.exports = { id: "p8", integrity: 51, mass: 2, - pGen: 9, + pgen: 9, rating: "D" }, { class: 3, @@ -2986,7 +2986,7 @@ module.exports = { id: "p7", integrity: 64, mass: 2.5, - pGen: 10, + pgen: 10, rating: "C" }, { class: 3, @@ -2998,7 +2998,7 @@ module.exports = { id: "p6", integrity: 77, mass: 4, - pGen: 11, + pgen: 11, rating: "B" }, { class: 3, @@ -3010,7 +3010,7 @@ module.exports = { id: "p5", integrity: 70, mass: 2.5, - pGen: 12, + pgen: 12, rating: "A" }, { class: 2, @@ -3022,7 +3022,7 @@ module.exports = { id: "p4", integrity: 46, mass: 2.5, - pGen: 6.4, + pgen: 6.4, rating: "E" }, { class: 2, @@ -3034,7 +3034,7 @@ module.exports = { id: "p3", integrity: 41, mass: 1, - pGen: 7.2, + pgen: 7.2, rating: "D" }, { class: 2, @@ -3046,7 +3046,7 @@ module.exports = { id: "p2", integrity: 51, mass: 1.3, - pGen: 8, + pgen: 8, rating: "C" }, { class: 2, @@ -3058,7 +3058,7 @@ module.exports = { id: "p1", integrity: 61, mass: 2, - pGen: 8.8, + pgen: 8.8, rating: "B" }, { class: 2, @@ -3070,7 +3070,7 @@ module.exports = { id: "p0", integrity: 56, mass: 1.3, - pGen: 9.6, + pgen: 9.6, rating: "A" } ], t: [ { @@ -6001,7 +6001,6 @@ module.exports = { }, hardpoints: { pl: [ { - armourpen: 20, breachdmg: 2.04, breachmax: .8, breachmin: .4, @@ -6016,6 +6015,7 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 20, power: .39, range: 3e3, rating: "F", @@ -6023,7 +6023,6 @@ module.exports = { thermload: .3, type: "T" }, { - armourpen: 20, breachdmg: 1.3, breachmax: .8, breachmin: .4, @@ -6038,6 +6037,7 @@ module.exports = { integrity: 40, mass: 2, mount: "G", + piercing: 20, power: .39, range: 3e3, rating: "G", @@ -6045,7 +6045,6 @@ module.exports = { thermload: .3, type: "T" }, { - armourpen: 20, breachdmg: 1, breachmax: .8, breachmin: .4, @@ -6060,6 +6059,7 @@ module.exports = { integrity: 40, mass: 2, mount: "T", + piercing: 20, power: .38, range: 3e3, rating: "G", @@ -6067,7 +6067,6 @@ module.exports = { thermload: .2, type: "T" }, { - armourpen: 35, breachdmg: 3, breachmax: .8, breachmin: .4, @@ -6082,6 +6081,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", + piercing: 35, power: .6, range: 3e3, rating: "F", @@ -6089,7 +6089,6 @@ module.exports = { thermload: .6, type: "T" }, { - armourpen: 35, breachdmg: 2.3, breachmax: .8, breachmin: .4, @@ -6104,6 +6103,7 @@ module.exports = { integrity: 51, mass: 4, mount: "G", + piercing: 35, power: .6, range: 3e3, rating: "F", @@ -6111,7 +6111,6 @@ module.exports = { thermload: .5, type: "T" }, { - armourpen: 35, breachdmg: 1.7, breachmax: .8, breachmin: .4, @@ -6126,6 +6125,7 @@ module.exports = { integrity: 51, mass: 4, mount: "T", + piercing: 35, power: .58, range: 3e3, rating: "F", @@ -6133,7 +6133,6 @@ module.exports = { thermload: .3, type: "T" }, { - armourpen: "A", breachdmg: 2.4, breachmax: .8, breachmin: .4, @@ -6144,9 +6143,11 @@ module.exports = { eddbID: 1483, grp: "pl", id: "PL", + integrity: 51, mass: 4, mount: "F", name: "Disruptor", + piercing: "A", power: .7, pp: "Felicia Winters", rating: "E", @@ -6154,7 +6155,6 @@ module.exports = { thermload: 1, type: "T" }, { - armourpen: 52, breachdmg: 5.1, breachmax: .8, breachmin: .4, @@ -6169,6 +6169,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", + piercing: 52, power: .9, range: 3e3, rating: "D", @@ -6176,7 +6177,6 @@ module.exports = { thermload: 1, type: "T" }, { - armourpen: 52, breachdmg: 3.9, breachmax: .8, breachmin: .4, @@ -6191,6 +6191,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", + piercing: 52, power: .92, range: 3e3, rating: "E", @@ -6198,7 +6199,6 @@ module.exports = { thermload: .9, type: "T" }, { - armourpen: 52, breachdmg: 3, breachmax: .8, breachmin: .4, @@ -6213,6 +6213,7 @@ module.exports = { integrity: 64, mass: 8, mount: "T", + piercing: 52, power: .89, range: 3e3, rating: "F", @@ -6220,7 +6221,6 @@ module.exports = { thermload: .6, type: "T" }, { - armourpen: 65, breachdmg: 8.7, breachmax: .8, breachmin: .4, @@ -6235,6 +6235,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", + piercing: 65, power: 1.33, range: 3e3, rating: "A", @@ -6242,7 +6243,6 @@ module.exports = { thermload: 1.6, type: "T" }, { - armourpen: 65, breachdmg: 6.6, breachmax: .8, breachmin: .4, @@ -6257,6 +6257,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", + piercing: 65, power: 1.37, range: 3e3, rating: "A", @@ -6265,7 +6266,6 @@ module.exports = { type: "T" } ], ul: [ { - armourpen: 20, breachdmg: 7.05, breachmax: .8, breachmin: .4, @@ -6282,6 +6282,7 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 20, power: .65, range: 3e3, rating: "F", @@ -6289,7 +6290,6 @@ module.exports = { thermload: .4, type: "T" }, { - armourpen: 20, breachdmg: 5.3, breachmax: .8, breachmin: .4, @@ -6306,6 +6306,7 @@ module.exports = { integrity: 40, mass: 2, mount: "G", + piercing: 20, power: .64, range: 3e3, rating: "G", @@ -6313,7 +6314,6 @@ module.exports = { thermload: .3, type: "T" }, { - armourpen: 20, breachdmg: 1.92, breachmax: .8, breachmin: .4, @@ -6330,6 +6330,7 @@ module.exports = { integrity: 40, mass: 2, mount: "T", + piercing: 20, power: .6, range: 3e3, rating: "G", @@ -6337,7 +6338,6 @@ module.exports = { thermload: .2, type: "T" }, { - armourpen: 1, breachdmg: 15.25, breachmax: 0, breachmin: 0, @@ -6355,6 +6355,7 @@ module.exports = { mass: 2, mount: "F", name: "Cytoscrambler", + piercing: 1, power: .8, pp: "Archon Delaine", range: 600, @@ -6363,7 +6364,6 @@ module.exports = { thermload: .3, type: "T" }, { - armourpen: 35, breachdmg: 11.1, breachmax: .8, breachmin: .4, @@ -6380,6 +6380,7 @@ module.exports = { integrity: 40, mass: 4, mount: "F", + piercing: 35, power: 1.05, range: 3e3, rating: "E", @@ -6387,7 +6388,6 @@ module.exports = { thermload: .8, type: "T" }, { - armourpen: 35, breachdmg: 8.82, breachmax: .8, breachmin: .4, @@ -6404,6 +6404,7 @@ module.exports = { integrity: 40, mass: 4, mount: "G", + piercing: 35, power: 1.04, range: 3e3, rating: "F", @@ -6411,7 +6412,6 @@ module.exports = { thermload: .7, type: "T" }, { - armourpen: 35, breachdmg: 3.51, breachmax: .8, breachmin: .4, @@ -6428,6 +6428,7 @@ module.exports = { integrity: 40, mass: 4, mount: "T", + piercing: 35, power: .98, range: 3e3, rating: "F", @@ -6435,7 +6436,6 @@ module.exports = { thermload: .4, type: "T" }, { - armourpen: 52, breachdmg: 10.53, breachmax: .8, breachmin: .4, @@ -6452,6 +6452,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", + piercing: 52, power: 1.66, range: 3e3, rating: "D", @@ -6459,7 +6460,6 @@ module.exports = { thermload: 1.7, type: "T" }, { - armourpen: 52, breachdmg: 14.08, breachmax: .8, breachmin: .4, @@ -6476,6 +6476,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", + piercing: 52, power: 1.65, range: 3e3, rating: "E", @@ -6483,7 +6484,6 @@ module.exports = { thermload: 1.4, type: "T" }, { - armourpen: 52, breachdmg: 5.58, breachmax: .8, breachmin: .4, @@ -6500,6 +6500,7 @@ module.exports = { integrity: 64, mass: 8, mount: "T", + piercing: 52, power: 1.57, range: 3e3, rating: "E", @@ -6507,7 +6508,6 @@ module.exports = { thermload: .8, type: "T" }, { - armourpen: 65, breachdmg: 28, breachmax: .8, breachmin: .4, @@ -6524,6 +6524,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", + piercing: 65, power: 2.58, range: 3e3, rating: "E", @@ -6531,7 +6532,6 @@ module.exports = { thermload: 4.5, type: "T" }, { - armourpen: 65, breachdmg: 21.63, breachmax: .8, breachmin: .4, @@ -6548,6 +6548,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", + piercing: 65, power: 2.59, range: 3e3, rating: "E", @@ -6556,7 +6557,6 @@ module.exports = { type: "T" } ], bl: [ { - armourpen: 18, breachdmg: 7.9, breachmax: .8, breachmin: .4, @@ -6571,13 +6571,13 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 18, power: .69, range: 3e3, rating: "E", thermload: 3.5, type: "T" }, { - armourpen: 18, breachdmg: 6.1, breachmax: .8, breachmin: .4, @@ -6592,13 +6592,13 @@ module.exports = { integrity: 40, mass: 2, mount: "G", + piercing: 18, power: .67, range: 3e3, rating: "E", thermload: 3.6, type: "T" }, { - armourpen: 18, breachdmg: 4.3, breachmax: .8, breachmin: .4, @@ -6615,13 +6615,13 @@ module.exports = { integrity: 40, mass: 2, mount: "T", + piercing: 18, power: .63, range: 3e3, rating: "F", thermload: 2.4, type: "T" }, { - armourpen: 18, breachdmg: 3.9, breachmax: .8, breachmin: .4, @@ -6637,6 +6637,7 @@ module.exports = { mass: 2, mount: "F", name: "Retributor", + piercing: 18, power: .69, pp: "Edmund Mahon", range: 3e3, @@ -6644,7 +6645,6 @@ module.exports = { thermload: 2.7, type: "T" }, { - armourpen: 35, breachdmg: 12.8, breachmax: .8, breachmin: .4, @@ -6659,13 +6659,13 @@ module.exports = { integrity: 51, mass: 4, mount: "F", + piercing: 35, power: 1.12, range: 3e3, rating: "D", thermload: 5.1, type: "T" }, { - armourpen: 35, breachdmg: 10, breachmax: .8, breachmin: .4, @@ -6680,13 +6680,13 @@ module.exports = { integrity: 51, mass: 4, mount: "G", + piercing: 35, power: 1.1, range: 3e3, rating: "D", thermload: 5.3, type: "T" }, { - armourpen: 35, breachdmg: 7.1, breachmax: .8, breachmin: .4, @@ -6701,13 +6701,13 @@ module.exports = { integrity: 51, mass: 4, mount: "T", + piercing: 35, power: 1.03, range: 3e3, rating: "E", thermload: 3.5, type: "T" }, { - armourpen: 50, breachdmg: 20.6, breachmax: .8, breachmin: .4, @@ -6722,13 +6722,13 @@ module.exports = { integrity: 64, mass: 8, mount: "F", + piercing: 50, power: 1.8, range: 3e3, rating: "C", thermload: 7.2, type: "T" }, { - armourpen: 50, breachdmg: 16.2, breachmax: .8, breachmin: .4, @@ -6743,13 +6743,13 @@ module.exports = { integrity: 64, mass: 8, mount: "G", + piercing: 50, power: 1.78, range: 3e3, rating: "C", thermload: 7.6, type: "T" }, { - armourpen: 50, breachdmg: 11.5, breachmax: .8, breachmin: .4, @@ -6764,13 +6764,13 @@ module.exports = { integrity: 64, mass: 8, mount: "T", + piercing: 50, power: 1.68, range: 3e3, rating: "D", thermload: 5.1, type: "T" }, { - armourpen: 60, breachdmg: 33.1, breachmax: .8, breachmin: .4, @@ -6785,13 +6785,13 @@ module.exports = { integrity: 80, mass: 16, mount: "F", + piercing: 60, power: 2.9, range: 3e3, rating: "A", thermload: 9.9, type: "T" }, { - armourpen: 60, breachdmg: 26.1, breachmax: .8, breachmin: .4, @@ -6806,6 +6806,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", + piercing: 60, power: 2.86, range: 3e3, rating: "A", @@ -6814,7 +6815,6 @@ module.exports = { } ], mc: [ { ammo: 2100, - armourpen: 22, breachdmg: 1, breachmax: .8, breachmin: .4, @@ -6830,6 +6830,7 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 22, power: .28, range: 4e3, rating: "F", @@ -6840,7 +6841,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 22, breachdmg: .7, breachmax: .8, breachmin: .4, @@ -6856,6 +6856,7 @@ module.exports = { integrity: 40, mass: 2, mount: "G", + piercing: 22, power: .37, range: 4e3, rating: "G", @@ -6866,7 +6867,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 22, breachdmg: .5, breachmax: .8, breachmin: .4, @@ -6882,6 +6882,7 @@ module.exports = { integrity: 40, mass: 2, mount: "T", + piercing: 22, power: .26, range: 4e3, rating: "G", @@ -6892,7 +6893,6 @@ module.exports = { type: "K" }, { ammo: 1e3, - armourpen: "A", breachdmg: 2.7, breachmax: .8, breachmin: .4, @@ -6904,9 +6904,11 @@ module.exports = { eddbID: 1481, grp: "mc", id: "e0", + integrity: 40, mass: 2, mount: "F", name: "Enforcer", + piercing: "A", power: .28, pp: "Pranav Antal", range: 4500, @@ -6918,7 +6920,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 37, breachdmg: 2, breachmax: .8, breachmin: .4, @@ -6934,6 +6935,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", + piercing: 37, power: .46, range: 4e3, rating: "E", @@ -6944,7 +6946,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 37, breachdmg: 1.5, breachmax: .8, breachmin: .4, @@ -6960,6 +6961,7 @@ module.exports = { integrity: 51, mass: 4, mount: "G", + piercing: 37, power: .64, range: 4e3, rating: "F", @@ -6970,7 +6972,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 37, breachdmg: 1.1, breachmax: .8, breachmin: .4, @@ -6986,6 +6987,7 @@ module.exports = { integrity: 51, mass: 4, mount: "T", + piercing: 37, power: .5, range: 4e3, rating: "F", @@ -6996,7 +6998,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 54, breachdmg: 3.5, breachmax: .8, breachmin: .4, @@ -7012,6 +7013,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", + piercing: 54, power: .64, range: 4e3, rating: "C", @@ -7022,7 +7024,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 54, breachdmg: 2.6, breachmax: .8, breachmin: .4, @@ -7038,6 +7039,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", + piercing: 54, power: .97, range: 4e3, rating: "C", @@ -7048,7 +7050,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 68, breachdmg: 4.2, breachmax: .8, breachmin: .4, @@ -7064,6 +7065,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", + piercing: 68, power: .73, range: 4e3, rating: "A", @@ -7075,7 +7077,6 @@ module.exports = { type: "K" }, { ammo: 2100, - armourpen: 68, breachdmg: 3.1, breachmax: .8, breachmin: .4, @@ -7091,6 +7092,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", + piercing: 68, power: 1.22, range: 4e3, rating: "A", @@ -7103,7 +7105,6 @@ module.exports = { } ], c: [ { ammo: 100, - armourpen: 35, breachdmg: 17.1, breachmax: .8, breachmin: .6, @@ -7119,6 +7120,7 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 35, power: .34, range: 3e3, rating: "D", @@ -7129,7 +7131,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 35, breachdmg: 13.2, breachmax: .9, breachmin: .6, @@ -7145,6 +7146,7 @@ module.exports = { integrity: 40, mass: 2, mount: "G", + piercing: 35, power: .38, range: 3e3, rating: "E", @@ -7155,7 +7157,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 10.6, breachmax: .8, breachmin: .6, @@ -7171,6 +7172,7 @@ module.exports = { integrity: 40, mass: 2, mount: "T", + piercing: 90, power: .32, range: 3e3, rating: "F", @@ -7181,7 +7183,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 28, breachmax: .8, breachmin: .6, @@ -7197,6 +7198,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", + piercing: 90, power: .49, range: 3500, rating: "D", @@ -7207,7 +7209,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 20.3, breachmax: .8, breachmin: .6, @@ -7223,6 +7224,7 @@ module.exports = { integrity: 51, mass: 4, mount: "G", + piercing: 90, power: .54, range: 3500, rating: "D", @@ -7233,7 +7235,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 16.3, breachmax: .8, breachmin: .6, @@ -7249,6 +7250,7 @@ module.exports = { integrity: 51, mass: 4, mount: "T", + piercing: 90, power: .45, range: 3500, rating: "E", @@ -7259,7 +7261,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 42.3, breachmax: .8, breachmin: .6, @@ -7275,6 +7276,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", + piercing: 90, power: .67, range: 4e3, rating: "C", @@ -7285,7 +7287,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 30.9, breachmax: .8, breachmin: .6, @@ -7303,6 +7304,7 @@ module.exports = { integrity: 64, mass: 8, mount: "G", + piercing: 90, power: .75, range: 4e3, rating: "C", @@ -7313,7 +7315,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 25.14, breachmax: .8, breachmin: .6, @@ -7329,6 +7330,7 @@ module.exports = { integrity: 64, mass: 8, mount: "T", + piercing: 90, power: .64, range: 4e3, rating: "D", @@ -7339,7 +7341,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 63.2, breachmax: .8, breachmin: .6, @@ -7357,6 +7358,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", + piercing: 90, power: .92, range: 4500, rating: "B", @@ -7367,7 +7369,6 @@ module.exports = { type: "K" }, { ammo: 100, - armourpen: 90, breachdmg: 46.7, breachmax: .8, breachmin: .6, @@ -7385,6 +7386,7 @@ module.exports = { integrity: 80, mass: 16, mount: "G", + piercing: 90, power: 1.03, range: 4500, rating: "B", @@ -7396,7 +7398,6 @@ module.exports = { } ], fc: [ { ammo: 90, - armourpen: 20, breachdmg: 1.3, breachmax: .8, breachmin: .4, @@ -7413,6 +7414,7 @@ module.exports = { jitter: .5, mass: 2, mount: "F", + piercing: 20, power: .45, range: 2e3, rating: "E", @@ -7424,7 +7426,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 20, breachdmg: .9, breachmax: .8, breachmin: .4, @@ -7441,6 +7442,7 @@ module.exports = { jitter: .5, mass: 2, mount: "G", + piercing: 20, power: .59, range: 2e3, rating: "E", @@ -7452,7 +7454,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 20, breachdmg: .5, breachmax: .8, breachmin: .4, @@ -7469,6 +7470,7 @@ module.exports = { jitter: .5, mass: 2, mount: "T", + piercing: 20, power: .42, range: 2e3, rating: "E", @@ -7480,7 +7482,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 35, breachdmg: 2.3, breachmax: .8, breachmin: .4, @@ -7497,6 +7498,7 @@ module.exports = { jitter: .5, mass: 4, mount: "F", + piercing: 35, power: .74, range: 2e3, rating: "A", @@ -7508,7 +7510,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 35, breachdmg: 1.8, breachmax: .8, breachmin: .4, @@ -7525,6 +7526,7 @@ module.exports = { jitter: .5, mass: 4, mount: "G", + piercing: 35, power: 1.03, range: 2e3, rating: "D", @@ -7536,7 +7538,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 35, breachdmg: 1.3, breachmax: .8, breachmin: .4, @@ -7553,6 +7554,7 @@ module.exports = { jitter: .5, mass: 4, mount: "T", + piercing: 35, power: .79, range: 2e3, rating: "D", @@ -7564,7 +7566,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 52, breachdmg: 3.5, breachmax: .8, breachmin: .4, @@ -7581,6 +7582,7 @@ module.exports = { jitter: .5, mass: 8, mount: "F", + piercing: 52, power: 1.02, range: 2e3, rating: "C", @@ -7592,7 +7594,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 52, breachdmg: 2.9, breachmax: .8, breachmin: .4, @@ -7609,6 +7610,7 @@ module.exports = { jitter: .5, mass: 8, mount: "G", + piercing: 52, power: 1.55, range: 2e3, rating: "C", @@ -7620,7 +7622,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 52, breachdmg: 2.3, breachmax: .8, breachmin: .4, @@ -7637,6 +7638,7 @@ module.exports = { jitter: .5, mass: 8, mount: "T", + piercing: 52, power: 1.29, range: 2e3, rating: "C", @@ -7648,7 +7650,6 @@ module.exports = { type: "K" }, { ammo: 90, - armourpen: 52, breachdmg: 3.1, breachmax: .8, breachmin: .4, @@ -7665,9 +7666,11 @@ module.exports = { mass: 8, mount: "F", name: "Pacifier", + piercing: 52, power: 1.02, pp: "Zachary Hudson", rating: "C", + reload: 5, rof: 4.5, speed: 1e3, thermload: 1.1, @@ -7675,7 +7678,6 @@ module.exports = { } ], rg: [ { ammo: 30, - armourpen: 30, breachdmg: 22.2, breachmax: .8, breachmin: .4, @@ -7691,6 +7693,7 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 30, power: 1.15, range: 3e3, rating: "D", @@ -7700,7 +7703,6 @@ module.exports = { type: "KT" }, { ammo: 30, - armourpen: 48, breachdmg: 39.5, breachmax: .8, breachmin: .4, @@ -7716,6 +7718,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", + piercing: 48, power: 1.63, range: 3e3, rating: "B", @@ -7725,7 +7728,6 @@ module.exports = { type: "KT" }, { ammo: 90, - armourpen: "A", breachdmg: 14.3, breachmax: .8, breachmin: .4, @@ -7740,19 +7742,21 @@ module.exports = { eddbID: 1484, grp: "rg", id: "ih", + integrity: 51, mass: 4, mount: "F", name: "Imperial Hammer", + piercing: "A", power: 1.63, pp: "Arissa Lavigny-Duval", rating: "B", + reload: 1, rof: 4.1, thermload: 16, type: "KT" } ], pa: [ { ammo: 100, - armourpen: 55, breachdmg: 44.2, breachmax: .8, breachmin: .4, @@ -7768,6 +7772,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", + piercing: 55, power: 1.43, range: 3500, rating: "C", @@ -7778,7 +7783,6 @@ module.exports = { type: "KT" }, { ammo: 100, - armourpen: 70, breachdmg: 68, breachmax: .8, breachmin: .4, @@ -7794,6 +7798,7 @@ module.exports = { integrity: 64, mass: 8, mount: "F", + piercing: 70, power: 1.97, range: 3500, rating: "B", @@ -7804,7 +7809,6 @@ module.exports = { type: "KT" }, { ammo: 300, - armourpen: 70, breachdmg: 28.1, breachmax: .8, breachmin: .4, @@ -7821,6 +7825,7 @@ module.exports = { mass: 8, mount: "F", name: "Advanced Plasma Accelerator", + piercing: 70, power: 1.97, pp: "Denton Patreus", range: 3500, @@ -7832,7 +7837,6 @@ module.exports = { type: "KT" }, { ammo: 100, - armourpen: 85, breachdmg: 102, breachmax: .8, breachmin: .4, @@ -7848,6 +7852,7 @@ module.exports = { integrity: 80, mass: 16, mount: "F", + piercing: 85, power: 2.63, range: 3500, rating: "A", @@ -7859,7 +7864,6 @@ module.exports = { } ], mr: [ { ammo: 16, - armourpen: 60, breachdmg: 20, breachmax: 1, breachmin: 1, @@ -7876,6 +7880,7 @@ module.exports = { mass: 2, missile: "D", mount: "F", + piercing: 60, power: .4, rating: "B", reload: 5, @@ -7885,7 +7890,6 @@ module.exports = { type: "E" }, { ammo: 6, - armourpen: 60, breachdmg: 16, breachmax: 0, breachmin: 0, @@ -7902,6 +7906,7 @@ module.exports = { mass: 2, missile: "S", mount: "F", + piercing: 60, power: .6, rating: "B", reload: 12, @@ -7911,7 +7916,6 @@ module.exports = { type: "E" }, { ammo: 48, - armourpen: 60, breachdmg: 20, breachmax: 1, breachmin: 1, @@ -7929,6 +7933,7 @@ module.exports = { mass: 4, missile: "D", mount: "F", + piercing: 60, power: 1.2, rating: "B", reload: 5, @@ -7937,7 +7942,6 @@ module.exports = { type: "E" }, { ammo: 18, - armourpen: 60, breachdmg: 16, breachmax: 0, breachmin: 0, @@ -7956,6 +7960,7 @@ module.exports = { mass: 4, missile: "S", mount: "F", + piercing: 60, power: 1.2, rating: "B", reload: 12, @@ -7965,7 +7970,6 @@ module.exports = { type: "E" }, { ammo: 48, - armourpen: 60, breachdmg: 16, breachmax: 0, breachmin: 0, @@ -7982,6 +7986,7 @@ module.exports = { missile: "D", mount: "F", name: "Rocket Propelled FSD Disruptor", + piercing: 60, power: 1.2, pp: "Yuri Grom", rating: "B", @@ -7992,7 +7997,6 @@ module.exports = { type: "E" }, { ammo: 120, - armourpen: 60, breachdmg: 6, breachmax: 0, breachmin: 0, @@ -8012,6 +8016,7 @@ module.exports = { missile: "S", mount: "F", name: "Pack-Hound", + piercing: 60, power: 1.2, pp: "Li Yong-Rui", rating: "B", @@ -8024,7 +8029,6 @@ module.exports = { } ], tp: [ { ammo: 1, - armourpen: 1e4, breachdmg: 60, breachmax: .8, breachmin: .6, @@ -8032,6 +8036,7 @@ module.exports = { clip: 1, cost: 11200, damage: 120, + distdraw: 0, edID: 128049509, eddbID: 882, grp: "tp", @@ -8040,6 +8045,7 @@ module.exports = { mass: 2, missile: "S", mount: "F", + piercing: 1e4, power: .4, rating: "I", reload: 5, @@ -8049,14 +8055,14 @@ module.exports = { type: "E" }, { ammo: 2, - armourpen: 1e4, breachdmg: 60, breachmax: .8, breachmin: .6, class: 2, clip: 1, cost: 44800, - dps: 120, + damage: 120, + distdraw: 0, edID: 128049510, eddbID: 883, grp: "tp", @@ -8065,6 +8071,7 @@ module.exports = { mass: 4, missile: "S", mount: "F", + piercing: 1e4, power: .4, rating: "I", reload: 5, @@ -8075,7 +8082,6 @@ module.exports = { } ], nl: [ { ammo: 36, - armourpen: 60, breachdmg: 0, breachmax: 0, breachmin: 0, @@ -8091,6 +8097,7 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 60, power: .4, rating: "I", reload: 2, @@ -8099,7 +8106,6 @@ module.exports = { type: "ET" }, { ammo: 36, - armourpen: 60, breachdmg: 0, breachmax: 0, breachmin: 0, @@ -8116,6 +8122,7 @@ module.exports = { mass: 2, mount: "F", name: "Shock Mine Launcher", + piercing: 60, power: .4, rating: "I", reload: 2, @@ -8124,7 +8131,6 @@ module.exports = { type: "ET" }, { ammo: 36, - armourpen: 60, breachdmg: 0, breachmax: 0, breachmin: 0, @@ -8140,6 +8146,7 @@ module.exports = { integrity: 51, mass: 4, mount: "F", + piercing: 60, power: .4, rating: "I", reload: 2, @@ -8148,7 +8155,6 @@ module.exports = { type: "ET" } ], ml: [ { - armourpen: 18, breachdmg: .3, breachmax: .2, breachmin: .1, @@ -8163,11 +8169,11 @@ module.exports = { integrity: 40, mass: 2, mount: "F", + piercing: 18, power: .5, rating: "D", thermload: 2 }, { - armourpen: "D", breachdmg: .6, breachmax: .2, breachmin: .1, @@ -8178,16 +8184,17 @@ module.exports = { eddbID: 1479, grp: "ml", id: "ml", + integrity: 40, mass: 2, mount: "F", name: "Mining Lance", + piercing: "D", power: .7, pp: "Zemina Torval", rating: "D", thermload: 6, type: "T" }, { - armourpen: 18, breachdmg: 1.2, breachmax: .2, breachmin: .1, @@ -8202,6 +8209,7 @@ module.exports = { integrity: 51, mass: 2, mount: "F", + piercing: 18, power: .75, rating: "D", thermload: 4 @@ -8493,8 +8501,8 @@ module.exports = { power: .2, rating: "I", reload: 10, - thermload: 4, - rof: 1 + rof: 1, + thermload: 4 } ], ec: [ { activepower: 4, @@ -8511,8 +8519,8 @@ module.exports = { name: "Electronic Countermeasure", power: .2, range: 3e3, - reload: 10, rating: "F", + reload: 10, thermload: 4 } ], hs: [ { diff --git a/dist/index.json b/dist/index.json index 5b4308c..4850ab2 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4311,7 +4311,7 @@ "id": "py", "integrity": 135, "mass": 160, - "pGen": 24, + "pgen": 24, "rating": "E" }, { @@ -4324,7 +4324,7 @@ "id": "px", "integrity": 120, "mass": 64, - "pGen": 27, + "pgen": 27, "rating": "D" }, { @@ -4337,7 +4337,7 @@ "id": "pw", "integrity": 150, "mass": 80, - "pGen": 30, + "pgen": 30, "rating": "C" }, { @@ -4350,7 +4350,7 @@ "id": "pv", "integrity": 180, "mass": 128, - "pGen": 33, + "pgen": 33, "rating": "B" }, { @@ -4363,7 +4363,7 @@ "id": "pu", "integrity": 165, "mass": 80, - "pGen": 36, + "pgen": 36, "rating": "A" }, { @@ -4376,7 +4376,7 @@ "id": "pt", "integrity": 118, "mass": 80, - "pGen": 20, + "pgen": 20, "rating": "E" }, { @@ -4389,7 +4389,7 @@ "id": "ps", "integrity": 105, "mass": 32, - "pGen": 22.5, + "pgen": 22.5, "rating": "D" }, { @@ -4402,7 +4402,7 @@ "id": "pr", "integrity": 131, "mass": 40, - "pGen": 25, + "pgen": 25, "rating": "C" }, { @@ -4415,7 +4415,7 @@ "id": "pq", "integrity": 157, "mass": 64, - "pGen": 27.5, + "pgen": 27.5, "rating": "B" }, { @@ -4428,7 +4428,7 @@ "id": "pp", "integrity": 144, "mass": 40, - "pGen": 30, + "pgen": 30, "rating": "A" }, { @@ -4441,7 +4441,7 @@ "id": "po", "integrity": 90, "mass": 40, - "pGen": 16.8, + "pgen": 16.8, "rating": "E" }, { @@ -4454,7 +4454,7 @@ "id": "pn", "integrity": 113, "mass": 16, - "pGen": 18.9, + "pgen": 18.9, "rating": "D" }, { @@ -4467,7 +4467,7 @@ "id": "pm", "integrity": 136, "mass": 20, - "pGen": 21, + "pgen": 21, "rating": "C" }, { @@ -4480,7 +4480,7 @@ "id": "pl", "integrity": 124, "mass": 32, - "pGen": 23.1, + "pgen": 23.1, "rating": "B" }, { @@ -4493,7 +4493,7 @@ "id": "pk", "integrity": 118, "mass": 20, - "pGen": 25.2, + "pgen": 25.2, "rating": "A" }, { @@ -4506,7 +4506,7 @@ "id": "pj", "integrity": 86, "mass": 20, - "pGen": 13.6, + "pgen": 13.6, "rating": "E" }, { @@ -4519,7 +4519,7 @@ "id": "pi", "integrity": 77, "mass": 8, - "pGen": 15.3, + "pgen": 15.3, "rating": "D" }, { @@ -4532,7 +4532,7 @@ "id": "ph", "integrity": 96, "mass": 10, - "pGen": 17, + "pgen": 17, "rating": "C" }, { @@ -4545,7 +4545,7 @@ "id": "pg", "integrity": 114, "mass": 16, - "pGen": 18.7, + "pgen": 18.7, "rating": "B" }, { @@ -4558,7 +4558,7 @@ "id": "pf", "integrity": 106, "mass": 10, - "pGen": 20.4, + "pgen": 20.4, "rating": "A" }, { @@ -4571,7 +4571,7 @@ "id": "pe", "integrity": 72, "mass": 10, - "pGen": 10.4, + "pgen": 10.4, "rating": "E" }, { @@ -4584,7 +4584,7 @@ "id": "pd", "integrity": 64, "mass": 4, - "pGen": 11.7, + "pgen": 11.7, "rating": "D" }, { @@ -4597,7 +4597,7 @@ "id": "pc", "integrity": 80, "mass": 5, - "pGen": 13, + "pgen": 13, "rating": "C" }, { @@ -4610,7 +4610,7 @@ "id": "pb", "integrity": 96, "mass": 8, - "pGen": 14.3, + "pgen": 14.3, "rating": "B" }, { @@ -4623,7 +4623,7 @@ "id": "pa", "integrity": 88, "mass": 5, - "pGen": 15.6, + "pgen": 15.6, "rating": "A" }, { @@ -4636,7 +4636,7 @@ "id": "p9", "integrity": 58, "mass": 5, - "pGen": 8, + "pgen": 8, "rating": "E" }, { @@ -4649,7 +4649,7 @@ "id": "p8", "integrity": 51, "mass": 2, - "pGen": 9, + "pgen": 9, "rating": "D" }, { @@ -4662,7 +4662,7 @@ "id": "p7", "integrity": 64, "mass": 2.5, - "pGen": 10, + "pgen": 10, "rating": "C" }, { @@ -4675,7 +4675,7 @@ "id": "p6", "integrity": 77, "mass": 4, - "pGen": 11, + "pgen": 11, "rating": "B" }, { @@ -4688,7 +4688,7 @@ "id": "p5", "integrity": 70, "mass": 2.5, - "pGen": 12, + "pgen": 12, "rating": "A" }, { @@ -4701,7 +4701,7 @@ "id": "p4", "integrity": 46, "mass": 2.5, - "pGen": 6.4, + "pgen": 6.4, "rating": "E" }, { @@ -4714,7 +4714,7 @@ "id": "p3", "integrity": 41, "mass": 1, - "pGen": 7.2, + "pgen": 7.2, "rating": "D" }, { @@ -4727,7 +4727,7 @@ "id": "p2", "integrity": 51, "mass": 1.3, - "pGen": 8, + "pgen": 8, "rating": "C" }, { @@ -4740,7 +4740,7 @@ "id": "p1", "integrity": 61, "mass": 2, - "pGen": 8.8, + "pgen": 8.8, "rating": "B" }, { @@ -4753,7 +4753,7 @@ "id": "p0", "integrity": 56, "mass": 1.3, - "pGen": 9.6, + "pgen": 9.6, "rating": "A" } ], @@ -7894,7 +7894,6 @@ "hardpoints": { "pl": [ { - "armourpen": 20, "breachdmg": 2.04, "breachmax": 0.8, "breachmin": 0.4, @@ -7909,6 +7908,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 20, "power": 0.39, "range": 3000, "rating": "F", @@ -7917,7 +7917,6 @@ "type": "T" }, { - "armourpen": 20, "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, @@ -7932,6 +7931,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 20, "power": 0.39, "range": 3000, "rating": "G", @@ -7940,7 +7940,6 @@ "type": "T" }, { - "armourpen": 20, "breachdmg": 1, "breachmax": 0.8, "breachmin": 0.4, @@ -7955,6 +7954,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 20, "power": 0.38, "range": 3000, "rating": "G", @@ -7963,7 +7963,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 3, "breachmax": 0.8, "breachmin": 0.4, @@ -7978,6 +7977,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 35, "power": 0.6, "range": 3000, "rating": "F", @@ -7986,7 +7986,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, @@ -8001,6 +8000,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 35, "power": 0.6, "range": 3000, "rating": "F", @@ -8009,7 +8009,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 1.7, "breachmax": 0.8, "breachmin": 0.4, @@ -8024,6 +8023,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 35, "power": 0.58, "range": 3000, "rating": "F", @@ -8032,7 +8032,6 @@ "type": "T" }, { - "armourpen": "A", "breachdmg": 2.4, "breachmax": 0.8, "breachmin": 0.4, @@ -8043,9 +8042,11 @@ "eddbID": 1483, "grp": "pl", "id": "PL", + "integrity": 51, "mass": 4, "mount": "F", "name": "Disruptor", + "piercing": "A", "power": 0.7, "pp": "Felicia Winters", "rating": "E", @@ -8054,7 +8055,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 5.1, "breachmax": 0.8, "breachmin": 0.4, @@ -8069,6 +8069,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 52, "power": 0.9, "range": 3000, "rating": "D", @@ -8077,7 +8078,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 3.9, "breachmax": 0.8, "breachmin": 0.4, @@ -8092,6 +8092,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 52, "power": 0.92, "range": 3000, "rating": "E", @@ -8100,7 +8101,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 3, "breachmax": 0.8, "breachmin": 0.4, @@ -8115,6 +8115,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 52, "power": 0.89, "range": 3000, "rating": "F", @@ -8123,7 +8124,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 8.7, "breachmax": 0.8, "breachmin": 0.4, @@ -8138,6 +8138,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 65, "power": 1.33, "range": 3000, "rating": "A", @@ -8146,7 +8147,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 6.6, "breachmax": 0.8, "breachmin": 0.4, @@ -8161,6 +8161,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 65, "power": 1.37, "range": 3000, "rating": "A", @@ -8171,7 +8172,6 @@ ], "ul": [ { - "armourpen": 20, "breachdmg": 7.05, "breachmax": 0.8, "breachmin": 0.4, @@ -8188,6 +8188,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 20, "power": 0.65, "range": 3000, "rating": "F", @@ -8196,7 +8197,6 @@ "type": "T" }, { - "armourpen": 20, "breachdmg": 5.3, "breachmax": 0.8, "breachmin": 0.4, @@ -8213,6 +8213,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 20, "power": 0.64, "range": 3000, "rating": "G", @@ -8221,7 +8222,6 @@ "type": "T" }, { - "armourpen": 20, "breachdmg": 1.92, "breachmax": 0.8, "breachmin": 0.4, @@ -8238,6 +8238,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 20, "power": 0.6, "range": 3000, "rating": "G", @@ -8246,7 +8247,6 @@ "type": "T" }, { - "armourpen": 1, "breachdmg": 15.25, "breachmax": 0, "breachmin": 0, @@ -8264,6 +8264,7 @@ "mass": 2, "mount": "F", "name": "Cytoscrambler", + "piercing": 1, "power": 0.8, "pp": "Archon Delaine", "range": 600, @@ -8273,7 +8274,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 11.1, "breachmax": 0.8, "breachmin": 0.4, @@ -8290,6 +8290,7 @@ "integrity": 40, "mass": 4, "mount": "F", + "piercing": 35, "power": 1.05, "range": 3000, "rating": "E", @@ -8298,7 +8299,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 8.82, "breachmax": 0.8, "breachmin": 0.4, @@ -8315,6 +8315,7 @@ "integrity": 40, "mass": 4, "mount": "G", + "piercing": 35, "power": 1.04, "range": 3000, "rating": "F", @@ -8323,7 +8324,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 3.51, "breachmax": 0.8, "breachmin": 0.4, @@ -8340,6 +8340,7 @@ "integrity": 40, "mass": 4, "mount": "T", + "piercing": 35, "power": 0.98, "range": 3000, "rating": "F", @@ -8348,7 +8349,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 10.53, "breachmax": 0.8, "breachmin": 0.4, @@ -8365,6 +8365,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 52, "power": 1.66, "range": 3000, "rating": "D", @@ -8373,7 +8374,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 14.08, "breachmax": 0.8, "breachmin": 0.4, @@ -8390,6 +8390,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 52, "power": 1.65, "range": 3000, "rating": "E", @@ -8398,7 +8399,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 5.58, "breachmax": 0.8, "breachmin": 0.4, @@ -8415,6 +8415,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 52, "power": 1.57, "range": 3000, "rating": "E", @@ -8423,7 +8424,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 28, "breachmax": 0.8, "breachmin": 0.4, @@ -8440,6 +8440,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 65, "power": 2.58, "range": 3000, "rating": "E", @@ -8448,7 +8449,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 21.63, "breachmax": 0.8, "breachmin": 0.4, @@ -8465,6 +8465,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 65, "power": 2.59, "range": 3000, "rating": "E", @@ -8475,7 +8476,6 @@ ], "bl": [ { - "armourpen": 18, "breachdmg": 7.9, "breachmax": 0.8, "breachmin": 0.4, @@ -8490,6 +8490,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 18, "power": 0.69, "range": 3000, "rating": "E", @@ -8497,7 +8498,6 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 6.1, "breachmax": 0.8, "breachmin": 0.4, @@ -8512,6 +8512,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 18, "power": 0.67, "range": 3000, "rating": "E", @@ -8519,7 +8520,6 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 4.3, "breachmax": 0.8, "breachmin": 0.4, @@ -8536,6 +8536,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 18, "power": 0.63, "range": 3000, "rating": "F", @@ -8543,7 +8544,6 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 3.9, "breachmax": 0.8, "breachmin": 0.4, @@ -8559,6 +8559,7 @@ "mass": 2, "mount": "F", "name": "Retributor", + "piercing": 18, "power": 0.69, "pp": "Edmund Mahon", "range": 3000, @@ -8567,7 +8568,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 12.8, "breachmax": 0.8, "breachmin": 0.4, @@ -8582,6 +8582,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 35, "power": 1.12, "range": 3000, "rating": "D", @@ -8589,7 +8590,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 10, "breachmax": 0.8, "breachmin": 0.4, @@ -8604,6 +8604,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 35, "power": 1.1, "range": 3000, "rating": "D", @@ -8611,7 +8612,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 7.1, "breachmax": 0.8, "breachmin": 0.4, @@ -8626,6 +8626,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 35, "power": 1.03, "range": 3000, "rating": "E", @@ -8633,7 +8634,6 @@ "type": "T" }, { - "armourpen": 50, "breachdmg": 20.6, "breachmax": 0.8, "breachmin": 0.4, @@ -8648,6 +8648,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 50, "power": 1.8, "range": 3000, "rating": "C", @@ -8655,7 +8656,6 @@ "type": "T" }, { - "armourpen": 50, "breachdmg": 16.2, "breachmax": 0.8, "breachmin": 0.4, @@ -8670,6 +8670,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 50, "power": 1.78, "range": 3000, "rating": "C", @@ -8677,7 +8678,6 @@ "type": "T" }, { - "armourpen": 50, "breachdmg": 11.5, "breachmax": 0.8, "breachmin": 0.4, @@ -8692,6 +8692,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 50, "power": 1.68, "range": 3000, "rating": "D", @@ -8699,7 +8700,6 @@ "type": "T" }, { - "armourpen": 60, "breachdmg": 33.1, "breachmax": 0.8, "breachmin": 0.4, @@ -8714,6 +8714,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 60, "power": 2.9, "range": 3000, "rating": "A", @@ -8721,7 +8722,6 @@ "type": "T" }, { - "armourpen": 60, "breachdmg": 26.1, "breachmax": 0.8, "breachmin": 0.4, @@ -8736,6 +8736,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 60, "power": 2.86, "range": 3000, "rating": "A", @@ -8746,7 +8747,6 @@ "mc": [ { "ammo": 2100, - "armourpen": 22, "breachdmg": 1, "breachmax": 0.8, "breachmin": 0.4, @@ -8762,6 +8762,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 22, "power": 0.28, "range": 4000, "rating": "F", @@ -8773,7 +8774,6 @@ }, { "ammo": 2100, - "armourpen": 22, "breachdmg": 0.7, "breachmax": 0.8, "breachmin": 0.4, @@ -8789,6 +8789,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 22, "power": 0.37, "range": 4000, "rating": "G", @@ -8800,7 +8801,6 @@ }, { "ammo": 2100, - "armourpen": 22, "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, @@ -8816,6 +8816,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 22, "power": 0.26, "range": 4000, "rating": "G", @@ -8827,7 +8828,6 @@ }, { "ammo": 1000, - "armourpen": "A", "breachdmg": 2.7, "breachmax": 0.8, "breachmin": 0.4, @@ -8839,9 +8839,11 @@ "eddbID": 1481, "grp": "mc", "id": "e0", + "integrity": 40, "mass": 2, "mount": "F", "name": "Enforcer", + "piercing": "A", "power": 0.28, "pp": "Pranav Antal", "range": 4500, @@ -8854,7 +8856,6 @@ }, { "ammo": 2100, - "armourpen": 37, "breachdmg": 2, "breachmax": 0.8, "breachmin": 0.4, @@ -8870,6 +8871,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 37, "power": 0.46, "range": 4000, "rating": "E", @@ -8881,7 +8883,6 @@ }, { "ammo": 2100, - "armourpen": 37, "breachdmg": 1.5, "breachmax": 0.8, "breachmin": 0.4, @@ -8897,6 +8898,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 37, "power": 0.64, "range": 4000, "rating": "F", @@ -8908,7 +8910,6 @@ }, { "ammo": 2100, - "armourpen": 37, "breachdmg": 1.1, "breachmax": 0.8, "breachmin": 0.4, @@ -8924,6 +8925,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 37, "power": 0.5, "range": 4000, "rating": "F", @@ -8935,7 +8937,6 @@ }, { "ammo": 2100, - "armourpen": 54, "breachdmg": 3.5, "breachmax": 0.8, "breachmin": 0.4, @@ -8951,6 +8952,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 54, "power": 0.64, "range": 4000, "rating": "C", @@ -8962,7 +8964,6 @@ }, { "ammo": 2100, - "armourpen": 54, "breachdmg": 2.6, "breachmax": 0.8, "breachmin": 0.4, @@ -8978,6 +8979,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 54, "power": 0.97, "range": 4000, "rating": "C", @@ -8989,7 +8991,6 @@ }, { "ammo": 2100, - "armourpen": 68, "breachdmg": 4.2, "breachmax": 0.8, "breachmin": 0.4, @@ -9005,6 +9006,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 68, "power": 0.73, "range": 4000, "rating": "A", @@ -9017,7 +9019,6 @@ }, { "ammo": 2100, - "armourpen": 68, "breachdmg": 3.1, "breachmax": 0.8, "breachmin": 0.4, @@ -9033,6 +9034,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 68, "power": 1.22, "range": 4000, "rating": "A", @@ -9047,7 +9049,6 @@ "c": [ { "ammo": 100, - "armourpen": 35, "breachdmg": 17.1, "breachmax": 0.8, "breachmin": 0.6, @@ -9063,6 +9064,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 35, "power": 0.34, "range": 3000, "rating": "D", @@ -9074,7 +9076,6 @@ }, { "ammo": 100, - "armourpen": 35, "breachdmg": 13.2, "breachmax": 0.9, "breachmin": 0.6, @@ -9090,6 +9091,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 35, "power": 0.38, "range": 3000, "rating": "E", @@ -9101,7 +9103,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 10.6, "breachmax": 0.8, "breachmin": 0.6, @@ -9117,6 +9118,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 90, "power": 0.32, "range": 3000, "rating": "F", @@ -9128,7 +9130,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 28, "breachmax": 0.8, "breachmin": 0.6, @@ -9144,6 +9145,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 90, "power": 0.49, "range": 3500, "rating": "D", @@ -9155,7 +9157,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 20.3, "breachmax": 0.8, "breachmin": 0.6, @@ -9171,6 +9172,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 90, "power": 0.54, "range": 3500, "rating": "D", @@ -9182,7 +9184,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 16.3, "breachmax": 0.8, "breachmin": 0.6, @@ -9198,6 +9199,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 90, "power": 0.45, "range": 3500, "rating": "E", @@ -9209,7 +9211,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 42.3, "breachmax": 0.8, "breachmin": 0.6, @@ -9225,6 +9226,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 90, "power": 0.67, "range": 4000, "rating": "C", @@ -9236,7 +9238,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 30.9, "breachmax": 0.8, "breachmin": 0.6, @@ -9254,6 +9255,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 90, "power": 0.75, "range": 4000, "rating": "C", @@ -9265,7 +9267,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 25.14, "breachmax": 0.8, "breachmin": 0.6, @@ -9281,6 +9282,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 90, "power": 0.64, "range": 4000, "rating": "D", @@ -9292,7 +9294,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 63.2, "breachmax": 0.8, "breachmin": 0.6, @@ -9310,6 +9311,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 90, "power": 0.92, "range": 4500, "rating": "B", @@ -9321,7 +9323,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 46.7, "breachmax": 0.8, "breachmin": 0.6, @@ -9339,6 +9340,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 90, "power": 1.03, "range": 4500, "rating": "B", @@ -9352,7 +9354,6 @@ "fc": [ { "ammo": 90, - "armourpen": 20, "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, @@ -9369,6 +9370,7 @@ "jitter": 0.5, "mass": 2, "mount": "F", + "piercing": 20, "power": 0.45, "range": 2000, "rating": "E", @@ -9381,7 +9383,6 @@ }, { "ammo": 90, - "armourpen": 20, "breachdmg": 0.9, "breachmax": 0.8, "breachmin": 0.4, @@ -9398,6 +9399,7 @@ "jitter": 0.5, "mass": 2, "mount": "G", + "piercing": 20, "power": 0.59, "range": 2000, "rating": "E", @@ -9410,7 +9412,6 @@ }, { "ammo": 90, - "armourpen": 20, "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, @@ -9427,6 +9428,7 @@ "jitter": 0.5, "mass": 2, "mount": "T", + "piercing": 20, "power": 0.42, "range": 2000, "rating": "E", @@ -9439,7 +9441,6 @@ }, { "ammo": 90, - "armourpen": 35, "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, @@ -9456,6 +9457,7 @@ "jitter": 0.5, "mass": 4, "mount": "F", + "piercing": 35, "power": 0.74, "range": 2000, "rating": "A", @@ -9468,7 +9470,6 @@ }, { "ammo": 90, - "armourpen": 35, "breachdmg": 1.8, "breachmax": 0.8, "breachmin": 0.4, @@ -9485,6 +9486,7 @@ "jitter": 0.5, "mass": 4, "mount": "G", + "piercing": 35, "power": 1.03, "range": 2000, "rating": "D", @@ -9497,7 +9499,6 @@ }, { "ammo": 90, - "armourpen": 35, "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, @@ -9514,6 +9515,7 @@ "jitter": 0.5, "mass": 4, "mount": "T", + "piercing": 35, "power": 0.79, "range": 2000, "rating": "D", @@ -9526,7 +9528,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 3.5, "breachmax": 0.8, "breachmin": 0.4, @@ -9543,6 +9544,7 @@ "jitter": 0.5, "mass": 8, "mount": "F", + "piercing": 52, "power": 1.02, "range": 2000, "rating": "C", @@ -9555,7 +9557,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 2.9, "breachmax": 0.8, "breachmin": 0.4, @@ -9572,6 +9573,7 @@ "jitter": 0.5, "mass": 8, "mount": "G", + "piercing": 52, "power": 1.55, "range": 2000, "rating": "C", @@ -9584,7 +9586,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, @@ -9601,6 +9602,7 @@ "jitter": 0.5, "mass": 8, "mount": "T", + "piercing": 52, "power": 1.29, "range": 2000, "rating": "C", @@ -9613,7 +9615,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 3.1, "breachmax": 0.8, "breachmin": 0.4, @@ -9630,9 +9631,11 @@ "mass": 8, "mount": "F", "name": "Pacifier", + "piercing": 52, "power": 1.02, "pp": "Zachary Hudson", "rating": "C", + "reload": 5, "rof": 4.5, "speed": 1000, "thermload": 1.1, @@ -9642,7 +9645,6 @@ "rg": [ { "ammo": 30, - "armourpen": 30, "breachdmg": 22.2, "breachmax": 0.8, "breachmin": 0.4, @@ -9658,6 +9660,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 30, "power": 1.15, "range": 3000, "rating": "D", @@ -9668,7 +9671,6 @@ }, { "ammo": 30, - "armourpen": 48, "breachdmg": 39.5, "breachmax": 0.8, "breachmin": 0.4, @@ -9684,6 +9686,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 48, "power": 1.63, "range": 3000, "rating": "B", @@ -9694,7 +9697,6 @@ }, { "ammo": 90, - "armourpen": "A", "breachdmg": 14.3, "breachmax": 0.8, "breachmin": 0.4, @@ -9709,12 +9711,15 @@ "eddbID": 1484, "grp": "rg", "id": "ih", + "integrity": 51, "mass": 4, "mount": "F", "name": "Imperial Hammer", + "piercing": "A", "power": 1.63, "pp": "Arissa Lavigny-Duval", "rating": "B", + "reload": 1, "rof": 4.1, "thermload": 16, "type": "KT" @@ -9723,7 +9728,6 @@ "pa": [ { "ammo": 100, - "armourpen": 55, "breachdmg": 44.2, "breachmax": 0.8, "breachmin": 0.4, @@ -9739,6 +9743,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 55, "power": 1.43, "range": 3500, "rating": "C", @@ -9750,7 +9755,6 @@ }, { "ammo": 100, - "armourpen": 70, "breachdmg": 68, "breachmax": 0.8, "breachmin": 0.4, @@ -9766,6 +9770,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 70, "power": 1.97, "range": 3500, "rating": "B", @@ -9777,7 +9782,6 @@ }, { "ammo": 300, - "armourpen": 70, "breachdmg": 28.1, "breachmax": 0.8, "breachmin": 0.4, @@ -9794,6 +9798,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", + "piercing": 70, "power": 1.97, "pp": "Denton Patreus", "range": 3500, @@ -9806,7 +9811,6 @@ }, { "ammo": 100, - "armourpen": 85, "breachdmg": 102, "breachmax": 0.8, "breachmin": 0.4, @@ -9822,6 +9826,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 85, "power": 2.63, "range": 3500, "rating": "A", @@ -9835,7 +9840,6 @@ "mr": [ { "ammo": 16, - "armourpen": 60, "breachdmg": 20, "breachmax": 1, "breachmin": 1, @@ -9852,6 +9856,7 @@ "mass": 2, "missile": "D", "mount": "F", + "piercing": 60, "power": 0.4, "rating": "B", "reload": 5, @@ -9862,7 +9867,6 @@ }, { "ammo": 6, - "armourpen": 60, "breachdmg": 16, "breachmax": 0, "breachmin": 0, @@ -9879,6 +9883,7 @@ "mass": 2, "missile": "S", "mount": "F", + "piercing": 60, "power": 0.6, "rating": "B", "reload": 12, @@ -9889,7 +9894,6 @@ }, { "ammo": 48, - "armourpen": 60, "breachdmg": 20, "breachmax": 1, "breachmin": 1, @@ -9907,6 +9911,7 @@ "mass": 4, "missile": "D", "mount": "F", + "piercing": 60, "power": 1.2, "rating": "B", "reload": 5, @@ -9916,7 +9921,6 @@ }, { "ammo": 18, - "armourpen": 60, "breachdmg": 16, "breachmax": 0, "breachmin": 0, @@ -9935,6 +9939,7 @@ "mass": 4, "missile": "S", "mount": "F", + "piercing": 60, "power": 1.2, "rating": "B", "reload": 12, @@ -9945,7 +9950,6 @@ }, { "ammo": 48, - "armourpen": 60, "breachdmg": 16, "breachmax": 0, "breachmin": 0, @@ -9962,6 +9966,7 @@ "missile": "D", "mount": "F", "name": "Rocket Propelled FSD Disruptor", + "piercing": 60, "power": 1.2, "pp": "Yuri Grom", "rating": "B", @@ -9973,7 +9978,6 @@ }, { "ammo": 120, - "armourpen": 60, "breachdmg": 6, "breachmax": 0, "breachmin": 0, @@ -9993,6 +9997,7 @@ "missile": "S", "mount": "F", "name": "Pack-Hound", + "piercing": 60, "power": 1.2, "pp": "Li Yong-Rui", "rating": "B", @@ -10007,7 +10012,6 @@ "tp": [ { "ammo": 1, - "armourpen": 10000, "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, @@ -10015,6 +10019,7 @@ "clip": 1, "cost": 11200, "damage": 120, + "distdraw": 0, "edID": 128049509, "eddbID": 882, "grp": "tp", @@ -10023,6 +10028,7 @@ "mass": 2, "missile": "S", "mount": "F", + "piercing": 10000, "power": 0.4, "rating": "I", "reload": 5, @@ -10033,14 +10039,14 @@ }, { "ammo": 2, - "armourpen": 10000, "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, "class": 2, "clip": 1, "cost": 44800, - "dps": 120, + "damage": 120, + "distdraw": 0, "edID": 128049510, "eddbID": 883, "grp": "tp", @@ -10049,6 +10055,7 @@ "mass": 4, "missile": "S", "mount": "F", + "piercing": 10000, "power": 0.4, "rating": "I", "reload": 5, @@ -10061,7 +10068,6 @@ "nl": [ { "ammo": 36, - "armourpen": 60, "breachdmg": 0, "breachmax": 0, "breachmin": 0, @@ -10077,6 +10083,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 60, "power": 0.4, "rating": "I", "reload": 2, @@ -10086,7 +10093,6 @@ }, { "ammo": 36, - "armourpen": 60, "breachdmg": 0, "breachmax": 0, "breachmin": 0, @@ -10103,6 +10109,7 @@ "mass": 2, "mount": "F", "name": "Shock Mine Launcher", + "piercing": 60, "power": 0.4, "rating": "I", "reload": 2, @@ -10112,7 +10119,6 @@ }, { "ammo": 36, - "armourpen": 60, "breachdmg": 0, "breachmax": 0, "breachmin": 0, @@ -10128,6 +10134,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 60, "power": 0.4, "rating": "I", "reload": 2, @@ -10138,7 +10145,6 @@ ], "ml": [ { - "armourpen": 18, "breachdmg": 0.3, "breachmax": 0.2, "breachmin": 0.1, @@ -10153,12 +10159,12 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 18, "power": 0.5, "rating": "D", "thermload": 2 }, { - "armourpen": "D", "breachdmg": 0.6, "breachmax": 0.2, "breachmin": 0.1, @@ -10169,9 +10175,11 @@ "eddbID": 1479, "grp": "ml", "id": "ml", + "integrity": 40, "mass": 2, "mount": "F", "name": "Mining Lance", + "piercing": "D", "power": 0.7, "pp": "Zemina Torval", "rating": "D", @@ -10179,7 +10187,6 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 1.2, "breachmax": 0.2, "breachmin": 0.1, @@ -10194,6 +10201,7 @@ "integrity": 51, "mass": 2, "mount": "F", + "piercing": 18, "power": 0.75, "rating": "D", "thermload": 4 @@ -10511,8 +10519,8 @@ "power": 0.2, "rating": "I", "reload": 10, - "thermload": 4, - "rof": 1 + "rof": 1, + "thermload": 4 } ], "ec": [ @@ -10531,8 +10539,8 @@ "name": "Electronic Countermeasure", "power": 0.2, "range": 3000, - "reload": 10, "rating": "F", + "reload": 10, "thermload": 4 } ], diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json index c72581d..7428783 100644 --- a/modules/hardpoints/beam_laser.json +++ b/modules/hardpoints/beam_laser.json @@ -1,7 +1,6 @@ { "bl": [ { - "armourpen": 18, "breachdmg": 7.9, "breachmax": 0.8, "breachmin": 0.4, @@ -16,6 +15,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 18, "power": 0.69, "range": 3000, "rating": "E", @@ -23,7 +23,6 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 6.1, "breachmax": 0.8, "breachmin": 0.4, @@ -38,6 +37,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 18, "power": 0.67, "range": 3000, "rating": "E", @@ -45,7 +45,6 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 4.3, "breachmax": 0.8, "breachmin": 0.4, @@ -62,6 +61,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 18, "power": 0.63, "range": 3000, "rating": "F", @@ -69,14 +69,13 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 3.9, "breachmax": 0.8, "breachmin": 0.4, "class": 1, "cost": 56150, "damage": 4.9, - "distdraw": 2.80, + "distdraw": 2.8, "edID": 128671346, "eddbID": 1476, "grp": "bl", @@ -85,6 +84,7 @@ "mass": 2, "mount": "F", "name": "Retributor", + "piercing": 18, "power": 0.69, "pp": "Edmund Mahon", "range": 3000, @@ -93,7 +93,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 12.8, "breachmax": 0.8, "breachmin": 0.4, @@ -108,6 +107,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 35, "power": 1.12, "range": 3000, "rating": "D", @@ -115,7 +115,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 10, "breachmax": 0.8, "breachmin": 0.4, @@ -130,6 +129,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 35, "power": 1.1, "range": 3000, "rating": "D", @@ -137,7 +137,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 7.1, "breachmax": 0.8, "breachmin": 0.4, @@ -152,6 +151,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 35, "power": 1.03, "range": 3000, "rating": "E", @@ -159,7 +159,6 @@ "type": "T" }, { - "armourpen": 50, "breachdmg": 20.6, "breachmax": 0.8, "breachmin": 0.4, @@ -174,6 +173,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 50, "power": 1.8, "range": 3000, "rating": "C", @@ -181,7 +181,6 @@ "type": "T" }, { - "armourpen": 50, "breachdmg": 16.2, "breachmax": 0.8, "breachmin": 0.4, @@ -196,6 +195,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 50, "power": 1.78, "range": 3000, "rating": "C", @@ -203,7 +203,6 @@ "type": "T" }, { - "armourpen": 50, "breachdmg": 11.5, "breachmax": 0.8, "breachmin": 0.4, @@ -218,6 +217,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 50, "power": 1.68, "range": 3000, "rating": "D", @@ -225,14 +225,13 @@ "type": "T" }, { - "armourpen": 60, "breachdmg": 33.1, "breachmax": 0.8, "breachmin": 0.4, "class": 4, "cost": 2396160, "damage": 41.38, - "distdraw": 9.10, + "distdraw": 9.1, "edID": 128049431, "eddbID": 1540, "grp": "bl", @@ -240,6 +239,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 60, "power": 2.9, "range": 3000, "rating": "A", @@ -247,7 +247,6 @@ "type": "T" }, { - "armourpen": 60, "breachdmg": 26.1, "breachmax": 0.8, "breachmin": 0.4, @@ -262,6 +261,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 60, "power": 2.86, "range": 3000, "rating": "A", diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json index 07ebca0..b8e78e5 100644 --- a/modules/hardpoints/burst_laser.json +++ b/modules/hardpoints/burst_laser.json @@ -1,7 +1,6 @@ { "ul": [ { - "armourpen": 20, "breachdmg": 7.05, "breachmax": 0.8, "breachmin": 0.4, @@ -18,6 +17,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 20, "power": 0.65, "range": 3000, "rating": "F", @@ -26,7 +26,6 @@ "type": "T" }, { - "armourpen": 20, "breachdmg": 5.3, "breachmax": 0.8, "breachmin": 0.4, @@ -43,6 +42,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 20, "power": 0.64, "range": 3000, "rating": "G", @@ -51,7 +51,6 @@ "type": "T" }, { - "armourpen": 20, "breachdmg": 1.92, "breachmax": 0.8, "breachmin": 0.4, @@ -68,6 +67,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 20, "power": 0.6, "range": 3000, "rating": "G", @@ -76,7 +76,6 @@ "type": "T" }, { - "armourpen": 1, "breachdmg": 15.25, "breachmax": 0, "breachmin": 0, @@ -94,6 +93,7 @@ "mass": 2, "mount": "F", "name": "Cytoscrambler", + "piercing": 1, "power": 0.8, "pp": "Archon Delaine", "range": 600, @@ -103,7 +103,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 11.1, "breachmax": 0.8, "breachmin": 0.4, @@ -120,6 +119,7 @@ "integrity": 40, "mass": 4, "mount": "F", + "piercing": 35, "power": 1.05, "range": 3000, "rating": "E", @@ -128,7 +128,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 8.82, "breachmax": 0.8, "breachmin": 0.4, @@ -145,6 +144,7 @@ "integrity": 40, "mass": 4, "mount": "G", + "piercing": 35, "power": 1.04, "range": 3000, "rating": "F", @@ -153,7 +153,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 3.51, "breachmax": 0.8, "breachmin": 0.4, @@ -170,6 +169,7 @@ "integrity": 40, "mass": 4, "mount": "T", + "piercing": 35, "power": 0.98, "range": 3000, "rating": "F", @@ -178,7 +178,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 10.53, "breachmax": 0.8, "breachmin": 0.4, @@ -195,6 +194,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 52, "power": 1.66, "range": 3000, "rating": "D", @@ -203,7 +203,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 14.08, "breachmax": 0.8, "breachmin": 0.4, @@ -220,6 +219,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 52, "power": 1.65, "range": 3000, "rating": "E", @@ -228,7 +228,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 5.58, "breachmax": 0.8, "breachmin": 0.4, @@ -245,6 +244,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 52, "power": 1.57, "range": 3000, "rating": "E", @@ -253,7 +253,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 28, "breachmax": 0.8, "breachmin": 0.4, @@ -270,6 +269,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 65, "power": 2.58, "range": 3000, "rating": "E", @@ -278,7 +278,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 21.63, "breachmax": 0.8, "breachmin": 0.4, @@ -286,7 +285,7 @@ "burstrof": 5, "class": 4, "cost": 1245600, - "damage": 12.10, + "damage": 12.1, "distdraw": 2.72, "edID": 128727920, "eddbID": 1550, @@ -295,6 +294,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 65, "power": 2.59, "range": 3000, "rating": "E", diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index 8772004..450ff13 100644 --- a/modules/hardpoints/cannon.json +++ b/modules/hardpoints/cannon.json @@ -2,7 +2,6 @@ "c": [ { "ammo": 100, - "armourpen": 35, "breachdmg": 17.1, "breachmax": 0.8, "breachmin": 0.6, @@ -18,6 +17,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 35, "power": 0.34, "range": 3000, "rating": "D", @@ -29,7 +29,6 @@ }, { "ammo": 100, - "armourpen": 35, "breachdmg": 13.2, "breachmax": 0.9, "breachmin": 0.6, @@ -45,6 +44,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 35, "power": 0.38, "range": 3000, "rating": "E", @@ -56,7 +56,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 10.6, "breachmax": 0.8, "breachmin": 0.6, @@ -72,6 +71,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 90, "power": 0.32, "range": 3000, "rating": "F", @@ -83,7 +83,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 28, "breachmax": 0.8, "breachmin": 0.6, @@ -99,6 +98,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 90, "power": 0.49, "range": 3500, "rating": "D", @@ -110,7 +110,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 20.3, "breachmax": 0.8, "breachmin": 0.6, @@ -126,6 +125,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 90, "power": 0.54, "range": 3500, "rating": "D", @@ -137,7 +137,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 16.3, "breachmax": 0.8, "breachmin": 0.6, @@ -153,6 +152,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 90, "power": 0.45, "range": 3500, "rating": "E", @@ -164,7 +164,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 42.3, "breachmax": 0.8, "breachmin": 0.6, @@ -180,6 +179,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 90, "power": 0.67, "range": 4000, "rating": "C", @@ -191,7 +191,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 30.9, "breachmax": 0.8, "breachmin": 0.6, @@ -209,6 +208,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 90, "power": 0.75, "range": 4000, "rating": "C", @@ -220,7 +220,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 25.14, "breachmax": 0.8, "breachmin": 0.6, @@ -236,6 +235,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 90, "power": 0.64, "range": 4000, "rating": "D", @@ -247,7 +247,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 63.2, "breachmax": 0.8, "breachmin": 0.6, @@ -265,6 +264,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 90, "power": 0.92, "range": 4500, "rating": "B", @@ -276,7 +276,6 @@ }, { "ammo": 100, - "armourpen": 90, "breachdmg": 46.7, "breachmax": 0.8, "breachmin": 0.6, @@ -294,6 +293,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 90, "power": 1.03, "range": 4500, "rating": "B", diff --git a/modules/hardpoints/chaff_launcher.json b/modules/hardpoints/chaff_launcher.json index 3a071c9..4cef54a 100644 --- a/modules/hardpoints/chaff_launcher.json +++ b/modules/hardpoints/chaff_launcher.json @@ -18,8 +18,8 @@ "power": 0.2, "rating": "I", "reload": 10, - "thermload": 4, - "rof": 1 + "rof": 1, + "thermload": 4 } ] } diff --git a/modules/hardpoints/electronic_countermeasure.json b/modules/hardpoints/electronic_countermeasure.json index 585ca85..5aed18c 100644 --- a/modules/hardpoints/electronic_countermeasure.json +++ b/modules/hardpoints/electronic_countermeasure.json @@ -15,8 +15,8 @@ "name": "Electronic Countermeasure", "power": 0.2, "range": 3000, - "reload": 10, "rating": "F", + "reload": 10, "thermload": 4 } ] diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index 30dda4b..ce1ed0b 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -2,7 +2,6 @@ "fc": [ { "ammo": 90, - "armourpen": 20, "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, @@ -19,6 +18,7 @@ "jitter": 0.5, "mass": 2, "mount": "F", + "piercing": 20, "power": 0.45, "range": 2000, "rating": "E", @@ -31,7 +31,6 @@ }, { "ammo": 90, - "armourpen": 20, "breachdmg": 0.9, "breachmax": 0.8, "breachmin": 0.4, @@ -48,6 +47,7 @@ "jitter": 0.5, "mass": 2, "mount": "G", + "piercing": 20, "power": 0.59, "range": 2000, "rating": "E", @@ -60,7 +60,6 @@ }, { "ammo": 90, - "armourpen": 20, "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, @@ -77,6 +76,7 @@ "jitter": 0.5, "mass": 2, "mount": "T", + "piercing": 20, "power": 0.42, "range": 2000, "rating": "E", @@ -89,7 +89,6 @@ }, { "ammo": 90, - "armourpen": 35, "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, @@ -106,6 +105,7 @@ "jitter": 0.5, "mass": 4, "mount": "F", + "piercing": 35, "power": 0.74, "range": 2000, "rating": "A", @@ -118,7 +118,6 @@ }, { "ammo": 90, - "armourpen": 35, "breachdmg": 1.8, "breachmax": 0.8, "breachmin": 0.4, @@ -135,6 +134,7 @@ "jitter": 0.5, "mass": 4, "mount": "G", + "piercing": 35, "power": 1.03, "range": 2000, "rating": "D", @@ -147,7 +147,6 @@ }, { "ammo": 90, - "armourpen": 35, "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, @@ -164,6 +163,7 @@ "jitter": 0.5, "mass": 4, "mount": "T", + "piercing": 35, "power": 0.79, "range": 2000, "rating": "D", @@ -176,7 +176,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 3.5, "breachmax": 0.8, "breachmin": 0.4, @@ -193,6 +192,7 @@ "jitter": 0.5, "mass": 8, "mount": "F", + "piercing": 52, "power": 1.02, "range": 2000, "rating": "C", @@ -205,7 +205,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 2.9, "breachmax": 0.8, "breachmin": 0.4, @@ -222,6 +221,7 @@ "jitter": 0.5, "mass": 8, "mount": "G", + "piercing": 52, "power": 1.55, "range": 2000, "rating": "C", @@ -234,7 +234,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, @@ -251,6 +250,7 @@ "jitter": 0.5, "mass": 8, "mount": "T", + "piercing": 52, "power": 1.29, "range": 2000, "rating": "C", @@ -263,7 +263,6 @@ }, { "ammo": 90, - "armourpen": 52, "breachdmg": 3.1, "breachmax": 0.8, "breachmin": 0.4, @@ -280,9 +279,11 @@ "mass": 8, "mount": "F", "name": "Pacifier", + "piercing": 52, "power": 1.02, "pp": "Zachary Hudson", "rating": "C", + "reload": 5, "rof": 4.5, "speed": 1000, "thermload": 1.1, diff --git a/modules/hardpoints/mine_launcher.json b/modules/hardpoints/mine_launcher.json index 71d199d..c91f106 100644 --- a/modules/hardpoints/mine_launcher.json +++ b/modules/hardpoints/mine_launcher.json @@ -2,7 +2,6 @@ "nl": [ { "ammo": 36, - "armourpen": 60, "breachdmg": 0, "breachmax": 0, "breachmin": 0, @@ -18,6 +17,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 60, "power": 0.4, "rating": "I", "reload": 2, @@ -27,7 +27,6 @@ }, { "ammo": 36, - "armourpen": 60, "breachdmg": 0, "breachmax": 0, "breachmin": 0, @@ -44,6 +43,7 @@ "mass": 2, "mount": "F", "name": "Shock Mine Launcher", + "piercing": 60, "power": 0.4, "rating": "I", "reload": 2, @@ -53,7 +53,6 @@ }, { "ammo": 36, - "armourpen": 60, "breachdmg": 0, "breachmax": 0, "breachmin": 0, @@ -69,6 +68,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 60, "power": 0.4, "rating": "I", "reload": 2, diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index d60a8b1..1f66fb8 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -1,7 +1,6 @@ { "ml": [ { - "armourpen": 18, "breachdmg": 0.3, "breachmax": 0.2, "breachmin": 0.1, @@ -16,12 +15,12 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 18, "power": 0.5, "rating": "D", "thermload": 2 }, { - "armourpen": "D", "breachdmg": 0.6, "breachmax": 0.2, "breachmin": 0.1, @@ -32,9 +31,11 @@ "eddbID": 1479, "grp": "ml", "id": "ml", + "integrity": 40, "mass": 2, "mount": "F", "name": "Mining Lance", + "piercing": "D", "power": 0.7, "pp": "Zemina Torval", "rating": "D", @@ -42,7 +43,6 @@ "type": "T" }, { - "armourpen": 18, "breachdmg": 1.2, "breachmax": 0.2, "breachmin": 0.1, @@ -57,6 +57,7 @@ "integrity": 51, "mass": 2, "mount": "F", + "piercing": 18, "power": 0.75, "rating": "D", "thermload": 4 diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index a16052c..0e356d9 100644 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -2,7 +2,6 @@ "mr": [ { "ammo": 16, - "armourpen": 60, "breachdmg": 20, "breachmax": 1, "breachmin": 1, @@ -19,6 +18,7 @@ "mass": 2, "missile": "D", "mount": "F", + "piercing": 60, "power": 0.4, "rating": "B", "reload": 5, @@ -29,7 +29,6 @@ }, { "ammo": 6, - "armourpen": 60, "breachdmg": 16, "breachmax": 0, "breachmin": 0, @@ -46,6 +45,7 @@ "mass": 2, "missile": "S", "mount": "F", + "piercing": 60, "power": 0.6, "rating": "B", "reload": 12, @@ -56,7 +56,6 @@ }, { "ammo": 48, - "armourpen": 60, "breachdmg": 20, "breachmax": 1, "breachmin": 1, @@ -74,6 +73,7 @@ "mass": 4, "missile": "D", "mount": "F", + "piercing": 60, "power": 1.2, "rating": "B", "reload": 5, @@ -83,7 +83,6 @@ }, { "ammo": 18, - "armourpen": 60, "breachdmg": 16, "breachmax": 0, "breachmin": 0, @@ -102,6 +101,7 @@ "mass": 4, "missile": "S", "mount": "F", + "piercing": 60, "power": 1.2, "rating": "B", "reload": 12, @@ -112,7 +112,6 @@ }, { "ammo": 48, - "armourpen": 60, "breachdmg": 16, "breachmax": 0, "breachmin": 0, @@ -129,6 +128,7 @@ "missile": "D", "mount": "F", "name": "Rocket Propelled FSD Disruptor", + "piercing": 60, "power": 1.2, "pp": "Yuri Grom", "rating": "B", @@ -140,7 +140,6 @@ }, { "ammo": 120, - "armourpen": 60, "breachdmg": 6, "breachmax": 0, "breachmin": 0, @@ -160,6 +159,7 @@ "missile": "S", "mount": "F", "name": "Pack-Hound", + "piercing": 60, "power": 1.2, "pp": "Li Yong-Rui", "rating": "B", diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index f1ec9fc..a2d44bc 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -2,7 +2,6 @@ "mc": [ { "ammo": 2100, - "armourpen": 22, "breachdmg": 1, "breachmax": 0.8, "breachmin": 0.4, @@ -18,6 +17,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 22, "power": 0.28, "range": 4000, "rating": "F", @@ -29,7 +29,6 @@ }, { "ammo": 2100, - "armourpen": 22, "breachdmg": 0.7, "breachmax": 0.8, "breachmin": 0.4, @@ -45,6 +44,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 22, "power": 0.37, "range": 4000, "rating": "G", @@ -56,7 +56,6 @@ }, { "ammo": 2100, - "armourpen": 22, "breachdmg": 0.5, "breachmax": 0.8, "breachmin": 0.4, @@ -72,6 +71,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 22, "power": 0.26, "range": 4000, "rating": "G", @@ -83,7 +83,6 @@ }, { "ammo": 1000, - "armourpen": "A", "breachdmg": 2.7, "breachmax": 0.8, "breachmin": 0.4, @@ -95,9 +94,11 @@ "eddbID": 1481, "grp": "mc", "id": "e0", + "integrity": 40, "mass": 2, "mount": "F", "name": "Enforcer", + "piercing": "A", "power": 0.28, "pp": "Pranav Antal", "range": 4500, @@ -110,7 +111,6 @@ }, { "ammo": 2100, - "armourpen": 37, "breachdmg": 2, "breachmax": 0.8, "breachmin": 0.4, @@ -126,6 +126,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 37, "power": 0.46, "range": 4000, "rating": "E", @@ -137,7 +138,6 @@ }, { "ammo": 2100, - "armourpen": 37, "breachdmg": 1.5, "breachmax": 0.8, "breachmin": 0.4, @@ -153,6 +153,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 37, "power": 0.64, "range": 4000, "rating": "F", @@ -164,7 +165,6 @@ }, { "ammo": 2100, - "armourpen": 37, "breachdmg": 1.1, "breachmax": 0.8, "breachmin": 0.4, @@ -180,6 +180,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 37, "power": 0.5, "range": 4000, "rating": "F", @@ -191,7 +192,6 @@ }, { "ammo": 2100, - "armourpen": 54, "breachdmg": 3.5, "breachmax": 0.8, "breachmin": 0.4, @@ -207,6 +207,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 54, "power": 0.64, "range": 4000, "rating": "C", @@ -218,7 +219,6 @@ }, { "ammo": 2100, - "armourpen": 54, "breachdmg": 2.6, "breachmax": 0.8, "breachmin": 0.4, @@ -234,6 +234,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 54, "power": 0.97, "range": 4000, "rating": "C", @@ -245,7 +246,6 @@ }, { "ammo": 2100, - "armourpen": 68, "breachdmg": 4.2, "breachmax": 0.8, "breachmin": 0.4, @@ -261,6 +261,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 68, "power": 0.73, "range": 4000, "rating": "A", @@ -273,7 +274,6 @@ }, { "ammo": 2100, - "armourpen": 68, "breachdmg": 3.1, "breachmax": 0.8, "breachmin": 0.4, @@ -289,6 +289,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 68, "power": 1.22, "range": 4000, "rating": "A", diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index 13b5362..a3e361a 100644 --- a/modules/hardpoints/plasma_accelerator.json +++ b/modules/hardpoints/plasma_accelerator.json @@ -2,7 +2,6 @@ "pa": [ { "ammo": 100, - "armourpen": 55, "breachdmg": 44.2, "breachmax": 0.8, "breachmin": 0.4, @@ -18,6 +17,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 55, "power": 1.43, "range": 3500, "rating": "C", @@ -29,7 +29,6 @@ }, { "ammo": 100, - "armourpen": 70, "breachdmg": 68, "breachmax": 0.8, "breachmin": 0.4, @@ -45,6 +44,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 70, "power": 1.97, "range": 3500, "rating": "B", @@ -56,7 +56,6 @@ }, { "ammo": 300, - "armourpen": 70, "breachdmg": 28.1, "breachmax": 0.8, "breachmin": 0.4, @@ -73,6 +72,7 @@ "mass": 8, "mount": "F", "name": "Advanced Plasma Accelerator", + "piercing": 70, "power": 1.97, "pp": "Denton Patreus", "range": 3500, @@ -85,7 +85,6 @@ }, { "ammo": 100, - "armourpen": 85, "breachdmg": 102, "breachmax": 0.8, "breachmin": 0.4, @@ -101,6 +100,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 85, "power": 2.63, "range": 3500, "rating": "A", diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json index 3fa0701..cea8730 100644 --- a/modules/hardpoints/pulse_laser.json +++ b/modules/hardpoints/pulse_laser.json @@ -1,7 +1,6 @@ { "pl": [ { - "armourpen": 20, "breachdmg": 2.04, "breachmax": 0.8, "breachmin": 0.4, @@ -16,6 +15,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 20, "power": 0.39, "range": 3000, "rating": "F", @@ -24,7 +24,6 @@ "type": "T" }, { - "armourpen": 20, "breachdmg": 1.3, "breachmax": 0.8, "breachmin": 0.4, @@ -39,6 +38,7 @@ "integrity": 40, "mass": 2, "mount": "G", + "piercing": 20, "power": 0.39, "range": 3000, "rating": "G", @@ -47,8 +47,7 @@ "type": "T" }, { - "armourpen": 20, - "breachdmg": 1.0, + "breachdmg": 1, "breachmax": 0.8, "breachmin": 0.4, "class": 1, @@ -62,6 +61,7 @@ "integrity": 40, "mass": 2, "mount": "T", + "piercing": 20, "power": 0.38, "range": 3000, "rating": "G", @@ -70,8 +70,7 @@ "type": "T" }, { - "armourpen": 35, - "breachdmg": 3.0, + "breachdmg": 3, "breachmax": 0.8, "breachmin": 0.4, "class": 2, @@ -85,6 +84,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 35, "power": 0.6, "range": 3000, "rating": "F", @@ -93,7 +93,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 2.3, "breachmax": 0.8, "breachmin": 0.4, @@ -108,6 +107,7 @@ "integrity": 51, "mass": 4, "mount": "G", + "piercing": 35, "power": 0.6, "range": 3000, "rating": "F", @@ -116,7 +116,6 @@ "type": "T" }, { - "armourpen": 35, "breachdmg": 1.7, "breachmax": 0.8, "breachmin": 0.4, @@ -131,6 +130,7 @@ "integrity": 51, "mass": 4, "mount": "T", + "piercing": 35, "power": 0.58, "range": 3000, "rating": "F", @@ -139,21 +139,21 @@ "type": "T" }, { - "armourpen": "A", "breachdmg": 2.4, "breachmax": 0.8, "breachmin": 0.4, "class": 2, "cost": 26400, - "damage": 2, "damage": 2.8, "distdraw": 1, "eddbID": 1483, "grp": "pl", "id": "PL", + "integrity": 51, "mass": 4, "mount": "F", "name": "Disruptor", + "piercing": "A", "power": 0.7, "pp": "Felicia Winters", "rating": "E", @@ -162,7 +162,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 5.1, "breachmax": 0.8, "breachmin": 0.4, @@ -177,6 +176,7 @@ "integrity": 64, "mass": 8, "mount": "F", + "piercing": 52, "power": 0.9, "range": 3000, "rating": "D", @@ -185,7 +185,6 @@ "type": "T" }, { - "armourpen": 52, "breachdmg": 3.9, "breachmax": 0.8, "breachmin": 0.4, @@ -200,6 +199,7 @@ "integrity": 64, "mass": 8, "mount": "G", + "piercing": 52, "power": 0.92, "range": 3000, "rating": "E", @@ -208,8 +208,7 @@ "type": "T" }, { - "armourpen": 52, - "breachdmg": 3.0, + "breachdmg": 3, "breachmax": 0.8, "breachmin": 0.4, "class": 3, @@ -223,6 +222,7 @@ "integrity": 64, "mass": 8, "mount": "T", + "piercing": 52, "power": 0.89, "range": 3000, "rating": "F", @@ -231,7 +231,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 8.7, "breachmax": 0.8, "breachmin": 0.4, @@ -246,6 +245,7 @@ "integrity": 80, "mass": 16, "mount": "F", + "piercing": 65, "power": 1.33, "range": 3000, "rating": "A", @@ -254,7 +254,6 @@ "type": "T" }, { - "armourpen": 65, "breachdmg": 6.6, "breachmax": 0.8, "breachmin": 0.4, @@ -269,6 +268,7 @@ "integrity": 80, "mass": 16, "mount": "G", + "piercing": 65, "power": 1.37, "range": 3000, "rating": "A", diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json index 49406ce..3c5120f 100644 --- a/modules/hardpoints/rail_gun.json +++ b/modules/hardpoints/rail_gun.json @@ -2,7 +2,6 @@ "rg": [ { "ammo": 30, - "armourpen": 30, "breachdmg": 22.2, "breachmax": 0.8, "breachmin": 0.4, @@ -18,6 +17,7 @@ "integrity": 40, "mass": 2, "mount": "F", + "piercing": 30, "power": 1.15, "range": 3000, "rating": "D", @@ -28,7 +28,6 @@ }, { "ammo": 30, - "armourpen": 48, "breachdmg": 39.5, "breachmax": 0.8, "breachmin": 0.4, @@ -44,6 +43,7 @@ "integrity": 51, "mass": 4, "mount": "F", + "piercing": 48, "power": 1.63, "range": 3000, "rating": "B", @@ -54,7 +54,6 @@ }, { "ammo": 90, - "armourpen": "A", "breachdmg": 14.3, "breachmax": 0.8, "breachmin": 0.4, @@ -69,12 +68,15 @@ "eddbID": 1484, "grp": "rg", "id": "ih", + "integrity": 51, "mass": 4, "mount": "F", "name": "Imperial Hammer", + "piercing": "A", "power": 1.63, "pp": "Arissa Lavigny-Duval", "rating": "B", + "reload": 1, "rof": 4.1, "thermload": 16, "type": "KT" diff --git a/modules/hardpoints/torpedo_pylon.json b/modules/hardpoints/torpedo_pylon.json index 7bd0029..290716d 100644 --- a/modules/hardpoints/torpedo_pylon.json +++ b/modules/hardpoints/torpedo_pylon.json @@ -2,7 +2,6 @@ "tp": [ { "ammo": 1, - "armourpen": 10000, "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, @@ -10,6 +9,7 @@ "clip": 1, "cost": 11200, "damage": 120, + "distdraw": 0, "edID": 128049509, "eddbID": 882, "grp": "tp", @@ -18,6 +18,7 @@ "mass": 2, "missile": "S", "mount": "F", + "piercing": 10000, "power": 0.4, "rating": "I", "reload": 5, @@ -28,14 +29,14 @@ }, { "ammo": 2, - "armourpen": 10000, "breachdmg": 60, "breachmax": 0.8, "breachmin": 0.6, "class": 2, "clip": 1, "cost": 44800, - "dps": 120, + "damage": 120, + "distdraw": 0, "edID": 128049510, "eddbID": 883, "grp": "tp", @@ -44,6 +45,7 @@ "mass": 4, "missile": "S", "mount": "F", + "piercing": 10000, "power": 0.4, "rating": "I", "reload": 5, diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 6aa0e32..bc267c4 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -10,7 +10,7 @@ "id": "py", "integrity": 135, "mass": 160, - "pGen": 24, + "pgen": 24, "rating": "E" }, { @@ -23,7 +23,7 @@ "id": "px", "integrity": 120, "mass": 64, - "pGen": 27, + "pgen": 27, "rating": "D" }, { @@ -36,7 +36,7 @@ "id": "pw", "integrity": 150, "mass": 80, - "pGen": 30, + "pgen": 30, "rating": "C" }, { @@ -49,7 +49,7 @@ "id": "pv", "integrity": 180, "mass": 128, - "pGen": 33, + "pgen": 33, "rating": "B" }, { @@ -62,7 +62,7 @@ "id": "pu", "integrity": 165, "mass": 80, - "pGen": 36, + "pgen": 36, "rating": "A" }, { @@ -75,7 +75,7 @@ "id": "pt", "integrity": 118, "mass": 80, - "pGen": 20, + "pgen": 20, "rating": "E" }, { @@ -88,7 +88,7 @@ "id": "ps", "integrity": 105, "mass": 32, - "pGen": 22.5, + "pgen": 22.5, "rating": "D" }, { @@ -101,7 +101,7 @@ "id": "pr", "integrity": 131, "mass": 40, - "pGen": 25, + "pgen": 25, "rating": "C" }, { @@ -114,7 +114,7 @@ "id": "pq", "integrity": 157, "mass": 64, - "pGen": 27.5, + "pgen": 27.5, "rating": "B" }, { @@ -127,7 +127,7 @@ "id": "pp", "integrity": 144, "mass": 40, - "pGen": 30, + "pgen": 30, "rating": "A" }, { @@ -140,7 +140,7 @@ "id": "po", "integrity": 90, "mass": 40, - "pGen": 16.8, + "pgen": 16.8, "rating": "E" }, { @@ -153,7 +153,7 @@ "id": "pn", "integrity": 113, "mass": 16, - "pGen": 18.9, + "pgen": 18.9, "rating": "D" }, { @@ -166,7 +166,7 @@ "id": "pm", "integrity": 136, "mass": 20, - "pGen": 21, + "pgen": 21, "rating": "C" }, { @@ -179,7 +179,7 @@ "id": "pl", "integrity": 124, "mass": 32, - "pGen": 23.1, + "pgen": 23.1, "rating": "B" }, { @@ -192,7 +192,7 @@ "id": "pk", "integrity": 118, "mass": 20, - "pGen": 25.2, + "pgen": 25.2, "rating": "A" }, { @@ -205,7 +205,7 @@ "id": "pj", "integrity": 86, "mass": 20, - "pGen": 13.6, + "pgen": 13.6, "rating": "E" }, { @@ -218,7 +218,7 @@ "id": "pi", "integrity": 77, "mass": 8, - "pGen": 15.3, + "pgen": 15.3, "rating": "D" }, { @@ -231,7 +231,7 @@ "id": "ph", "integrity": 96, "mass": 10, - "pGen": 17, + "pgen": 17, "rating": "C" }, { @@ -244,7 +244,7 @@ "id": "pg", "integrity": 114, "mass": 16, - "pGen": 18.7, + "pgen": 18.7, "rating": "B" }, { @@ -257,7 +257,7 @@ "id": "pf", "integrity": 106, "mass": 10, - "pGen": 20.4, + "pgen": 20.4, "rating": "A" }, { @@ -270,7 +270,7 @@ "id": "pe", "integrity": 72, "mass": 10, - "pGen": 10.4, + "pgen": 10.4, "rating": "E" }, { @@ -283,7 +283,7 @@ "id": "pd", "integrity": 64, "mass": 4, - "pGen": 11.7, + "pgen": 11.7, "rating": "D" }, { @@ -296,7 +296,7 @@ "id": "pc", "integrity": 80, "mass": 5, - "pGen": 13, + "pgen": 13, "rating": "C" }, { @@ -309,7 +309,7 @@ "id": "pb", "integrity": 96, "mass": 8, - "pGen": 14.3, + "pgen": 14.3, "rating": "B" }, { @@ -322,7 +322,7 @@ "id": "pa", "integrity": 88, "mass": 5, - "pGen": 15.6, + "pgen": 15.6, "rating": "A" }, { @@ -335,7 +335,7 @@ "id": "p9", "integrity": 58, "mass": 5, - "pGen": 8, + "pgen": 8, "rating": "E" }, { @@ -348,7 +348,7 @@ "id": "p8", "integrity": 51, "mass": 2, - "pGen": 9, + "pgen": 9, "rating": "D" }, { @@ -361,7 +361,7 @@ "id": "p7", "integrity": 64, "mass": 2.5, - "pGen": 10, + "pgen": 10, "rating": "C" }, { @@ -374,7 +374,7 @@ "id": "p6", "integrity": 77, "mass": 4, - "pGen": 11, + "pgen": 11, "rating": "B" }, { @@ -387,7 +387,7 @@ "id": "p5", "integrity": 70, "mass": 2.5, - "pGen": 12, + "pgen": 12, "rating": "A" }, { @@ -400,7 +400,7 @@ "id": "p4", "integrity": 46, "mass": 2.5, - "pGen": 6.4, + "pgen": 6.4, "rating": "E" }, { @@ -413,7 +413,7 @@ "id": "p3", "integrity": 41, "mass": 1, - "pGen": 7.2, + "pgen": 7.2, "rating": "D" }, { @@ -426,7 +426,7 @@ "id": "p2", "integrity": 51, "mass": 1.3, - "pGen": 8, + "pgen": 8, "rating": "C" }, { @@ -439,7 +439,7 @@ "id": "p1", "integrity": 61, "mass": 2, - "pGen": 8.8, + "pgen": 8.8, "rating": "B" }, { @@ -452,7 +452,7 @@ "id": "p0", "integrity": 56, "mass": 1.3, - "pGen": 9.6, + "pgen": 9.6, "rating": "A" } ] diff --git a/spec/data-spec.js b/spec/data-spec.js index 3b65d26..7da38d7 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -75,14 +75,14 @@ describe('JSON Data', function() { if (group[i].edID) { edIDs[group[i].edID] = true; } - if (group[i].dps) { - expect(group[i].dps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing dps`); + if (group[i].damage) { + expect(group[i].damage).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing damage`); expect(group[i].breachmin).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmin`); expect(group[i].breachmax).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachmax`); - expect(group[i].breachdps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdps`); - expect(group[i].armourpen).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing armourpen`); - expect(group[i].eps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing eps`); - expect(group[i].hps).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing hps`); + expect(group[i].breachdmg).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing breachdmg`); + expect(group[i].piercing).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing piercing`); + expect(group[i].thermload).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing thermload`); + expect(group[i].distdraw).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing distdraw`); } if ((group[i].ammo || group[i].reload || group[i].clip) && g != 'hs' && g != 'ec') { expect(group[i].ammo).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing ammo`); From 384931b6941ccabe6cf4843d1f236a6522954eda Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 3 Nov 2016 14:51:50 +0000 Subject: [PATCH 46/49] 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", From 422655ffaeb0cbb2bbd540ca5ff25e14ea524572 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 4 Nov 2016 22:25:40 +0000 Subject: [PATCH 47/49] Fix up names --- dist/index.js | 4 ++-- dist/index.json | 4 ++-- modifications/modifiers.json | 2 +- modifications/validity.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index 1b9203a..d036161 100644 --- a/dist/index.js +++ b/dist/index.js @@ -13153,7 +13153,7 @@ module.exports = { } }, Modifications: { - 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" ], + 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", "shieldboost", "spinup", "syscap", "sysrate", "thermload", "thermres", "wepcap", "weprate" ], validity: { am: [ "integrity", "power" ], bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ], @@ -13187,7 +13187,7 @@ module.exports = { rf: [ "integrity", "power" ], 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" ], + sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "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" ], diff --git a/dist/index.json b/dist/index.json index 00f9100..2a23b8b 100644 --- a/dist/index.json +++ b/dist/index.json @@ -15581,7 +15581,7 @@ "reload", "rof", "shield", - "shieldmul", + "shieldboost", "spinup", "syscap", "sysrate", @@ -15883,7 +15883,7 @@ "kinres", "mass", "power", - "shieldmul", + "shieldboost", "thermres" ], "scb": [ diff --git a/modifications/modifiers.json b/modifications/modifiers.json index cd1d60c..6e22069 100644 --- a/modifications/modifiers.json +++ b/modifications/modifiers.json @@ -30,7 +30,7 @@ "reload", "rof", "shield", - "shieldmul", + "shieldboost", "spinup", "syscap", "sysrate", diff --git a/modifications/validity.json b/modifications/validity.json index 862d703..d86eea0 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -291,7 +291,7 @@ "kinres", "mass", "power", - "shieldmul", + "shieldboost", "thermres" ], "scb": [ From c0c19b157b04d54883c12a1e2e9bdc82f8a828e6 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 4 Nov 2016 22:33:55 +0000 Subject: [PATCH 48/49] Fix up name of shield boost --- dist/index.js | 10 +++++----- dist/index.json | 10 +++++----- modules/hardpoints/shield_booster.json | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dist/index.js b/dist/index.js index d036161..000920f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8429,7 +8429,7 @@ module.exports = { passive: 1, power: .2, rating: "E", - shieldmul: .04 + shieldboost: .04 }, { class: 0, cost: 23e3, @@ -8442,7 +8442,7 @@ module.exports = { passive: 1, power: .5, rating: "D", - shieldmul: .08 + shieldboost: .08 }, { class: 0, cost: 53e3, @@ -8455,7 +8455,7 @@ module.exports = { passive: 1, power: .7, rating: "C", - shieldmul: .12 + shieldboost: .12 }, { class: 0, cost: 122e3, @@ -8468,7 +8468,7 @@ module.exports = { passive: 1, power: 1, rating: "B", - shieldmul: .16 + shieldboost: .16 }, { class: 0, cost: 281e3, @@ -8481,7 +8481,7 @@ module.exports = { passive: 1, power: 1.2, rating: "A", - shieldmul: .2 + shieldboost: .2 } ], ch: [ { ammo: 10, diff --git a/dist/index.json b/dist/index.json index 2a23b8b..3c40226 100644 --- a/dist/index.json +++ b/dist/index.json @@ -10441,7 +10441,7 @@ "passive": 1, "power": 0.2, "rating": "E", - "shieldmul": 0.04 + "shieldboost": 0.04 }, { "class": 0, @@ -10455,7 +10455,7 @@ "passive": 1, "power": 0.5, "rating": "D", - "shieldmul": 0.08 + "shieldboost": 0.08 }, { "class": 0, @@ -10469,7 +10469,7 @@ "passive": 1, "power": 0.7, "rating": "C", - "shieldmul": 0.12 + "shieldboost": 0.12 }, { "class": 0, @@ -10483,7 +10483,7 @@ "passive": 1, "power": 1, "rating": "B", - "shieldmul": 0.16 + "shieldboost": 0.16 }, { "class": 0, @@ -10497,7 +10497,7 @@ "passive": 1, "power": 1.2, "rating": "A", - "shieldmul": 0.2 + "shieldboost": 0.2 } ], "ch": [ diff --git a/modules/hardpoints/shield_booster.json b/modules/hardpoints/shield_booster.json index 648e795..f701c4a 100644 --- a/modules/hardpoints/shield_booster.json +++ b/modules/hardpoints/shield_booster.json @@ -12,7 +12,7 @@ "passive": 1, "power": 0.2, "rating": "E", - "shieldmul": 0.04 + "shieldboost": 0.04 }, { "class": 0, @@ -26,7 +26,7 @@ "passive": 1, "power": 0.5, "rating": "D", - "shieldmul": 0.08 + "shieldboost": 0.08 }, { "class": 0, @@ -40,7 +40,7 @@ "passive": 1, "power": 0.7, "rating": "C", - "shieldmul": 0.12 + "shieldboost": 0.12 }, { "class": 0, @@ -54,7 +54,7 @@ "passive": 1, "power": 1, "rating": "B", - "shieldmul": 0.16 + "shieldboost": 0.16 }, { "class": 0, @@ -68,7 +68,7 @@ "passive": 1, "power": 1.2, "rating": "A", - "shieldmul": 0.2 + "shieldboost": 0.2 } ] } From 092a2db3cb4cec7542a00450337164e31c9a19cf Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sat, 5 Nov 2016 14:02:46 +0000 Subject: [PATCH 49/49] Bump version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dea6376..c90911b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis-data", - "version": "2.2.0", + "version": "2.2.1", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis-data"