From 777a826f4e278e74356de287fed8d4e3477b1518 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 14 Oct 2016 17:07:11 +0100 Subject: [PATCH] Merged known EDDB IDs --- modules/hardpoints/multi_cannon.json | 8 ++++---- modules/internal/cargo_rack.json | 7 +++++-- modules/standard/thrusters.json | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index 2ecd4be..f220a77 100755 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -1,10 +1,10 @@ { "mc": [ - { "id": "7n", "edID": 128049458, "eddbID": 0, "grp": "mc", "class": 4, "rating": "A", "cost": 1177600, "mass": 16, "integrity": 80, "power": 0.73, "mount": "F", "type": "K", "armourpen": 68, "breachdps": 25.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 28, "eps": 1.44, "hps": 2.4, "range": 4000, "rof": 3, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 2 }, - { "id": "7o", "edID": 128681996, "eddbID": 0, "grp": "mc", "class": 4, "rating": "A", "cost": 6377600, "mass": 16, "integrity": 80, "power": 1.22, "mount": "G", "type": "K", "armourpen": 68, "breachdps": 21.08, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.3, "eps": 2.516, "hps": 3.4, "range": 4000, "rof": 3.4, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 2 }, + { "id": "7n", "edID": 128049458, "eddbID": 1542, "grp": "mc", "class": 4, "rating": "A", "cost": 1177600, "mass": 16, "integrity": 80, "power": 0.73, "mount": "F", "type": "K", "armourpen": 68, "breachdps": 25.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 28, "eps": 1.44, "hps": 2.4, "range": 4000, "rof": 3, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 2 }, + { "id": "7o", "edID": 128681996, "eddbID": 1546, "grp": "mc", "class": 4, "rating": "A", "cost": 6377600, "mass": 16, "integrity": 80, "power": 1.22, "mount": "G", "type": "K", "armourpen": 68, "breachdps": 21.08, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.3, "eps": 2.516, "hps": 3.4, "range": 4000, "rof": 3.4, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 2 }, - { "id": "7k", "edID": 128049457, "eddbID": 0, "grp": "mc", "class": 3, "rating": "C", "cost": 140400, "mass": 8, "integrity": 64, "power": 0.64, "mount": "F", "type": "K", "armourpen": 54, "breachdps": 20.65, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.1, "eps": 1.062, "hps": 1.77, "range": 4000, "rof": 5.9, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, - { "id": "7l", "edID": 128049461, "eddbID": 0, "grp": "mc", "class": 3, "rating": "C", "cost": 578436, "mass": 8, "integrity": 64, "power": 0.97, "mount": "G", "type": "K", "armourpen": 54, "breachdps": 17.42, "breachmin": 0.4, "breachmax": 0.8, "dps": 18.9, "eps": 1.675, "hps": 2.01, "range": 4000, "rof": 6.7, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, + { "id": "7k", "edID": 128049457, "eddbID": 1541, "grp": "mc", "class": 3, "rating": "C", "cost": 140400, "mass": 8, "integrity": 64, "power": 0.64, "mount": "F", "type": "K", "armourpen": 54, "breachdps": 20.65, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.1, "eps": 1.062, "hps": 1.77, "range": 4000, "rof": 5.9, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, + { "id": "7l", "edID": 128049461, "eddbID": 1543, "grp": "mc", "class": 3, "rating": "C", "cost": 578436, "mass": 8, "integrity": 64, "power": 0.97, "mount": "G", "type": "K", "armourpen": 54, "breachdps": 17.42, "breachmin": 0.4, "breachmax": 0.8, "dps": 18.9, "eps": 1.675, "hps": 2.01, "range": 4000, "rof": 6.7, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, { "id": "26", "edID": 128049456, "eddbID": 868, "grp": "mc", "class": 2, "rating": "E", "cost": 38000, "mass": 4, "integrity": 51, "power": 0.46, "mount": "F", "type": "K", "armourpen": 37, "breachdps": 14.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 15.6, "eps": 0.781, "hps": 1.42, "range": 4000, "rof": 7.1, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, { "id": "27", "edID": 128049460, "eddbID": 870, "grp": "mc", "class": 2, "rating": "F", "cost": 57000, "mass": 4, "integrity": 51, "power": 0.64, "mount": "G", "type": "K", "armourpen": 37, "breachdps": 11.55, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.6, "eps": 1.078, "hps": 1.54, "range": 4000, "rof": 7.7, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 }, diff --git a/modules/internal/cargo_rack.json b/modules/internal/cargo_rack.json index 6be7823..e06ce45 100755 --- a/modules/internal/cargo_rack.json +++ b/modules/internal/cargo_rack.json @@ -7,6 +7,9 @@ { "id": "04", "edID": 128064342, "eddbID": 1195, "grp": "cr", "class": 5, "rating": "E", "cost": 111570, "cargo": 32 }, { "id": "05", "edID": 128064343, "eddbID": 1196, "grp": "cr", "class": 6, "rating": "E", "cost": 362590, "cargo": 64 }, { "id": "06", "edID": 128064344, "eddbID": 1197, "grp": "cr", "class": 7, "rating": "E", "cost": 1178420, "cargo": 128 }, - { "id": "07", "edID": 128064345, "eddbID": 1198, "grp": "cr", "class": 8, "rating": "E", "cost": 3829870, "cargo": 256 } + { "id": "07", "edID": 128064345, "eddbID": 1198, "grp": "cr", "class": 8, "rating": "E", "cost": 3829870, "cargo": 256 }, + + { "id": "1w", "edID": 128681641, "eddbID": 1553, "grp": "cr", "class": 1, "rating": "E", "cost": 6250, "cargo": 1, "name": "Corrosion Resistant" }, + { "id": "1y", "edID": 128681992, "eddbID": 1552, "grp": "cr", "class": 1, "rating": "F", "cost": 12563, "cargo": 2, "name": "Corrosion Resistant" } ] -} \ No newline at end of file +} diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json index d29ce5a..c6f1e30 100755 --- a/modules/standard/thrusters.json +++ b/modules/standard/thrusters.json @@ -42,7 +42,7 @@ { "id":"t1", "edID": 128064071, "eddbID": 929, "grp": "t", "class": 2, "rating": "B", "M": 0.07, "P": 1.51, "cost": 53410, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 }, { "id":"t0", "edID": 128064072, "eddbID": 930, "grp": "t", "class": 2, "rating": "A", "M": 0.04, "P": 2.33, "cost": 160220, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 }, - { "id":"tz", "edID": 128682013, "eddbID": 0, "grp": "t", "class": 3, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 5103952, "mass": 5, "power": 5, "optmass": 90, "maxmass": 200 }, - { "id":"u0", "edID": 128682014, "eddbID": 0, "grp": "t", "class": 2, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 2.5, "power": 4, "optmass": 60, "maxmass": 120 } + { "id":"tz", "edID": 128682013, "eddbID": 1548, "grp": "t", "class": 3, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 5103952, "mass": 5, "power": 5, "optmass": 90, "maxmass": 200 }, + { "id":"u0", "edID": 128682014, "eddbID": 1547, "grp": "t", "class": 2, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 2.5, "power": 4, "optmass": 60, "maxmass": 120 } ] }