Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-09 07:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/fixes' into develop

Browse Source
This commit is contained in:
Cmdr McDonald
2016-11-09 19:06:02 +00:00
parent dad809a4bb 70fd4595b4
commit 70cae4660b
10 changed files with 179 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.md Normal file
View File

@@ -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

83
dist/index.js vendored
View File

@@ -470,7 +470,7 @@ module.exports = {
defaults: { defaults: {
standard: [ "6E", "7E", "7E", "8E", "6E", "5E", "7C" ], standard: [ "6E", "7E", "7E", "8E", "6E", "5E", "7C" ],
hardpoints: [ 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], 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: { cobra_mk_iii: {
@@ -1773,7 +1773,7 @@ module.exports = {
name: "Keelback", name: "Keelback",
manufacturer: "Lakon", manufacturer: "Lakon",
class: 2, class: 2,
hullCost: 2951180, hullCost: 2943880,
speed: 200, speed: 200,
boost: 300, boost: 300,
boostEnergy: 10, boostEnergy: 10,
@@ -1785,7 +1785,7 @@ module.exports = {
pipSpeed: .1375, pipSpeed: .1375,
fighterHangars: true fighterHangars: true
}, },
retailCost: 3126150, retailCost: 3126160,
bulkheads: [ { bulkheads: [ {
id: "cb", id: "cb",
edID: 128672271, edID: 128672271,
@@ -1860,7 +1860,7 @@ module.exports = {
name: "Orca", name: "Orca",
manufacturer: "Saud Kruger", manufacturer: "Saud Kruger",
class: 3, class: 3,
hullCost: 47798080, hullCost: 47790590,
speed: 300, speed: 300,
boost: 380, boost: 380,
boostEnergy: 16, boostEnergy: 16,
@@ -1872,7 +1872,7 @@ module.exports = {
pipSpeed: .08375, pipSpeed: .08375,
luxuryCabins: true luxuryCabins: true
}, },
retailCost: 48539890, retailCost: 48539900,
bulkheads: [ { bulkheads: [ {
id: "BM", id: "BM",
edID: 128049328, edID: 128049328,
@@ -1957,7 +1957,7 @@ module.exports = {
defaults: { defaults: {
standard: [ "5E", "6E", "5E", "6E", "5E", "4E", "5C" ], standard: [ "5E", "6E", "5E", "6E", "5E", "4E", "5C" ],
hardpoints: [ 0, 17, 17, 0, 0, 0, 0 ], 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: { python: {
@@ -2225,7 +2225,7 @@ module.exports = {
name: "Type-7 Transporter", name: "Type-7 Transporter",
manufacturer: "Lakon", manufacturer: "Lakon",
class: 3, class: 3,
hullCost: 16881510, hullCost: 16780510,
speed: 180, speed: 180,
boost: 300, boost: 300,
boostEnergy: 10, boostEnergy: 10,
@@ -2236,7 +2236,7 @@ module.exports = {
masslock: 10, masslock: 10,
pipSpeed: .16625 pipSpeed: .16625
}, },
retailCost: 17472250, retailCost: 17472260,
bulkheads: [ { bulkheads: [ {
id: "Bs", id: "Bs",
edID: 128049298, edID: 128049298,
@@ -4234,7 +4234,7 @@ module.exports = {
ls: [ { ls: [ {
boot: 1, boot: 1,
class: 8, class: 8,
cost: 0, cost: 697590,
edID: 128064173, edID: 128064173,
eddbID: 1031, eddbID: 1031,
grp: "ls", grp: "ls",
@@ -4247,7 +4247,7 @@ module.exports = {
}, { }, {
boot: 1, boot: 1,
class: 8, class: 8,
cost: 0, cost: 1743970,
edID: 128064174, edID: 128064174,
eddbID: 1032, eddbID: 1032,
grp: "ls", grp: "ls",
@@ -4260,7 +4260,7 @@ module.exports = {
}, { }, {
boot: 1, boot: 1,
class: 8, class: 8,
cost: 0, cost: 4359900,
edID: 128064175, edID: 128064175,
eddbID: 1033, eddbID: 1033,
grp: "ls", grp: "ls",
@@ -4273,7 +4273,7 @@ module.exports = {
}, { }, {
boot: 1, boot: 1,
class: 8, class: 8,
cost: 0, cost: 10899770,
edID: 128064176, edID: 128064176,
eddbID: 1034, eddbID: 1034,
grp: "ls", grp: "ls",
@@ -4286,7 +4286,7 @@ module.exports = {
}, { }, {
boot: 1, boot: 1,
class: 8, class: 8,
cost: 0, cost: 27249400,
edID: 128064177, edID: 128064177,
eddbID: 1035, eddbID: 1035,
grp: "ls", grp: "ls",
@@ -10835,100 +10835,130 @@ module.exports = {
cost: 15e4, cost: 15e4,
edID: 128668545, edID: 128668545,
eddbID: 1381, eddbID: 1381,
explres: 2.5,
grp: "hr", grp: "hr",
id: "2e", id: "2e",
kinres: 2.5,
mass: 64, mass: 64,
rating: "E" rating: "E",
thermres: 2.5
}, { }, {
hullreinforcement: 390, hullreinforcement: 390,
class: 5, class: 5,
cost: 45e4, cost: 45e4,
edID: 128668546, edID: 128668546,
eddbID: 1382, eddbID: 1382,
explres: 2.5,
grp: "hr", grp: "hr",
id: "2d", id: "2d",
kinres: 2.5,
mass: 32, mass: 32,
rating: "D" rating: "D",
thermres: 2.5
}, { }, {
hullreinforcement: 300, hullreinforcement: 300,
class: 4, class: 4,
cost: 65e3, cost: 65e3,
edID: 128668543, edID: 128668543,
eddbID: 1379, eddbID: 1379,
explres: 2,
grp: "hr", grp: "hr",
id: "2c", id: "2c",
kinres: 2,
mass: 32, mass: 32,
rating: "E" rating: "E",
thermres: 2
}, { }, {
hullreinforcement: 330, hullreinforcement: 330,
class: 4, class: 4,
cost: 195e3, cost: 195e3,
edID: 128668544, edID: 128668544,
eddbID: 1380, eddbID: 1380,
explres: 2,
grp: "hr", grp: "hr",
id: "2b", id: "2b",
kinres: 2,
mass: 16, mass: 16,
rating: "D" rating: "D",
thermres: 2
}, { }, {
hullreinforcement: 230, hullreinforcement: 230,
class: 3, class: 3,
cost: 28e3, cost: 28e3,
edID: 128668541, edID: 128668541,
eddbID: 1377, eddbID: 1377,
explres: 1.5,
grp: "hr", grp: "hr",
id: "2a", id: "2a",
kinres: 1.5,
mass: 16, mass: 16,
rating: "E" rating: "E",
thermres: 1.5
}, { }, {
hullreinforcement: 260, hullreinforcement: 260,
class: 3, class: 3,
cost: 84e3, cost: 84e3,
edID: 128668542, edID: 128668542,
eddbID: 1378, eddbID: 1378,
explres: 1.5,
grp: "hr", grp: "hr",
id: "29", id: "29",
kinres: 1.5,
mass: 8, mass: 8,
rating: "D" rating: "D",
thermres: 1.5
}, { }, {
hullreinforcement: 150, hullreinforcement: 150,
class: 2, class: 2,
cost: 12e3, cost: 12e3,
edID: 128668539, edID: 128668539,
eddbID: 1375, eddbID: 1375,
explres: 1,
grp: "hr", grp: "hr",
id: "28", id: "28",
kinres: 1,
mass: 8, mass: 8,
rating: "E" rating: "E",
thermres: 1
}, { }, {
hullreinforcement: 190, hullreinforcement: 190,
class: 2, class: 2,
cost: 36e3, cost: 36e3,
edID: 128668540, edID: 128668540,
eddbID: 1376, eddbID: 1376,
explres: 1,
grp: "hr", grp: "hr",
id: "27", id: "27",
kinres: 1,
mass: 4, mass: 4,
rating: "D" rating: "D",
themres: 1
}, { }, {
hullreinforcement: 80, hullreinforcement: 80,
class: 1, class: 1,
cost: 5e3, cost: 5e3,
edID: 128668537, edID: 128668537,
eddbID: 1373, eddbID: 1373,
explres: .5,
grp: "hr", grp: "hr",
id: "26", id: "26",
kinres: .5,
mass: 4, mass: 4,
rating: "E" rating: "E",
thermres: .5
}, { }, {
hullreinforcement: 110, hullreinforcement: 110,
class: 1, class: 1,
cost: 15e3, cost: 15e3,
edID: 128668538, edID: 128668538,
eddbID: 1374, eddbID: 1374,
explres: .5,
grp: "hr", grp: "hr",
id: "25", id: "25",
kinres: .5,
mass: 2, mass: 2,
rating: "D" rating: "D",
thermres: .5
} ], } ],
pv: [ { pv: [ {
bays: 4, bays: 4,
@@ -13158,7 +13188,7 @@ module.exports = {
am: [ "integrity", "power" ], am: [ "integrity", "power" ],
bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ], bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ],
bl: [ "damage", "distdraw", "integrity", "mass", "piercing", "power", "range", "thermload" ], 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" ], c: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
cc: [ "integrity", "mass", "power" ], cc: [ "integrity", "mass", "power" ],
ch: [ "ammo", "integrity", "mass", "power", "reload" ], ch: [ "ammo", "integrity", "mass", "power", "reload" ],
@@ -13183,13 +13213,12 @@ module.exports = {
pl: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], pl: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
po: [ "ammo", "integrity", "mass", "power", "reload" ], po: [ "ammo", "integrity", "mass", "power", "reload" ],
pp: [ "eff", "integrity", "mass", "pgen" ], 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" ], rf: [ "integrity", "power" ],
rg: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ], 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" ], sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "thermres" ],
scb: [ "boot", "duration", "integrity", "power", "shield", "spinup", "thermload" ], 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" ], t: [ "integrity", "mass", "optmass", "optmul", "power", "thermload" ],
tp: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], tp: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
ul: [ "burst", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ], ul: [ "burst", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],

93
dist/index.json vendored
View File

@@ -765,10 +765,10 @@
"internal": [ "internal": [
"4j", "4j",
"04", "04",
"6dbusiness", "mi",
"6dbusiness", "mi",
"4dbusiness", "mg",
"4dbusiness", "mg",
"02", "02",
"01", "01",
0, 0,
@@ -2895,7 +2895,7 @@
"name": "Keelback", "name": "Keelback",
"manufacturer": "Lakon", "manufacturer": "Lakon",
"class": 2, "class": 2,
"hullCost": 2951180, "hullCost": 2943880,
"speed": 200, "speed": 200,
"boost": 300, "boost": 300,
"boostEnergy": 10, "boostEnergy": 10,
@@ -2907,7 +2907,7 @@
"pipSpeed": 0.1375, "pipSpeed": 0.1375,
"fighterHangars": true "fighterHangars": true
}, },
"retailCost": 3126150, "retailCost": 3126160,
"bulkheads": [ "bulkheads": [
{ {
"id": "cb", "id": "cb",
@@ -3034,7 +3034,7 @@
"name": "Orca", "name": "Orca",
"manufacturer": "Saud Kruger", "manufacturer": "Saud Kruger",
"class": 3, "class": 3,
"hullCost": 47798080, "hullCost": 47790590,
"speed": 300, "speed": 300,
"boost": 380, "boost": 380,
"boostEnergy": 16, "boostEnergy": 16,
@@ -3046,7 +3046,7 @@
"pipSpeed": 0.08375, "pipSpeed": 0.08375,
"luxuryCabins": true "luxuryCabins": true
}, },
"retailCost": 48539890, "retailCost": 48539900,
"bulkheads": [ "bulkheads": [
{ {
"id": "BM", "id": "BM",
@@ -3179,8 +3179,8 @@
0 0
], ],
"internal": [ "internal": [
"6e economy", "me",
"4e economy", "mc",
"03", "03",
"4e", "4e",
"02", "02",
@@ -3609,7 +3609,7 @@
"name": "Type-7 Transporter", "name": "Type-7 Transporter",
"manufacturer": "Lakon", "manufacturer": "Lakon",
"class": 3, "class": 3,
"hullCost": 16881510, "hullCost": 16780510,
"speed": 180, "speed": 180,
"boost": 300, "boost": 300,
"boostEnergy": 10, "boostEnergy": 10,
@@ -3620,7 +3620,7 @@
"masslock": 10, "masslock": 10,
"pipSpeed": 0.16625 "pipSpeed": 0.16625
}, },
"retailCost": 17472250, "retailCost": 17472260,
"bulkheads": [ "bulkheads": [
{ {
"id": "Bs", "id": "Bs",
@@ -5993,7 +5993,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 697590,
"edID": 128064173, "edID": 128064173,
"eddbID": 1031, "eddbID": 1031,
"grp": "ls", "grp": "ls",
@@ -6007,7 +6007,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 1743970,
"edID": 128064174, "edID": 128064174,
"eddbID": 1032, "eddbID": 1032,
"grp": "ls", "grp": "ls",
@@ -6021,7 +6021,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 4359900,
"edID": 128064175, "edID": 128064175,
"eddbID": 1033, "eddbID": 1033,
"grp": "ls", "grp": "ls",
@@ -6035,7 +6035,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 10899770,
"edID": 128064176, "edID": 128064176,
"eddbID": 1034, "eddbID": 1034,
"grp": "ls", "grp": "ls",
@@ -6049,7 +6049,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 27249400,
"edID": 128064177, "edID": 128064177,
"eddbID": 1035, "eddbID": 1035,
"grp": "ls", "grp": "ls",
@@ -13062,10 +13062,13 @@
"cost": 150000, "cost": 150000,
"edID": 128668545, "edID": 128668545,
"eddbID": 1381, "eddbID": 1381,
"explres": 2.5,
"grp": "hr", "grp": "hr",
"id": "2e", "id": "2e",
"kinres": 2.5,
"mass": 64, "mass": 64,
"rating": "E" "rating": "E",
"thermres": 2.5
}, },
{ {
"hullreinforcement": 390, "hullreinforcement": 390,
@@ -13073,10 +13076,13 @@
"cost": 450000, "cost": 450000,
"edID": 128668546, "edID": 128668546,
"eddbID": 1382, "eddbID": 1382,
"explres": 2.5,
"grp": "hr", "grp": "hr",
"id": "2d", "id": "2d",
"kinres": 2.5,
"mass": 32, "mass": 32,
"rating": "D" "rating": "D",
"thermres": 2.5
}, },
{ {
"hullreinforcement": 300, "hullreinforcement": 300,
@@ -13084,10 +13090,13 @@
"cost": 65000, "cost": 65000,
"edID": 128668543, "edID": 128668543,
"eddbID": 1379, "eddbID": 1379,
"explres": 2,
"grp": "hr", "grp": "hr",
"id": "2c", "id": "2c",
"kinres": 2,
"mass": 32, "mass": 32,
"rating": "E" "rating": "E",
"thermres": 2
}, },
{ {
"hullreinforcement": 330, "hullreinforcement": 330,
@@ -13095,10 +13104,13 @@
"cost": 195000, "cost": 195000,
"edID": 128668544, "edID": 128668544,
"eddbID": 1380, "eddbID": 1380,
"explres": 2,
"grp": "hr", "grp": "hr",
"id": "2b", "id": "2b",
"kinres": 2,
"mass": 16, "mass": 16,
"rating": "D" "rating": "D",
"thermres": 2
}, },
{ {
"hullreinforcement": 230, "hullreinforcement": 230,
@@ -13106,10 +13118,13 @@
"cost": 28000, "cost": 28000,
"edID": 128668541, "edID": 128668541,
"eddbID": 1377, "eddbID": 1377,
"explres": 1.5,
"grp": "hr", "grp": "hr",
"id": "2a", "id": "2a",
"kinres": 1.5,
"mass": 16, "mass": 16,
"rating": "E" "rating": "E",
"thermres": 1.5
}, },
{ {
"hullreinforcement": 260, "hullreinforcement": 260,
@@ -13117,10 +13132,13 @@
"cost": 84000, "cost": 84000,
"edID": 128668542, "edID": 128668542,
"eddbID": 1378, "eddbID": 1378,
"explres": 1.5,
"grp": "hr", "grp": "hr",
"id": "29", "id": "29",
"kinres": 1.5,
"mass": 8, "mass": 8,
"rating": "D" "rating": "D",
"thermres": 1.5
}, },
{ {
"hullreinforcement": 150, "hullreinforcement": 150,
@@ -13128,10 +13146,13 @@
"cost": 12000, "cost": 12000,
"edID": 128668539, "edID": 128668539,
"eddbID": 1375, "eddbID": 1375,
"explres": 1,
"grp": "hr", "grp": "hr",
"id": "28", "id": "28",
"kinres": 1,
"mass": 8, "mass": 8,
"rating": "E" "rating": "E",
"thermres": 1
}, },
{ {
"hullreinforcement": 190, "hullreinforcement": 190,
@@ -13139,10 +13160,13 @@
"cost": 36000, "cost": 36000,
"edID": 128668540, "edID": 128668540,
"eddbID": 1376, "eddbID": 1376,
"explres": 1,
"grp": "hr", "grp": "hr",
"id": "27", "id": "27",
"kinres": 1,
"mass": 4, "mass": 4,
"rating": "D" "rating": "D",
"themres": 1
}, },
{ {
"hullreinforcement": 80, "hullreinforcement": 80,
@@ -13150,10 +13174,13 @@
"cost": 5000, "cost": 5000,
"edID": 128668537, "edID": 128668537,
"eddbID": 1373, "eddbID": 1373,
"explres": 0.5,
"grp": "hr", "grp": "hr",
"id": "26", "id": "26",
"kinres": 0.5,
"mass": 4, "mass": 4,
"rating": "E" "rating": "E",
"thermres": 0.5
}, },
{ {
"hullreinforcement": 110, "hullreinforcement": 110,
@@ -13161,10 +13188,13 @@
"cost": 15000, "cost": 15000,
"edID": 128668538, "edID": 128668538,
"eddbID": 1374, "eddbID": 1374,
"explres": 0.5,
"grp": "hr", "grp": "hr",
"id": "25", "id": "25",
"kinres": 0.5,
"mass": 2, "mass": 2,
"rating": "D" "rating": "D",
"thermres": 0.5
} }
], ],
"pv": [ "pv": [
@@ -15615,6 +15645,7 @@
"bsg": [ "bsg": [
"boot", "boot",
"brokenregen", "brokenregen",
"distdraw",
"explres", "explres",
"integrity", "integrity",
"kinres", "kinres",
@@ -15841,6 +15872,7 @@
"psg": [ "psg": [
"boot", "boot",
"brokenregen", "brokenregen",
"distdraw",
"explres", "explres",
"integrity", "integrity",
"kinres", "kinres",
@@ -15871,12 +15903,6 @@
"rof", "rof",
"thermload" "thermload"
], ],
"s": [
"boot",
"integrity",
"mass",
"power"
],
"sb": [ "sb": [
"explres", "explres",
"integrity", "integrity",
@@ -15898,6 +15924,7 @@
"sg": [ "sg": [
"boot", "boot",
"brokenregen", "brokenregen",
"distdraw",
"explres", "explres",
"integrity", "integrity",
"kinres", "kinres",

9
modifications/validity.json
View File

@@ -23,6 +23,7 @@
"bsg": [ "bsg": [
"boot", "boot",
"brokenregen", "brokenregen",
"distdraw",
"explres", "explres",
"integrity", "integrity",
"kinres", "kinres",
@@ -249,6 +250,7 @@
"psg": [ "psg": [
"boot", "boot",
"brokenregen", "brokenregen",
"distdraw",
"explres", "explres",
"integrity", "integrity",
"kinres", "kinres",
@@ -279,12 +281,6 @@
"rof", "rof",
"thermload" "thermload"
], ],
"s": [
"boot",
"integrity",
"mass",
"power"
],
"sb": [ "sb": [
"explres", "explres",
"integrity", "integrity",
@@ -306,6 +302,7 @@
"sg": [ "sg": [
"boot", "boot",
"brokenregen", "brokenregen",
"distdraw",
"explres", "explres",
"integrity", "integrity",
"kinres", "kinres",

50
modules/internal/hull_reinforcement_package.json
View File

@@ -6,10 +6,13 @@
"cost": 150000, "cost": 150000,
"edID": 128668545, "edID": 128668545,
"eddbID": 1381, "eddbID": 1381,
"explres": 2.5,
"grp": "hr", "grp": "hr",
"id": "2e", "id": "2e",
"kinres": 2.5,
"mass": 64, "mass": 64,
"rating": "E" "rating": "E",
"thermres": 2.5
}, },
{ {
"hullreinforcement": 390, "hullreinforcement": 390,
@@ -17,10 +20,13 @@
"cost": 450000, "cost": 450000,
"edID": 128668546, "edID": 128668546,
"eddbID": 1382, "eddbID": 1382,
"explres": 2.5,
"grp": "hr", "grp": "hr",
"id": "2d", "id": "2d",
"kinres": 2.5,
"mass": 32, "mass": 32,
"rating": "D" "rating": "D",
"thermres": 2.5
}, },
{ {
"hullreinforcement": 300, "hullreinforcement": 300,
@@ -28,10 +34,13 @@
"cost": 65000, "cost": 65000,
"edID": 128668543, "edID": 128668543,
"eddbID": 1379, "eddbID": 1379,
"explres": 2,
"grp": "hr", "grp": "hr",
"id": "2c", "id": "2c",
"kinres": 2,
"mass": 32, "mass": 32,
"rating": "E" "rating": "E",
"thermres": 2
}, },
{ {
"hullreinforcement": 330, "hullreinforcement": 330,
@@ -39,10 +48,13 @@
"cost": 195000, "cost": 195000,
"edID": 128668544, "edID": 128668544,
"eddbID": 1380, "eddbID": 1380,
"explres": 2,
"grp": "hr", "grp": "hr",
"id": "2b", "id": "2b",
"kinres": 2,
"mass": 16, "mass": 16,
"rating": "D" "rating": "D",
"thermres": 2
}, },
{ {
"hullreinforcement": 230, "hullreinforcement": 230,
@@ -50,10 +62,13 @@
"cost": 28000, "cost": 28000,
"edID": 128668541, "edID": 128668541,
"eddbID": 1377, "eddbID": 1377,
"explres": 1.5,
"grp": "hr", "grp": "hr",
"id": "2a", "id": "2a",
"kinres": 1.5,
"mass": 16, "mass": 16,
"rating": "E" "rating": "E",
"thermres": 1.5
}, },
{ {
"hullreinforcement": 260, "hullreinforcement": 260,
@@ -61,10 +76,13 @@
"cost": 84000, "cost": 84000,
"edID": 128668542, "edID": 128668542,
"eddbID": 1378, "eddbID": 1378,
"explres": 1.5,
"grp": "hr", "grp": "hr",
"id": "29", "id": "29",
"kinres": 1.5,
"mass": 8, "mass": 8,
"rating": "D" "rating": "D",
"thermres": 1.5
}, },
{ {
"hullreinforcement": 150, "hullreinforcement": 150,
@@ -72,10 +90,13 @@
"cost": 12000, "cost": 12000,
"edID": 128668539, "edID": 128668539,
"eddbID": 1375, "eddbID": 1375,
"explres": 1,
"grp": "hr", "grp": "hr",
"id": "28", "id": "28",
"kinres": 1,
"mass": 8, "mass": 8,
"rating": "E" "rating": "E",
"thermres": 1
}, },
{ {
"hullreinforcement": 190, "hullreinforcement": 190,
@@ -83,10 +104,13 @@
"cost": 36000, "cost": 36000,
"edID": 128668540, "edID": 128668540,
"eddbID": 1376, "eddbID": 1376,
"explres": 1,
"grp": "hr", "grp": "hr",
"id": "27", "id": "27",
"kinres": 1,
"mass": 4, "mass": 4,
"rating": "D" "rating": "D",
"themres": 1
}, },
{ {
"hullreinforcement": 80, "hullreinforcement": 80,
@@ -94,10 +118,13 @@
"cost": 5000, "cost": 5000,
"edID": 128668537, "edID": 128668537,
"eddbID": 1373, "eddbID": 1373,
"explres": 0.5,
"grp": "hr", "grp": "hr",
"id": "26", "id": "26",
"kinres": 0.5,
"mass": 4, "mass": 4,
"rating": "E" "rating": "E",
"thermres": 0.5
}, },
{ {
"hullreinforcement": 110, "hullreinforcement": 110,
@@ -105,10 +132,13 @@
"cost": 15000, "cost": 15000,
"edID": 128668538, "edID": 128668538,
"eddbID": 1374, "eddbID": 1374,
"explres": 0.5,
"grp": "hr", "grp": "hr",
"id": "25", "id": "25",
"kinres": 0.5,
"mass": 2, "mass": 2,
"rating": "D" "rating": "D",
"thermres": 0.5
} }
] ]
} }

10
modules/standard/life_support.json
View File

@@ -3,7 +3,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 697590,
"edID": 128064173, "edID": 128064173,
"eddbID": 1031, "eddbID": 1031,
"grp": "ls", "grp": "ls",
@@ -17,7 +17,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 1743970,
"edID": 128064174, "edID": 128064174,
"eddbID": 1032, "eddbID": 1032,
"grp": "ls", "grp": "ls",
@@ -31,7 +31,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 4359900,
"edID": 128064175, "edID": 128064175,
"eddbID": 1033, "eddbID": 1033,
"grp": "ls", "grp": "ls",
@@ -45,7 +45,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 10899770,
"edID": 128064176, "edID": 128064176,
"eddbID": 1034, "eddbID": 1034,
"grp": "ls", "grp": "ls",
@@ -59,7 +59,7 @@
{ {
"boot": 1, "boot": 1,
"class": 8, "class": 8,
"cost": 0, "cost": 27249400,
"edID": 128064177, "edID": 128064177,
"eddbID": 1035, "eddbID": 1035,
"grp": "ls", "grp": "ls",

2
ships/beluga.json
View File

@@ -42,7 +42,7 @@
"defaults": { "defaults": {
"standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"], "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"],
"hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0], "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"]
} }
} }
} }

4
ships/keelback.json
View File

@@ -6,7 +6,7 @@
"name": "Keelback", "name": "Keelback",
"manufacturer": "Lakon", "manufacturer": "Lakon",
"class": 2, "class": 2,
"hullCost": 2951180, "hullCost": 2943880,
"speed": 200, "speed": 200,
"boost": 300, "boost": 300,
"boostEnergy": 10, "boostEnergy": 10,
@@ -18,7 +18,7 @@
"pipSpeed": 0.1375, "pipSpeed": 0.1375,
"fighterHangars": true "fighterHangars": true
}, },
"retailCost": 3126150, "retailCost": 3126160,
"bulkheads": [ "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": "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 }, { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },

6
ships/orca.json
View File

@@ -6,7 +6,7 @@
"name": "Orca", "name": "Orca",
"manufacturer": "Saud Kruger", "manufacturer": "Saud Kruger",
"class": 3, "class": 3,
"hullCost": 47798080, "hullCost": 47790590,
"speed": 300, "speed": 300,
"boost": 380, "boost": 380,
"boostEnergy": 16, "boostEnergy": 16,
@@ -18,7 +18,7 @@
"pipSpeed": 0.08375, "pipSpeed": 0.08375,
"luxuryCabins": true "luxuryCabins": true
}, },
"retailCost": 48539890, "retailCost": 48539900,
"bulkheads": [ "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": "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 }, { "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": { "defaults": {
"standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"], "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"],
"hardpoints": [0, 17, 17, 0, 0, 0, 0], "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"]
} }
} }
} }

4
ships/type_7_transport.json
View File

@@ -6,7 +6,7 @@
"name": "Type-7 Transporter", "name": "Type-7 Transporter",
"manufacturer": "Lakon", "manufacturer": "Lakon",
"class": 3, "class": 3,
"hullCost": 16881510, "hullCost": 16780510,
"speed": 180, "speed": 180,
"boost": 300, "boost": 300,
"boostEnergy": 10, "boostEnergy": 10,
@@ -17,7 +17,7 @@
"masslock": 10, "masslock": 10,
"pipSpeed": 0.16625 "pipSpeed": 0.16625
}, },
"retailCost": 17472250, "retailCost": 17472260,
"bulkheads": [ "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": "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 }, { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },