From f6f9a03beff4b6dad89108aa329f9f42f4a8b24b Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 13 Apr 2017 23:10:35 +0100 Subject: [PATCH 1/3] Separate scan time and scan range --- ChangeLog.md | 3 +++ modifications/blueprints.json | 10 +++++----- modifications/modifications.json | 1 + modifications/modules.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7bce1cb..52fea82 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +#2.3.1 + * Separate scan time and scan range + #2.3.0 * Add Dolphin * Add turreted mining lasers diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 8b86068..9e95eb5 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -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 ] } } }, diff --git a/modifications/modifications.json b/modifications/modifications.json index 49cca6e..cc4dc70 100644 --- a/modifications/modifications.json +++ b/modifications/modifications.json @@ -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}, diff --git a/modifications/modules.json b/modifications/modules.json index c134590..5534a30 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -5547,7 +5547,7 @@ "mass", "angle", "range", - "scantime" + "scanrate" ] }, From 81ad6806d0a3efe4c791bfd029e3c28802bcc6fc Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 13 Apr 2017 23:11:13 +0100 Subject: [PATCH 2/3] Add FD IDs --- ChangeLog.md | 1 + dist/index.js | 27 +++++++++++++++++++++------ dist/index.json | 27 +++++++++++++++++++++------ modules/hardpoints/mining_laser.json | 2 ++ ships/dolphin.json | 11 ++++++----- spec/data-spec.js | 3 +-- 6 files changed, 52 insertions(+), 19 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 52fea82..3116763 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,6 @@ #2.3.1 * Separate scan time and scan range + * Add Frontier IDs for new items in 2.3 #2.3.0 * Add Dolphin diff --git a/dist/index.js b/dist/index.js index c31387b..d69c18e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -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: { diff --git a/dist/index.json b/dist/index.json index 7c1ae15..42956aa 100644 --- a/dist/index.json +++ b/dist/index.json @@ -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": { diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index 454884c..491668d 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -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", diff --git a/ships/dolphin.json b/ships/dolphin.json index 71d20d1..0415ed8 100755 --- a/ships/dolphin.json +++ b/ships/dolphin.json @@ -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], diff --git a/spec/data-spec.js b/spec/data-spec.js index 7d578de..7eaa3b2 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -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); } } From b1cd41661958fd0938e572cf8e0aedbaf85066e6 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 13 Apr 2017 23:11:57 +0100 Subject: [PATCH 3/3] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6c1ed0..8fb7538 100644 --- a/package.json +++ b/package.json @@ -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"