From 4992357e584195a1113ee1ca03439c7b12ca7725 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 18 Feb 2016 12:27:41 -0800 Subject: [PATCH] Added E:D IDs for Ships and bulkheads --- dist/index.js | 175 ++++++++++++++++++++++++++++ dist/index.json | 175 ++++++++++++++++++++++++++++ modules/hardpoints/burst_laser.json | 2 +- ships/adder.json | 11 +- ships/anaconda.json | 11 +- ships/asp.json | 11 +- ships/asp_scout.json | 12 +- ships/cobra_mk_iii.json | 11 +- ships/cobra_mk_iv.json | 11 +- ships/diamondback_explorer.json | 12 +- ships/diamondback_scout.json | 11 +- ships/eagle.json | 11 +- ships/federal_assault_ship.json | 12 +- ships/federal_corvette.json | 11 +- ships/federal_dropship.json | 11 +- ships/federal_gunship.json | 11 +- ships/fer_de_lance.json | 11 +- ships/hauler.json | 11 +- ships/imperial_clipper.json | 11 +- ships/imperial_courier.json | 12 +- ships/imperial_cutter.json | 12 +- ships/imperial_eagle.json | 11 +- ships/keelback.json | 11 +- ships/orca.json | 11 +- ships/python.json | 11 +- ships/sidewinder.json | 11 +- ships/type_6_transporter.json | 11 +- ships/type_7_transport.json | 11 +- ships/type_9_heavy.json | 11 +- ships/viper.json | 11 +- ships/viper_mk_iv.json | 11 +- ships/vulture.json | 11 +- spec/data-spec.js | 13 ++- 33 files changed, 532 insertions(+), 157 deletions(-) diff --git a/dist/index.js b/dist/index.js index 9ee7523..ca47087 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,6 +1,7 @@ module.exports = { Ships: { adder: { + edID: 128049267, eddbID: 1, properties: { name: "Adder", @@ -20,26 +21,31 @@ module.exports = { retailCost: 87810, bulkheads: [ { id: "Bx", + edID: 128049268, eddbID: 753, cost: 0, mass: 0 }, { id: "By", + edID: 128049269, eddbID: 754, cost: 30622340, mass: 75 }, { id: "Bz", + edID: 128049270, eddbID: 755, cost: 68900260, mass: 150 }, { id: "BA", + edID: 128049271, eddbID: 756, cost: 162834280, mass: 150 }, { id: "BB", + edID: 128049272, eddbID: 757, cost: 180442120, mass: 150 @@ -56,6 +62,7 @@ module.exports = { } }, anaconda: { + edID: 128049363, eddbID: 2, properties: { name: "Anaconda", @@ -75,26 +82,31 @@ module.exports = { retailCost: 146969450, bulkheads: [ { id: "bT", + edID: 128049364, eddbID: 818, cost: 0, mass: 0 }, { id: "bU", + edID: 128049365, eddbID: 819, cost: 58787780, mass: 30 }, { id: "bV", + edID: 128049366, eddbID: 820, cost: 132272510, mass: 60 }, { id: "bW", + edID: 128049367, eddbID: 821, cost: 312604020, mass: 60 }, { id: "bX", + edID: 128049368, eddbID: 822, cost: 346407e3, mass: 60 @@ -111,6 +123,7 @@ module.exports = { } }, asp: { + edID: 128049303, eddbID: 3, properties: { name: "Asp Explorer", @@ -130,26 +143,31 @@ module.exports = { retailCost: 6661150, bulkheads: [ { id: "BH", + edID: 128049304, eddbID: 778, cost: 0, mass: 0 }, { id: "BI", + edID: 128049305, eddbID: 779, cost: 2664460, mass: 21 }, { id: "BJ", + edID: 128049306, eddbID: 780, cost: 5995040, mass: 42 }, { id: "BK", + edID: 128049307, eddbID: 781, cost: 14168270, mass: 42 }, { id: "BL", + edID: 128049308, eddbID: 782, cost: 15700340, mass: 42 @@ -166,6 +184,7 @@ module.exports = { } }, asp_scout: { + edID: 128672276, eddbID: 24, properties: { name: "Asp Scout", @@ -185,26 +204,31 @@ module.exports = { retailCost: 3961150, bulkheads: [ { id: "c1", + edID: 128672278, eddbID: 1503, cost: 0, mass: 0 }, { id: "c2", + edID: 128672279, eddbID: 1504, cost: 1584460, mass: 21 }, { id: "c3", + edID: 128672280, eddbID: 1505, cost: 3565040, mass: 42 }, { id: "c4", + edID: 128672281, eddbID: 1506, cost: 8425380, mass: 42 }, { id: "c5", + edID: 128672282, eddbID: 1507, cost: 9336440, mass: 42 @@ -221,6 +245,7 @@ module.exports = { } }, cobra_mk_iii: { + edID: 128049279, eddbID: 4, properties: { name: "Cobra Mk III", @@ -240,26 +265,31 @@ module.exports = { retailCost: 349720, bulkheads: [ { id: "bk", + edID: 128049280, eddbID: 763, cost: 0, mass: 0 }, { id: "bl", + edID: 128049281, eddbID: 764, cost: 151890, mass: 14 }, { id: "bm", + edID: 128049282, eddbID: 765, cost: 341750, mass: 27 }, { id: "bn", + edID: 128049283, eddbID: 766, cost: 797410, mass: 27 }, { id: "bo", + edID: 128049284, eddbID: 767, cost: 895e3, mass: 27 @@ -276,6 +306,7 @@ module.exports = { } }, cobra_mk_iv: { + edID: 128672262, eddbID: 29, properties: { name: "Cobra Mk IV", @@ -295,26 +326,31 @@ module.exports = { retailCost: 747660, bulkheads: [ { id: "cg", + edID: 128672264, eddbID: 1518, cost: 0, mass: 0 }, { id: "ch", + edID: 128672265, eddbID: 1519, cost: 305890, mass: 14 }, { id: "ci", + edID: 128672266, eddbID: 1520, cost: 688250, mass: 27 }, { id: "cj", + edID: 128672267, eddbID: 1521, cost: 1605910, mass: 27 }, { id: "ck", + edID: 128672268, eddbID: 1522, cost: 1802440, mass: 27 @@ -331,6 +367,7 @@ module.exports = { } }, diamondback_explorer: { + edID: 128671831, eddbID: 5, properties: { name: "Diamondback Explorer", @@ -350,26 +387,31 @@ module.exports = { retailCost: 1894760, bulkheads: [ { id: "ba", + edID: 128671832, eddbID: 1456, cost: 0, mass: 0 }, { id: "bb", + edID: 128671833, eddbID: 1457, cost: 8e5, mass: 23 }, { id: "bc", + edID: 128671834, eddbID: 1458, cost: 18e5, mass: 47 }, { id: "bd", + edID: 128671835, eddbID: 1459, cost: 42e5, mass: 26 }, { id: "be", + edID: 128671836, eddbID: 1460, cost: 4714e3, mass: 47 @@ -386,6 +428,7 @@ module.exports = { } }, diamondback: { + edID: 128671217, eddbID: 6, properties: { name: "Diamondback Scout", @@ -405,26 +448,31 @@ module.exports = { retailCost: 564330, bulkheads: [ { id: "b5", + edID: 128671218, eddbID: 1384, cost: 0, mass: 0 }, { id: "b6", + edID: 128671219, eddbID: 1385, cost: 225700, mass: 13 }, { id: "b7", + edID: 128671220, eddbID: 1386, cost: 507900, mass: 26 }, { id: "b8", + edID: 128671221, eddbID: 1387, cost: 1185100, mass: 26 }, { id: "b9", + edID: 128671222, eddbID: 1388, cost: 1330100, mass: 26 @@ -441,6 +489,7 @@ module.exports = { } }, eagle: { + edID: 128049255, eddbID: 7, properties: { name: "Eagle", @@ -460,26 +509,31 @@ module.exports = { retailCost: 44800, bulkheads: [ { id: "bY", + edID: 128049256, eddbID: 743, cost: 0, mass: 0 }, { id: "bZ", + edID: 128049257, eddbID: 744, cost: 26880, mass: 4 }, { id: "B0", + edID: 128049258, eddbID: 745, cost: 90050, mass: 8 }, { id: "B1", + edID: 128049259, eddbID: 746, cost: 140090, mass: 8 }, { id: "B2", + edID: 128049260, eddbID: 747, cost: 150390, mass: 8 @@ -496,6 +550,7 @@ module.exports = { } }, federal_assault_ship: { + edID: 128672145, eddbID: 8, properties: { name: "Federal Assault Ship", @@ -515,26 +570,31 @@ module.exports = { retailCost: 19814210, bulkheads: [ { id: "bz", + edID: 128672147, eddbID: 1466, cost: 0, mass: 0 }, { id: "bA", + edID: 128672148, eddbID: 1467, cost: 7925680, mass: 44 }, { id: "bB", + edID: 128672149, eddbID: 1468, cost: 17832780, mass: 87 }, { id: "bC", + edID: 128672150, eddbID: 1469, cost: 42144810, mass: 87 }, { id: "bD", + edID: 128672151, eddbID: 1470, cost: 46702080, mass: 87 @@ -551,6 +611,7 @@ module.exports = { } }, federal_corvette: { + edID: 128049369, eddbID: 25, properties: { name: "Federal Corvette", @@ -570,26 +631,31 @@ module.exports = { retailCost: 187969450, bulkheads: [ { id: "BW", + edID: 128049370, eddbID: 1498, cost: 0, mass: 0 }, { id: "BX", + edID: 128049371, eddbID: 1499, cost: 75187790, mass: 30 }, { id: "BY", + edID: 128049372, eddbID: 1500, cost: 169172510, mass: 60 }, { id: "BZ", + edID: 128049373, eddbID: 1501, cost: 399811020, mass: 60 }, { id: "c0", + edID: 128049374, eddbID: 1502, cost: 443044e3, mass: 60 @@ -606,6 +672,7 @@ module.exports = { } }, federal_dropship: { + edID: 128049321, eddbID: 9, properties: { name: "Federal Dropship", @@ -625,26 +692,31 @@ module.exports = { retailCost: 14314210, bulkheads: [ { id: "bE", + edID: 128049322, eddbID: 793, cost: 0, mass: 0 }, { id: "bF", + edID: 128049323, eddbID: 794, cost: 5725680, mass: 44 }, { id: "bG", + edID: 128049324, eddbID: 795, cost: 12882780, mass: 87 }, { id: "bH", + edID: 128049325, eddbID: 796, cost: 30446310, mass: 87 }, { id: "bI", + edID: 128049326, eddbID: 797, cost: 33738580, mass: 87 @@ -661,6 +733,7 @@ module.exports = { } }, federal_gunship: { + edID: 128672152, eddbID: 10, properties: { name: "Federal Gunship", @@ -680,26 +753,31 @@ module.exports = { retailCost: 35814210, bulkheads: [ { id: "bJ", + edID: 128672154, eddbID: 1471, cost: 0, mass: 0 }, { id: "bK", + edID: 128672155, eddbID: 1472, cost: 14325690, mass: 44 }, { id: "bL", + edID: 128672156, eddbID: 1473, cost: 32232790, mass: 87 }, { id: "bM", + edID: 128672157, eddbID: 1474, cost: 76176810, mass: 87 }, { id: "bN", + edID: 128672158, eddbID: 1475, cost: 84414090, mass: 87 @@ -716,6 +794,7 @@ module.exports = { } }, fer_de_lance: { + edID: 128049351, eddbID: 11, properties: { name: "Fer-de-Lance", @@ -735,26 +814,31 @@ module.exports = { retailCost: 51567040, bulkheads: [ { id: "Bd", + edID: 128049352, eddbID: 813, cost: 0, mass: 0 }, { id: "Be", + edID: 128049353, eddbID: 814, cost: 20626820, mass: 19 }, { id: "Bf", + edID: 128049354, eddbID: 815, cost: 46410340, mass: 38 }, { id: "Bg", + edID: 128049355, eddbID: 816, cost: 109683090, mass: 38 }, { id: "Bh", + edID: 128049356, eddbID: 817, cost: 121543510, mass: 38 @@ -771,6 +855,7 @@ module.exports = { } }, hauler: { + edID: 128049261, eddbID: 12, properties: { name: "Hauler", @@ -790,26 +875,31 @@ module.exports = { retailCost: 52720, bulkheads: [ { id: "Bi", + edID: 128049262, eddbID: 748, cost: 0, mass: 0 }, { id: "Bj", + edID: 128049263, eddbID: 749, cost: 42180, mass: 1 }, { id: "Bk", + edID: 128049264, eddbID: 750, cost: 185050, mass: 2 }, { id: "Bl", + edID: 128049265, eddbID: 751, cost: 270300, mass: 2 }, { id: "Bm", + edID: 128049266, eddbID: 752, cost: 282420, mass: 2 @@ -826,6 +916,7 @@ module.exports = { } }, imperial_clipper: { + edID: 128049315, eddbID: 13, properties: { name: "Imperial Clipper", @@ -845,26 +936,31 @@ module.exports = { retailCost: 22296860, bulkheads: [ { id: "bp", + edID: 128049316, eddbID: 788, cost: 0, mass: 0 }, { id: "bq", + edID: 128049317, eddbID: 789, cost: 8918340, mass: 30 }, { id: "br", + edID: 128049318, eddbID: 790, cost: 20066270, mass: 60 }, { id: "bs", + edID: 128049319, eddbID: 791, cost: 47423290, mass: 60 }, { id: "bt", + edID: 128049320, eddbID: 792, cost: 52551340, mass: 60 @@ -881,6 +977,7 @@ module.exports = { } }, imperial_courier: { + edID: 128671223, eddbID: 14, properties: { name: "Imperial Courier", @@ -900,26 +997,31 @@ module.exports = { retailCost: 2542930, bulkheads: [ { id: "bf", + edID: 128671224, eddbID: 1389, cost: 0, mass: 0 }, { id: "bg", + edID: 128671225, eddbID: 1390, cost: 1017200, mass: 4 }, { id: "bh", + edID: 128671226, eddbID: 1391, cost: 2288600, mass: 8 }, { id: "bi", + edID: 128671227, eddbID: 1392, cost: 5408800, mass: 8 }, { id: "bj", + edID: 128671228, eddbID: 1393, cost: 5993700, mass: 8 @@ -936,6 +1038,7 @@ module.exports = { } }, imperial_cutter: { + edID: 128049375, eddbID: 26, properties: { name: "Imperial Cutter", @@ -955,26 +1058,31 @@ module.exports = { retailCost: 208969450, bulkheads: [ { id: "BR", + edID: 128049376, eddbID: 1493, cost: 0, mass: 0 }, { id: "BS", + edID: 128049377, eddbID: 1494, cost: 83587790, mass: 30 }, { id: "BT", + edID: 128049378, eddbID: 1495, cost: 188072510, mass: 60 }, { id: "BU", + edID: 128049379, eddbID: 1496, cost: 444478020, mass: 60 }, { id: "BV", + edID: 128049380, eddbID: 1497, cost: 492541e3, mass: 60 @@ -991,6 +1099,7 @@ module.exports = { } }, imperial_eagle: { + edID: 128672138, eddbID: 15, properties: { name: "Imperial Eagle", @@ -1010,26 +1119,31 @@ module.exports = { retailCost: 110830, bulkheads: [ { id: "bu", + edID: 128672140, eddbID: 1461, cost: 0, mass: 0 }, { id: "bv", + edID: 128672141, eddbID: 1462, cost: 66500, mass: 4 }, { id: "bw", + edID: 128672142, eddbID: 1463, cost: 222760, mass: 8 }, { id: "bx", + edID: 128672143, eddbID: 1464, cost: 346550, mass: 8 }, { id: "by", + edID: 128672144, eddbID: 1465, cost: 372040, mass: 8 @@ -1046,6 +1160,7 @@ module.exports = { } }, keelback: { + edID: 128672269, eddbID: 27, properties: { name: "Keelback", @@ -1065,26 +1180,31 @@ module.exports = { retailCost: 3126150, bulkheads: [ { id: "cb", + edID: 128672271, eddbID: 1513, cost: 0, mass: 0 }, { id: "cc", + edID: 128672272, eddbID: 1514, cost: 1250460, mass: 12 }, { id: "cd", + edID: 128672273, eddbID: 1515, cost: 2813540, mass: 23 }, { id: "ce", + edID: 128672274, eddbID: 1516, cost: 6649330, mass: 23 }, { id: "cf", + edID: 128672275, eddbID: 1517, cost: 7368340, mass: 23 @@ -1101,6 +1221,7 @@ module.exports = { } }, orca: { + edID: 128049327, eddbID: 16, properties: { name: "Orca", @@ -1120,26 +1241,31 @@ module.exports = { retailCost: 48539890, bulkheads: [ { id: "BM", + edID: 128049328, eddbID: 798, cost: 0, mass: 0 }, { id: "BN", + edID: 128049329, eddbID: 799, cost: 19415950, mass: 21 }, { id: "BO", + edID: 128049330, eddbID: 800, cost: 43685900, mass: 87 }, { id: "BP", + edID: 128049331, eddbID: 801, cost: 103244340, mass: 87 }, { id: "BQ", + edID: 128049332, eddbID: 802, cost: 114408510, mass: 87 @@ -1168,6 +1294,7 @@ module.exports = { } }, python: { + edID: 128049339, eddbID: 17, properties: { name: "Python", @@ -1187,26 +1314,31 @@ module.exports = { retailCost: 56978180, bulkheads: [ { id: "bO", + edID: 128049340, eddbID: 808, cost: 0, mass: 0 }, { id: "bP", + edID: 128049341, eddbID: 809, cost: 22791270, mass: 26 }, { id: "bQ", + edID: 128049342, eddbID: 810, cost: 51280360, mass: 53 }, { id: "bR", + edID: 128049343, eddbID: 811, cost: 121192590, mass: 53 }, { id: "bS", + edID: 128049344, eddbID: 812, cost: 134297570, mass: 53 @@ -1223,6 +1355,7 @@ module.exports = { } }, sidewinder: { + edID: 128049249, eddbID: 18, properties: { name: "Sidewinder", @@ -1242,26 +1375,31 @@ module.exports = { retailCost: 40800, bulkheads: [ { id: "b0", + edID: 128049250, eddbID: 738, cost: 0, mass: 0 }, { id: "b1", + edID: 128049251, eddbID: 739, cost: 25600, mass: 2 }, { id: "b2", + edID: 128049252, eddbID: 740, cost: 80320, mass: 4 }, { id: "b3", + edID: 128049253, eddbID: 741, cost: 132060, mass: 4 }, { id: "b4", + edID: 128049254, eddbID: 742, cost: 139420, mass: 4 @@ -1278,6 +1416,7 @@ module.exports = { } }, type_6_transporter: { + edID: 128049285, eddbID: 19, properties: { name: "Type-6 Transporter", @@ -1297,26 +1436,31 @@ module.exports = { retailCost: 1045950, bulkheads: [ { id: "Bn", + edID: 128049286, eddbID: 768, cost: 0, mass: 0 }, { id: "Bo", + edID: 128049287, eddbID: 769, cost: 418380, mass: 12 }, { id: "Bp", + edID: 128049288, eddbID: 770, cost: 941350, mass: 23 }, { id: "Bq", + edID: 128049289, eddbID: 771, cost: 2224730, mass: 23 }, { id: "Br", + edID: 128049290, eddbID: 772, cost: 2465290, mass: 23 @@ -1333,6 +1477,7 @@ module.exports = { } }, type_7_transport: { + edID: 128049297, eddbID: 20, properties: { name: "Type-7 Transporter", @@ -1352,26 +1497,31 @@ module.exports = { retailCost: 17472250, bulkheads: [ { id: "Bs", + edID: 128049298, eddbID: 773, cost: 0, mass: 0 }, { id: "Bt", + edID: 128049299, eddbID: 774, cost: 6988900, mass: 32 }, { id: "Bu", + edID: 128049300, eddbID: 775, cost: 15725030, mass: 63 }, { id: "Bv", + edID: 128049301, eddbID: 776, cost: 37163480, mass: 63 }, { id: "Bw", + edID: 128049302, eddbID: 777, cost: 41182100, mass: 63 @@ -1388,6 +1538,7 @@ module.exports = { } }, type_9_heavy: { + edID: 128049333, eddbID: 21, properties: { name: "Type-9 Heavy", @@ -1407,26 +1558,31 @@ module.exports = { retailCost: 76555840, bulkheads: [ { id: "cl", + edID: 128049334, eddbID: 803, cost: 0, mass: 0 }, { id: "cm", + edID: 128049335, eddbID: 804, cost: 30622340, mass: 75 }, { id: "cn", + edID: 128049336, eddbID: 805, cost: 68900260, mass: 150 }, { id: "co", + edID: 128049337, eddbID: 806, cost: 162834280, mass: 150 }, { id: "cp", + edID: 128049338, eddbID: 807, cost: 180442120, mass: 150 @@ -1443,6 +1599,7 @@ module.exports = { } }, viper: { + edID: 128049273, eddbID: 22, properties: { name: "Viper", @@ -1462,26 +1619,31 @@ module.exports = { retailCost: 142930, bulkheads: [ { id: "B3", + edID: 128049274, eddbID: 758, cost: 0, mass: 0 }, { id: "B4", + edID: 128049275, eddbID: 759, cost: 57170, mass: 5 }, { id: "B5", + edID: 128049276, eddbID: 760, cost: 128640, mass: 9 }, { id: "B6", + edID: 128049277, eddbID: 761, cost: 304010, mass: 9 }, { id: "B7", + edID: 128049278, eddbID: 762, cost: 336890, mass: 9 @@ -1498,6 +1660,7 @@ module.exports = { } }, viper_mk_iv: { + edID: 128672255, eddbID: 28, properties: { name: "Viper Mk IV", @@ -1517,26 +1680,31 @@ module.exports = { retailCost: 437930, bulkheads: [ { id: "c6", + edID: 128672257, eddbID: 1508, cost: 0, mass: 0 }, { id: "c7", + edID: 128672258, eddbID: 1509, cost: 175180, mass: 5 }, { id: "c8", + edID: 128672259, eddbID: 1510, cost: 394140, mass: 9 }, { id: "c9", + edID: 128672260, eddbID: 1511, cost: 931490, mass: 9 }, { id: "ca", + edID: 128672261, eddbID: 1512, cost: 1033210, mass: 9 @@ -1553,6 +1721,7 @@ module.exports = { } }, vulture: { + edID: 128049309, eddbID: 23, properties: { name: "Vulture", @@ -1572,26 +1741,31 @@ module.exports = { retailCost: 4925620, bulkheads: [ { id: "B8", + edID: 128049310, eddbID: 783, cost: 0, mass: 0 }, { id: "B9", + edID: 128049311, eddbID: 784, cost: 1970250, mass: 17 }, { id: "Ba", + edID: 128049312, eddbID: 785, cost: 4433050, mass: 35 }, { id: "Bb", + edID: 128049313, eddbID: 786, cost: 10476780, mass: 35 }, { id: "Bc", + edID: 128049314, eddbID: 787, cost: 11609670, mass: 35 @@ -4947,6 +5121,7 @@ module.exports = { thermload: 1 }, { id: "cy", + edID: 128671449, eddbID: 1477, grp: "ul", name: "Cytoscrambler", diff --git a/dist/index.json b/dist/index.json index bf39365..702bba1 100644 --- a/dist/index.json +++ b/dist/index.json @@ -1,6 +1,7 @@ { "Ships": { "adder": { + "edID": 128049267, "eddbID": 1, "properties": { "name": "Adder", @@ -21,30 +22,35 @@ "bulkheads": [ { "id": "Bx", + "edID": 128049268, "eddbID": 753, "cost": 0, "mass": 0 }, { "id": "By", + "edID": 128049269, "eddbID": 754, "cost": 30622340, "mass": 75 }, { "id": "Bz", + "edID": 128049270, "eddbID": 755, "cost": 68900260, "mass": 150 }, { "id": "BA", + "edID": 128049271, "eddbID": 756, "cost": 162834280, "mass": 150 }, { "id": "BB", + "edID": 128049272, "eddbID": 757, "cost": 180442120, "mass": 150 @@ -102,6 +108,7 @@ } }, "anaconda": { + "edID": 128049363, "eddbID": 2, "properties": { "name": "Anaconda", @@ -122,30 +129,35 @@ "bulkheads": [ { "id": "bT", + "edID": 128049364, "eddbID": 818, "cost": 0, "mass": 0 }, { "id": "bU", + "edID": 128049365, "eddbID": 819, "cost": 58787780, "mass": 30 }, { "id": "bV", + "edID": 128049366, "eddbID": 820, "cost": 132272510, "mass": 60 }, { "id": "bW", + "edID": 128049367, "eddbID": 821, "cost": 312604020, "mass": 60 }, { "id": "bX", + "edID": 128049368, "eddbID": 822, "cost": 346407000, "mass": 60 @@ -237,6 +249,7 @@ } }, "asp": { + "edID": 128049303, "eddbID": 3, "properties": { "name": "Asp Explorer", @@ -257,30 +270,35 @@ "bulkheads": [ { "id": "BH", + "edID": 128049304, "eddbID": 778, "cost": 0, "mass": 0 }, { "id": "BI", + "edID": 128049305, "eddbID": 779, "cost": 2664460, "mass": 21 }, { "id": "BJ", + "edID": 128049306, "eddbID": 780, "cost": 5995040, "mass": 42 }, { "id": "BK", + "edID": 128049307, "eddbID": 781, "cost": 14168270, "mass": 42 }, { "id": "BL", + "edID": 128049308, "eddbID": 782, "cost": 15700340, "mass": 42 @@ -352,6 +370,7 @@ } }, "asp_scout": { + "edID": 128672276, "eddbID": 24, "properties": { "name": "Asp Scout", @@ -372,30 +391,35 @@ "bulkheads": [ { "id": "c1", + "edID": 128672278, "eddbID": 1503, "cost": 0, "mass": 0 }, { "id": "c2", + "edID": 128672279, "eddbID": 1504, "cost": 1584460, "mass": 21 }, { "id": "c3", + "edID": 128672280, "eddbID": 1505, "cost": 3565040, "mass": 42 }, { "id": "c4", + "edID": 128672281, "eddbID": 1506, "cost": 8425380, "mass": 42 }, { "id": "c5", + "edID": 128672282, "eddbID": 1507, "cost": 9336440, "mass": 42 @@ -455,6 +479,7 @@ } }, "cobra_mk_iii": { + "edID": 128049279, "eddbID": 4, "properties": { "name": "Cobra Mk III", @@ -475,30 +500,35 @@ "bulkheads": [ { "id": "bk", + "edID": 128049280, "eddbID": 763, "cost": 0, "mass": 0 }, { "id": "bl", + "edID": 128049281, "eddbID": 764, "cost": 151890, "mass": 14 }, { "id": "bm", + "edID": 128049282, "eddbID": 765, "cost": 341750, "mass": 27 }, { "id": "bn", + "edID": 128049283, "eddbID": 766, "cost": 797410, "mass": 27 }, { "id": "bo", + "edID": 128049284, "eddbID": 767, "cost": 895000, "mass": 27 @@ -560,6 +590,7 @@ } }, "cobra_mk_iv": { + "edID": 128672262, "eddbID": 29, "properties": { "name": "Cobra Mk IV", @@ -580,30 +611,35 @@ "bulkheads": [ { "id": "cg", + "edID": 128672264, "eddbID": 1518, "cost": 0, "mass": 0 }, { "id": "ch", + "edID": 128672265, "eddbID": 1519, "cost": 305890, "mass": 14 }, { "id": "ci", + "edID": 128672266, "eddbID": 1520, "cost": 688250, "mass": 27 }, { "id": "cj", + "edID": 128672267, "eddbID": 1521, "cost": 1605910, "mass": 27 }, { "id": "ck", + "edID": 128672268, "eddbID": 1522, "cost": 1802440, "mass": 27 @@ -671,6 +707,7 @@ } }, "diamondback_explorer": { + "edID": 128671831, "eddbID": 5, "properties": { "name": "Diamondback Explorer", @@ -691,30 +728,35 @@ "bulkheads": [ { "id": "ba", + "edID": 128671832, "eddbID": 1456, "cost": 0, "mass": 0 }, { "id": "bb", + "edID": 128671833, "eddbID": 1457, "cost": 800000, "mass": 23 }, { "id": "bc", + "edID": 128671834, "eddbID": 1458, "cost": 1800000, "mass": 47 }, { "id": "bd", + "edID": 128671835, "eddbID": 1459, "cost": 4200000, "mass": 26 }, { "id": "be", + "edID": 128671836, "eddbID": 1460, "cost": 4714000, "mass": 47 @@ -776,6 +818,7 @@ } }, "diamondback": { + "edID": 128671217, "eddbID": 6, "properties": { "name": "Diamondback Scout", @@ -796,30 +839,35 @@ "bulkheads": [ { "id": "b5", + "edID": 128671218, "eddbID": 1384, "cost": 0, "mass": 0 }, { "id": "b6", + "edID": 128671219, "eddbID": 1385, "cost": 225700, "mass": 13 }, { "id": "b7", + "edID": 128671220, "eddbID": 1386, "cost": 507900, "mass": 26 }, { "id": "b8", + "edID": 128671221, "eddbID": 1387, "cost": 1185100, "mass": 26 }, { "id": "b9", + "edID": 128671222, "eddbID": 1388, "cost": 1330100, "mass": 26 @@ -881,6 +929,7 @@ } }, "eagle": { + "edID": 128049255, "eddbID": 7, "properties": { "name": "Eagle", @@ -901,30 +950,35 @@ "bulkheads": [ { "id": "bY", + "edID": 128049256, "eddbID": 743, "cost": 0, "mass": 0 }, { "id": "bZ", + "edID": 128049257, "eddbID": 744, "cost": 26880, "mass": 4 }, { "id": "B0", + "edID": 128049258, "eddbID": 745, "cost": 90050, "mass": 8 }, { "id": "B1", + "edID": 128049259, "eddbID": 746, "cost": 140090, "mass": 8 }, { "id": "B2", + "edID": 128049260, "eddbID": 747, "cost": 150390, "mass": 8 @@ -976,6 +1030,7 @@ } }, "federal_assault_ship": { + "edID": 128672145, "eddbID": 8, "properties": { "name": "Federal Assault Ship", @@ -996,30 +1051,35 @@ "bulkheads": [ { "id": "bz", + "edID": 128672147, "eddbID": 1466, "cost": 0, "mass": 0 }, { "id": "bA", + "edID": 128672148, "eddbID": 1467, "cost": 7925680, "mass": 44 }, { "id": "bB", + "edID": 128672149, "eddbID": 1468, "cost": 17832780, "mass": 87 }, { "id": "bC", + "edID": 128672150, "eddbID": 1469, "cost": 42144810, "mass": 87 }, { "id": "bD", + "edID": 128672151, "eddbID": 1470, "cost": 46702080, "mass": 87 @@ -1085,6 +1145,7 @@ } }, "federal_corvette": { + "edID": 128049369, "eddbID": 25, "properties": { "name": "Federal Corvette", @@ -1105,30 +1166,35 @@ "bulkheads": [ { "id": "BW", + "edID": 128049370, "eddbID": 1498, "cost": 0, "mass": 0 }, { "id": "BX", + "edID": 128049371, "eddbID": 1499, "cost": 75187790, "mass": 30 }, { "id": "BY", + "edID": 128049372, "eddbID": 1500, "cost": 169172510, "mass": 60 }, { "id": "BZ", + "edID": 128049373, "eddbID": 1501, "cost": 399811020, "mass": 60 }, { "id": "c0", + "edID": 128049374, "eddbID": 1502, "cost": 443044000, "mass": 60 @@ -1216,6 +1282,7 @@ } }, "federal_dropship": { + "edID": 128049321, "eddbID": 9, "properties": { "name": "Federal Dropship", @@ -1236,30 +1303,35 @@ "bulkheads": [ { "id": "bE", + "edID": 128049322, "eddbID": 793, "cost": 0, "mass": 0 }, { "id": "bF", + "edID": 128049323, "eddbID": 794, "cost": 5725680, "mass": 44 }, { "id": "bG", + "edID": 128049324, "eddbID": 795, "cost": 12882780, "mass": 87 }, { "id": "bH", + "edID": 128049325, "eddbID": 796, "cost": 30446310, "mass": 87 }, { "id": "bI", + "edID": 128049326, "eddbID": 797, "cost": 33738580, "mass": 87 @@ -1329,6 +1401,7 @@ } }, "federal_gunship": { + "edID": 128672152, "eddbID": 10, "properties": { "name": "Federal Gunship", @@ -1349,30 +1422,35 @@ "bulkheads": [ { "id": "bJ", + "edID": 128672154, "eddbID": 1471, "cost": 0, "mass": 0 }, { "id": "bK", + "edID": 128672155, "eddbID": 1472, "cost": 14325690, "mass": 44 }, { "id": "bL", + "edID": 128672156, "eddbID": 1473, "cost": 32232790, "mass": 87 }, { "id": "bM", + "edID": 128672157, "eddbID": 1474, "cost": 76176810, "mass": 87 }, { "id": "bN", + "edID": 128672158, "eddbID": 1475, "cost": 84414090, "mass": 87 @@ -1442,6 +1520,7 @@ } }, "fer_de_lance": { + "edID": 128049351, "eddbID": 11, "properties": { "name": "Fer-de-Lance", @@ -1462,30 +1541,35 @@ "bulkheads": [ { "id": "Bd", + "edID": 128049352, "eddbID": 813, "cost": 0, "mass": 0 }, { "id": "Be", + "edID": 128049353, "eddbID": 814, "cost": 20626820, "mass": 19 }, { "id": "Bf", + "edID": 128049354, "eddbID": 815, "cost": 46410340, "mass": 38 }, { "id": "Bg", + "edID": 128049355, "eddbID": 816, "cost": 109683090, "mass": 38 }, { "id": "Bh", + "edID": 128049356, "eddbID": 817, "cost": 121543510, "mass": 38 @@ -1555,6 +1639,7 @@ } }, "hauler": { + "edID": 128049261, "eddbID": 12, "properties": { "name": "Hauler", @@ -1575,30 +1660,35 @@ "bulkheads": [ { "id": "Bi", + "edID": 128049262, "eddbID": 748, "cost": 0, "mass": 0 }, { "id": "Bj", + "edID": 128049263, "eddbID": 749, "cost": 42180, "mass": 1 }, { "id": "Bk", + "edID": 128049264, "eddbID": 750, "cost": 185050, "mass": 2 }, { "id": "Bl", + "edID": 128049265, "eddbID": 751, "cost": 270300, "mass": 2 }, { "id": "Bm", + "edID": 128049266, "eddbID": 752, "cost": 282420, "mass": 2 @@ -1650,6 +1740,7 @@ } }, "imperial_clipper": { + "edID": 128049315, "eddbID": 13, "properties": { "name": "Imperial Clipper", @@ -1670,30 +1761,35 @@ "bulkheads": [ { "id": "bp", + "edID": 128049316, "eddbID": 788, "cost": 0, "mass": 0 }, { "id": "bq", + "edID": 128049317, "eddbID": 789, "cost": 8918340, "mass": 30 }, { "id": "br", + "edID": 128049318, "eddbID": 790, "cost": 20066270, "mass": 60 }, { "id": "bs", + "edID": 128049319, "eddbID": 791, "cost": 47423290, "mass": 60 }, { "id": "bt", + "edID": 128049320, "eddbID": 792, "cost": 52551340, "mass": 60 @@ -1763,6 +1859,7 @@ } }, "imperial_courier": { + "edID": 128671223, "eddbID": 14, "properties": { "name": "Imperial Courier", @@ -1783,30 +1880,35 @@ "bulkheads": [ { "id": "bf", + "edID": 128671224, "eddbID": 1389, "cost": 0, "mass": 0 }, { "id": "bg", + "edID": 128671225, "eddbID": 1390, "cost": 1017200, "mass": 4 }, { "id": "bh", + "edID": 128671226, "eddbID": 1391, "cost": 2288600, "mass": 8 }, { "id": "bi", + "edID": 128671227, "eddbID": 1392, "cost": 5408800, "mass": 8 }, { "id": "bj", + "edID": 128671228, "eddbID": 1393, "cost": 5993700, "mass": 8 @@ -1870,6 +1972,7 @@ } }, "imperial_cutter": { + "edID": 128049375, "eddbID": 26, "properties": { "name": "Imperial Cutter", @@ -1890,30 +1993,35 @@ "bulkheads": [ { "id": "BR", + "edID": 128049376, "eddbID": 1493, "cost": 0, "mass": 0 }, { "id": "BS", + "edID": 128049377, "eddbID": 1494, "cost": 83587790, "mass": 30 }, { "id": "BT", + "edID": 128049378, "eddbID": 1495, "cost": 188072510, "mass": 60 }, { "id": "BU", + "edID": 128049379, "eddbID": 1496, "cost": 444478020, "mass": 60 }, { "id": "BV", + "edID": 128049380, "eddbID": 1497, "cost": 492541000, "mass": 60 @@ -1999,6 +2107,7 @@ } }, "imperial_eagle": { + "edID": 128672138, "eddbID": 15, "properties": { "name": "Imperial Eagle", @@ -2019,30 +2128,35 @@ "bulkheads": [ { "id": "bu", + "edID": 128672140, "eddbID": 1461, "cost": 0, "mass": 0 }, { "id": "bv", + "edID": 128672141, "eddbID": 1462, "cost": 66500, "mass": 4 }, { "id": "bw", + "edID": 128672142, "eddbID": 1463, "cost": 222760, "mass": 8 }, { "id": "bx", + "edID": 128672143, "eddbID": 1464, "cost": 346550, "mass": 8 }, { "id": "by", + "edID": 128672144, "eddbID": 1465, "cost": 372040, "mass": 8 @@ -2096,6 +2210,7 @@ } }, "keelback": { + "edID": 128672269, "eddbID": 27, "properties": { "name": "Keelback", @@ -2116,30 +2231,35 @@ "bulkheads": [ { "id": "cb", + "edID": 128672271, "eddbID": 1513, "cost": 0, "mass": 0 }, { "id": "cc", + "edID": 128672272, "eddbID": 1514, "cost": 1250460, "mass": 12 }, { "id": "cd", + "edID": 128672273, "eddbID": 1515, "cost": 2813540, "mass": 23 }, { "id": "ce", + "edID": 128672274, "eddbID": 1516, "cost": 6649330, "mass": 23 }, { "id": "cf", + "edID": 128672275, "eddbID": 1517, "cost": 7368340, "mass": 23 @@ -2203,6 +2323,7 @@ } }, "orca": { + "edID": 128049327, "eddbID": 16, "properties": { "name": "Orca", @@ -2223,30 +2344,35 @@ "bulkheads": [ { "id": "BM", + "edID": 128049328, "eddbID": 798, "cost": 0, "mass": 0 }, { "id": "BN", + "edID": 128049329, "eddbID": 799, "cost": 19415950, "mass": 21 }, { "id": "BO", + "edID": 128049330, "eddbID": 800, "cost": 43685900, "mass": 87 }, { "id": "BP", + "edID": 128049331, "eddbID": 801, "cost": 103244340, "mass": 87 }, { "id": "BQ", + "edID": 128049332, "eddbID": 802, "cost": 114408510, "mass": 87 @@ -2326,6 +2452,7 @@ } }, "python": { + "edID": 128049339, "eddbID": 17, "properties": { "name": "Python", @@ -2346,30 +2473,35 @@ "bulkheads": [ { "id": "bO", + "edID": 128049340, "eddbID": 808, "cost": 0, "mass": 0 }, { "id": "bP", + "edID": 128049341, "eddbID": 809, "cost": 22791270, "mass": 26 }, { "id": "bQ", + "edID": 128049342, "eddbID": 810, "cost": 51280360, "mass": 53 }, { "id": "bR", + "edID": 128049343, "eddbID": 811, "cost": 121192590, "mass": 53 }, { "id": "bS", + "edID": 128049344, "eddbID": 812, "cost": 134297570, "mass": 53 @@ -2443,6 +2575,7 @@ } }, "sidewinder": { + "edID": 128049249, "eddbID": 18, "properties": { "name": "Sidewinder", @@ -2463,30 +2596,35 @@ "bulkheads": [ { "id": "b0", + "edID": 128049250, "eddbID": 738, "cost": 0, "mass": 0 }, { "id": "b1", + "edID": 128049251, "eddbID": 739, "cost": 25600, "mass": 2 }, { "id": "b2", + "edID": 128049252, "eddbID": 740, "cost": 80320, "mass": 4 }, { "id": "b3", + "edID": 128049253, "eddbID": 741, "cost": 132060, "mass": 4 }, { "id": "b4", + "edID": 128049254, "eddbID": 742, "cost": 139420, "mass": 4 @@ -2538,6 +2676,7 @@ } }, "type_6_transporter": { + "edID": 128049285, "eddbID": 19, "properties": { "name": "Type-6 Transporter", @@ -2558,30 +2697,35 @@ "bulkheads": [ { "id": "Bn", + "edID": 128049286, "eddbID": 768, "cost": 0, "mass": 0 }, { "id": "Bo", + "edID": 128049287, "eddbID": 769, "cost": 418380, "mass": 12 }, { "id": "Bp", + "edID": 128049288, "eddbID": 770, "cost": 941350, "mass": 23 }, { "id": "Bq", + "edID": 128049289, "eddbID": 771, "cost": 2224730, "mass": 23 }, { "id": "Br", + "edID": 128049290, "eddbID": 772, "cost": 2465290, "mass": 23 @@ -2643,6 +2787,7 @@ } }, "type_7_transport": { + "edID": 128049297, "eddbID": 20, "properties": { "name": "Type-7 Transporter", @@ -2663,30 +2808,35 @@ "bulkheads": [ { "id": "Bs", + "edID": 128049298, "eddbID": 773, "cost": 0, "mass": 0 }, { "id": "Bt", + "edID": 128049299, "eddbID": 774, "cost": 6988900, "mass": 32 }, { "id": "Bu", + "edID": 128049300, "eddbID": 775, "cost": 15725030, "mass": 63 }, { "id": "Bv", + "edID": 128049301, "eddbID": 776, "cost": 37163480, "mass": 63 }, { "id": "Bw", + "edID": 128049302, "eddbID": 777, "cost": 41182100, "mass": 63 @@ -2756,6 +2906,7 @@ } }, "type_9_heavy": { + "edID": 128049333, "eddbID": 21, "properties": { "name": "Type-9 Heavy", @@ -2776,30 +2927,35 @@ "bulkheads": [ { "id": "cl", + "edID": 128049334, "eddbID": 803, "cost": 0, "mass": 0 }, { "id": "cm", + "edID": 128049335, "eddbID": 804, "cost": 30622340, "mass": 75 }, { "id": "cn", + "edID": 128049336, "eddbID": 805, "cost": 68900260, "mass": 150 }, { "id": "co", + "edID": 128049337, "eddbID": 806, "cost": 162834280, "mass": 150 }, { "id": "cp", + "edID": 128049338, "eddbID": 807, "cost": 180442120, "mass": 150 @@ -2873,6 +3029,7 @@ } }, "viper": { + "edID": 128049273, "eddbID": 22, "properties": { "name": "Viper", @@ -2893,30 +3050,35 @@ "bulkheads": [ { "id": "B3", + "edID": 128049274, "eddbID": 758, "cost": 0, "mass": 0 }, { "id": "B4", + "edID": 128049275, "eddbID": 759, "cost": 57170, "mass": 5 }, { "id": "B5", + "edID": 128049276, "eddbID": 760, "cost": 128640, "mass": 9 }, { "id": "B6", + "edID": 128049277, "eddbID": 761, "cost": 304010, "mass": 9 }, { "id": "B7", + "edID": 128049278, "eddbID": 762, "cost": 336890, "mass": 9 @@ -2974,6 +3136,7 @@ } }, "viper_mk_iv": { + "edID": 128672255, "eddbID": 28, "properties": { "name": "Viper Mk IV", @@ -2994,30 +3157,35 @@ "bulkheads": [ { "id": "c6", + "edID": 128672257, "eddbID": 1508, "cost": 0, "mass": 0 }, { "id": "c7", + "edID": 128672258, "eddbID": 1509, "cost": 175180, "mass": 5 }, { "id": "c8", + "edID": 128672259, "eddbID": 1510, "cost": 394140, "mass": 9 }, { "id": "c9", + "edID": 128672260, "eddbID": 1511, "cost": 931490, "mass": 9 }, { "id": "ca", + "edID": 128672261, "eddbID": 1512, "cost": 1033210, "mass": 9 @@ -3079,6 +3247,7 @@ } }, "vulture": { + "edID": 128049309, "eddbID": 23, "properties": { "name": "Vulture", @@ -3099,30 +3268,35 @@ "bulkheads": [ { "id": "B8", + "edID": 128049310, "eddbID": 783, "cost": 0, "mass": 0 }, { "id": "B9", + "edID": 128049311, "eddbID": 784, "cost": 1970250, "mass": 17 }, { "id": "Ba", + "edID": 128049312, "eddbID": 785, "cost": 4433050, "mass": 35 }, { "id": "Bb", + "edID": 128049313, "eddbID": 786, "cost": 10476780, "mass": 35 }, { "id": "Bc", + "edID": 128049314, "eddbID": 787, "cost": 11609670, "mass": 35 @@ -6782,6 +6956,7 @@ }, { "id": "cy", + "edID": 128671449, "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json index a0e86c0..77b440c 100755 --- a/modules/hardpoints/burst_laser.json +++ b/modules/hardpoints/burst_laser.json @@ -12,6 +12,6 @@ { "id": "12", "edID": 128049404, "eddbID": 835, "grp": "ul", "class": 1, "rating": "G", "cost": 8600, "mass": 2, "power": 0.64, "mount": "G", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.7, "dps": 3, "mjdps" : 7.95, "mjeps" : 1.40, "ssdam" : 4.53, "thermload": 1 }, { "id": "13", "edID": 128049407, "eddbID": 838, "grp": "ul", "class": 1, "rating": "G", "cost": 52800, "mass": 2, "power": 0.6, "mount": "T", "type": "T", "damage": 1, "armourpen": "B", "rof": 1.3, "dps": 2, "mjdps" : 2.98, "mjeps" : 0.63, "ssdam" : 2.24, "thermload": 1 }, - { "id": "cy", "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", "class": 1, "rating": "F", "cost": 8800, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "thermload": 1 } + { "id": "cy", "edID": 128671449, "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", "class": 1, "rating": "F", "cost": 8800, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "thermload": 1 } ] } \ No newline at end of file diff --git a/ships/adder.json b/ships/adder.json index ce5b38b..9f08315 100755 --- a/ships/adder.json +++ b/ships/adder.json @@ -1,5 +1,6 @@ { "adder": { + "edID": 128049267, "eddbID": 1, "properties": { "name": "Adder", @@ -18,11 +19,11 @@ }, "retailCost": 87810, "bulkheads": [ - { "id": "Bx", "eddbID": 753, "cost": 0, "mass": 0 }, - { "id": "By", "eddbID": 754, "cost": 30622340, "mass": 75 }, - { "id": "Bz", "eddbID": 755, "cost": 68900260, "mass": 150 }, - { "id": "BA", "eddbID": 756, "cost": 162834280, "mass": 150 }, - { "id": "BB", "eddbID": 757, "cost": 180442120, "mass": 150 } + { "id": "Bx", "edID": 128049268, "eddbID": 753, "cost": 0, "mass": 0 }, + { "id": "By", "edID": 128049269, "eddbID": 754, "cost": 30622340, "mass": 75 }, + { "id": "Bz", "edID": 128049270, "eddbID": 755, "cost": 68900260, "mass": 150 }, + { "id": "BA", "edID": 128049271, "eddbID": 756, "cost": 162834280, "mass": 150 }, + { "id": "BB", "edID": 128049272, "eddbID": 757, "cost": 180442120, "mass": 150 } ], "slots": { "standard": [3, 3, 3, 1, 2, 3, 3], diff --git a/ships/anaconda.json b/ships/anaconda.json index 4519ba1..93864e8 100755 --- a/ships/anaconda.json +++ b/ships/anaconda.json @@ -1,5 +1,6 @@ { "anaconda": { + "edID": 128049363, "eddbID": 2, "properties": { "name": "Anaconda", @@ -18,11 +19,11 @@ }, "retailCost": 146969450, "bulkheads": [ - { "id": "bT", "eddbID": 818, "cost": 0, "mass": 0 }, - { "id": "bU", "eddbID": 819, "cost": 58787780, "mass": 30 }, - { "id": "bV", "eddbID": 820, "cost": 132272510, "mass": 60 }, - { "id": "bW", "eddbID": 821, "cost": 312604020, "mass": 60 }, - { "id": "bX", "eddbID": 822, "cost": 346407000, "mass": 60 } + { "id": "bT", "edID": 128049364, "eddbID": 818, "cost": 0, "mass": 0 }, + { "id": "bU", "edID": 128049365, "eddbID": 819, "cost": 58787780, "mass": 30 }, + { "id": "bV", "edID": 128049366, "eddbID": 820, "cost": 132272510, "mass": 60 }, + { "id": "bW", "edID": 128049367, "eddbID": 821, "cost": 312604020, "mass": 60 }, + { "id": "bX", "edID": 128049368, "eddbID": 822, "cost": 346407000, "mass": 60 } ], "slots": { "standard": [8, 7, 6, 5, 8, 8, 5], diff --git a/ships/asp.json b/ships/asp.json index 8951b0b..ea02f11 100755 --- a/ships/asp.json +++ b/ships/asp.json @@ -1,5 +1,6 @@ { "asp": { + "edID": 128049303, "eddbID": 3, "properties": { "name": "Asp Explorer", @@ -18,11 +19,11 @@ }, "retailCost": 6661150, "bulkheads": [ - { "id": "BH", "eddbID": 778, "cost": 0, "mass": 0 }, - { "id": "BI", "eddbID": 779, "cost": 2664460, "mass": 21 }, - { "id": "BJ", "eddbID": 780, "cost": 5995040, "mass": 42 }, - { "id": "BK", "eddbID": 781, "cost": 14168270, "mass": 42 }, - { "id": "BL", "eddbID": 782, "cost": 15700340, "mass": 42 } + { "id": "BH", "edID": 128049304, "eddbID": 778, "cost": 0, "mass": 0 }, + { "id": "BI", "edID": 128049305, "eddbID": 779, "cost": 2664460, "mass": 21 }, + { "id": "BJ", "edID": 128049306, "eddbID": 780, "cost": 5995040, "mass": 42 }, + { "id": "BK", "edID": 128049307, "eddbID": 781, "cost": 14168270, "mass": 42 }, + { "id": "BL", "edID": 128049308, "eddbID": 782, "cost": 15700340, "mass": 42 } ], "slots": { "standard": [5, 5, 5, 4, 4, 5, 5], diff --git a/ships/asp_scout.json b/ships/asp_scout.json index 7e49cfa..a19187b 100644 --- a/ships/asp_scout.json +++ b/ships/asp_scout.json @@ -1,6 +1,6 @@ { "asp_scout": { - "eddbID": 24, + "edID": 128672276, "eddbID": 24, "properties": { "name": "Asp Scout", "manufacturer": "Lakon", @@ -18,11 +18,11 @@ }, "retailCost": 3961150, "bulkheads": [ - { "id": "c1", "eddbID": 1503, "cost": 0, "mass": 0 }, - { "id": "c2", "eddbID": 1504, "cost": 1584460, "mass": 21 }, - { "id": "c3", "eddbID": 1505, "cost": 3565040, "mass": 42 }, - { "id": "c4", "eddbID": 1506, "cost": 8425380, "mass": 42 }, - { "id": "c5", "eddbID": 1507, "cost": 9336440, "mass": 42 } + { "id": "c1", "edID": 128672278, "eddbID": 1503, "cost": 0, "mass": 0 }, + { "id": "c2", "edID": 128672279, "eddbID": 1504, "cost": 1584460, "mass": 21 }, + { "id": "c3", "edID": 128672280, "eddbID": 1505, "cost": 3565040, "mass": 42 }, + { "id": "c4", "edID": 128672281, "eddbID": 1506, "cost": 8425380, "mass": 42 }, + { "id": "c5", "edID": 128672282, "eddbID": 1507, "cost": 9336440, "mass": 42 } ], "slots": { "standard": [4, 4, 4, 3, 4, 4, 4], diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json index 84c9d7d..5668639 100755 --- a/ships/cobra_mk_iii.json +++ b/ships/cobra_mk_iii.json @@ -1,5 +1,6 @@ { "cobra_mk_iii": { + "edID": 128049279, "eddbID": 4, "properties": { "name": "Cobra Mk III", @@ -18,11 +19,11 @@ }, "retailCost": 349720, "bulkheads": [ - { "id": "bk", "eddbID": 763, "cost": 0, "mass": 0 }, - { "id": "bl", "eddbID": 764, "cost": 151890, "mass": 14 }, - { "id": "bm", "eddbID": 765, "cost": 341750, "mass": 27 }, - { "id": "bn", "eddbID": 766, "cost": 797410, "mass": 27 }, - { "id": "bo", "eddbID": 767, "cost": 895000, "mass": 27 } + { "id": "bk", "edID": 128049280, "eddbID": 763, "cost": 0, "mass": 0 }, + { "id": "bl", "edID": 128049281, "eddbID": 764, "cost": 151890, "mass": 14 }, + { "id": "bm", "edID": 128049282, "eddbID": 765, "cost": 341750, "mass": 27 }, + { "id": "bn", "edID": 128049283, "eddbID": 766, "cost": 797410, "mass": 27 }, + { "id": "bo", "edID": 128049284, "eddbID": 767, "cost": 895000, "mass": 27 } ], "slots": { "standard": [4, 4, 4, 3, 3, 3, 4], diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json index 153f6a5..3c25ac2 100644 --- a/ships/cobra_mk_iv.json +++ b/ships/cobra_mk_iv.json @@ -1,5 +1,6 @@ { "cobra_mk_iv": { + "edID": 128672262, "eddbID": 29, "properties": { "name": "Cobra Mk IV", @@ -18,11 +19,11 @@ }, "retailCost": 747660, "bulkheads": [ - { "id": "cg", "eddbID": 1518, "cost": 0, "mass": 0 }, - { "id": "ch", "eddbID": 1519, "cost": 305890, "mass": 14 }, - { "id": "ci", "eddbID": 1520, "cost": 688250, "mass": 27 }, - { "id": "cj", "eddbID": 1521, "cost": 1605910, "mass": 27 }, - { "id": "ck", "eddbID": 1522, "cost": 1802440, "mass": 27 } + { "id": "cg", "edID": 128672264, "eddbID": 1518, "cost": 0, "mass": 0 }, + { "id": "ch", "edID": 128672265, "eddbID": 1519, "cost": 305890, "mass": 14 }, + { "id": "ci", "edID": 128672266, "eddbID": 1520, "cost": 688250, "mass": 27 }, + { "id": "cj", "edID": 128672267, "eddbID": 1521, "cost": 1605910, "mass": 27 }, + { "id": "ck", "edID": 128672268, "eddbID": 1522, "cost": 1802440, "mass": 27 } ], "slots": { "standard": [4, 4, 4, 3, 3, 3, 4], diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json index a0d8955..debd123 100644 --- a/ships/diamondback_explorer.json +++ b/ships/diamondback_explorer.json @@ -1,6 +1,6 @@ { "diamondback_explorer": { - "eddbID": 5, + "edID": 128671831, "eddbID": 5, "properties": { "name": "Diamondback Explorer", "manufacturer": "Lakon", @@ -18,11 +18,11 @@ }, "retailCost": 1894760, "bulkheads": [ - { "id": "ba", "eddbID": 1456, "cost": 0, "mass": 0 }, - { "id": "bb", "eddbID": 1457, "cost": 800000, "mass": 23 }, - { "id": "bc", "eddbID": 1458, "cost": 1800000, "mass": 47 }, - { "id": "bd", "eddbID": 1459, "cost": 4200000, "mass": 26 }, - { "id": "be", "eddbID": 1460, "cost": 4714000, "mass": 47 } + { "id": "ba", "edID": 128671832, "eddbID": 1456, "cost": 0, "mass": 0 }, + { "id": "bb", "edID": 128671833, "eddbID": 1457, "cost": 800000, "mass": 23 }, + { "id": "bc", "edID": 128671834, "eddbID": 1458, "cost": 1800000, "mass": 47 }, + { "id": "bd", "edID": 128671835, "eddbID": 1459, "cost": 4200000, "mass": 26 }, + { "id": "be", "edID": 128671836, "eddbID": 1460, "cost": 4714000, "mass": 47 } ], "slots": { "standard": [ 4, 4, 5, 3, 4, 3, 5], diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json index 4b90931..5fbadde 100644 --- a/ships/diamondback_scout.json +++ b/ships/diamondback_scout.json @@ -1,5 +1,6 @@ { "diamondback": { + "edID": 128671217, "eddbID": 6, "properties": { "name": "Diamondback Scout", @@ -18,11 +19,11 @@ }, "retailCost": 564330, "bulkheads": [ - { "id": "b5", "eddbID": 1384, "cost": 0, "mass": 0 }, - { "id": "b6", "eddbID": 1385, "cost": 225700, "mass": 13 }, - { "id": "b7", "eddbID": 1386, "cost": 507900, "mass": 26 }, - { "id": "b8", "eddbID": 1387, "cost": 1185100, "mass": 26 }, - { "id": "b9", "eddbID": 1388, "cost": 1330100, "mass": 26 } + { "id": "b5", "edID": 128671218, "eddbID": 1384, "cost": 0, "mass": 0 }, + { "id": "b6", "edID": 128671219, "eddbID": 1385, "cost": 225700, "mass": 13 }, + { "id": "b7", "edID": 128671220, "eddbID": 1386, "cost": 507900, "mass": 26 }, + { "id": "b8", "edID": 128671221, "eddbID": 1387, "cost": 1185100, "mass": 26 }, + { "id": "b9", "edID": 128671222, "eddbID": 1388, "cost": 1330100, "mass": 26 } ], "slots": { "standard": [ 4, 4, 4, 2, 3, 2, 4], diff --git a/ships/eagle.json b/ships/eagle.json index df89f6f..787e2dd 100755 --- a/ships/eagle.json +++ b/ships/eagle.json @@ -1,5 +1,6 @@ { "eagle": { + "edID": 128049255, "eddbID": 7, "properties": { "name": "Eagle", @@ -18,11 +19,11 @@ }, "retailCost": 44800, "bulkheads": [ - { "id": "bY", "eddbID": 743, "cost": 0, "mass": 0 }, - { "id": "bZ", "eddbID": 744, "cost": 26880, "mass": 4 }, - { "id": "B0", "eddbID": 745, "cost": 90050, "mass": 8 }, - { "id": "B1", "eddbID": 746, "cost": 140090, "mass": 8 }, - { "id": "B2", "eddbID": 747, "cost": 150390, "mass": 8 } + { "id": "bY", "edID": 128049256, "eddbID": 743, "cost": 0, "mass": 0 }, + { "id": "bZ", "edID": 128049257, "eddbID": 744, "cost": 26880, "mass": 4 }, + { "id": "B0", "edID": 128049258, "eddbID": 745, "cost": 90050, "mass": 8 }, + { "id": "B1", "edID": 128049259, "eddbID": 746, "cost": 140090, "mass": 8 }, + { "id": "B2", "edID": 128049260, "eddbID": 747, "cost": 150390, "mass": 8 } ], "slots": { "standard": [2, 3, 3, 1, 2, 2, 2], diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json index fed8758..815f33d 100644 --- a/ships/federal_assault_ship.json +++ b/ships/federal_assault_ship.json @@ -1,6 +1,6 @@ { "federal_assault_ship": { - "eddbID": 8, + "edID": 128672145, "eddbID": 8, "properties": { "name": "Federal Assault Ship", "manufacturer": "Core Dynamics", @@ -18,11 +18,11 @@ }, "retailCost": 19814210, "bulkheads": [ - { "id": "bz", "eddbID": 1466, "cost": 0, "mass": 0 }, - { "id": "bA", "eddbID": 1467, "cost": 7925680, "mass": 44 }, - { "id": "bB", "eddbID": 1468, "cost": 17832780, "mass": 87 }, - { "id": "bC", "eddbID": 1469, "cost": 42144810, "mass": 87 }, - { "id": "bD", "eddbID": 1470, "cost": 46702080, "mass": 87 } + { "id": "bz", "edID": 128672147, "eddbID": 1466, "cost": 0, "mass": 0 }, + { "id": "bA", "edID": 128672148, "eddbID": 1467, "cost": 7925680, "mass": 44 }, + { "id": "bB", "edID": 128672149, "eddbID": 1468, "cost": 17832780, "mass": 87 }, + { "id": "bC", "edID": 128672150, "eddbID": 1469, "cost": 42144810, "mass": 87 }, + { "id": "bD", "edID": 128672151, "eddbID": 1470, "cost": 46702080, "mass": 87 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json index a6e226e..8475a92 100644 --- a/ships/federal_corvette.json +++ b/ships/federal_corvette.json @@ -1,5 +1,6 @@ { "federal_corvette": { + "edID": 128049369, "eddbID": 25, "properties": { "name": "Federal Corvette", @@ -18,11 +19,11 @@ }, "retailCost": 187969450, "bulkheads": [ - { "id": "BW", "eddbID": 1498, "cost": 0, "mass": 0 }, - { "id": "BX", "eddbID": 1499, "cost": 75187790, "mass": 30 }, - { "id": "BY", "eddbID": 1500, "cost": 169172510, "mass": 60 }, - { "id": "BZ", "eddbID": 1501, "cost": 399811020, "mass": 60 }, - { "id": "c0", "eddbID": 1502, "cost": 443044000, "mass": 60 } + { "id": "BW", "edID": 128049370, "eddbID": 1498, "cost": 0, "mass": 0 }, + { "id": "BX", "edID": 128049371, "eddbID": 1499, "cost": 75187790, "mass": 30 }, + { "id": "BY", "edID": 128049372, "eddbID": 1500, "cost": 169172510, "mass": 60 }, + { "id": "BZ", "edID": 128049373, "eddbID": 1501, "cost": 399811020, "mass": 60 }, + { "id": "c0", "edID": 128049374, "eddbID": 1502, "cost": 443044000, "mass": 60 } ], "slots": { "standard": [8, 7, 6, 5, 8, 8, 5], diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json index 5cc4ae1..7108562 100755 --- a/ships/federal_dropship.json +++ b/ships/federal_dropship.json @@ -1,5 +1,6 @@ { "federal_dropship": { + "edID": 128049321, "eddbID": 9, "properties": { "name": "Federal Dropship", @@ -18,11 +19,11 @@ }, "retailCost": 14314210, "bulkheads": [ - { "id": "bE", "eddbID": 793, "cost": 0, "mass": 0 }, - { "id": "bF", "eddbID": 794, "cost": 5725680, "mass": 44 }, - { "id": "bG", "eddbID": 795, "cost": 12882780, "mass": 87 }, - { "id": "bH", "eddbID": 796, "cost": 30446310, "mass": 87 }, - { "id": "bI", "eddbID": 797, "cost": 33738580, "mass": 87 } + { "id": "bE", "edID": 128049322, "eddbID": 793, "cost": 0, "mass": 0 }, + { "id": "bF", "edID": 128049323, "eddbID": 794, "cost": 5725680, "mass": 44 }, + { "id": "bG", "edID": 128049324, "eddbID": 795, "cost": 12882780, "mass": 87 }, + { "id": "bH", "edID": 128049325, "eddbID": 796, "cost": 30446310, "mass": 87 }, + { "id": "bI", "edID": 128049326, "eddbID": 797, "cost": 33738580, "mass": 87 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json index d0c216f..41af475 100644 --- a/ships/federal_gunship.json +++ b/ships/federal_gunship.json @@ -1,5 +1,6 @@ { "federal_gunship": { + "edID": 128672152, "eddbID": 10, "properties": { "name": "Federal Gunship", @@ -18,11 +19,11 @@ }, "retailCost": 35814210, "bulkheads": [ - { "id": "bJ", "eddbID": 1471, "cost": 0, "mass": 0 }, - { "id": "bK", "eddbID": 1472, "cost": 14325690, "mass": 44 }, - { "id": "bL", "eddbID": 1473, "cost": 32232790, "mass": 87 }, - { "id": "bM", "eddbID": 1474, "cost": 76176810, "mass": 87 }, - { "id": "bN", "eddbID": 1475, "cost": 84414090, "mass": 87 } + { "id": "bJ", "edID": 128672154, "eddbID": 1471, "cost": 0, "mass": 0 }, + { "id": "bK", "edID": 128672155, "eddbID": 1472, "cost": 14325690, "mass": 44 }, + { "id": "bL", "edID": 128672156, "eddbID": 1473, "cost": 32232790, "mass": 87 }, + { "id": "bM", "edID": 128672157, "eddbID": 1474, "cost": 76176810, "mass": 87 }, + { "id": "bN", "edID": 128672158, "eddbID": 1475, "cost": 84414090, "mass": 87 } ], "slots": { "standard": [6, 6, 5, 5, 7, 5, 4], diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json index eac8746..50fc2cd 100755 --- a/ships/fer_de_lance.json +++ b/ships/fer_de_lance.json @@ -1,5 +1,6 @@ { "fer_de_lance": { + "edID": 128049351, "eddbID": 11, "properties": { "name": "Fer-de-Lance", @@ -18,11 +19,11 @@ }, "retailCost": 51567040, "bulkheads": [ - { "id": "Bd", "eddbID": 813, "cost": 0, "mass": 0 }, - { "id": "Be", "eddbID": 814, "cost": 20626820, "mass": 19 }, - { "id": "Bf", "eddbID": 815, "cost": 46410340, "mass": 38 }, - { "id": "Bg", "eddbID": 816, "cost": 109683090, "mass": 38 }, - { "id": "Bh", "eddbID": 817, "cost": 121543510, "mass": 38 } + { "id": "Bd", "edID": 128049352, "eddbID": 813, "cost": 0, "mass": 0 }, + { "id": "Be", "edID": 128049353, "eddbID": 814, "cost": 20626820, "mass": 19 }, + { "id": "Bf", "edID": 128049354, "eddbID": 815, "cost": 46410340, "mass": 38 }, + { "id": "Bg", "edID": 128049355, "eddbID": 816, "cost": 109683090, "mass": 38 }, + { "id": "Bh", "edID": 128049356, "eddbID": 817, "cost": 121543510, "mass": 38 } ], "slots": { "standard": [6, 5, 4, 4, 6, 4, 3], diff --git a/ships/hauler.json b/ships/hauler.json index 86065bd..79a4da9 100755 --- a/ships/hauler.json +++ b/ships/hauler.json @@ -1,5 +1,6 @@ { "hauler": { + "edID": 128049261, "eddbID": 12, "properties": { "name": "Hauler", @@ -18,11 +19,11 @@ }, "retailCost": 52720, "bulkheads": [ - { "id": "Bi", "eddbID": 748, "cost": 0, "mass": 0 }, - { "id": "Bj", "eddbID": 749, "cost": 42180, "mass": 1 }, - { "id": "Bk", "eddbID": 750, "cost": 185050, "mass": 2 }, - { "id": "Bl", "eddbID": 751, "cost": 270300, "mass": 2 }, - { "id": "Bm", "eddbID": 752, "cost": 282420, "mass": 2 } + { "id": "Bi", "edID": 128049262, "eddbID": 748, "cost": 0, "mass": 0 }, + { "id": "Bj", "edID": 128049263, "eddbID": 749, "cost": 42180, "mass": 1 }, + { "id": "Bk", "edID": 128049264, "eddbID": 750, "cost": 185050, "mass": 2 }, + { "id": "Bl", "edID": 128049265, "eddbID": 751, "cost": 270300, "mass": 2 }, + { "id": "Bm", "edID": 128049266, "eddbID": 752, "cost": 282420, "mass": 2 } ], "slots": { "standard": [2, 2, 2, 1, 1, 1, 2], diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json index ad7b3e7..b7565d2 100755 --- a/ships/imperial_clipper.json +++ b/ships/imperial_clipper.json @@ -1,5 +1,6 @@ { "imperial_clipper": { + "edID": 128049315, "eddbID": 13, "properties": { "name": "Imperial Clipper", @@ -18,11 +19,11 @@ }, "retailCost": 22296860, "bulkheads": [ - { "id": "bp", "eddbID": 788, "cost": 0, "mass": 0 }, - { "id": "bq", "eddbID": 789, "cost": 8918340, "mass": 30 }, - { "id": "br", "eddbID": 790, "cost": 20066270, "mass": 60 }, - { "id": "bs", "eddbID": 791, "cost": 47423290, "mass": 60 }, - { "id": "bt", "eddbID": 792, "cost": 52551340, "mass": 60 } + { "id": "bp", "edID": 128049316, "eddbID": 788, "cost": 0, "mass": 0 }, + { "id": "bq", "edID": 128049317, "eddbID": 789, "cost": 8918340, "mass": 30 }, + { "id": "br", "edID": 128049318, "eddbID": 790, "cost": 20066270, "mass": 60 }, + { "id": "bs", "edID": 128049319, "eddbID": 791, "cost": 47423290, "mass": 60 }, + { "id": "bt", "edID": 128049320, "eddbID": 792, "cost": 52551340, "mass": 60 } ], "slots": { "standard": [6, 6, 5, 5, 6, 5, 4], diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json index 409d53d..6f7cd11 100644 --- a/ships/imperial_courier.json +++ b/ships/imperial_courier.json @@ -1,6 +1,6 @@ { "imperial_courier": { - "eddbID": 14, + "edID": 128671223, "eddbID": 14, "properties": { "name": "Imperial Courier", "manufacturer": "Gutamaya", @@ -18,11 +18,11 @@ }, "retailCost": 2542930, "bulkheads": [ - { "id": "bf", "eddbID": 1389, "cost": 0, "mass": 0 }, - { "id": "bg", "eddbID": 1390, "cost": 1017200, "mass": 4 }, - { "id": "bh", "eddbID": 1391, "cost": 2288600, "mass": 8 }, - { "id": "bi", "eddbID": 1392, "cost": 5408800, "mass": 8 }, - { "id": "bj", "eddbID": 1393, "cost": 5993700, "mass": 8 } + { "id": "bf", "edID": 128671224, "eddbID": 1389, "cost": 0, "mass": 0 }, + { "id": "bg", "edID": 128671225, "eddbID": 1390, "cost": 1017200, "mass": 4 }, + { "id": "bh", "edID": 128671226, "eddbID": 1391, "cost": 2288600, "mass": 8 }, + { "id": "bi", "edID": 128671227, "eddbID": 1392, "cost": 5408800, "mass": 8 }, + { "id": "bj", "edID": 128671228, "eddbID": 1393, "cost": 5993700, "mass": 8 } ], "slots": { "standard": [ 4, 3, 3, 1, 3, 2, 3], diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json index 5bec211..fd33ba1 100644 --- a/ships/imperial_cutter.json +++ b/ships/imperial_cutter.json @@ -1,6 +1,6 @@ { "imperial_cutter": { - "eddbID": 26, + "edID": 128049375, "eddbID": 26, "properties": { "name": "Imperial Cutter", "manufacturer": "Gutamaya", @@ -18,11 +18,11 @@ }, "retailCost": 208969450, "bulkheads": [ - { "id": "BR", "eddbID": 1493, "cost": 0, "mass": 0 }, - { "id": "BS", "eddbID": 1494, "cost": 83587790, "mass": 30 }, - { "id": "BT", "eddbID": 1495, "cost": 188072510, "mass": 60 }, - { "id": "BU", "eddbID": 1496, "cost": 444478020, "mass": 60 }, - { "id": "BV", "eddbID": 1497, "cost": 492541000, "mass": 60 } + { "id": "BR", "edID": 128049376, "eddbID": 1493, "cost": 0, "mass": 0 }, + { "id": "BS", "edID": 128049377, "eddbID": 1494, "cost": 83587790, "mass": 30 }, + { "id": "BT", "edID": 128049378, "eddbID": 1495, "cost": 188072510, "mass": 60 }, + { "id": "BU", "edID": 128049379, "eddbID": 1496, "cost": 444478020, "mass": 60 }, + { "id": "BV", "edID": 128049380, "eddbID": 1497, "cost": 492541000, "mass": 60 } ], "slots": { "standard": [8, 8, 7, 7, 7, 7, 6], diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json index 4294883..861db05 100644 --- a/ships/imperial_eagle.json +++ b/ships/imperial_eagle.json @@ -1,5 +1,6 @@ { "imperial_eagle": { + "edID": 128672138, "eddbID": 15, "properties": { "name": "Imperial Eagle", @@ -18,11 +19,11 @@ }, "retailCost": 110830, "bulkheads": [ - { "id": "bu", "eddbID": 1461, "cost": 0, "mass": 0 }, - { "id": "bv", "eddbID": 1462, "cost": 66500, "mass": 4 }, - { "id": "bw", "eddbID": 1463, "cost": 222760, "mass": 8 }, - { "id": "bx", "eddbID": 1464, "cost": 346550, "mass": 8 }, - { "id": "by", "eddbID": 1465, "cost": 372040, "mass": 8 } + { "id": "bu", "edID": 128672140, "eddbID": 1461, "cost": 0, "mass": 0 }, + { "id": "bv", "edID": 128672141, "eddbID": 1462, "cost": 66500, "mass": 4 }, + { "id": "bw", "edID": 128672142, "eddbID": 1463, "cost": 222760, "mass": 8 }, + { "id": "bx", "edID": 128672143, "eddbID": 1464, "cost": 346550, "mass": 8 }, + { "id": "by", "edID": 128672144, "eddbID": 1465, "cost": 372040, "mass": 8 } ], "slots": { "standard": [3, 3, 3, 1, 2, 2, 2], diff --git a/ships/keelback.json b/ships/keelback.json index 36a1f18..9ce999d 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -1,5 +1,6 @@ { "keelback": { + "edID": 128672269, "eddbID": 27, "properties": { "name": "Keelback", @@ -18,11 +19,11 @@ }, "retailCost": 3126150, "bulkheads": [ - { "id": "cb", "eddbID": 1513, "cost": 0, "mass": 0 }, - { "id": "cc", "eddbID": 1514, "cost": 1250460, "mass": 12 }, - { "id": "cd", "eddbID": 1515, "cost": 2813540, "mass": 23 }, - { "id": "ce", "eddbID": 1516, "cost": 6649330, "mass": 23 }, - { "id": "cf", "eddbID": 1517, "cost": 7368340, "mass": 23 } + { "id": "cb", "edID": 128672271, "eddbID": 1513, "cost": 0, "mass": 0 }, + { "id": "cc", "edID": 128672272, "eddbID": 1514, "cost": 1250460, "mass": 12 }, + { "id": "cd", "edID": 128672273, "eddbID": 1515, "cost": 2813540, "mass": 23 }, + { "id": "ce", "edID": 128672274, "eddbID": 1516, "cost": 6649330, "mass": 23 }, + { "id": "cf", "edID": 128672275, "eddbID": 1517, "cost": 7368340, "mass": 23 } ], "slots": { "standard": [4, 4, 4, 1, 3, 2, 4], diff --git a/ships/orca.json b/ships/orca.json index 2736de9..dd33c8e 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -1,5 +1,6 @@ { "orca": { + "edID": 128049327, "eddbID": 16, "properties": { "name": "Orca", @@ -18,11 +19,11 @@ }, "retailCost": 48539890, "bulkheads": [ - { "id": "BM", "eddbID": 798, "cost": 0, "mass": 0 }, - { "id": "BN", "eddbID": 799, "cost": 19415950, "mass": 21 }, - { "id": "BO", "eddbID": 800, "cost": 43685900, "mass": 87 }, - { "id": "BP", "eddbID": 801, "cost": 103244340, "mass": 87 }, - { "id": "BQ", "eddbID": 802, "cost": 114408510, "mass": 87 } + { "id": "BM", "edID": 128049328, "eddbID": 798, "cost": 0, "mass": 0 }, + { "id": "BN", "edID": 128049329, "eddbID": 799, "cost": 19415950, "mass": 21 }, + { "id": "BO", "edID": 128049330, "eddbID": 800, "cost": 43685900, "mass": 87 }, + { "id": "BP", "edID": 128049331, "eddbID": 801, "cost": 103244340, "mass": 87 }, + { "id": "BQ", "edID": 128049332, "eddbID": 802, "cost": 114408510, "mass": 87 } ], "slots": { "standard": [5, 6, 5, 6, 5, 4, 4], diff --git a/ships/python.json b/ships/python.json index dc0584f..ecb0bf0 100755 --- a/ships/python.json +++ b/ships/python.json @@ -1,5 +1,6 @@ { "python": { + "edID": 128049339, "eddbID": 17, "properties": { "name": "Python", @@ -18,11 +19,11 @@ }, "retailCost": 56978180, "bulkheads": [ - { "id": "bO", "eddbID": 808, "cost": 0, "mass": 0 }, - { "id": "bP", "eddbID": 809, "cost": 22791270, "mass": 26 }, - { "id": "bQ", "eddbID": 810, "cost": 51280360, "mass": 53 }, - { "id": "bR", "eddbID": 811, "cost": 121192590, "mass": 53 }, - { "id": "bS", "eddbID": 812, "cost": 134297570, "mass": 53 } + { "id": "bO", "edID": 128049340, "eddbID": 808, "cost": 0, "mass": 0 }, + { "id": "bP", "edID": 128049341, "eddbID": 809, "cost": 22791270, "mass": 26 }, + { "id": "bQ", "edID": 128049342, "eddbID": 810, "cost": 51280360, "mass": 53 }, + { "id": "bR", "edID": 128049343, "eddbID": 811, "cost": 121192590, "mass": 53 }, + { "id": "bS", "edID": 128049344, "eddbID": 812, "cost": 134297570, "mass": 53 } ], "slots": { "standard": [7, 6, 5, 4, 7, 6, 5], diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 8cc95dc..f72b4b7 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -1,5 +1,6 @@ { "sidewinder": { + "edID": 128049249, "eddbID": 18, "properties": { "name": "Sidewinder", @@ -18,11 +19,11 @@ }, "retailCost": 40800, "bulkheads": [ - { "id": "b0", "eddbID": 738, "cost": 0, "mass": 0 }, - { "id": "b1", "eddbID": 739, "cost": 25600, "mass": 2 }, - { "id": "b2", "eddbID": 740, "cost": 80320, "mass": 4 }, - { "id": "b3", "eddbID": 741, "cost": 132060, "mass": 4 }, - { "id": "b4", "eddbID": 742, "cost": 139420, "mass": 4 } + { "id": "b0", "edID": 128049250, "eddbID": 738, "cost": 0, "mass": 0 }, + { "id": "b1", "edID": 128049251, "eddbID": 739, "cost": 25600, "mass": 2 }, + { "id": "b2", "edID": 128049252, "eddbID": 740, "cost": 80320, "mass": 4 }, + { "id": "b3", "edID": 128049253, "eddbID": 741, "cost": 132060, "mass": 4 }, + { "id": "b4", "edID": 128049254, "eddbID": 742, "cost": 139420, "mass": 4 } ], "slots": { "standard": [2, 2, 2, 1, 1, 1, 1], diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json index 81cf5e0..7507298 100755 --- a/ships/type_6_transporter.json +++ b/ships/type_6_transporter.json @@ -1,5 +1,6 @@ { "type_6_transporter": { + "edID": 128049285, "eddbID": 19, "properties": { "name": "Type-6 Transporter", @@ -18,11 +19,11 @@ }, "retailCost": 1045950, "bulkheads": [ - { "id": "Bn", "eddbID": 768, "cost": 0, "mass": 0 }, - { "id": "Bo", "eddbID": 769, "cost": 418380, "mass": 12 }, - { "id": "Bp", "eddbID": 770, "cost": 941350, "mass": 23 }, - { "id": "Bq", "eddbID": 771, "cost": 2224730, "mass": 23 }, - { "id": "Br", "eddbID": 772, "cost": 2465290, "mass": 23 } + { "id": "Bn", "edID": 128049286, "eddbID": 768, "cost": 0, "mass": 0 }, + { "id": "Bo", "edID": 128049287, "eddbID": 769, "cost": 418380, "mass": 12 }, + { "id": "Bp", "edID": 128049288, "eddbID": 770, "cost": 941350, "mass": 23 }, + { "id": "Bq", "edID": 128049289, "eddbID": 771, "cost": 2224730, "mass": 23 }, + { "id": "Br", "edID": 128049290, "eddbID": 772, "cost": 2465290, "mass": 23 } ], "slots": { "standard": [3, 4, 4, 2, 3, 2, 4], diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index a8d83a9..7fe14be 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -1,5 +1,6 @@ { "type_7_transport": { + "edID": 128049297, "eddbID": 20, "properties": { "name": "Type-7 Transporter", @@ -18,11 +19,11 @@ }, "retailCost": 17472250, "bulkheads": [ - { "id": "Bs", "eddbID": 773, "cost": 0, "mass": 0 }, - { "id": "Bt", "eddbID": 774, "cost": 6988900, "mass": 32 }, - { "id": "Bu", "eddbID": 775, "cost": 15725030, "mass": 63 }, - { "id": "Bv", "eddbID": 776, "cost": 37163480, "mass": 63 }, - { "id": "Bw", "eddbID": 777, "cost": 41182100, "mass": 63 } + { "id": "Bs", "edID": 128049298, "eddbID": 773, "cost": 0, "mass": 0 }, + { "id": "Bt", "edID": 128049299, "eddbID": 774, "cost": 6988900, "mass": 32 }, + { "id": "Bu", "edID": 128049300, "eddbID": 775, "cost": 15725030, "mass": 63 }, + { "id": "Bv", "edID": 128049301, "eddbID": 776, "cost": 37163480, "mass": 63 }, + { "id": "Bw", "edID": 128049302, "eddbID": 777, "cost": 41182100, "mass": 63 } ], "slots": { "standard": [4, 5, 5, 4, 3, 3, 5], diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json index d5436d5..1424ad5 100755 --- a/ships/type_9_heavy.json +++ b/ships/type_9_heavy.json @@ -1,5 +1,6 @@ { "type_9_heavy": { + "edID": 128049333, "eddbID": 21, "properties": { "name": "Type-9 Heavy", @@ -18,11 +19,11 @@ }, "retailCost": 76555840, "bulkheads": [ - { "id": "cl", "eddbID": 803, "cost": 0, "mass": 0 }, - { "id": "cm", "eddbID": 804, "cost": 30622340, "mass": 75 }, - { "id": "cn", "eddbID": 805, "cost": 68900260, "mass": 150 }, - { "id": "co", "eddbID": 806, "cost": 162834280, "mass": 150 }, - { "id": "cp", "eddbID": 807, "cost": 180442120, "mass": 150 } + { "id": "cl", "edID": 128049334, "eddbID": 803, "cost": 0, "mass": 0 }, + { "id": "cm", "edID": 128049335, "eddbID": 804, "cost": 30622340, "mass": 75 }, + { "id": "cn", "edID": 128049336, "eddbID": 805, "cost": 68900260, "mass": 150 }, + { "id": "co", "edID": 128049337, "eddbID": 806, "cost": 162834280, "mass": 150 }, + { "id": "cp", "edID": 128049338, "eddbID": 807, "cost": 180442120, "mass": 150 } ], "slots": { "standard": [6, 7, 6, 5, 6, 4, 6], diff --git a/ships/viper.json b/ships/viper.json index c91c6d6..c00e87c 100755 --- a/ships/viper.json +++ b/ships/viper.json @@ -1,5 +1,6 @@ { "viper": { + "edID": 128049273, "eddbID": 22, "properties": { "name": "Viper", @@ -18,11 +19,11 @@ }, "retailCost": 142930, "bulkheads": [ - { "id": "B3", "eddbID": 758, "cost": 0, "mass": 0 }, - { "id": "B4", "eddbID": 759, "cost": 57170, "mass": 5 }, - { "id": "B5", "eddbID": 760, "cost": 128640, "mass": 9 }, - { "id": "B6", "eddbID": 761, "cost": 304010, "mass": 9 }, - { "id": "B7", "eddbID": 762, "cost": 336890, "mass": 9 } + { "id": "B3", "edID": 128049274, "eddbID": 758, "cost": 0, "mass": 0 }, + { "id": "B4", "edID": 128049275, "eddbID": 759, "cost": 57170, "mass": 5 }, + { "id": "B5", "edID": 128049276, "eddbID": 760, "cost": 128640, "mass": 9 }, + { "id": "B6", "edID": 128049277, "eddbID": 761, "cost": 304010, "mass": 9 }, + { "id": "B7", "edID": 128049278, "eddbID": 762, "cost": 336890, "mass": 9 } ], "slots": { "standard": [3, 3, 3, 2, 3, 3, 2], diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json index eb97b0c..9894bc4 100644 --- a/ships/viper_mk_iv.json +++ b/ships/viper_mk_iv.json @@ -1,5 +1,6 @@ { "viper_mk_iv": { + "edID": 128672255, "eddbID": 28, "properties": { "name": "Viper Mk IV", @@ -18,11 +19,11 @@ }, "retailCost": 437930, "bulkheads": [ - { "id": "c6", "eddbID": 1508, "cost": 0, "mass": 0 }, - { "id": "c7", "eddbID": 1509, "cost": 175180, "mass": 5 }, - { "id": "c8", "eddbID": 1510, "cost": 394140, "mass": 9 }, - { "id": "c9", "eddbID": 1511, "cost": 931490, "mass": 9 }, - { "id": "ca", "eddbID": 1512, "cost": 1033210, "mass": 9 } + { "id": "c6", "edID": 128672257, "eddbID": 1508, "cost": 0, "mass": 0 }, + { "id": "c7", "edID": 128672258, "eddbID": 1509, "cost": 175180, "mass": 5 }, + { "id": "c8", "edID": 128672259, "eddbID": 1510, "cost": 394140, "mass": 9 }, + { "id": "c9", "edID": 128672260, "eddbID": 1511, "cost": 931490, "mass": 9 }, + { "id": "ca", "edID": 128672261, "eddbID": 1512, "cost": 1033210, "mass": 9 } ], "slots": { "standard": [4, 4, 4, 2, 3, 3, 4], diff --git a/ships/vulture.json b/ships/vulture.json index a6646b4..85edf8e 100755 --- a/ships/vulture.json +++ b/ships/vulture.json @@ -1,5 +1,6 @@ { "vulture": { + "edID": 128049309, "eddbID": 23, "properties": { "name": "Vulture", @@ -18,11 +19,11 @@ }, "retailCost": 4925620, "bulkheads": [ - { "id": "B8", "eddbID": 783, "cost": 0, "mass": 0 }, - { "id": "B9", "eddbID": 784, "cost": 1970250, "mass": 17 }, - { "id": "Ba", "eddbID": 785, "cost": 4433050, "mass": 35 }, - { "id": "Bb", "eddbID": 786, "cost": 10476780, "mass": 35 }, - { "id": "Bc", "eddbID": 787, "cost": 11609670, "mass": 35 } + { "id": "B8", "edID": 128049310, "eddbID": 783, "cost": 0, "mass": 0 }, + { "id": "B9", "edID": 128049311, "eddbID": 784, "cost": 1970250, "mass": 17 }, + { "id": "Ba", "edID": 128049312, "eddbID": 785, "cost": 4433050, "mass": 35 }, + { "id": "Bb", "edID": 128049313, "eddbID": 786, "cost": 10476780, "mass": 35 }, + { "id": "Bc", "edID": 128049314, "eddbID": 787, "cost": 11609670, "mass": 35 } ], "slots": { "standard": [4, 5, 4, 3, 5, 4, 3], diff --git a/spec/data-spec.js b/spec/data-spec.js index ce484ee..e5951d5 100644 --- a/spec/data-spec.js +++ b/spec/data-spec.js @@ -95,13 +95,14 @@ describe('JSON Data', function() { it('has data for every ship', function() { var bulkheadIds = {}; + for (var s in Ships) { for (var p = 0; p < shipProperties.length; p++) { expect(Ships[s].properties[shipProperties[p]]).toBeDefined(shipProperties[p] + ' is missing for ' + s); } expect(Ships[s].eddbID).toBeDefined(s + ' is missing EDDB ID'); - // TODO: Get Ids, see github issue https://github.com/cmmcleod/coriolis-data/issues/6 - // expect(Ships[s].edID).toBeDefined(s + ' is missing E:D ID'); + expect(Ships[s].edID).toBeDefined(s + ' is missing E:D ID'); + expect(edIDs[Ships[s].edID]).toBeFalsy(`${s} E:D ID [${Ships[s].edID}] already exists`); expect(Ships[s].slots.standard.length).toEqual(7, s + ' is missing standard slots'); expect(Ships[s].defaults.standard.length).toEqual(7, s + ' is missing standard defaults'); expect(Ships[s].slots.hardpoints.length).toEqual(Ships[s].defaults.hardpoints.length, s + ' hardpoint slots and defaults dont match'); @@ -109,6 +110,7 @@ describe('JSON Data', function() { expect(Ships[s].retailCost).toBeGreaterThan(Ships[s].properties.hullCost, s + ' has invalid retail cost'); expect(Ships[s].bulkheads).toBeDefined(s + ' is missing bulkheads'); expect(Ships[s].bulkheads.length).toEqual(5, s + ' is missing bulkheads'); + edIDs[Ships[s].edID] = true; for (var i = 0; i < Ships[s].bulkheads.length; i++) { var b = Ships[s].bulkheads[i]; @@ -116,10 +118,9 @@ describe('JSON Data', function() { expect(bulkheadIds[b.id]).toBeFalsy(`${s} bulkhead [${i} - ${b.id}] ID already exists`); expect(b.eddbID).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing EDDB ID`); expect(eddbIDs[b.eddbID]).toBeFalsy(`EDDB ID [${b.eddbID}] already exists: ${s} bulkhead [${i} - ${b.id}]`); - // TODO: Get Ids, see github issue https://github.com/cmmcleod/coriolis-data/issues/6 - // expect(b.edId).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`); - // expect(edIDs[b.edID]).toBeFalsy(`E:D ID [${b.edID}] already exists: ${s} bulkhead [${i} - ${b.id}]`); - // edIDs[b.edID] = true; + expect(b.edID).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`); + expect(edIDs[b.edID]).toBeFalsy(`E:D ID [${b.edID}] already exists: ${s} bulkhead [${i} - ${b.id}]`); + edIDs[b.edID] = true; eddbIDs[b.eddbID] = true; bulkheadIds[b.id] = true; }