Compare commits

..

4 Commits

Author SHA1 Message Date
willyb321
e8c1ae4c89 Merge branch 'release/2.9.13' 2018-05-03 07:15:42 +10:00
willyb321
6d8c74ad3f Merge branch 'release/2.9.12' 2018-04-28 12:15:32 +10:00
willyb321
c140856334 Merge branch 'develop' 2018-04-28 09:57:05 +10:00
willyb321
9ac6427ee0 Merge branch 'release/2.9.11' 2018-04-26 09:20:42 +10:00
7 changed files with 37 additions and 39 deletions

24
dist/index.js vendored
View File

@@ -16834,7 +16834,7 @@ module.exports = {
ChaffLauncher_ChaffCapacity: { ChaffLauncher_ChaffCapacity: {
fdname: "ChaffLauncher_ChaffCapacity", fdname: "ChaffLauncher_ChaffCapacity",
grades: { grades: {
"3": { "1": {
components: { components: {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
Niobium: 1, Niobium: 1,
@@ -17908,9 +17908,9 @@ module.exports = {
}, },
"4": { "4": {
components: { components: {
"Unidentified Scan Archives": 1, "Unidentfied Scan Archives": 1,
"Strange Wake Solutions": 1, "Strange Wake Solution": 1,
"Atypical Encryption Archives": 1 "Atypical Encryption Archive": 1
}, },
features: { features: {
facinglimit: [ -.25, -.25 ], facinglimit: [ -.25, -.25 ],
@@ -18336,7 +18336,7 @@ module.exports = {
HeatSinkLauncher_HeatSinkCapacity: { HeatSinkLauncher_HeatSinkCapacity: {
fdname: "HeatSinkLauncher_HeatSinkCapacity", fdname: "HeatSinkLauncher_HeatSinkCapacity",
grades: { grades: {
"3": { "1": {
components: { components: {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
Niobium: 1, Niobium: 1,
@@ -19349,7 +19349,7 @@ module.exports = {
PointDefence_PointDefenseCapacity: { PointDefence_PointDefenseCapacity: {
fdname: "PointDefence_PointDefenseCapacity", fdname: "PointDefence_PointDefenseCapacity",
grades: { grades: {
"3": { "1": {
components: { components: {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
Niobium: 1, Niobium: 1,
@@ -20059,7 +20059,7 @@ module.exports = {
features: { features: {
eff: [ .15, .15 ], eff: [ .15, .15 ],
integrity: [ -.15, -.15 ], integrity: [ -.15, -.15 ],
pgen: [ .19, .26 ] pgen: [ .12, .19 ]
} }
}, },
"4": { "4": {
@@ -20071,7 +20071,7 @@ module.exports = {
features: { features: {
eff: [ .2, .2 ], eff: [ .2, .2 ],
integrity: [ -.2, -.2 ], integrity: [ -.2, -.2 ],
pgen: [ .26, .33 ] pgen: [ .19, .33 ]
} }
}, },
"5": { "5": {
@@ -20083,7 +20083,7 @@ module.exports = {
features: { features: {
eff: [ .25, .25 ], eff: [ .25, .25 ],
integrity: [ -.25, -.25 ], integrity: [ -.25, -.25 ],
pgen: [ .33, .4 ] pgen: [ .3, .4 ]
} }
} }
}, },
@@ -22535,7 +22535,7 @@ module.exports = {
Sulphur: 1 Sulphur: 1
}, },
features: { features: {
fallofffromrange: [ .2, .2 ], fallofffromrange: [ 0, .2 ],
mass: [ .1, .1 ], mass: [ .1, .1 ],
power: [ .03, .03 ], power: [ .03, .03 ],
range: [ 0, .2 ], range: [ 0, .2 ],
@@ -23623,7 +23623,7 @@ module.exports = {
}, },
special_weapon_rateoffire: { special_weapon_rateoffire: {
power: .05, power: .05,
rof: -.03 rof: .03
}, },
special_weapon_efficient: { special_weapon_efficient: {
power: -.1 power: -.1
@@ -25826,7 +25826,7 @@ module.exports = {
} }
}, },
modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_plasma_slug_cooled", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", "special_weapon_efficient", "special_weapon_rateoffire", "special_weapon_toughened", "special_weapon_lightweight" ] specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", "special_weapon_efficient", "special_weapon_rateoffire", "special_weapon_toughened", "special_weapon_lightweight" ]
}, },
pas: { pas: {
blueprints: {}, blueprints: {},

25
dist/index.json vendored
View File

@@ -19961,7 +19961,7 @@
"ChaffLauncher_ChaffCapacity": { "ChaffLauncher_ChaffCapacity": {
"fdname": "ChaffLauncher_ChaffCapacity", "fdname": "ChaffLauncher_ChaffCapacity",
"grades": { "grades": {
"3": { "1": {
"components": { "components": {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
"Niobium": 1, "Niobium": 1,
@@ -21799,9 +21799,9 @@
}, },
"4": { "4": {
"components": { "components": {
"Unidentified Scan Archives": 1, "Unidentfied Scan Archives": 1,
"Strange Wake Solutions": 1, "Strange Wake Solution": 1,
"Atypical Encryption Archives": 1 "Atypical Encryption Archive": 1
}, },
"features": { "features": {
"facinglimit": [ "facinglimit": [
@@ -22460,7 +22460,7 @@
"HeatSinkLauncher_HeatSinkCapacity": { "HeatSinkLauncher_HeatSinkCapacity": {
"fdname": "HeatSinkLauncher_HeatSinkCapacity", "fdname": "HeatSinkLauncher_HeatSinkCapacity",
"grades": { "grades": {
"3": { "1": {
"components": { "components": {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
"Niobium": 1, "Niobium": 1,
@@ -24163,7 +24163,7 @@
"PointDefence_PointDefenseCapacity": { "PointDefence_PointDefenseCapacity": {
"fdname": "PointDefence_PointDefenseCapacity", "fdname": "PointDefence_PointDefenseCapacity",
"grades": { "grades": {
"3": { "1": {
"components": { "components": {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
"Niobium": 1, "Niobium": 1,
@@ -25563,8 +25563,8 @@
-0.15 -0.15
], ],
"pgen": [ "pgen": [
0.19, 0.12,
0.26 0.19
] ]
} }
}, },
@@ -25584,7 +25584,7 @@
-0.2 -0.2
], ],
"pgen": [ "pgen": [
0.26, 0.19,
0.33 0.33
] ]
} }
@@ -25605,7 +25605,7 @@
-0.25 -0.25
], ],
"pgen": [ "pgen": [
0.33, 0.3,
0.4 0.4
] ]
} }
@@ -29901,7 +29901,7 @@
}, },
"features": { "features": {
"fallofffromrange": [ "fallofffromrange": [
0.2, 0,
0.2 0.2
], ],
"mass": [ "mass": [
@@ -31307,7 +31307,7 @@
}, },
"special_weapon_rateoffire": { "special_weapon_rateoffire": {
"power": 0.05, "power": 0.05,
"rof": -0.03 "rof": 0.03
}, },
"special_weapon_efficient": { "special_weapon_efficient": {
"power": -0.1 "power": -0.1
@@ -35176,7 +35176,6 @@
"special_dispersal_field", "special_dispersal_field",
"special_phasing_sequence", "special_phasing_sequence",
"special_plasma_slug", "special_plasma_slug",
"special_plasma_slug_cooled",
"special_lock_breaker", "special_lock_breaker",
"special_thermal_conduit", "special_thermal_conduit",
"special_weapon_damage", "special_weapon_damage",

View File

@@ -575,7 +575,7 @@
"ChaffLauncher_ChaffCapacity": { "ChaffLauncher_ChaffCapacity": {
"fdname": "ChaffLauncher_ChaffCapacity", "fdname": "ChaffLauncher_ChaffCapacity",
"grades": { "grades": {
"3": { "1": {
"components": { "components": {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
"Niobium": 1, "Niobium": 1,
@@ -1649,9 +1649,9 @@
}, },
"4": { "4": {
"components": { "components": {
"Unidentified Scan Archives": 1, "Unidentfied Scan Archives": 1,
"Strange Wake Solutions": 1, "Strange Wake Solution": 1,
"Atypical Encryption Archives": 1 "Atypical Encryption Archive": 1
}, },
"features": { "features": {
"facinglimit": [ -0.25, -0.25 ], "facinglimit": [ -0.25, -0.25 ],
@@ -2077,7 +2077,7 @@
"HeatSinkLauncher_HeatSinkCapacity": { "HeatSinkLauncher_HeatSinkCapacity": {
"fdname": "HeatSinkLauncher_HeatSinkCapacity", "fdname": "HeatSinkLauncher_HeatSinkCapacity",
"grades": { "grades": {
"3": { "1": {
"components": { "components": {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
"Niobium": 1, "Niobium": 1,
@@ -3090,7 +3090,7 @@
"PointDefence_PointDefenseCapacity": { "PointDefence_PointDefenseCapacity": {
"fdname": "PointDefence_PointDefenseCapacity", "fdname": "PointDefence_PointDefenseCapacity",
"grades": { "grades": {
"3": { "1": {
"components": { "components": {
"Mechanical Scrap": 1, "Mechanical Scrap": 1,
"Niobium": 1, "Niobium": 1,
@@ -3801,7 +3801,7 @@
"features": { "features": {
"eff": [ 0.15, 0.15 ], "eff": [ 0.15, 0.15 ],
"integrity": [ -0.15, -0.15 ], "integrity": [ -0.15, -0.15 ],
"pgen": [ 0.19, 0.26 ] "pgen": [ 0.12, 0.19 ]
} }
}, },
"4": { "4": {
@@ -3813,7 +3813,7 @@
"features": { "features": {
"eff": [ 0.2, 0.2 ], "eff": [ 0.2, 0.2 ],
"integrity": [ -0.2, -0.2 ], "integrity": [ -0.2, -0.2 ],
"pgen": [ 0.26, 0.33 ] "pgen": [ 0.19, 0.33 ]
} }
}, },
"5": { "5": {
@@ -3825,7 +3825,7 @@
"features": { "features": {
"eff": [ 0.25, 0.25 ], "eff": [ 0.25, 0.25 ],
"integrity": [ -0.25, -0.25 ], "integrity": [ -0.25, -0.25 ],
"pgen": [ 0.33, 0.4 ] "pgen": [ 0.3, 0.4 ]
} }
} }
}, },
@@ -6277,7 +6277,7 @@
"Sulphur": 1 "Sulphur": 1
}, },
"features": { "features": {
"fallofffromrange": [ 0.2, 0.2 ], "fallofffromrange": [ 0, 0.2 ],
"mass": [ 0.1, 0.1 ], "mass": [ 0.1, 0.1 ],
"power": [ 0.03, 0.03 ], "power": [ 0.03, 0.03 ],
"range": [ 0, 0.2 ], "range": [ 0, 0.2 ],

View File

@@ -400,7 +400,7 @@
}, },
"special_weapon_rateoffire": { "special_weapon_rateoffire": {
"power": 0.05, "power": 0.05,
"rof": -0.03 "rof": 0.03
}, },
"special_weapon_efficient": { "special_weapon_efficient": {
"power": -0.1 "power": -0.1

View File

@@ -3729,7 +3729,6 @@
"special_dispersal_field", "special_dispersal_field",
"special_phasing_sequence", "special_phasing_sequence",
"special_plasma_slug", "special_plasma_slug",
"special_plasma_slug_cooled",
"special_lock_breaker", "special_lock_breaker",
"special_thermal_conduit", "special_thermal_conduit",
"special_weapon_damage", "special_weapon_damage",

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis-data", "name": "coriolis-data",
"version": "2.9.16", "version": "2.9.13",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis-data", "name": "coriolis-data",
"version": "2.9.16", "version": "2.9.13",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/EDCD/coriolis-data" "url": "https://github.com/EDCD/coriolis-data"