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 'release/2.9.11'

Browse Source
This commit is contained in:
willyb321
2018-04-26 09:20:42 +10:00
parent f2baefc4c8 cf5352aaef
commit 9ac6427ee0
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dist/index.js vendored
View File

@@ -133,7 +133,7 @@ module.exports = {
eddbID: 1641,
grp: "bh",
cost: 6803170,
mass: 75,
mass: 40,
explres: -.4,
kinres: -.2,
thermres: 0,
@@ -144,7 +144,7 @@ module.exports = {
eddbID: 1642,
grp: "bh",
cost: 15307134,
mass: 150,
mass: 78,
explres: -.4,
kinres: -.2,
thermres: 0,
@@ -155,7 +155,7 @@ module.exports = {
eddbID: 1643,
grp: "bh",
cost: 36175859,
mass: 150,
mass: 78,
explres: -.5,
kinres: -.75,
thermres: .5,
@@ -166,7 +166,7 @@ module.exports = {
eddbID: 1644,
grp: "bh",
cost: 40087682,
mass: 150,
mass: 78,
explres: .2,
kinres: .25,
thermres: -.4,
@@ -23452,7 +23452,7 @@ module.exports = {
},
special_powerplant_highcharge: {
mass: .1,
power: .05
pgen: .05
},
special_powerplant_cooled: {
eff: -.1
@@ -23554,9 +23554,9 @@ module.exports = {
},
special_hullreinforcement_chunky: {
hullreinforcement: .1,
explres: 2,
thermres: 2,
kinres: 2
explres: -2,
thermres: -2,
kinres: -2
},
special_shieldbooster_thermic: {
optmul: -.01,

16
dist/index.json vendored
View File

@@ -181,7 +181,7 @@
"eddbID": 1641,
"grp": "bh",
"cost": 6803170,
"mass": 75,
"mass": 40,
"explres": -0.4,
"kinres": -0.2,
"thermres": 0,
@@ -193,7 +193,7 @@
"eddbID": 1642,
"grp": "bh",
"cost": 15307134,
"mass": 150,
"mass": 78,
"explres": -0.4,
"kinres": -0.2,
"thermres": 0,
@@ -205,7 +205,7 @@
"eddbID": 1643,
"grp": "bh",
"cost": 36175859,
"mass": 150,
"mass": 78,
"explres": -0.5,
"kinres": -0.75,
"thermres": 0.5,
@@ -217,7 +217,7 @@
"eddbID": 1644,
"grp": "bh",
"cost": 40087682,
"mass": 150,
"mass": 78,
"explres": 0.2,
"kinres": 0.25,
"thermres": -0.4,
@@ -31087,7 +31087,7 @@
},
"special_powerplant_highcharge": {
"mass": 0.1,
"power": 0.05
"pgen": 0.05
},
"special_powerplant_cooled": {
"eff": -0.1
@@ -31189,9 +31189,9 @@
},
"special_hullreinforcement_chunky": {
"hullreinforcement": 0.1,
"explres": 2,
"thermres": 2,
"kinres": 2
"explres": -2,
"thermres": -2,
"kinres": -2
},
"special_shieldbooster_thermic": {
"optmul": -0.01,

8
modifications/modifierActions.json
View File

@@ -341,7 +341,7 @@
},
"special_powerplant_highcharge": {
"mass": 0.1,
"power": 0.05
"pgen": 0.05
},
"special_powerplant_cooled": {
"eff": -0.1
@@ -443,9 +443,9 @@
},
"special_hullreinforcement_chunky": {
"hullreinforcement": 0.1,
"explres": 2,
"thermres": 2,
"kinres": 2
"explres": -2,
"thermres": -2,
"kinres": -2
},
"special_shieldbooster_thermic": {
"optmul": -0.01,

2
package-lock.json generated
View File

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

2
package.json
View File

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

8
ships/alliance_chieftain.json
View File

@@ -27,10 +27,10 @@
},
"bulkheads": [
{ "id": "CI", "edID": 128816576, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
{ "id": "CJ", "edID": 128816577, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
{ "id": "CK", "edID": 128816578, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
{ "id": "CL", "edID": 128816579, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
{ "id": "CM", "edID": 128816580, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
{ "id": "CJ", "edID": 128816577, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
{ "id": "CK", "edID": 128816578, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
{ "id": "CL", "edID": 128816579, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
{ "id": "CM", "edID": 128816580, "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],