Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-09 07:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/fixes' into develop

Browse Source
This commit is contained in:
Cmdr McDonald
2017-02-13 19:48:24 +00:00
parent e99e86cfce ba1ccdedb0
commit 926e89cf1e
8 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.md
View File

@@ -1,3 +1,8 @@
#2.2.15
* Fix location of initial cargo rack for Vulture
* Fix broken regeneration rate for 6B shield generators
* Tidy up breach damage values
#2.2.14 #2.2.14
* Alter blueprint structure to combine components and features * Alter blueprint structure to combine components and features
* Make hidden value of modifications its own attribute * Make hidden value of modifications its own attribute

36
dist/index.js vendored
View File

@@ -2878,7 +2878,7 @@ module.exports = {
defaults: { defaults: {
standard: [ "4E", "5E", "4E", "3E", "5E", "4E", "3C" ], standard: [ "4E", "5E", "4E", "3E", "5E", "4E", "3C" ],
hardpoints: [ 17, 17, 0, 0, 0, 0 ], hardpoints: [ 17, 17, 0, 0, 0, 0 ],
internal: [ "4e", 0, 0, "02", 0, "2h" ] internal: [ "4e", 0, "02", 0, 0, "2h" ]
} }
} }
}, },
@@ -6251,7 +6251,7 @@ module.exports = {
}, },
hardpoints: { hardpoints: {
pl: [ { pl: [ {
breachdmg: 2.04, breachdmg: 1.7,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
class: 1, class: 1,
@@ -6553,7 +6553,7 @@ module.exports = {
thermload: 1.6 thermload: 1.6
} ], } ],
ul: [ { ul: [ {
breachdmg: 7.05, breachdmg: 1.5,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -6580,7 +6580,7 @@ module.exports = {
rof: 2, rof: 2,
thermload: .4 thermload: .4
}, { }, {
breachdmg: 5.3, breachdmg: 1,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -6607,9 +6607,9 @@ module.exports = {
rof: 2.23, rof: 2.23,
thermload: .3 thermload: .3
}, { }, {
breachdmg: 1.92, breachdmg: .4,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .6,
burst: 3, burst: 3,
burstrof: 19, burstrof: 19,
class: 1, class: 1,
@@ -6664,7 +6664,7 @@ module.exports = {
rof: 6.6, rof: 6.6,
thermload: .3 thermload: .3
}, { }, {
breachdmg: 11.1, breachdmg: 3,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -6691,7 +6691,7 @@ module.exports = {
rof: 1.6, rof: 1.6,
thermload: .8 thermload: .8
}, { }, {
breachdmg: 8.82, breachdmg: 2.1,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -6718,9 +6718,9 @@ module.exports = {
rof: 1.78, rof: 1.78,
thermload: .7 thermload: .7
}, { }, {
breachdmg: 3.51, breachdmg: .9,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .6,
burst: 3, burst: 3,
burstrof: 15, burstrof: 15,
class: 2, class: 2,
@@ -6745,7 +6745,7 @@ module.exports = {
rof: 1.57, rof: 1.57,
thermload: .4 thermload: .4
}, { }, {
breachdmg: 10.53, breachdmg: 3.9,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -6772,7 +6772,7 @@ module.exports = {
rof: 1.2, rof: 1.2,
thermload: 1.7 thermload: 1.7
}, { }, {
breachdmg: 14.08, breachdmg: 4.4,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -6799,9 +6799,9 @@ module.exports = {
rof: 1.4, rof: 1.4,
thermload: 1.4 thermload: 1.4
}, { }, {
breachdmg: 5.58, breachdmg: 1.8,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .6,
burst: 3, burst: 3,
burstrof: 11, burstrof: 11,
class: 3, class: 3,
@@ -6826,7 +6826,7 @@ module.exports = {
rof: 1.272, rof: 1.272,
thermload: .8 thermload: .8
}, { }, {
breachdmg: 28, breachdmg: 17.5,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -6853,7 +6853,7 @@ module.exports = {
rof: .8, rof: .8,
thermload: 4.5 thermload: 4.5
}, { }, {
breachdmg: 21.63, breachdmg: 10.3,
breachmax: .8, breachmax: .8,
breachmin: .4, breachmin: .4,
burst: 3, burst: 3,
@@ -9652,7 +9652,7 @@ module.exports = {
optmul: .9, optmul: .9,
power: 1.8, power: 1.8,
rating: "C", rating: "C",
regen: 2.2, regen: 1.8,
thermres: -.2 thermres: -.2
}, { }, {
brokenregen: 3.8, brokenregen: 3.8,
@@ -13844,7 +13844,7 @@ module.exports = {
optmul: 1.1, optmul: 1.1,
power: 3.72, power: 3.72,
rating: "B", rating: "B",
regen: 3.1, regen: 1.3,
thermres: -.2 thermres: -.2
}, { }, {
brokenregen: 5.3, brokenregen: 5.3,

36
dist/index.json vendored
View File

@@ -4556,9 +4556,9 @@
"internal": [ "internal": [
"4e", "4e",
0, 0,
0,
"02", "02",
0, 0,
0,
"2h" "2h"
] ]
} }
@@ -8178,7 +8178,7 @@
"hardpoints": { "hardpoints": {
"pl": [ "pl": [
{ {
"breachdmg": 2.04, "breachdmg": 1.7,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"class": 1, "class": 1,
@@ -8493,7 +8493,7 @@
], ],
"ul": [ "ul": [
{ {
"breachdmg": 7.05, "breachdmg": 1.5,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -8521,7 +8521,7 @@
"thermload": 0.4 "thermload": 0.4
}, },
{ {
"breachdmg": 5.3, "breachdmg": 1,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -8549,9 +8549,9 @@
"thermload": 0.3 "thermload": 0.3
}, },
{ {
"breachdmg": 1.92, "breachdmg": 0.4,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.6,
"burst": 3, "burst": 3,
"burstrof": 19, "burstrof": 19,
"class": 1, "class": 1,
@@ -8608,7 +8608,7 @@
"thermload": 0.3 "thermload": 0.3
}, },
{ {
"breachdmg": 11.1, "breachdmg": 3,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -8636,7 +8636,7 @@
"thermload": 0.8 "thermload": 0.8
}, },
{ {
"breachdmg": 8.82, "breachdmg": 2.1,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -8664,9 +8664,9 @@
"thermload": 0.7 "thermload": 0.7
}, },
{ {
"breachdmg": 3.51, "breachdmg": 0.9,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.6,
"burst": 3, "burst": 3,
"burstrof": 15, "burstrof": 15,
"class": 2, "class": 2,
@@ -8692,7 +8692,7 @@
"thermload": 0.4 "thermload": 0.4
}, },
{ {
"breachdmg": 10.53, "breachdmg": 3.9,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -8720,7 +8720,7 @@
"thermload": 1.7 "thermload": 1.7
}, },
{ {
"breachdmg": 14.08, "breachdmg": 4.4,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -8748,9 +8748,9 @@
"thermload": 1.4 "thermload": 1.4
}, },
{ {
"breachdmg": 5.58, "breachdmg": 1.8,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.6,
"burst": 3, "burst": 3,
"burstrof": 11, "burstrof": 11,
"class": 3, "class": 3,
@@ -8776,7 +8776,7 @@
"thermload": 0.8 "thermload": 0.8
}, },
{ {
"breachdmg": 28, "breachdmg": 17.5,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -8804,7 +8804,7 @@
"thermload": 4.5 "thermload": 4.5
}, },
{ {
"breachdmg": 21.63, "breachdmg": 10.3,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -11755,7 +11755,7 @@
"optmul": 0.9, "optmul": 0.9,
"power": 1.8, "power": 1.8,
"rating": "C", "rating": "C",
"regen": 2.2, "regen": 1.8,
"thermres": -0.2 "thermres": -0.2
}, },
{ {
@@ -16273,7 +16273,7 @@
"optmul": 1.1, "optmul": 1.1,
"power": 3.72, "power": 3.72,
"rating": "B", "rating": "B",
"regen": 3.1, "regen": 1.3,
"thermres": -0.2 "thermres": -0.2
}, },
{ {

28
modules/hardpoints/burst_laser.json
View File

@@ -1,7 +1,7 @@
{ {
"ul": [ "ul": [
{ {
"breachdmg": 7.05, "breachdmg": 1.5,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -29,7 +29,7 @@
"thermload": 0.4 "thermload": 0.4
}, },
{ {
"breachdmg": 5.3, "breachdmg": 1,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -57,9 +57,9 @@
"thermload": 0.3 "thermload": 0.3
}, },
{ {
"breachdmg": 1.92, "breachdmg": 0.4,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.6,
"burst": 3, "burst": 3,
"burstrof": 19, "burstrof": 19,
"class": 1, "class": 1,
@@ -116,7 +116,7 @@
"thermload": 0.3 "thermload": 0.3
}, },
{ {
"breachdmg": 11.1, "breachdmg": 3,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -144,7 +144,7 @@
"thermload": 0.8 "thermload": 0.8
}, },
{ {
"breachdmg": 8.82, "breachdmg": 2.1,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -172,9 +172,9 @@
"thermload": 0.7 "thermload": 0.7
}, },
{ {
"breachdmg": 3.51, "breachdmg": 0.9,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.6,
"burst": 3, "burst": 3,
"burstrof": 15, "burstrof": 15,
"class": 2, "class": 2,
@@ -200,7 +200,7 @@
"thermload": 0.4 "thermload": 0.4
}, },
{ {
"breachdmg": 10.53, "breachdmg": 3.9,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -228,7 +228,7 @@
"thermload": 1.7 "thermload": 1.7
}, },
{ {
"breachdmg": 14.08, "breachdmg": 4.4,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -256,9 +256,9 @@
"thermload": 1.4 "thermload": 1.4
}, },
{ {
"breachdmg": 5.58, "breachdmg": 1.8,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.6,
"burst": 3, "burst": 3,
"burstrof": 11, "burstrof": 11,
"class": 3, "class": 3,
@@ -284,7 +284,7 @@
"thermload": 0.8 "thermload": 0.8
}, },
{ {
"breachdmg": 28, "breachdmg": 17.5,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,
@@ -312,7 +312,7 @@
"thermload": 4.5 "thermload": 4.5
}, },
{ {
"breachdmg": 21.63, "breachdmg": 10.3,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"burst": 3, "burst": 3,

2
modules/hardpoints/pulse_laser.json
View File

@@ -1,7 +1,7 @@
{ {
"pl": [ "pl": [
{ {
"breachdmg": 2.04, "breachdmg": 1.7,
"breachmax": 0.8, "breachmax": 0.8,
"breachmin": 0.4, "breachmin": 0.4,
"class": 1, "class": 1,

2
modules/internal/bi_weave_shield_generator.json
View File

@@ -66,7 +66,7 @@
"optmul": 0.9, "optmul": 0.9,
"power": 1.8, "power": 1.8,
"rating": "C", "rating": "C",
"regen": 2.2, "regen": 1.8,
"thermres": -0.2 "thermres": -0.2
}, },
{ {

2
modules/internal/shield_generator.json
View File

@@ -572,7 +572,7 @@
"optmul": 1.1, "optmul": 1.1,
"power": 3.72, "power": 3.72,
"rating": "B", "rating": "B",
"regen": 3.1, "regen": 1.3,
"thermres": -0.2 "thermres": -0.2
}, },
{ {

2
ships/vulture.json
View File

@@ -40,7 +40,7 @@
"defaults": { "defaults": {
"standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"], "standard": ["4E", "5E", "4E", "3E", "5E", "4E", "3C"],
"hardpoints": [17, 17, 0, 0, 0, 0], "hardpoints": [17, 17, 0, 0, 0, 0],
"internal": ["4e", 0, 0, "02", 0, "2h"] "internal": ["4e", 0, "02", 0, 0, "2h"]
} }
} }
} }