From 9e330ea31a918a12f867fea913f18509218cdce2 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 29 Jan 2017 08:22:51 +0000 Subject: [PATCH] Add IDs for most powerplay modules --- ChangeLog.md | 1 + dist/index.js | 83 ++++++++++++++++++++++++++++ dist/index.json | 83 ++++++++++++++++++++++++++++ modifications/blueprints.json | 80 +++++++++++++++++++++++++++ modules/hardpoints/mining_laser.json | 1 + modules/hardpoints/multi_cannon.json | 1 + modules/hardpoints/pulse_laser.json | 1 + spec/data-spec.js | 6 +- 8 files changed, 253 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 75724aa..c078fb6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,6 @@ #2.2.12 * Add special effects for each blueprint + * Add IDs for most Powerplay modules #2.2.11 * Remove non-existant chaff launcher capacity blueprint grades diff --git a/dist/index.js b/dist/index.js index b4e3972..49c4ef4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -6411,6 +6411,7 @@ module.exports = { T: 1 }, distdraw: .9, + edID: 128671342, eddbID: 1483, falloff: 500, grp: "pl", @@ -7272,6 +7273,7 @@ module.exports = { K: 1 }, distdraw: .12, + edID: 128671345, eddbID: 1481, falloff: 1800, grp: "mc", @@ -8704,6 +8706,7 @@ module.exports = { T: 1 }, distdraw: 1.75, + edID: 128671347, eddbID: 1479, falloff: 400, grp: "ml", @@ -14092,6 +14095,25 @@ module.exports = { blueprints: { AFM_Shielded: { id: 3, + components: { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + Carbon: 1, + "Shield Emitters": 1 + }, + "3": { + Carbon: 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Shielding Sensors": 1, + Vanadium: 1 + } + }, features: { "1": { integrity: [ .2, .5 ], @@ -14118,6 +14140,30 @@ module.exports = { }, Armour_Kinetic: { id: 4, + components: { + "1": { + Nickel: 1 + }, + "2": { + Nickel: 1, + Vanadium: 1 + }, + "3": { + "High Density Composites": 1, + "Salvaged Alloys": 1, + Vanadium: 1 + }, + "4": { + "Galvanising Alloys": 1, + "Proprietary Composites": 1, + Tungsten: 1 + }, + "5": { + "Core Dynamics Composites": 1, + Molybdenum: 1, + "Phase Alloys": 1 + } + }, features: { "1": { explres: [ -.056, -.028 ], @@ -14149,6 +14195,29 @@ module.exports = { }, Armour_Explosive: { id: 5, + components: { + "1": { + Nickel: 1 + }, + "2": { + Carbon: 1, + Zinc: 1 + }, + "3": { + "Salvaged Alloys": 1, + Vanadium: 1 + }, + "4": { + "Galvanising Alloys": 1, + Mercury: 1, + Tungsten: 1 + }, + "5": { + Molybdenum: 1, + "Phase Alloys": 1, + Ruthenium: 1 + } + }, features: { "1": { explres: [ .07, .112 ], @@ -14180,6 +14249,20 @@ module.exports = { }, Armour_Advanced: { id: 6, + components: { + "1": { + Iron: 1 + }, + "2": { + "Conductive Components": 1, + Iron: 1 + }, + "3": { + "Conductive Components": 1, + "High Density Composites": 1, + Iron: 1 + } + }, features: { "1": { explres: [ 0, .028 ], diff --git a/dist/index.json b/dist/index.json index 85ea11d..c14eaa1 100644 --- a/dist/index.json +++ b/dist/index.json @@ -8344,6 +8344,7 @@ "T": 1 }, "distdraw": 0.9, + "edID": 128671342, "eddbID": 1483, "falloff": 500, "grp": "pl", @@ -9241,6 +9242,7 @@ "K": 1 }, "distdraw": 0.12, + "edID": 128671345, "eddbID": 1481, "falloff": 1800, "grp": "mc", @@ -10729,6 +10731,7 @@ "T": 1 }, "distdraw": 1.75, + "edID": 128671347, "eddbID": 1479, "falloff": 400, "grp": "ml", @@ -16533,6 +16536,25 @@ "blueprints": { "AFM_Shielded": { "id": 3, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Shielding Sensors": 1, + "Vanadium": 1 + } + }, "features": { "1": { "integrity": [ @@ -16589,6 +16611,30 @@ }, "Armour_Kinetic": { "id": 4, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Vanadium": 1 + }, + "3": { + "High Density Composites": 1, + "Salvaged Alloys": 1, + "Vanadium": 1 + }, + "4": { + "Galvanising Alloys": 1, + "Proprietary Composites": 1, + "Tungsten": 1 + }, + "5": { + "Core Dynamics Composites": 1, + "Molybdenum": 1, + "Phase Alloys": 1 + } + }, "features": { "1": { "explres": [ @@ -16665,6 +16711,29 @@ }, "Armour_Explosive": { "id": 5, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Carbon": 1, + "Zinc": 1 + }, + "3": { + "Salvaged Alloys": 1, + "Vanadium": 1 + }, + "4": { + "Galvanising Alloys": 1, + "Mercury": 1, + "Tungsten": 1 + }, + "5": { + "Molybdenum": 1, + "Phase Alloys": 1, + "Ruthenium": 1 + } + }, "features": { "1": { "explres": [ @@ -16741,6 +16810,20 @@ }, "Armour_Advanced": { "id": 6, + "components": { + "1": { + "Iron": 1 + }, + "2": { + "Conductive Components": 1, + "Iron": 1 + }, + "3": { + "Conductive Components": 1, + "High Density Composites": 1, + "Iron": 1 + } + }, "features": { "1": { "explres": [ diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 75c4629..5bbfb76 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -1,6 +1,25 @@ { "AFM_Shielded": { "id": 3, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Shielding Sensors": 1, + "Vanadium": 1 + } + }, "features": { "1": { "integrity": [ 0.2, 0.5 ], @@ -27,6 +46,30 @@ }, "Armour_Kinetic": { "id": 4, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Vanadium": 1 + }, + "3": { + "High Density Composites": 1, + "Salvaged Alloys": 1, + "Vanadium": 1 + }, + "4": { + "Galvanising Alloys": 1, + "Proprietary Composites": 1, + "Tungsten": 1 + }, + "5": { + "Core Dynamics Composites": 1, + "Molybdenum": 1, + "Phase Alloys": 1 + } + }, "features": { "1": { "explres": [ -0.056, -0.028 ], @@ -58,6 +101,29 @@ }, "Armour_Explosive": { "id": 5, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Carbon": 1, + "Zinc": 1 + }, + "3": { + "Salvaged Alloys": 1, + "Vanadium": 1 + }, + "4": { + "Galvanising Alloys": 1, + "Mercury": 1, + "Tungsten": 1 + }, + "5": { + "Molybdenum": 1, + "Phase Alloys": 1, + "Ruthenium": 1 + } + }, "features": { "1": { "explres": [ 0.07, 0.112 ], @@ -89,6 +155,20 @@ }, "Armour_Advanced": { "id": 6, + "components": { + "1": { + "Iron": 1 + }, + "2": { + "Conductive Components": 1, + "Iron": 1 + }, + "3": { + "Conductive Components": 1, + "High Density Composites": 1, + "Iron": 1 + } + }, "features": { "1": { "explres": [ 0, 0.028 ], diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json index f931658..7414dbe 100644 --- a/modules/hardpoints/mining_laser.json +++ b/modules/hardpoints/mining_laser.json @@ -34,6 +34,7 @@ "T": 1 }, "distdraw": 1.75, + "edID": 128671347, "eddbID": 1479, "falloff": 400, "grp": "ml", diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index 4869f88..bbf6ba0 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -103,6 +103,7 @@ "K": 1 }, "distdraw": 0.12, + "edID": 128671345, "eddbID": 1481, "falloff": 1800, "grp": "mc", diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json index 862c19c..f3e36c1 100644 --- a/modules/hardpoints/pulse_laser.json +++ b/modules/hardpoints/pulse_laser.json @@ -167,6 +167,7 @@ "T": 1 }, "distdraw": 0.9, + "edID": 128671342, "eddbID": 1483, "falloff": 500, "grp": "pl", diff --git a/spec/data-spec.js b/spec/data-spec.js index 4294b69..6bdb5ae 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -40,7 +40,7 @@ describe('JSON Data', function() { var id = group[i].id; expect(ids[id]).toBeFalsy('ID already exists: ' + id); expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID'); - expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID'); + expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID'); if (s != 'ft' && s != 'pas' ) { expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity'); } @@ -70,7 +70,7 @@ describe('JSON Data', function() { expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`); expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`); expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`); - expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`); + expect(group[i].edID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`); expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`); expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`); if (group[i].eddbID) { @@ -110,7 +110,7 @@ describe('JSON Data', function() { var id = group[i].id; expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`); expect(ids[id]).toBeFalsy('ID already exists: ' + id); - expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`); + expect(group[i].eddbID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`); expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`); if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${id}`);