Merge branch 'develop'

This commit is contained in:
William Blythe
2018-09-06 09:56:52 +10:00
18 changed files with 1892 additions and 235 deletions

847
dist/index.js vendored

File diff suppressed because it is too large Load Diff

941
dist/index.json vendored

File diff suppressed because it is too large Load Diff

View File

@@ -1959,11 +1959,11 @@
},
"features": {
"integrity": [
0,
-0.03,
-0.03
],
"optmass": [
0,
-0.03,
-0.03
],
"optmul": [
@@ -1971,11 +1971,11 @@
0.12
],
"power": [
0,
0.04,
0.04
],
"thermload": [
0,
0.2,
0.2
]
},
@@ -1988,11 +1988,11 @@
},
"features": {
"integrity": [
-0.03,
-0.06,
-0.06
],
"optmass": [
-0.03,
-0.05,
-0.05
],
"optmul": [
@@ -2000,11 +2000,11 @@
0.19
],
"power": [
0.04,
0.06,
0.06
],
"thermload": [
0.2,
0.3,
0.3
]
},
@@ -2018,11 +2018,11 @@
},
"features": {
"integrity": [
-0.06,
-0.09,
-0.09
],
"optmass": [
-0.05,
-0.08,
-0.08
],
"optmul": [
@@ -2030,11 +2030,11 @@
0.26
],
"power": [
0.06,
0.08,
0.08
],
"thermload": [
0.3,
0.4,
0.4
]
},
@@ -2048,11 +2048,11 @@
},
"features": {
"integrity": [
-0.09,
-0.12,
-0.12
],
"optmass": [
-0.08,
-0.1,
-0.1
],
"optmul": [
@@ -2060,11 +2060,11 @@
0.33
],
"power": [
0.08,
0.1,
0.1
],
"thermload": [
0.4,
0.5,
0.5
]
},
@@ -2078,11 +2078,11 @@
},
"features": {
"integrity": [
-0.12,
-0.15,
-0.15
],
"optmass": [
-0.1,
-0.13,
-0.13
],
"optmul": [
@@ -2090,11 +2090,11 @@
0.4
],
"power": [
0.1,
0.12,
0.12
],
"thermload": [
0.5,
0.6,
0.6
]
},
@@ -2121,7 +2121,7 @@
0.3
],
"mass": [
0,
0.05,
0.05
],
"thermload": [
@@ -2142,7 +2142,7 @@
0.5
],
"mass": [
0.05,
0.1,
0.1
],
"thermload": [
@@ -2164,7 +2164,7 @@
0.7
],
"mass": [
0.1,
0.15,
0.15
],
"thermload": [
@@ -2186,7 +2186,7 @@
0.9
],
"mass": [
0.15,
0.2,
0.2
],
"thermload": [
@@ -2208,7 +2208,7 @@
1.1
],
"mass": [
0.2,
0.25,
0.25
],
"thermload": [
@@ -2235,7 +2235,7 @@
},
"features": {
"optmass": [
0,
-0.02,
-0.02
],
"optmul": [
@@ -2256,11 +2256,11 @@
},
"features": {
"integrity": [
0,
-0.04,
-0.04
],
"optmass": [
-0.02,
-0.04,
-0.04
],
"optmul": [
@@ -2268,7 +2268,7 @@
0.13
],
"power": [
0,
0.04,
0.04
],
"thermload": [
@@ -2286,11 +2286,11 @@
},
"features": {
"integrity": [
-0.04,
-0.08,
-0.08
],
"optmass": [
-0.04,
-0.06,
-0.06
],
"optmul": [
@@ -2298,7 +2298,7 @@
0.18
],
"power": [
0.04,
0.08,
0.08
],
"thermload": [
@@ -2316,11 +2316,11 @@
},
"features": {
"integrity": [
-0.08,
-0.12,
-0.12
],
"optmass": [
-0.06,
-0.08,
-0.08
],
"optmul": [
@@ -2328,7 +2328,7 @@
0.23
],
"power": [
0.08,
0.12,
0.12
],
"thermload": [
@@ -2346,11 +2346,11 @@
},
"features": {
"integrity": [
-0.12,
-0.16,
-0.16
],
"optmass": [
-0.08,
-0.1,
-0.1
],
"optmul": [
@@ -2358,7 +2358,7 @@
0.28
],
"power": [
0.12,
0.16,
0.16
],
"thermload": [
@@ -2895,7 +2895,7 @@
},
"features": {
"facinglimit": [
-0.1,
-0.01,
-0.01
],
"mass": [
@@ -4809,7 +4809,7 @@
0.2
],
"angle": [
-0.12,
-0.15,
-0.15
],
"range": [
@@ -7588,7 +7588,7 @@
0.2
],
"angle": [
-0.12,
-0.15,
-0.15
],
"range": [
@@ -8156,7 +8156,7 @@
0.2
],
"angle": [
0,
-0.1,
-0.1
],
"range": [
@@ -8177,7 +8177,7 @@
0.4
],
"angle": [
-0.1,
-0.15,
-0.15
],
"range": [
@@ -8199,7 +8199,7 @@
0.6
],
"angle": [
-0.15,
-0.2,
-0.2
],
"range": [
@@ -8221,7 +8221,7 @@
0.8
],
"angle": [
-0.2,
-0.25,
-0.25
],
"range": [
@@ -8243,7 +8243,7 @@
1
],
"angle": [
-0.25,
-0.3,
-0.3
],
"range": [
@@ -8823,7 +8823,7 @@
0.2
],
"angle": [
-0.12,
-0.15,
-0.15
],
"range": [
@@ -11575,7 +11575,7 @@
},
"features": {
"clip": [
0,
-0.03,
-0.03
],
"damage": [
@@ -11583,11 +11583,11 @@
0.3
],
"distdraw": [
0,
0.15,
0.15
],
"thermload": [
0,
0.03,
0.03
]
},
@@ -11600,7 +11600,7 @@
},
"features": {
"clip": [
-0.03,
-0.06,
-0.06
],
"damage": [
@@ -11608,11 +11608,11 @@
0.4
],
"distdraw": [
0.15,
0.2,
0.2
],
"thermload": [
0.03,
0.06,
0.06
]
},
@@ -11626,7 +11626,7 @@
},
"features": {
"clip": [
-0.06,
-0.09,
-0.09
],
"damage": [
@@ -11634,11 +11634,11 @@
0.5
],
"distdraw": [
0.2,
0.25,
0.25
],
"thermload": [
0.06,
0.09,
0.09
]
},
@@ -11652,7 +11652,7 @@
},
"features": {
"clip": [
-0.09,
-0.12,
-0.12
],
"damage": [
@@ -11660,11 +11660,11 @@
0.6
],
"distdraw": [
0.25,
0.3,
0.3
],
"thermload": [
0.09,
0.12,
0.12
]
},
@@ -11678,7 +11678,7 @@
},
"features": {
"clip": [
-0.12,
-0.15,
-0.15
],
"damage": [
@@ -11686,11 +11686,11 @@
0.7
],
"distdraw": [
0.3,
0.35,
0.35
],
"thermload": [
0.12,
0.15,
0.15
]
},

View File

@@ -3,7 +3,7 @@
"boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative", "higherbetter": false},
"brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite", "higherbetter": true},
"burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": false},
"burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": true},
"clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
@@ -33,7 +33,7 @@
"ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
"rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
"rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"angle": {"id": 46, "name": "angle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"scanrate": {"id": 49, "name": "scanrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},

View File

@@ -6,7 +6,7 @@
"grp": "tbem",
"id": "xt",
"eddbID": 0,
"edID": 0,
"edID": 128833995,
"mount": "F",
"cost": 480501,
"mass": 4,

View File

@@ -68,12 +68,12 @@
"grp": "gpc",
"id": "xu",
"eddbID": 0,
"edID": 0,
"edID": 128834783,
"mount": "F",
"cost": 1423301,
"mass": 8,
"integrity": 51,
"power": 1.39,
"power": 3.10,
"damage": 3.4,
"distdraw": 2.42,
"thermload": 6.2,
@@ -106,7 +106,7 @@
"A": 1
},
"distdraw": 2.6,
"edID": 0,
"edID": 128834784,
"eddbID": 0,
"falloff": 1000,
"grp": "gpc",

View File

@@ -105,7 +105,7 @@
"grp": "gsc",
"id": "xx",
"eddbID": 0,
"edID": 0,
"edID": 128834779,
"mount": "T",
"cost": 5865026,
"mass": 8,

View File

@@ -6,7 +6,7 @@
"grp": "tbrfl",
"id": "xy",
"eddbID": 0,
"edID": 0,
"edID": 128833996,
"mount": "F",
"cost": 353761,
"mass": 4,
@@ -15,7 +15,7 @@
"damage": 13,
"distdraw": 0.24,
"thermload": 3.6,
"piercing": 70,
"piercing": 80,
"shotspeed": 550,
"rof": 0.5,
"clip": 1,
@@ -35,7 +35,7 @@
"grp": "tbrfl",
"id": "yF",
"eddbID": 0,
"edID": 0,
"edID": 128833997,
"mount": "T",
"cost": 1279200,
"mass": 4,

View File

@@ -1,5 +1,38 @@
{
"tbsc": [
{
"rating": "C",
"class": 3,
"grp": "tbsc",
"id": "yG",
"eddbID": 0,
"edID": 128834780,
"mount": "F",
"cost": 1015750,
"mass": 8,
"integrity": 64,
"power": 0.89,
"damage": 18.1,
"distdraw": 0.92,
"thermload": 2.7,
"piercing": 60,
"range": 3000,
"shotspeed": 1200,
"rof": 10,
"roundspershot": 0,
"clip": 16,
"ammo": 240,
"reload": 6,
"breachdmg": 12.7,
"breachmin": 0.4,
"breachmax": 0.8,
"jitter": 0,
"symbol": "Hpt_PlasmaShockCannon_Fixed_Large",
"damagedist": {
"K": 1
},
"falloff": 2500
},
{
"rating": "C",
"class": 3,
@@ -19,17 +52,17 @@
"falloff": 2500,
"integrity": 64,
"mount": "G",
"piercing": 95,
"piercing": 60,
"power": 0.89,
"range": 3000,
"rof": 10,
"shotspeed": 1200,
"thermload": 3.1,
"cost": 1015750,
"cost": 2249050,
"reload": 6,
"id": "2N",
"edID": 128834780,
"symbol": "Hpt_PlasmaShockCannon_Fixed_Large"
"edID": 128834781,
"symbol": "Hpt_PlasmaShockCannon_Gimbal_Large"
},
{
"rating": "D",
@@ -38,7 +71,7 @@
"symbol": "Hpt_PlasmaShockCannon_Turret_Large",
"id": "xz",
"eddbID": 0,
"edID": 0,
"edID": 128834782,
"mount": "T",
"cost": 6050201,
"mass": 8,
@@ -98,7 +131,7 @@
"symbol": "Hpt_PlasmaShockCannon_Fixed_Medium",
"id": "y0",
"eddbID": 0,
"edID": 128834003,
"edID": 128834002,
"class": 2,
"rating": "D",
"mount": "F",
@@ -123,6 +156,39 @@
"K": 1
},
"falloff": 2500
},
{
"rating": "E",
"class": 2,
"grp": "tbsc",
"id": "0",
"eddbID": 0,
"edID": 128834004,
"mount": "T",
"cost": 1359200,
"mass": 4,
"integrity": 51,
"power": 0.5,
"damage": 9.0,
"distdraw": 0.39,
"thermload": 1.2,
"piercing": 40,
"range": 3000,
"shotspeed": 1200,
"rof": 10,
"roundspershot": 0,
"clip": 16,
"ammo": 240,
"reload": 6,
"breachdmg": 6.3,
"breachmin": 0.4,
"breachmax": 0.8,
"jitter": 0,
"symbol": "Hpt_PlasmaShockCannon_Turret_Medium",
"damagedist": {
"K": 1
},
"falloff": 2500
}
]
}

View File

@@ -72,6 +72,7 @@ module.exports = {
ss: require('./internal/surface_scanner').ss,
rpl: require('./internal/repair_limpet_controller').rpl,
rcpl: require('./internal/recon_limpet_controllers').rcpl,
rsl: require('./internal/research_limpet_controller.json').rsl,
gsrp: require('./internal/guardian_shield_reinforcement_package').gsrp,
gfsb: require('./internal/guardian_fsd_booster').gfsb,
ghrp: require('./internal/guardian_hull_reinforcement_package').ghrp,

View File

@@ -128,7 +128,7 @@
"cargo": 16,
"class": 4,
"cost": 94330,
"edID": 128681992,
"edID": 128833944,
"eddbID": 1552,
"grp": "cr",
"id": "0W",
@@ -137,4 +137,4 @@
"symbol": "Int_CorrosionProofCargoRack_Size4_Class1"
}
]
}
}

View File

@@ -3,7 +3,7 @@
{
"class": 1,
"cost": 3600,
"edID": 0,
"edID": 128793941,
"eddbID": 0,
"grp": "dtl",
"id": "y1",
@@ -17,7 +17,7 @@
{
"class": 3,
"cost": 16201,
"edID": 0,
"edID": 128793942,
"eddbID": 0,
"grp": "dtl",
"id": "y2",
@@ -31,7 +31,7 @@
{
"class": 5,
"cost": 145801,
"edID": 0,
"edID": 128793943,
"eddbID": 0,
"grp": "dtl",
"id": "y3",
@@ -45,7 +45,7 @@
{
"class": 7,
"cost": 1312201,
"edID": 0,
"edID": 128793944,
"eddbID": 0,
"grp": "dtl",
"id": "y4",

View File

@@ -9,6 +9,7 @@
"eddbID": 0,
"power": 0.56,
"hullreinforcement": 138,
"causres": 0.05,
"thermres": 0.02,
"cost": 30000,
"symbol": "Int_GuardianHullReinforcement_Size1_Class2",
@@ -23,6 +24,7 @@
"eddbID": 0,
"power": 0.45,
"hullreinforcement": 100,
"causres": 0.05,
"thermres": 0.02,
"cost": 10000,
"symbol": "Int_GuardianHullReinforcement_Size1_Class1",
@@ -37,6 +39,7 @@
"eddbID": 0,
"power": 0.79,
"hullreinforcement": 238,
"causres": 0.05,
"thermres": 0.02,
"cost": 72000,
"symbol": "Int_GuardianHullReinforcement_Size2_Class2",
@@ -51,6 +54,7 @@
"eddbID": 0,
"power": 0.68,
"hullreinforcement": 188,
"causres": 0.05,
"thermres": 0.02,
"cost": 24000,
"symbol": "Int_GuardianHullReinforcement_Size2_Class1",
@@ -65,6 +69,7 @@
"eddbID": 0,
"power": 1.01,
"hullreinforcement": 325,
"causres": 0.05,
"thermres": 0.02,
"cost": 172800,
"symbol": "Int_GuardianHullReinforcement_Size3_Class2",
@@ -79,6 +84,7 @@
"eddbID": 0,
"power": 0.9,
"hullreinforcement": 288,
"causres": 0.05,
"thermres": 0.02,
"cost": 57600,
"symbol": "Int_GuardianHullReinforcement_Size3_Class1",
@@ -92,6 +98,7 @@
"eddbID": 0,
"power": 1.24,
"hullreinforcement": 413,
"causres": 0.05,
"thermres": 0.02,
"cost": 414720,
"id": "2R",
@@ -106,6 +113,7 @@
"eddbID": 0,
"power": 1.13,
"hullreinforcement": 375,
"causres": 0.05,
"thermres": 0.02,
"cost": 138240,
"id": "2B",
@@ -120,6 +128,7 @@
"eddbID": 0,
"power": 1.46,
"hullreinforcement": 488,
"causres": 0.05,
"thermres": 0.02,
"cost": 995330,
"id": "2C",
@@ -134,6 +143,7 @@
"eddbID": 0,
"power": 1.35,
"hullreinforcement": 450,
"causres": 0.05,
"thermres": 0.02,
"cost": 331778,
"id": "2D",

View File

@@ -4,7 +4,7 @@
"hullreinforcement": 72,
"class": 1,
"cost": 7501,
"edID": 0,
"edID": 128793117,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -20,7 +20,7 @@
"hullreinforcement": 99,
"class": 1,
"cost": 22501,
"edID": 0,
"edID": 128793118,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -36,7 +36,7 @@
"hullreinforcement": 135,
"class": 2,
"cost": 18000,
"edID": 0,
"edID": 128793119,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -52,7 +52,7 @@
"hullreinforcement": 171,
"class": 2,
"cost": 54000,
"edID": 0,
"edID": 128793120,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -68,7 +68,7 @@
"hullreinforcement": 207,
"class": 3,
"cost": 42000,
"edID": 0,
"edID": 128793121,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -84,7 +84,7 @@
"hullreinforcement": 234,
"class": 3,
"cost": 126000,
"edID": 0,
"edID": 128793122,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -100,7 +100,7 @@
"hullreinforcement": 270,
"class": 4,
"cost": 97501,
"edID": 0,
"edID": 128793123,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -116,7 +116,7 @@
"hullreinforcement": 297,
"class": 4,
"cost": 292501,
"edID": 0,
"edID": 128793124,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -132,7 +132,7 @@
"hullreinforcement": 324,
"class": 5,
"cost": 225001,
"edID": 0,
"edID": 128793125,
"eddbID": 0,
"explres": 0,
"grp": "mahr",
@@ -148,7 +148,7 @@
"hullreinforcement": 351,
"class": 5,
"cost": 675001,
"edID": 0,
"edID": 128793126,
"eddbID": 0,
"explres": 0,
"grp": "mahr",

View File

@@ -0,0 +1,20 @@
{
"rsl": [
{
"rating": "E",
"class": 1,
"grp": "rsl",
"id": "0",
"eddbID": 1617,
"edID": 128793116,
"cost": 1749600,
"mass": 1.3,
"maximum": 1,
"power": 0.4,
"range": 2000,
"symbol": "Int_DroneControl_UnkVesselResearch",
"time": 300,
"integrity": 20
}
]
}

View File

@@ -15,7 +15,7 @@
"hardness": 65,
"hullMass": 450,
"masslock": 13,
"pipSpeed": 0.0875,
"pipSpeed": 0.088709677419355,
"pitch": 32,
"roll": 90,
"yaw": 16,

View File

@@ -0,0 +1,51 @@
{
"alliance_crusader": {
"edID": 128816581,
"eddbID": 0,
"properties": {
"name": "Alliance Crusader",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 22866341,
"speed": 180,
"boost": 300,
"boostEnergy": 19,
"baseShieldStrength": 200,
"baseArmour": 300,
"hardness": 65,
"hullMass": 500,
"masslock": 13,
"fighterHangars": true,
"pipSpeed": 0.15833333333333,
"pitch": 32,
"roll": 80,
"yaw": 16,
"crew": 3
},
"retailCost": 19382252,
"requirements": {
"horizons": true
},
"bulkheads": [
{ "id": "CI", "edID": 128816583, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
{ "id": "CJ", "edID": 128816584, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
{ "id": "CK", "edID": 128816585, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
{ "id": "CL", "edID": 128816586, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
{ "id": "CM", "edID": 128816587, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
],
"slots": {
"standard": [6, 6, 5, 5, 6, 4, 4],
"hardpoints": [3, 2, 2, 1, 1, 1, 0, 0, 0, 0],
"internal": [6, 5, 3, 3, 2, 2,
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
{ "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
]
},
"defaults": {
"standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
"hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
"internal": ["04", "4e", "02", "", "2h", "", "", ""]
}
}
}

View File

@@ -2,6 +2,7 @@ module.exports = {
adder: require('./adder').adder,
alliance_chieftain: require('./alliance_chieftain').alliance_chieftain,
alliance_challenger: require('./alliance_challenger').alliance_challenger,
alliance_crusader: require('./alliance_crusader').alliance_crusader,
anaconda: require('./anaconda').anaconda,
asp: require('./asp').asp,
asp_scout: require('./asp_scout').asp_scout,