Merge branch 'develop'

This commit is contained in:
Willyb321
2018-12-20 08:36:31 +11:00
8 changed files with 530 additions and 7 deletions

175
dist/index.js vendored
View File

@@ -3024,14 +3024,14 @@ module.exports = {
hullCost: 55866341,
speed: 300,
boost: 370,
boostEnergy: 19,
boostEnergy: 17,
baseShieldStrength: 270,
heatCapacity: 165,
baseArmour: 230,
hardness: 65,
hullMass: 250,
masslock: 12,
pipSpeed: .047297297297297,
pipSpeed: .056451612903226,
pitch: 27,
roll: 80,
yaw: 10,
@@ -11149,6 +11149,148 @@ module.exports = {
scantime: 10,
symbol: "Hpt_CloudScanner_Size0_Class5"
} ],
pwa: [ {
rating: "A",
class: "0",
mass: 1.3,
eddbID: 0,
power: 3.2,
integrity: 48,
cost: 3e4,
id: "2x",
maxangle: 15,
scanrange: 24e3,
scantime: 3,
grp: "pwa",
boot: 3,
edID: 128915722,
symbol: "hpt_mrascanner_size0_class5"
}, {
rating: "B",
class: "0",
mass: 1.3,
eddbID: 0,
power: 1.6,
integrity: 56,
cost: 3e4,
id: "2y",
maxangle: 15,
boot: 3,
scanrange: 21e3,
scantime: 3.08,
grp: "pwa",
edID: 128915721,
symbol: "hpt_mrascanner_size0_class4"
}, {
rating: "C",
class: "0",
mass: 1.3,
eddbID: 0,
power: .8,
integrity: 40,
cost: 3e4,
id: "2z",
maxangle: 15,
boot: 3,
scanrange: 18e3,
scantime: 3,
grp: "pwa",
edID: 128915720,
symbol: "hpt_mrascanner_size0_class3"
}, {
rating: "D",
class: "0",
mass: 1.3,
eddbID: 0,
power: .8,
integrity: 24,
cost: 3e4,
id: "3J",
maxangle: 15,
boot: 3,
scanrange: 15e3,
scantime: 3,
grp: "pwa",
edID: 128915719,
symbol: "hpt_mrascanner_size0_class2"
}, {
rating: "E",
class: "0",
mass: 1.3,
eddbID: 0,
power: .8,
integrity: 24,
cost: 3e4,
id: "3K",
maxangle: 15,
boot: 3,
scanrange: 12e3,
scantime: 3,
grp: "pwa",
edID: 128915718,
symbol: "hpt_mrascanner_size0_class1"
} ],
scl: [ {
breachdmg: 3,
breachmax: 0,
shotspeed: 350,
breachmin: 0,
class: 2,
cost: 2200,
damage: 15,
chargetime: 2,
damagedist: {
E: 1
},
distdraw: .24,
edID: 128049381,
eddbID: 823,
falloff: 500,
ammo: 72,
clip: 1,
grp: "scl",
id: "3L",
integrity: 51,
mass: 4,
mount: "T",
piercing: 35,
power: 1.2,
range: 3e3,
rating: "B",
rof: 1,
thermload: 3.6,
symbol: "Hpt_Mining_SeismChrgWarhd_Turret_Medium"
}, {
breachdmg: 3,
breachmax: 0,
shotspeed: 350,
breachmin: 0,
class: 2,
cost: 2200,
damage: 15,
chargetime: 2,
damagedist: {
E: 1
},
distdraw: .24,
edID: 128049381,
eddbID: 823,
falloff: 500,
ammo: 72,
clip: 1,
grp: "scl",
id: "3M",
integrity: 51,
mass: 4,
mount: "F",
piercing: 35,
power: 1.01,
range: 3e3,
rating: "B",
rof: 1,
thermload: 3.6,
symbol: "Hpt_Mining_SeismChrgWarhd_Fixed_Medium"
} ],
kw: [ {
class: 0,
cost: 13540,
@@ -26304,6 +26446,27 @@ module.exports = {
type: "numeric",
method: "additive",
higherbetter: true
},
scanrange: {
id: 51,
name: "scanrange",
type: "numeric",
method: "additive",
higherbetter: true
},
maxangle: {
id: 51,
name: "maxangle",
type: "numeric",
method: "additive",
higherbetter: true
},
chargetime: {
id: 52,
name: "chargetime",
type: "percentage",
method: "multiplicative",
higherbetter: false
}
},
modifierActions: {
@@ -30378,6 +30541,14 @@ module.exports = {
mahr: {
blueprints: {},
modifications: []
},
pwa: {
blueprints: {},
modifications: []
},
scl: {
blueprints: {},
modifications: []
}
},
specials: {

184
dist/index.json vendored
View File

@@ -4645,14 +4645,14 @@
"hullCost": 55866341,
"speed": 300,
"boost": 370,
"boostEnergy": 19,
"boostEnergy": 17,
"baseShieldStrength": 270,
"heatCapacity": 165,
"baseArmour": 230,
"hardness": 65,
"hullMass": 250,
"masslock": 12,
"pipSpeed": 0.047297297297297,
"pipSpeed": 0.056451612903226,
"pitch": 27,
"roll": 80,
"yaw": 10,
@@ -13729,6 +13729,157 @@
"symbol": "Hpt_CloudScanner_Size0_Class5"
}
],
"pwa": [
{
"rating": "A",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 3.2,
"integrity": 48,
"cost": 30000,
"id": "2x",
"maxangle": 15,
"scanrange": 24000,
"scantime": 3,
"grp": "pwa",
"boot": 3,
"edID": 128915722,
"symbol": "hpt_mrascanner_size0_class5"
},
{
"rating": "B",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 1.6,
"integrity": 56,
"cost": 30000,
"id": "2y",
"maxangle": 15,
"boot": 3,
"scanrange": 21000,
"scantime": 3.08,
"grp": "pwa",
"edID": 128915721,
"symbol": "hpt_mrascanner_size0_class4"
},
{
"rating": "C",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 0.8,
"integrity": 40,
"cost": 30000,
"id": "2z",
"maxangle": 15,
"boot": 3,
"scanrange": 18000,
"scantime": 3,
"grp": "pwa",
"edID": 128915720,
"symbol": "hpt_mrascanner_size0_class3"
},
{
"rating": "D",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 0.8,
"integrity": 24,
"cost": 30000,
"id": "3J",
"maxangle": 15,
"boot": 3,
"scanrange": 15000,
"scantime": 3,
"grp": "pwa",
"edID": 128915719,
"symbol": "hpt_mrascanner_size0_class2"
},
{
"rating": "E",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 0.8,
"integrity": 24,
"cost": 30000,
"id": "3K",
"maxangle": 15,
"boot": 3,
"scanrange": 12000,
"scantime": 3,
"grp": "pwa",
"edID": 128915718,
"symbol": "hpt_mrascanner_size0_class1"
}
],
"scl": [
{
"breachdmg": 3,
"breachmax": 0,
"shotspeed": 350,
"breachmin": 0,
"class": 2,
"cost": 2200,
"damage": 15,
"chargetime": 2,
"damagedist": {
"E": 1
},
"distdraw": 0.24,
"edID": 128049381,
"eddbID": 823,
"falloff": 500,
"ammo": 72,
"clip": 1,
"grp": "scl",
"id": "3L",
"integrity": 51,
"mass": 4,
"mount": "T",
"piercing": 35,
"power": 1.2,
"range": 3000,
"rating": "B",
"rof": 1,
"thermload": 3.6,
"symbol": "Hpt_Mining_SeismChrgWarhd_Turret_Medium"
},
{
"breachdmg": 3,
"breachmax": 0,
"shotspeed": 350,
"breachmin": 0,
"class": 2,
"cost": 2200,
"damage": 15,
"chargetime": 2,
"damagedist": {
"E": 1
},
"distdraw": 0.24,
"edID": 128049381,
"eddbID": 823,
"falloff": 500,
"ammo": 72,
"clip": 1,
"grp": "scl",
"id": "3M",
"integrity": 51,
"mass": 4,
"mount": "F",
"piercing": 35,
"power": 1.01,
"range": 3000,
"rating": "B",
"rof": 1,
"thermload": 3.6,
"symbol": "Hpt_Mining_SeismChrgWarhd_Fixed_Medium"
}
],
"kw": [
{
"class": 0,
@@ -34434,6 +34585,27 @@
"type": "numeric",
"method": "additive",
"higherbetter": true
},
"scanrange": {
"id": 51,
"name": "scanrange",
"type": "numeric",
"method": "additive",
"higherbetter": true
},
"maxangle": {
"id": 51,
"name": "maxangle",
"type": "numeric",
"method": "additive",
"higherbetter": true
},
"chargetime": {
"id": 52,
"name": "chargetime",
"type": "percentage",
"method": "multiplicative",
"higherbetter": false
}
},
"modifierActions": {
@@ -41533,6 +41705,14 @@
"mahr": {
"blueprints": {},
"modifications": []
},
"pwa": {
"blueprints": {},
"modifications": []
},
"scl": {
"blueprints": {},
"modifications": []
}
},
"specials": {

View File

@@ -50,5 +50,8 @@
"weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"jumpboost": {"id": 47, "name": "jumpboost", "type": "numeric", "method": "additive", "higherbetter": true},
"shieldaddition": {"id": 50, "name": "shieldaddition", "type": "numeric", "method": "additive", "higherbetter": true}
"shieldaddition": {"id": 50, "name": "shieldaddition", "type": "numeric", "method": "additive", "higherbetter": true},
"scanrange": {"id": 51, "name": "scanrange", "type": "numeric", "method": "additive", "higherbetter": true},
"maxangle": {"id": 51, "name": "maxangle", "type": "numeric", "method": "additive", "higherbetter": true},
"chargetime": {"id": 52, "name": "chargetime", "type": "percentage", "method": "multiplicative", "higherbetter": false}
}

View File

@@ -6602,5 +6602,17 @@
},
"modifications": [
]
},
"pwa": {
"blueprints": {
},
"modifications": [
]
},
"scl": {
"blueprints": {
},
"modifications": [
]
}
}

View File

@@ -0,0 +1,89 @@
{
"pwa": [
{
"rating": "A",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 3.2,
"integrity": 48,
"cost": 30000,
"id": "2x",
"maxangle": 15,
"scanrange": 24000,
"scantime": 3,
"grp": "pwa",
"boot": 3,
"edID": 128915722,
"symbol": "hpt_mrascanner_size0_class5"
},
{
"rating": "B",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 1.6,
"integrity": 56,
"cost": 30000,
"id": "2y",
"maxangle": 15,
"boot": 3,
"scanrange": 21000,
"scantime": 3.08,
"grp": "pwa",
"edID": 128915721,
"symbol": "hpt_mrascanner_size0_class4"
},
{
"rating": "C",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 0.8,
"integrity": 40,
"cost": 30000,
"id": "2z",
"maxangle": 15,
"boot": 3,
"scanrange": 18000,
"scantime": 3,
"grp": "pwa",
"edID": 128915720,
"symbol": "hpt_mrascanner_size0_class3"
},
{
"rating": "D",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 0.8,
"integrity": 24,
"cost": 30000,
"id": "3J",
"maxangle": 15,
"boot": 3,
"scanrange": 15000,
"scantime": 3,
"grp": "pwa",
"edID": 128915719,
"symbol": "hpt_mrascanner_size0_class2"
},
{
"rating": "E",
"class": "0",
"mass": 1.3,
"eddbID": 0,
"power": 0.8,
"integrity": 24,
"cost": 30000,
"id": "3K",
"maxangle": 15,
"boot": 3,
"scanrange": 12000,
"scantime": 3,
"grp": "pwa",
"edID": 128915718,
"symbol": "hpt_mrascanner_size0_class1"
}
]
}

View File

@@ -0,0 +1,66 @@
{
"scl": [
{
"breachdmg": 3,
"breachmax": 0,
"shotspeed": 350,
"breachmin": 0,
"class": 2,
"cost": 2200,
"damage": 15,
"chargetime": 2,
"damagedist": {
"E": 1
},
"distdraw": 0.24,
"edID": 128049381,
"eddbID": 823,
"falloff": 500,
"ammo": 72,
"clip": 1,
"grp": "scl",
"id": "3L",
"integrity": 51,
"mass": 4,
"mount": "T",
"piercing": 35,
"power": 1.2,
"range": 3000,
"rating": "B",
"rof": 1,
"thermload": 3.6,
"symbol": "Hpt_Mining_SeismChrgWarhd_Turret_Medium"
},
{
"breachdmg": 3,
"breachmax": 0,
"shotspeed": 350,
"breachmin": 0,
"class": 2,
"cost": 2200,
"damage": 15,
"chargetime": 2,
"damagedist": {
"E": 1
},
"distdraw": 0.24,
"edID": 128049381,
"eddbID": 823,
"falloff": 500,
"ammo": 72,
"clip": 1,
"grp": "scl",
"id": "3M",
"integrity": 51,
"mass": 4,
"mount": "F",
"piercing": 35,
"power": 1.01,
"range": 3000,
"rating": "B",
"rof": 1,
"thermload": 3.6,
"symbol": "Hpt_Mining_SeismChrgWarhd_Fixed_Medium"
}
]
}

View File

@@ -27,6 +27,8 @@ module.exports = {
ml: require('./hardpoints/mining_laser').ml,
cs: require('./hardpoints/cargo_scanner').cs,
ws: require('./hardpoints/frame_shift_wake_scanner').ws,
pwa: require('./hardpoints/pulse_wave_analyser').pwa,
scl: require('./hardpoints/seismic_charge_launcher').scl,
kw: require('./hardpoints/kill_warrant_scanner').kw,
sb: require('./hardpoints/shield_booster').sb,
ch: require('./hardpoints/chaff_launcher').ch,

View File

@@ -9,14 +9,14 @@
"hullCost": 55866341,
"speed": 300,
"boost": 370,
"boostEnergy": 19,
"boostEnergy": 17,
"baseShieldStrength": 270,
"heatCapacity": 165,
"baseArmour": 230,
"hardness": 65,
"hullMass": 250,
"masslock": 12,
"pipSpeed": 0.047297297297297,
"pipSpeed": 0.056451612903226,
"pitch": 27,
"roll": 80,
"yaw": 10,