Merge remote-tracking branch 'upstream/develop' into feature/chieftan

This commit is contained in:
willyb321
2018-01-26 19:43:22 +11:00
14 changed files with 1121 additions and 5 deletions

349
dist/index.js vendored
View File

@@ -7920,6 +7920,123 @@ module.exports = {
shotspeed: 1600,
thermload: .51
} ],
axmc: [ {
ammo: 2100,
breachdmg: 2.8,
breachmax: .5,
breachmin: .8,
class: 2,
clip: 100,
cost: 379e3,
damage: 3.3,
damagedist: {
X: 1
},
distdraw: .11,
edID: 128788701,
eddbID: 1618,
falloff: 2e3,
grp: "axmc",
id: "x0",
integrity: 51,
mass: 4,
mount: "F",
piercing: 17,
power: .46,
range: 4e3,
rating: "E",
reload: 4,
rof: 7.1,
shotspeed: 1600,
thermload: .2
}, {
ammo: 2100,
breachdmg: .4,
breachmax: .5,
breachmin: .5,
class: 2,
clip: 90,
cost: 1826500,
damage: 1.7,
damagedist: {
X: 1
},
distdraw: .06,
edID: 128793059,
eddbID: 1619,
falloff: 2e3,
grp: "axmc",
id: "x1",
integrity: 51,
mass: 4,
mount: "T",
piercing: 17,
power: .5,
range: 4e3,
rating: "F",
reload: 4,
rof: 6.2,
shotspeed: 1600,
thermload: .1
}, {
ammo: 2100,
breachdmg: 5.2,
breachmax: .5,
breachmin: .8,
class: 3,
clip: 100,
cost: 1181500,
damage: 6.1,
damagedist: {
X: 1
},
distdraw: .18,
edID: 128788702,
eddbID: 1625,
falloff: 2e3,
grp: "axmc",
id: "x2",
integrity: 64,
mass: 8,
mount: "F",
piercing: 33,
power: .64,
range: 4e3,
rating: "C",
reload: 4,
rof: 5.9,
shotspeed: 1600,
thermload: .3
}, {
ammo: 2100,
breachdmg: .8,
breachmax: .5,
breachmin: .5,
class: 3,
clip: 90,
cost: 3821600,
damage: 3.3,
damagedist: {
X: 1
},
distdraw: .06,
edID: 128793060,
eddbID: 1626,
falloff: 2e3,
grp: "axmc",
id: "x3",
integrity: 64,
mass: 8,
mount: "T",
piercing: 33,
power: .64,
range: 4e3,
rating: "E",
reload: 4,
rof: 6.2,
shotspeed: 1600,
thermload: .1
} ],
c: [ {
ammo: 120,
breachdmg: 17.1,
@@ -8558,6 +8675,63 @@ module.exports = {
shotspeed: 1e3,
thermload: 1.1
} ],
rfl: [ {
ammo: 32,
breachdmg: 1.7,
breachmax: 1,
breachmin: 1,
class: 2,
clip: 1,
cost: 261800,
damage: 34,
damagedist: {
E: 1
},
distdraw: .24,
edID: 128785626,
eddbID: 1620,
falloff: 1e5,
grp: "rfl",
id: "x8",
integrity: 51,
mass: 4,
mount: "F",
piercing: 60,
power: 1.2,
rating: "B",
reload: 2,
rof: .5,
shotspeed: 550,
thermload: 3.6
}, {
ammo: 32,
breachdmg: 1.7,
breachmax: 1,
breachmin: 1,
class: 2,
clip: 1,
cost: 1259200,
damage: 34,
damagedist: {
E: 1
},
distdraw: .24,
edID: 128793058,
eddbID: 1621,
falloff: 1e5,
grp: "rfl",
id: "x9",
integrity: 51,
mass: 4,
mount: "T",
piercing: 60,
power: 1.2,
rating: "B",
reload: 2,
rof: .5,
shotspeed: 550,
thermload: 3.6
} ],
rg: [ {
ammo: 80,
breachdmg: 22.2,
@@ -8957,6 +9131,123 @@ module.exports = {
shotspeed: 600,
thermload: 3.6
} ],
axmr: [ {
ammo: 64,
breachdmg: .1,
breachmax: .8,
breachmin: 1,
class: 2,
clip: 8,
cost: 540900,
damage: 64,
damagedist: {
X: 1
},
distdraw: .14,
edID: 128788699,
eddbID: 1614,
falloff: 1e4,
grp: "axmr",
id: "x4",
integrity: 51,
mass: 4,
missile: "D",
mount: "F",
piercing: 60,
power: 1.2,
rating: "B",
reload: 5,
rof: .5,
shotspeed: 750,
thermload: 2.4
}, {
ammo: 64,
breachdmg: .1,
breachmax: .8,
breachmin: 1,
class: 2,
clip: 8,
cost: 2022700,
damage: 50,
damagedist: {
X: 1
},
distdraw: .08,
edID: 128788704,
eddbID: 1615,
falloff: 1e4,
grp: "axmr",
id: "x5",
integrity: 51,
mass: 4,
missile: "D",
mount: "T",
piercing: 60,
power: 1.2,
rating: "B",
reload: 5,
rof: .5,
shotspeed: 750,
thermload: 1.5
}, {
ammo: 128,
breachdmg: .1,
breachmax: .8,
breachmin: 1,
class: 3,
clip: 12,
cost: 1352250,
damage: 64,
damagedist: {
X: 1
},
distdraw: .24,
edID: 128788700,
eddbID: 1623,
falloff: 1e4,
grp: "axmr",
id: "x6",
integrity: 64,
mass: 8,
missile: "D",
mount: "F",
piercing: 60,
power: 1.62,
rating: "A",
reload: 5,
rof: .5,
shotspeed: 750,
thermload: 3.6
}, {
ammo: 128,
breachdmg: .1,
breachmax: .8,
breachmin: 1,
class: 3,
clip: 12,
cost: 4056750,
damage: 64,
damagedist: {
X: 1
},
distdraw: .14,
edID: 128788705,
eddbID: 1624,
falloff: 1e4,
grp: "axmr",
id: "x7",
integrity: 64,
mass: 8,
missile: "D",
mount: "T",
piercing: 60,
power: 1.75,
rating: "A",
reload: 5,
rof: .5,
shotspeed: 750,
thermload: 1.9
} ],
tp: [ {
ammo: 1,
breachdmg: 60,
@@ -9580,6 +9871,41 @@ module.exports = {
rof: 10,
shotspeed: 1e3,
thermload: .1
} ],
sfn: [ {
class: 0,
cost: 63e3,
edID: 128771884,
eddbID: 1622,
grp: "sfn",
id: "sfn",
integrity: 35,
mass: 1.3,
name: "Shutdown Field Neutraliser",
passive: 1,
power: .2,
activepower: .25,
rating: "F",
cooldown: 10,
duration: 1,
range: 3e3
} ],
xs: [ {
class: 0,
cost: 365698,
edID: 128793115,
eddbID: 1616,
grp: "xs",
id: "xs",
integrity: 56,
mass: 1.3,
name: "Xeno Scanner",
power: .2,
range: 500,
rating: "E",
boot: 2,
scantime: 10,
angle: 23
} ]
},
internal: {
@@ -21800,6 +22126,9 @@ module.exports = {
OutfittingFieldType_DSS_RateMult: {
scanrate: 1
},
OutfittingFieldType_ScannerTimeToScan: {
scantime: 1
},
OutfittingFieldType_ScannerRange: {
range: 1
},
@@ -23008,6 +23337,10 @@ module.exports = {
modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
specials: [ "special_corrosive_shell", "special_blinding_shell", "special_incendiary_rounds", "special_drag_munitions", "special_screening_shell" ]
},
rfl: {
blueprints: {},
modifications: []
},
fh: {
blueprints: {},
modifications: []
@@ -23756,6 +24089,10 @@ module.exports = {
modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
specials: [ "special_auto_loader", "special_corrosive_shell", "special_emissive_munitions", "special_incendiary_rounds", "special_smart_rounds", "special_thermalshock" ]
},
axmc: {
blueprints: {},
modifications: []
},
ml: {
blueprints: {},
modifications: []
@@ -23843,6 +24180,10 @@ module.exports = {
specials_S: [ "special_drag_munitions", "special_emissive_munitions", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ],
specials_D: [ "special_drag_munitions", "special_emissive_munitions", "special_fsd_interrupt", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ]
},
axmr: {
blueprints: {},
modifications: []
},
mrp: {
blueprints: {},
modifications: []
@@ -24922,6 +25263,10 @@ module.exports = {
},
modifications: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "thermres" ]
},
sfn: {
blueprints: {},
modifications: []
},
sc: {
blueprints: {},
modifications: []
@@ -25100,6 +25445,10 @@ module.exports = {
},
modifications: [ "mass", "angle", "range", "scanrate" ]
},
xs: {
blueprints: {},
modifications: []
},
t: {
blueprints: {
Engine_Dirty: {

366
dist/index.json vendored
View File

@@ -10089,6 +10089,128 @@
"thermload": 0.51
}
],
"axmc": [
{
"ammo": 2100,
"breachdmg": 2.8,
"breachmax": 0.5,
"breachmin": 0.8,
"class": 2,
"clip": 100,
"cost": 379000,
"damage": 3.3,
"damagedist": {
"X": 1
},
"distdraw": 0.11,
"edID": 128788701,
"eddbID": 1618,
"falloff": 2000,
"grp": "axmc",
"id": "x0",
"integrity": 51,
"mass": 4,
"mount": "F",
"piercing": 17,
"power": 0.46,
"range": 4000,
"rating": "E",
"reload": 4,
"rof": 7.1,
"shotspeed": 1600,
"thermload": 0.2
},
{
"ammo": 2100,
"breachdmg": 0.4,
"breachmax": 0.5,
"breachmin": 0.5,
"class": 2,
"clip": 90,
"cost": 1826500,
"damage": 1.7,
"damagedist": {
"X": 1
},
"distdraw": 0.06,
"edID": 128793059,
"eddbID": 1619,
"falloff": 2000,
"grp": "axmc",
"id": "x1",
"integrity": 51,
"mass": 4,
"mount": "T",
"piercing": 17,
"power": 0.5,
"range": 4000,
"rating": "F",
"reload": 4,
"rof": 6.2,
"shotspeed": 1600,
"thermload": 0.1
},
{
"ammo": 2100,
"breachdmg": 5.2,
"breachmax": 0.5,
"breachmin": 0.8,
"class": 3,
"clip": 100,
"cost": 1181500,
"damage": 6.1,
"damagedist": {
"X": 1
},
"distdraw": 0.18,
"edID": 128788702,
"eddbID": 1625,
"falloff": 2000,
"grp": "axmc",
"id": "x2",
"integrity": 64,
"mass": 8,
"mount": "F",
"piercing": 33,
"power": 0.64,
"range": 4000,
"rating": "C",
"reload": 4,
"rof": 5.9,
"shotspeed": 1600,
"thermload": 0.3
},
{
"ammo": 2100,
"breachdmg": 0.8,
"breachmax": 0.5,
"breachmin": 0.5,
"class": 3,
"clip": 90,
"cost": 3821600,
"damage": 3.3,
"damagedist": {
"X": 1
},
"distdraw": 0.06,
"edID": 128793060,
"eddbID": 1626,
"falloff": 2000,
"grp": "axmc",
"id": "x3",
"integrity": 64,
"mass": 8,
"mount": "T",
"piercing": 33,
"power": 0.64,
"range": 4000,
"rating": "E",
"reload": 4,
"rof": 6.2,
"shotspeed": 1600,
"thermload": 0.1
}
],
"c": [
{
"ammo": 120,
@@ -10750,6 +10872,66 @@
"thermload": 1.1
}
],
"rfl": [
{
"ammo": 32,
"breachdmg": 1.7,
"breachmax": 1,
"breachmin": 1,
"class": 2,
"clip": 1,
"cost": 261800,
"damage": 34,
"damagedist": {
"E": 1
},
"distdraw": 0.24,
"edID": 128785626,
"eddbID": 1620,
"falloff": 100000,
"grp": "rfl",
"id": "x8",
"integrity": 51,
"mass": 4,
"mount": "F",
"piercing": 60,
"power": 1.2,
"rating": "B",
"reload": 2,
"rof": 0.5,
"shotspeed": 550,
"thermload": 3.6
},
{
"ammo": 32,
"breachdmg": 1.7,
"breachmax": 1,
"breachmin": 1,
"class": 2,
"clip": 1,
"cost": 1259200,
"damage": 34,
"damagedist": {
"E": 1
},
"distdraw": 0.24,
"edID": 128793058,
"eddbID": 1621,
"falloff": 100000,
"grp": "rfl",
"id": "x9",
"integrity": 51,
"mass": 4,
"mount": "T",
"piercing": 60,
"power": 1.2,
"rating": "B",
"reload": 2,
"rof": 0.5,
"shotspeed": 550,
"thermload": 3.6
}
],
"rg": [
{
"ammo": 80,
@@ -11165,6 +11347,128 @@
"thermload": 3.6
}
],
"axmr": [
{
"ammo": 64,
"breachdmg": 0.1,
"breachmax": 0.8,
"breachmin": 1,
"class": 2,
"clip": 8,
"cost": 540900,
"damage": 64,
"damagedist": {
"X": 1
},
"distdraw": 0.14,
"edID": 128788699,
"eddbID": 1614,
"falloff": 10000,
"grp": "axmr",
"id": "x4",
"integrity": 51,
"mass": 4,
"missile": "D",
"mount": "F",
"piercing": 60,
"power": 1.2,
"rating": "B",
"reload": 5,
"rof": 0.5,
"shotspeed": 750,
"thermload": 2.4
},
{
"ammo": 64,
"breachdmg": 0.1,
"breachmax": 0.8,
"breachmin": 1,
"class": 2,
"clip": 8,
"cost": 2022700,
"damage": 50,
"damagedist": {
"X": 1
},
"distdraw": 0.08,
"edID": 128788704,
"eddbID": 1615,
"falloff": 10000,
"grp": "axmr",
"id": "x5",
"integrity": 51,
"mass": 4,
"missile": "D",
"mount": "T",
"piercing": 60,
"power": 1.2,
"rating": "B",
"reload": 5,
"rof": 0.5,
"shotspeed": 750,
"thermload": 1.5
},
{
"ammo": 128,
"breachdmg": 0.1,
"breachmax": 0.8,
"breachmin": 1,
"class": 3,
"clip": 12,
"cost": 1352250,
"damage": 64,
"damagedist": {
"X": 1
},
"distdraw": 0.24,
"edID": 128788700,
"eddbID": 1623,
"falloff": 10000,
"grp": "axmr",
"id": "x6",
"integrity": 64,
"mass": 8,
"missile": "D",
"mount": "F",
"piercing": 60,
"power": 1.62,
"rating": "A",
"reload": 5,
"rof": 0.5,
"shotspeed": 750,
"thermload": 3.6
},
{
"ammo": 128,
"breachdmg": 0.1,
"breachmax": 0.8,
"breachmin": 1,
"class": 3,
"clip": 12,
"cost": 4056750,
"damage": 64,
"damagedist": {
"X": 1
},
"distdraw": 0.14,
"edID": 128788705,
"eddbID": 1624,
"falloff": 10000,
"grp": "axmr",
"id": "x7",
"integrity": 64,
"mass": 8,
"missile": "D",
"mount": "T",
"piercing": 60,
"power": 1.75,
"rating": "A",
"reload": 5,
"rof": 0.5,
"shotspeed": 750,
"thermload": 1.9
}
],
"tp": [
{
"ammo": 1,
@@ -11833,6 +12137,45 @@
"shotspeed": 1000,
"thermload": 0.1
}
],
"sfn": [
{
"class": 0,
"cost": 63000,
"edID": 128771884,
"eddbID": 1622,
"grp": "sfn",
"id": "sfn",
"integrity": 35,
"mass": 1.3,
"name": "Shutdown Field Neutraliser",
"passive": 1,
"power": 0.2,
"activepower": 0.25,
"rating": "F",
"cooldown": 10,
"duration": 1,
"range": 3000
}
],
"xs": [
{
"class": 0,
"cost": 365698,
"edID": 128793115,
"eddbID": 1616,
"grp": "xs",
"id": "xs",
"integrity": 56,
"mass": 1.3,
"name": "Xeno Scanner",
"power": 0.2,
"range": 500,
"rating": "E",
"boot": 2,
"scantime": 10,
"angle": 23
}
]
},
"internal": {
@@ -29225,6 +29568,9 @@
"OutfittingFieldType_DSS_RateMult": {
"scanrate": 1
},
"OutfittingFieldType_ScannerTimeToScan": {
"scantime": 1
},
"OutfittingFieldType_ScannerRange": {
"range": 1
},
@@ -31151,6 +31497,10 @@
"special_screening_shell"
]
},
"rfl": {
"blueprints": {},
"modifications": []
},
"fh": {
"blueprints": {},
"modifications": []
@@ -32513,6 +32863,10 @@
"special_thermalshock"
]
},
"axmc": {
"blueprints": {},
"modifications": []
},
"ml": {
"blueprints": {},
"modifications": []
@@ -32680,6 +33034,10 @@
"special_thermal_cascade"
]
},
"axmr": {
"blueprints": {},
"modifications": []
},
"mrp": {
"blueprints": {},
"modifications": []
@@ -34677,6 +35035,10 @@
"thermres"
]
},
"sfn": {
"blueprints": {},
"modifications": []
},
"sc": {
"blueprints": {},
"modifications": []
@@ -35055,6 +35417,10 @@
"scanrate"
]
},
"xs": {
"blueprints": {},
"modifications": []
},
"t": {
"blueprints": {
"Engine_Dirty": {