Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-08 15:13:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/2.3.1'

Browse Source
This commit is contained in:
Cmdr McDonald
2017-04-13 23:12:04 +01:00
parent 1930ea90cc b1cd416619
commit 463b16789e
10 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.md
View File

@@ -1,3 +1,7 @@
#2.3.1
* Separate scan time and scan range
* Add Frontier IDs for new items in 2.3
#2.3.0
* Add Dolphin
* Add turreted mining lasers

27
dist/index.js vendored
View File

@@ -866,6 +866,7 @@ module.exports = {
}
},
dolphin: {
edID: 128049291,
eddbID: 31,
properties: {
name: "Dolphin",
@@ -890,6 +891,7 @@ module.exports = {
retailCost: 1337330,
bulkheads: [ {
id: "cq",
edID: 128049292,
eddbID: 1589,
grp: "bh",
cost: 0,
@@ -900,6 +902,7 @@ module.exports = {
hullboost: .8
}, {
id: "cr",
edID: 128049293,
eddbID: 1590,
grp: "bh",
cost: 534940,
@@ -910,6 +913,7 @@ module.exports = {
hullboost: 1.52
}, {
id: "cs",
edID: 128049294,
eddbID: 1591,
grp: "bh",
cost: 1203600,
@@ -920,6 +924,7 @@ module.exports = {
hullboost: 2.5
}, {
id: "ct",
edID: 128049295,
eddbID: 1592,
grp: "bh",
cost: 2808390,
@@ -930,6 +935,7 @@ module.exports = {
hullboost: 2.5
}, {
id: "cu",
edID: 128049296,
eddbID: 1593,
grp: "bh",
cost: 3152080,
@@ -8875,6 +8881,7 @@ module.exports = {
T: 1
},
distdraw: 1.5,
edID: 128740819,
eddbID: 1587,
falloff: 300,
grp: "ml",
@@ -8948,6 +8955,7 @@ module.exports = {
T: 1
},
distdraw: 3,
edID: 128740820,
eddbID: 1588,
falloff: 300,
grp: "ml",
@@ -18931,7 +18939,7 @@ module.exports = {
},
features: {
mass: [ .4, .2 ],
scantime: [ .1, .4 ]
scanrate: [ .1, .4 ]
}
},
"2": {
@@ -18941,7 +18949,7 @@ module.exports = {
},
features: {
mass: [ .8, .4 ],
scantime: [ .2, .5 ]
scanrate: [ .2, .5 ]
}
},
"3": {
@@ -18952,7 +18960,7 @@ module.exports = {
},
features: {
mass: [ 1.2, .6 ],
scantime: [ .3, .6 ]
scanrate: [ .3, .6 ]
}
},
"4": {
@@ -18963,7 +18971,7 @@ module.exports = {
},
features: {
mass: [ 1.6, .8 ],
scantime: [ .4, .7 ]
scanrate: [ .4, .7 ]
}
},
"5": {
@@ -18974,7 +18982,7 @@ module.exports = {
},
features: {
mass: [ 2, 1 ],
scantime: [ .5, .8 ]
scanrate: [ .5, .8 ]
}
}
},
@@ -21145,6 +21153,13 @@ module.exports = {
method: "multiplicative",
higherbetter: true
},
scanrate: {
id: 49,
name: "scanrate",
type: "percentage",
method: "multiplicative",
higherbetter: true
},
scantime: {
id: 48,
name: "scantime",
@@ -24606,7 +24621,7 @@ module.exports = {
}
}
},
modifications: [ "mass", "angle", "range", "scantime" ]
modifications: [ "mass", "angle", "range", "scanrate" ]
},
t: {
blueprints: {

27
dist/index.json vendored
View File

@@ -1382,6 +1382,7 @@
}
},
"dolphin": {
"edID": 128049291,
"eddbID": 31,
"properties": {
"name": "Dolphin",
@@ -1407,6 +1408,7 @@
"bulkheads": [
{
"id": "cq",
"edID": 128049292,
"eddbID": 1589,
"grp": "bh",
"cost": 0,
@@ -1418,6 +1420,7 @@
},
{
"id": "cr",
"edID": 128049293,
"eddbID": 1590,
"grp": "bh",
"cost": 534940,
@@ -1429,6 +1432,7 @@
},
{
"id": "cs",
"edID": 128049294,
"eddbID": 1591,
"grp": "bh",
"cost": 1203600,
@@ -1440,6 +1444,7 @@
},
{
"id": "ct",
"edID": 128049295,
"eddbID": 1592,
"grp": "bh",
"cost": 2808390,
@@ -1451,6 +1456,7 @@
},
{
"id": "cu",
"edID": 128049296,
"eddbID": 1593,
"grp": "bh",
"cost": 3152080,
@@ -10954,6 +10960,7 @@
"T": 1
},
"distdraw": 1.5,
"edID": 128740819,
"eddbID": 1587,
"falloff": 300,
"grp": "ml",
@@ -11030,6 +11037,7 @@
"T": 1
},
"distdraw": 3,
"edID": 128740820,
"eddbID": 1588,
"falloff": 300,
"grp": "ml",
@@ -24597,7 +24605,7 @@
0.4,
0.2
],
"scantime": [
"scanrate": [
0.1,
0.4
]
@@ -24613,7 +24621,7 @@
0.8,
0.4
],
"scantime": [
"scanrate": [
0.2,
0.5
]
@@ -24630,7 +24638,7 @@
1.2,
0.6
],
"scantime": [
"scanrate": [
0.3,
0.6
]
@@ -24647,7 +24655,7 @@
1.6,
0.8
],
"scantime": [
"scanrate": [
0.4,
0.7
]
@@ -24664,7 +24672,7 @@
2,
1
],
"scantime": [
"scanrate": [
0.5,
0.8
]
@@ -28398,6 +28406,13 @@
"method": "multiplicative",
"higherbetter": true
},
"scanrate": {
"id": 49,
"name": "scanrate",
"type": "percentage",
"method": "multiplicative",
"higherbetter": true
},
"scantime": {
"id": 48,
"name": "scantime",
@@ -34373,7 +34388,7 @@
"mass",
"angle",
"range",
"scantime"
"scanrate"
]
},
"t": {

10
modifications/blueprints.json
View File

@@ -4494,7 +4494,7 @@
},
"features": {
"mass": [ 0.4, 0.2 ],
"scantime": [ 0.1, 0.4 ]
"scanrate": [ 0.1, 0.4 ]
}
},
"2": {
@@ -4504,7 +4504,7 @@
},
"features": {
"mass": [ 0.8, 0.4 ],
"scantime": [ 0.2, 0.5 ]
"scanrate": [ 0.2, 0.5 ]
}
},
"3": {
@@ -4515,7 +4515,7 @@
},
"features": {
"mass": [ 1.2, 0.6 ],
"scantime": [ 0.3, 0.6 ]
"scanrate": [ 0.3, 0.6 ]
}
},
"4": {
@@ -4526,7 +4526,7 @@
},
"features": {
"mass": [ 1.6, 0.8 ],
"scantime": [ 0.4, 0.7 ]
"scanrate": [ 0.4, 0.7 ]
}
},
"5": {
@@ -4537,7 +4537,7 @@
},
"features": {
"mass": [ 2, 1 ],
"scantime": [ 0.5, 0.8 ]
"scanrate": [ 0.5, 0.8 ]
}
}
},

1
modifications/modifications.json
View File

@@ -35,6 +35,7 @@
"reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
"rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
"angle": {"id": 46, "name": "angle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"scanrate": {"id": 49, "name": "scanrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
"shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative", "higherbetter": true},
"shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},

2
modifications/modules.json
View File

@@ -5547,7 +5547,7 @@
"mass",
"angle",
"range",
"scantime"
"scanrate"
]
},

2
modules/hardpoints/mining_laser.json
View File

@@ -36,6 +36,7 @@
"T": 1
},
"distdraw": 1.5,
"edID": 128740819,
"eddbID": 1587,
"falloff": 300,
"grp": "ml",
@@ -112,6 +113,7 @@
"T": 1
},
"distdraw": 3,
"edID": 128740820,
"eddbID": 1588,
"falloff": 300,
"grp": "ml",

2
package.json
View File

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

11
ships/dolphin.json
View File

@@ -1,5 +1,6 @@
{
"dolphin": {
"edID": 128049291,
"eddbID": 31,
"properties": {
"name": "Dolphin",
@@ -23,11 +24,11 @@
},
"retailCost": 1337330,
"bulkheads": [
{ "id": "cq", "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
{ "id": "cr", "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
{ "id": "cs", "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
{ "id": "ct", "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
{ "id": "cu", "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
{ "id": "cq", "edID": 128049292, "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
{ "id": "cr", "edID": 128049293, "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
{ "id": "cs", "edID": 128049294, "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
{ "id": "ct", "edID": 128049295, "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
{ "id": "cu", "edID": 128049296, "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
],
"slots": {
"standard": [4, 5, 4, 4, 3, 3, 4],

3
spec/data-spec.js
View File

@@ -211,8 +211,7 @@ describe('JSON Data', function() {
const module = Modifications.modules[m];
for (var bp in module.blueprints) {
expect(Modifications.blueprints[bp]).toBeDefined('Missing ' + bp + ' for ' + m);
for (var g in module.blueprints[bp]) {
const grade = module.blueprints[bp][g];
for (var grade in module.blueprints[bp].grades) {
expect(Modifications.blueprints[bp].grades[grade]).toBeDefined('Missing ' + bp + ' grade ' + grade + ' for ' + m);
}
}