diff --git a/ChangeLog.md b/ChangeLog.md new file mode 100644 index 0000000..4adf454 --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1,7 @@ +#2.2.x + * Add distributor draw modifier to shield generators + * Remove modifiers for sensors + * Add initial loadout passenger cabins for Beluga + * Add initial loadout passenger cabins for Orca + * Update costs and initial loadouts for Keelback and Type-7 + * Add resistances for hull reinforcement packages diff --git a/dist/index.js b/dist/index.js index 000920f..0f38607 100644 --- a/dist/index.js +++ b/dist/index.js @@ -470,7 +470,7 @@ module.exports = { defaults: { standard: [ "6E", "7E", "7E", "8E", "6E", "5E", "7C" ], hardpoints: [ 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], - internal: [ "4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h" ] + internal: [ "4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, "2h" ] } }, cobra_mk_iii: { @@ -1773,7 +1773,7 @@ module.exports = { name: "Keelback", manufacturer: "Lakon", class: 2, - hullCost: 2951180, + hullCost: 2943880, speed: 200, boost: 300, boostEnergy: 10, @@ -1785,7 +1785,7 @@ module.exports = { pipSpeed: .1375, fighterHangars: true }, - retailCost: 3126150, + retailCost: 3126160, bulkheads: [ { id: "cb", edID: 128672271, @@ -1860,7 +1860,7 @@ module.exports = { name: "Orca", manufacturer: "Saud Kruger", class: 3, - hullCost: 47798080, + hullCost: 47790590, speed: 300, boost: 380, boostEnergy: 16, @@ -1872,7 +1872,7 @@ module.exports = { pipSpeed: .08375, luxuryCabins: true }, - retailCost: 48539890, + retailCost: 48539900, bulkheads: [ { id: "BM", edID: 128049328, @@ -1957,7 +1957,7 @@ module.exports = { defaults: { standard: [ "5E", "6E", "5E", "6E", "5E", "4E", "5C" ], hardpoints: [ 0, 17, 17, 0, 0, 0, 0 ], - internal: [ "6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h" ] + internal: [ "me", "mc", "03", "4e", "02", 0, 0, "2h" ] } }, python: { @@ -2225,7 +2225,7 @@ module.exports = { name: "Type-7 Transporter", manufacturer: "Lakon", class: 3, - hullCost: 16881510, + hullCost: 16780510, speed: 180, boost: 300, boostEnergy: 10, @@ -2236,7 +2236,7 @@ module.exports = { masslock: 10, pipSpeed: .16625 }, - retailCost: 17472250, + retailCost: 17472260, bulkheads: [ { id: "Bs", edID: 128049298, @@ -4234,7 +4234,7 @@ module.exports = { ls: [ { boot: 1, class: 8, - cost: 0, + cost: 697590, edID: 128064173, eddbID: 1031, grp: "ls", @@ -4247,7 +4247,7 @@ module.exports = { }, { boot: 1, class: 8, - cost: 0, + cost: 1743970, edID: 128064174, eddbID: 1032, grp: "ls", @@ -4260,7 +4260,7 @@ module.exports = { }, { boot: 1, class: 8, - cost: 0, + cost: 4359900, edID: 128064175, eddbID: 1033, grp: "ls", @@ -4273,7 +4273,7 @@ module.exports = { }, { boot: 1, class: 8, - cost: 0, + cost: 10899770, edID: 128064176, eddbID: 1034, grp: "ls", @@ -4286,7 +4286,7 @@ module.exports = { }, { boot: 1, class: 8, - cost: 0, + cost: 27249400, edID: 128064177, eddbID: 1035, grp: "ls", @@ -10835,100 +10835,130 @@ module.exports = { cost: 15e4, edID: 128668545, eddbID: 1381, + explres: 2.5, grp: "hr", id: "2e", + kinres: 2.5, mass: 64, - rating: "E" + rating: "E", + thermres: 2.5 }, { hullreinforcement: 390, class: 5, cost: 45e4, edID: 128668546, eddbID: 1382, + explres: 2.5, grp: "hr", id: "2d", + kinres: 2.5, mass: 32, - rating: "D" + rating: "D", + thermres: 2.5 }, { hullreinforcement: 300, class: 4, cost: 65e3, edID: 128668543, eddbID: 1379, + explres: 2, grp: "hr", id: "2c", + kinres: 2, mass: 32, - rating: "E" + rating: "E", + thermres: 2 }, { hullreinforcement: 330, class: 4, cost: 195e3, edID: 128668544, eddbID: 1380, + explres: 2, grp: "hr", id: "2b", + kinres: 2, mass: 16, - rating: "D" + rating: "D", + thermres: 2 }, { hullreinforcement: 230, class: 3, cost: 28e3, edID: 128668541, eddbID: 1377, + explres: 1.5, grp: "hr", id: "2a", + kinres: 1.5, mass: 16, - rating: "E" + rating: "E", + thermres: 1.5 }, { hullreinforcement: 260, class: 3, cost: 84e3, edID: 128668542, eddbID: 1378, + explres: 1.5, grp: "hr", id: "29", + kinres: 1.5, mass: 8, - rating: "D" + rating: "D", + thermres: 1.5 }, { hullreinforcement: 150, class: 2, cost: 12e3, edID: 128668539, eddbID: 1375, + explres: 1, grp: "hr", id: "28", + kinres: 1, mass: 8, - rating: "E" + rating: "E", + thermres: 1 }, { hullreinforcement: 190, class: 2, cost: 36e3, edID: 128668540, eddbID: 1376, + explres: 1, grp: "hr", id: "27", + kinres: 1, mass: 4, - rating: "D" + rating: "D", + themres: 1 }, { hullreinforcement: 80, class: 1, cost: 5e3, edID: 128668537, eddbID: 1373, + explres: .5, grp: "hr", id: "26", + kinres: .5, mass: 4, - rating: "E" + rating: "E", + thermres: .5 }, { hullreinforcement: 110, class: 1, cost: 15e3, edID: 128668538, eddbID: 1374, + explres: .5, grp: "hr", id: "25", + kinres: .5, mass: 2, - rating: "D" + rating: "D", + thermres: .5 } ], pv: [ { bays: 4, @@ -13158,7 +13188,7 @@ module.exports = { am: [ "integrity", "power" ], bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ], bl: [ "damage", "distdraw", "integrity", "mass", "piercing", "power", "range", "thermload" ], - bsg: [ "boot", "brokenregen", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], + bsg: [ "boot", "brokenregen", "distdraw", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], c: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], cc: [ "integrity", "mass", "power" ], ch: [ "ammo", "integrity", "mass", "power", "reload" ], @@ -13183,13 +13213,12 @@ module.exports = { pl: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], po: [ "ammo", "integrity", "mass", "power", "reload" ], pp: [ "eff", "integrity", "mass", "pgen" ], - psg: [ "boot", "brokenregen", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], + psg: [ "boot", "brokenregen", "distdraw", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], rf: [ "integrity", "power" ], rg: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], - s: [ "boot", "integrity", "mass", "power" ], sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "thermres" ], scb: [ "boot", "duration", "integrity", "power", "shield", "spinup", "thermload" ], - sg: [ "boot", "brokenregen", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], + sg: [ "boot", "brokenregen", "distdraw", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ], t: [ "integrity", "mass", "optmass", "optmul", "power", "thermload" ], tp: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], ul: [ "burst", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], diff --git a/dist/index.json b/dist/index.json index 3c40226..77759d2 100644 --- a/dist/index.json +++ b/dist/index.json @@ -765,10 +765,10 @@ "internal": [ "4j", "04", - "6dbusiness", - "6dbusiness", - "4dbusiness", - "4dbusiness", + "mi", + "mi", + "mg", + "mg", "02", "01", 0, @@ -2895,7 +2895,7 @@ "name": "Keelback", "manufacturer": "Lakon", "class": 2, - "hullCost": 2951180, + "hullCost": 2943880, "speed": 200, "boost": 300, "boostEnergy": 10, @@ -2907,7 +2907,7 @@ "pipSpeed": 0.1375, "fighterHangars": true }, - "retailCost": 3126150, + "retailCost": 3126160, "bulkheads": [ { "id": "cb", @@ -3034,7 +3034,7 @@ "name": "Orca", "manufacturer": "Saud Kruger", "class": 3, - "hullCost": 47798080, + "hullCost": 47790590, "speed": 300, "boost": 380, "boostEnergy": 16, @@ -3046,7 +3046,7 @@ "pipSpeed": 0.08375, "luxuryCabins": true }, - "retailCost": 48539890, + "retailCost": 48539900, "bulkheads": [ { "id": "BM", @@ -3179,8 +3179,8 @@ 0 ], "internal": [ - "6e economy", - "4e economy", + "me", + "mc", "03", "4e", "02", @@ -3609,7 +3609,7 @@ "name": "Type-7 Transporter", "manufacturer": "Lakon", "class": 3, - "hullCost": 16881510, + "hullCost": 16780510, "speed": 180, "boost": 300, "boostEnergy": 10, @@ -3620,7 +3620,7 @@ "masslock": 10, "pipSpeed": 0.16625 }, - "retailCost": 17472250, + "retailCost": 17472260, "bulkheads": [ { "id": "Bs", @@ -5993,7 +5993,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 697590, "edID": 128064173, "eddbID": 1031, "grp": "ls", @@ -6007,7 +6007,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 1743970, "edID": 128064174, "eddbID": 1032, "grp": "ls", @@ -6021,7 +6021,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 4359900, "edID": 128064175, "eddbID": 1033, "grp": "ls", @@ -6035,7 +6035,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 10899770, "edID": 128064176, "eddbID": 1034, "grp": "ls", @@ -6049,7 +6049,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 27249400, "edID": 128064177, "eddbID": 1035, "grp": "ls", @@ -13062,10 +13062,13 @@ "cost": 150000, "edID": 128668545, "eddbID": 1381, + "explres": 2.5, "grp": "hr", "id": "2e", + "kinres": 2.5, "mass": 64, - "rating": "E" + "rating": "E", + "thermres": 2.5 }, { "hullreinforcement": 390, @@ -13073,10 +13076,13 @@ "cost": 450000, "edID": 128668546, "eddbID": 1382, + "explres": 2.5, "grp": "hr", "id": "2d", + "kinres": 2.5, "mass": 32, - "rating": "D" + "rating": "D", + "thermres": 2.5 }, { "hullreinforcement": 300, @@ -13084,10 +13090,13 @@ "cost": 65000, "edID": 128668543, "eddbID": 1379, + "explres": 2, "grp": "hr", "id": "2c", + "kinres": 2, "mass": 32, - "rating": "E" + "rating": "E", + "thermres": 2 }, { "hullreinforcement": 330, @@ -13095,10 +13104,13 @@ "cost": 195000, "edID": 128668544, "eddbID": 1380, + "explres": 2, "grp": "hr", "id": "2b", + "kinres": 2, "mass": 16, - "rating": "D" + "rating": "D", + "thermres": 2 }, { "hullreinforcement": 230, @@ -13106,10 +13118,13 @@ "cost": 28000, "edID": 128668541, "eddbID": 1377, + "explres": 1.5, "grp": "hr", "id": "2a", + "kinres": 1.5, "mass": 16, - "rating": "E" + "rating": "E", + "thermres": 1.5 }, { "hullreinforcement": 260, @@ -13117,10 +13132,13 @@ "cost": 84000, "edID": 128668542, "eddbID": 1378, + "explres": 1.5, "grp": "hr", "id": "29", + "kinres": 1.5, "mass": 8, - "rating": "D" + "rating": "D", + "thermres": 1.5 }, { "hullreinforcement": 150, @@ -13128,10 +13146,13 @@ "cost": 12000, "edID": 128668539, "eddbID": 1375, + "explres": 1, "grp": "hr", "id": "28", + "kinres": 1, "mass": 8, - "rating": "E" + "rating": "E", + "thermres": 1 }, { "hullreinforcement": 190, @@ -13139,10 +13160,13 @@ "cost": 36000, "edID": 128668540, "eddbID": 1376, + "explres": 1, "grp": "hr", "id": "27", + "kinres": 1, "mass": 4, - "rating": "D" + "rating": "D", + "themres": 1 }, { "hullreinforcement": 80, @@ -13150,10 +13174,13 @@ "cost": 5000, "edID": 128668537, "eddbID": 1373, + "explres": 0.5, "grp": "hr", "id": "26", + "kinres": 0.5, "mass": 4, - "rating": "E" + "rating": "E", + "thermres": 0.5 }, { "hullreinforcement": 110, @@ -13161,10 +13188,13 @@ "cost": 15000, "edID": 128668538, "eddbID": 1374, + "explres": 0.5, "grp": "hr", "id": "25", + "kinres": 0.5, "mass": 2, - "rating": "D" + "rating": "D", + "thermres": 0.5 } ], "pv": [ @@ -15615,6 +15645,7 @@ "bsg": [ "boot", "brokenregen", + "distdraw", "explres", "integrity", "kinres", @@ -15841,6 +15872,7 @@ "psg": [ "boot", "brokenregen", + "distdraw", "explres", "integrity", "kinres", @@ -15871,12 +15903,6 @@ "rof", "thermload" ], - "s": [ - "boot", - "integrity", - "mass", - "power" - ], "sb": [ "explres", "integrity", @@ -15898,6 +15924,7 @@ "sg": [ "boot", "brokenregen", + "distdraw", "explres", "integrity", "kinres", diff --git a/modifications/validity.json b/modifications/validity.json index d86eea0..6ba9eee 100644 --- a/modifications/validity.json +++ b/modifications/validity.json @@ -23,6 +23,7 @@ "bsg": [ "boot", "brokenregen", + "distdraw", "explres", "integrity", "kinres", @@ -249,6 +250,7 @@ "psg": [ "boot", "brokenregen", + "distdraw", "explres", "integrity", "kinres", @@ -279,12 +281,6 @@ "rof", "thermload" ], - "s": [ - "boot", - "integrity", - "mass", - "power" - ], "sb": [ "explres", "integrity", @@ -306,6 +302,7 @@ "sg": [ "boot", "brokenregen", + "distdraw", "explres", "integrity", "kinres", diff --git a/modules/internal/hull_reinforcement_package.json b/modules/internal/hull_reinforcement_package.json index 78e595a..7cd9d9d 100644 --- a/modules/internal/hull_reinforcement_package.json +++ b/modules/internal/hull_reinforcement_package.json @@ -6,10 +6,13 @@ "cost": 150000, "edID": 128668545, "eddbID": 1381, + "explres": 2.5, "grp": "hr", "id": "2e", + "kinres": 2.5, "mass": 64, - "rating": "E" + "rating": "E", + "thermres": 2.5 }, { "hullreinforcement": 390, @@ -17,10 +20,13 @@ "cost": 450000, "edID": 128668546, "eddbID": 1382, + "explres": 2.5, "grp": "hr", "id": "2d", + "kinres": 2.5, "mass": 32, - "rating": "D" + "rating": "D", + "thermres": 2.5 }, { "hullreinforcement": 300, @@ -28,10 +34,13 @@ "cost": 65000, "edID": 128668543, "eddbID": 1379, + "explres": 2, "grp": "hr", "id": "2c", + "kinres": 2, "mass": 32, - "rating": "E" + "rating": "E", + "thermres": 2 }, { "hullreinforcement": 330, @@ -39,10 +48,13 @@ "cost": 195000, "edID": 128668544, "eddbID": 1380, + "explres": 2, "grp": "hr", "id": "2b", + "kinres": 2, "mass": 16, - "rating": "D" + "rating": "D", + "thermres": 2 }, { "hullreinforcement": 230, @@ -50,10 +62,13 @@ "cost": 28000, "edID": 128668541, "eddbID": 1377, + "explres": 1.5, "grp": "hr", "id": "2a", + "kinres": 1.5, "mass": 16, - "rating": "E" + "rating": "E", + "thermres": 1.5 }, { "hullreinforcement": 260, @@ -61,10 +76,13 @@ "cost": 84000, "edID": 128668542, "eddbID": 1378, + "explres": 1.5, "grp": "hr", "id": "29", + "kinres": 1.5, "mass": 8, - "rating": "D" + "rating": "D", + "thermres": 1.5 }, { "hullreinforcement": 150, @@ -72,10 +90,13 @@ "cost": 12000, "edID": 128668539, "eddbID": 1375, + "explres": 1, "grp": "hr", "id": "28", + "kinres": 1, "mass": 8, - "rating": "E" + "rating": "E", + "thermres": 1 }, { "hullreinforcement": 190, @@ -83,10 +104,13 @@ "cost": 36000, "edID": 128668540, "eddbID": 1376, + "explres": 1, "grp": "hr", "id": "27", + "kinres": 1, "mass": 4, - "rating": "D" + "rating": "D", + "themres": 1 }, { "hullreinforcement": 80, @@ -94,10 +118,13 @@ "cost": 5000, "edID": 128668537, "eddbID": 1373, + "explres": 0.5, "grp": "hr", "id": "26", + "kinres": 0.5, "mass": 4, - "rating": "E" + "rating": "E", + "thermres": 0.5 }, { "hullreinforcement": 110, @@ -105,10 +132,13 @@ "cost": 15000, "edID": 128668538, "eddbID": 1374, + "explres": 0.5, "grp": "hr", "id": "25", + "kinres": 0.5, "mass": 2, - "rating": "D" + "rating": "D", + "thermres": 0.5 } ] } diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json index d75de9e..48f2182 100644 --- a/modules/standard/life_support.json +++ b/modules/standard/life_support.json @@ -3,7 +3,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 697590, "edID": 128064173, "eddbID": 1031, "grp": "ls", @@ -17,7 +17,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 1743970, "edID": 128064174, "eddbID": 1032, "grp": "ls", @@ -31,7 +31,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 4359900, "edID": 128064175, "eddbID": 1033, "grp": "ls", @@ -45,7 +45,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 10899770, "edID": 128064176, "eddbID": 1034, "grp": "ls", @@ -59,7 +59,7 @@ { "boot": 1, "class": 8, - "cost": 0, + "cost": 27249400, "edID": 128064177, "eddbID": 1035, "grp": "ls", diff --git a/ships/beluga.json b/ships/beluga.json index 45f44d3..1e2a2e9 100755 --- a/ships/beluga.json +++ b/ships/beluga.json @@ -42,7 +42,7 @@ "defaults": { "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"], "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0], - "internal": ["4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h"] + "internal": ["4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, "2h"] } } } diff --git a/ships/keelback.json b/ships/keelback.json index 3688fd9..8a17ac3 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -6,7 +6,7 @@ "name": "Keelback", "manufacturer": "Lakon", "class": 2, - "hullCost": 2951180, + "hullCost": 2943880, "speed": 200, "boost": 300, "boostEnergy": 10, @@ -18,7 +18,7 @@ "pipSpeed": 0.1375, "fighterHangars": true }, - "retailCost": 3126150, + "retailCost": 3126160, "bulkheads": [ { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, diff --git a/ships/orca.json b/ships/orca.json index 3d6ca9f..a1c1a1e 100755 --- a/ships/orca.json +++ b/ships/orca.json @@ -6,7 +6,7 @@ "name": "Orca", "manufacturer": "Saud Kruger", "class": 3, - "hullCost": 47798080, + "hullCost": 47790590, "speed": 300, "boost": 380, "boostEnergy": 16, @@ -18,7 +18,7 @@ "pipSpeed": 0.08375, "luxuryCabins": true }, - "retailCost": 48539890, + "retailCost": 48539900, "bulkheads": [ { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 }, @@ -38,7 +38,7 @@ "defaults": { "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"], "hardpoints": [0, 17, 17, 0, 0, 0, 0], - "internal": ["6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h"] + "internal": ["me", "mc", "03", "4e", "02", 0, 0, "2h"] } } } diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json index 0dae4c0..f9ae3a0 100755 --- a/ships/type_7_transport.json +++ b/ships/type_7_transport.json @@ -6,7 +6,7 @@ "name": "Type-7 Transporter", "manufacturer": "Lakon", "class": 3, - "hullCost": 16881510, + "hullCost": 16780510, "speed": 180, "boost": 300, "boostEnergy": 10, @@ -17,7 +17,7 @@ "masslock": 10, "pipSpeed": 0.16625 }, - "retailCost": 17472250, + "retailCost": 17472260, "bulkheads": [ { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 }, { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },