From 51ee7c9af3371fdf124ee6e999900ab83458fcbf Mon Sep 17 00:00:00 2001 From: willyb321 Date: Fri, 19 Jan 2018 15:57:50 +1100 Subject: [PATCH 1/9] initial chieftan stats are from FDL (and IDs) --- dist/index.js | 114 +++++++++++++++++++++++ dist/index.json | 170 +++++++++++++++++++++++++++++++++++ ships/alliance_chieftan.json | 47 ++++++++++ ships/index.js | 1 + 4 files changed, 332 insertions(+) create mode 100644 ships/alliance_chieftan.json diff --git a/dist/index.js b/dist/index.js index 7121b24..464798b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -90,6 +90,120 @@ module.exports = { internal: [ "01", "44", "00", 0, "2h" ] } }, + alliance_chieftan: { + edID: 128049352, + eddbID: 12, + properties: { + name: "Alliance Chieftan", + manufacturer: "Lakon", + class: 2, + hullCost: 51232230, + speed: 260, + boost: 350, + boostEnergy: 19, + baseShieldStrength: 300, + baseArmour: 504, + hardness: 70, + hullMass: 250, + masslock: 12, + pipSpeed: .03875, + pitch: 38, + roll: 90, + yaw: 12, + crew: 2 + }, + retailCost: 51567040, + bulkheads: [ { + id: "Bd", + edID: 128049352, + eddbID: 813, + grp: "bh", + cost: 0, + mass: 0, + explres: -.4, + kinres: -.2, + thermres: 0, + hullboost: .8 + }, { + id: "Be", + edID: 128049353, + eddbID: 814, + grp: "bh", + cost: 20626820, + mass: 19, + explres: -.4, + kinres: -.2, + thermres: 0, + hullboost: 1.52 + }, { + id: "Bf", + edID: 128049354, + eddbID: 815, + grp: "bh", + cost: 46410340, + mass: 38, + explres: -.4, + kinres: -.2, + thermres: 0, + hullboost: 2.5 + }, { + id: "Bg", + edID: 128049355, + eddbID: 816, + grp: "bh", + cost: 109683090, + mass: 38, + explres: -.5, + kinres: -.75, + thermres: .5, + hullboost: 2.5 + }, { + id: "Bh", + edID: 128049356, + eddbID: 817, + grp: "bh", + cost: 121543510, + mass: 38, + explres: .2, + kinres: .25, + thermres: -.4, + hullboost: 2.5 + } ], + slots: { + standard: [ 6, 6, 5, 5, 6, 4, 4 ], + hardpoints: [ 3, 3, 2, 1, 1, 1, 0, 0, 0, 0 ], + internal: [ 5, 5, 4, 2, 2, { + class: 4, + name: "Military", + eligible: { + hr: 1, + scb: 1, + mrp: 1 + } + }, { + class: 4, + name: "Military", + eligible: { + hr: 1, + scb: 1, + mrp: 1 + } + }, { + class: 4, + name: "Military", + eligible: { + hr: 1, + scb: 1, + mrp: 1 + } + } ] + }, + defaults: { + standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ], + hardpoints: [ 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0 ], + internal: [ "" ] + } + }, anaconda: { edID: 128049363, eddbID: 2, diff --git a/dist/index.json b/dist/index.json index a3e2ca9..7f47825 100644 --- a/dist/index.json +++ b/dist/index.json @@ -136,6 +136,176 @@ ] } }, + "alliance_chieftan": { + "edID": 128049352, + "eddbID": 12, + "properties": { + "name": "Alliance Chieftan", + "manufacturer": "Lakon", + "class": 2, + "hullCost": 51232230, + "speed": 260, + "boost": 350, + "boostEnergy": 19, + "baseShieldStrength": 300, + "baseArmour": 504, + "hardness": 70, + "hullMass": 250, + "masslock": 12, + "pipSpeed": 0.03875, + "pitch": 38, + "roll": 90, + "yaw": 12, + "crew": 2 + }, + "retailCost": 51567040, + "bulkheads": [ + { + "id": "Bd", + "edID": 128049352, + "eddbID": 813, + "grp": "bh", + "cost": 0, + "mass": 0, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 0.8 + }, + { + "id": "Be", + "edID": 128049353, + "eddbID": 814, + "grp": "bh", + "cost": 20626820, + "mass": 19, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 1.52 + }, + { + "id": "Bf", + "edID": 128049354, + "eddbID": 815, + "grp": "bh", + "cost": 46410340, + "mass": 38, + "explres": -0.4, + "kinres": -0.2, + "thermres": 0, + "hullboost": 2.5 + }, + { + "id": "Bg", + "edID": 128049355, + "eddbID": 816, + "grp": "bh", + "cost": 109683090, + "mass": 38, + "explres": -0.5, + "kinres": -0.75, + "thermres": 0.5, + "hullboost": 2.5 + }, + { + "id": "Bh", + "edID": 128049356, + "eddbID": 817, + "grp": "bh", + "cost": 121543510, + "mass": 38, + "explres": 0.2, + "kinres": 0.25, + "thermres": -0.4, + "hullboost": 2.5 + } + ], + "slots": { + "standard": [ + 6, + 6, + 5, + 5, + 6, + 4, + 4 + ], + "hardpoints": [ + 3, + 3, + 2, + 1, + 1, + 1, + 0, + 0, + 0, + 0 + ], + "internal": [ + 5, + 5, + 4, + 2, + 2, + { + "class": 4, + "name": "Military", + "eligible": { + "hr": 1, + "scb": 1, + "mrp": 1 + } + }, + { + "class": 4, + "name": "Military", + "eligible": { + "hr": 1, + "scb": 1, + "mrp": 1 + } + }, + { + "class": 4, + "name": "Military", + "eligible": { + "hr": 1, + "scb": 1, + "mrp": 1 + } + } + ] + }, + "defaults": { + "standard": [ + "6E", + "6E", + "5E", + "5E", + "6E", + "4E", + "4C" + ], + "hardpoints": [ + 0, + 17, + 17, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "internal": [ + "" + ] + } + }, "anaconda": { "edID": 128049363, "eddbID": 2, diff --git a/ships/alliance_chieftan.json b/ships/alliance_chieftan.json new file mode 100644 index 0000000..11ed8bb --- /dev/null +++ b/ships/alliance_chieftan.json @@ -0,0 +1,47 @@ +{ + "alliance_chieftan": { + "edID": 128049352, + "eddbID": 12, + "properties": { + "name": "Alliance Chieftan", + "manufacturer": "Lakon", + "class": 2, + "hullCost": 51232230, + "speed": 260, + "boost": 350, + "boostEnergy": 19, + "baseShieldStrength": 300, + "baseArmour": 504, + "hardness": 70, + "hullMass": 250, + "masslock": 12, + "pipSpeed": 0.03875, + "pitch": 38, + "roll": 90, + "yaw": 12, + "crew": 2 + }, + "retailCost": 51567040, + "bulkheads": [ + { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, + { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } + ], + "slots": { + "standard": [6, 6, 5, 5, 6, 4, 4], + "hardpoints": [3, 3, 2, 1, 1, 1, 0, 0, 0, 0], + "internal": [5, 5, 4, 2, 2, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }, + { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } } + ] + }, + "defaults": { + "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"], + "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0], + "internal": [""] + } + } +} diff --git a/ships/index.js b/ships/index.js index 9e64129..146cc38 100644 --- a/ships/index.js +++ b/ships/index.js @@ -1,5 +1,6 @@ module.exports = { adder: require('./adder').adder, + alliance_chieftan: require('./alliance_chieftan').alliance_chieftan, anaconda: require('./anaconda').anaconda, asp: require('./asp').asp, asp_scout: require('./asp_scout').asp_scout, From 4f7f79a7f43eb8089d90f898ec8875dd14e4c6d9 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Fri, 26 Jan 2018 19:51:45 +1100 Subject: [PATCH 2/9] more chieftan --- dist/index.js | 36 +++++++++++++++++----------------- dist/index.json | 38 ++++++++++++++++++++---------------- ships/alliance_chieftan.json | 26 ++++++++++++------------ 3 files changed, 52 insertions(+), 48 deletions(-) diff --git a/dist/index.js b/dist/index.js index 995eb84..4b2d876 100644 --- a/dist/index.js +++ b/dist/index.js @@ -91,20 +91,20 @@ module.exports = { } }, alliance_chieftan: { - edID: 128049352, + edID: 128816574, eddbID: 12, properties: { name: "Alliance Chieftan", manufacturer: "Lakon", class: 2, - hullCost: 51232230, - speed: 260, - boost: 350, + hullCost: 17007927, + speed: 235, + boost: 337, boostEnergy: 19, - baseShieldStrength: 300, + baseShieldStrength: 154, baseArmour: 504, hardness: 70, - hullMass: 250, + hullMass: 420, masslock: 12, pipSpeed: .03875, pitch: 38, @@ -112,10 +112,10 @@ module.exports = { yaw: 12, crew: 2 }, - retailCost: 51567040, + retailCost: 18897696, bulkheads: [ { id: "Bd", - edID: 128049352, + edID: 128816576, eddbID: 813, grp: "bh", cost: 0, @@ -126,10 +126,10 @@ module.exports = { hullboost: .8 }, { id: "Be", - edID: 128049353, + edID: 128816577, eddbID: 814, grp: "bh", - cost: 20626820, + cost: 6803170, mass: 19, explres: -.4, kinres: -.2, @@ -137,10 +137,10 @@ module.exports = { hullboost: 1.52 }, { id: "Bf", - edID: 128049354, + edID: 128816578, eddbID: 815, grp: "bh", - cost: 46410340, + cost: 15307134, mass: 38, explres: -.4, kinres: -.2, @@ -148,10 +148,10 @@ module.exports = { hullboost: 2.5 }, { id: "Bg", - edID: 128049355, + edID: 128816579, eddbID: 816, grp: "bh", - cost: 109683090, + cost: 36175859, mass: 38, explres: -.5, kinres: -.75, @@ -159,10 +159,10 @@ module.exports = { hullboost: 2.5 }, { id: "Bh", - edID: 128049356, + edID: 128816580, eddbID: 817, grp: "bh", - cost: 121543510, + cost: 40087682, mass: 38, explres: .2, kinres: .25, @@ -201,7 +201,7 @@ module.exports = { defaults: { standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ], hardpoints: [ 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0 ], - internal: [ "" ] + internal: [ "03", "4e", "02", "", "2h" ] } }, anaconda: { @@ -9878,7 +9878,7 @@ module.exports = { edID: 128771884, eddbID: 1622, grp: "sfn", - id: "sfn", + id: "Sn", integrity: 35, mass: 1.3, name: "Shutdown Field Neutraliser", diff --git a/dist/index.json b/dist/index.json index 523c98c..9436349 100644 --- a/dist/index.json +++ b/dist/index.json @@ -137,20 +137,20 @@ } }, "alliance_chieftan": { - "edID": 128049352, + "edID": 128816574, "eddbID": 12, "properties": { "name": "Alliance Chieftan", "manufacturer": "Lakon", "class": 2, - "hullCost": 51232230, - "speed": 260, - "boost": 350, + "hullCost": 17007927, + "speed": 235, + "boost": 337, "boostEnergy": 19, - "baseShieldStrength": 300, + "baseShieldStrength": 154, "baseArmour": 504, "hardness": 70, - "hullMass": 250, + "hullMass": 420, "masslock": 12, "pipSpeed": 0.03875, "pitch": 38, @@ -158,11 +158,11 @@ "yaw": 12, "crew": 2 }, - "retailCost": 51567040, + "retailCost": 18897696, "bulkheads": [ { "id": "Bd", - "edID": 128049352, + "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, @@ -174,10 +174,10 @@ }, { "id": "Be", - "edID": 128049353, + "edID": 128816577, "eddbID": 814, "grp": "bh", - "cost": 20626820, + "cost": 6803170, "mass": 19, "explres": -0.4, "kinres": -0.2, @@ -186,10 +186,10 @@ }, { "id": "Bf", - "edID": 128049354, + "edID": 128816578, "eddbID": 815, "grp": "bh", - "cost": 46410340, + "cost": 15307134, "mass": 38, "explres": -0.4, "kinres": -0.2, @@ -198,10 +198,10 @@ }, { "id": "Bg", - "edID": 128049355, + "edID": 128816579, "eddbID": 816, "grp": "bh", - "cost": 109683090, + "cost": 36175859, "mass": 38, "explres": -0.5, "kinres": -0.75, @@ -210,10 +210,10 @@ }, { "id": "Bh", - "edID": 128049356, + "edID": 128816580, "eddbID": 817, "grp": "bh", - "cost": 121543510, + "cost": 40087682, "mass": 38, "explres": 0.2, "kinres": 0.25, @@ -302,7 +302,11 @@ 0 ], "internal": [ - "" + "03", + "4e", + "02", + "", + "2h" ] } }, diff --git a/ships/alliance_chieftan.json b/ships/alliance_chieftan.json index 11ed8bb..f71c7a7 100644 --- a/ships/alliance_chieftan.json +++ b/ships/alliance_chieftan.json @@ -1,19 +1,19 @@ { "alliance_chieftan": { - "edID": 128049352, + "edID": 128816574, "eddbID": 12, "properties": { "name": "Alliance Chieftan", "manufacturer": "Lakon", "class": 2, - "hullCost": 51232230, - "speed": 260, - "boost": 350, + "hullCost": 17007927, + "speed": 235, + "boost": 337, "boostEnergy": 19, - "baseShieldStrength": 300, + "baseShieldStrength": 154, "baseArmour": 504, "hardness": 70, - "hullMass": 250, + "hullMass": 420, "masslock": 12, "pipSpeed": 0.03875, "pitch": 38, @@ -21,13 +21,13 @@ "yaw": 12, "crew": 2 }, - "retailCost": 51567040, + "retailCost": 18897696, "bulkheads": [ - { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, - { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, - { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 }, - { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, - { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } + { "id": "Bd", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, + { "id": "Be", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "Bf", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "Bg", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "Bh", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], @@ -41,7 +41,7 @@ "defaults": { "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"], "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0], - "internal": [""] + "internal": ["03", "4e", "02", "", "2h"] } } } From bb24fa8aecd3797477273388c8c483368e618dcd Mon Sep 17 00:00:00 2001 From: willyb321 Date: Fri, 26 Jan 2018 20:31:21 +1100 Subject: [PATCH 3/9] fix name it has an i --- dist/index.js | 6 +++--- dist/index.json | 4 ++-- ships/{alliance_chieftan.json => alliance_chieftain.json} | 4 ++-- ships/index.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename ships/{alliance_chieftan.json => alliance_chieftain.json} (96%) diff --git a/dist/index.js b/dist/index.js index 4b2d876..f6d8c96 100644 --- a/dist/index.js +++ b/dist/index.js @@ -90,11 +90,11 @@ module.exports = { internal: [ "01", "44", "00", 0, "2h" ] } }, - alliance_chieftan: { + alliance_chieftain: { edID: 128816574, eddbID: 12, properties: { - name: "Alliance Chieftan", + name: "Alliance Chieftain", manufacturer: "Lakon", class: 2, hullCost: 17007927, @@ -9878,7 +9878,7 @@ module.exports = { edID: 128771884, eddbID: 1622, grp: "sfn", - id: "Sn", + id: "sfn", integrity: 35, mass: 1.3, name: "Shutdown Field Neutraliser", diff --git a/dist/index.json b/dist/index.json index 9436349..ded94d4 100644 --- a/dist/index.json +++ b/dist/index.json @@ -136,11 +136,11 @@ ] } }, - "alliance_chieftan": { + "alliance_chieftain": { "edID": 128816574, "eddbID": 12, "properties": { - "name": "Alliance Chieftan", + "name": "Alliance Chieftain", "manufacturer": "Lakon", "class": 2, "hullCost": 17007927, diff --git a/ships/alliance_chieftan.json b/ships/alliance_chieftain.json similarity index 96% rename from ships/alliance_chieftan.json rename to ships/alliance_chieftain.json index f71c7a7..276c494 100644 --- a/ships/alliance_chieftan.json +++ b/ships/alliance_chieftain.json @@ -1,9 +1,9 @@ { - "alliance_chieftan": { + "alliance_chieftain": { "edID": 128816574, "eddbID": 12, "properties": { - "name": "Alliance Chieftan", + "name": "Alliance Chieftain", "manufacturer": "Lakon", "class": 2, "hullCost": 17007927, diff --git a/ships/index.js b/ships/index.js index 146cc38..11ad1f1 100644 --- a/ships/index.js +++ b/ships/index.js @@ -1,6 +1,6 @@ module.exports = { adder: require('./adder').adder, - alliance_chieftan: require('./alliance_chieftan').alliance_chieftan, + alliance_chieftain: require('./alliance_chieftain').alliance_chieftain, anaconda: require('./anaconda').anaconda, asp: require('./asp').asp, asp_scout: require('./asp_scout').asp_scout, From 9945aa9583c147f068533f7cd309cee1d34d4224 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Sat, 27 Jan 2018 06:59:26 +1100 Subject: [PATCH 4/9] fix bh ids, default loadout tweak, cost, MLF --- dist/index.js | 16 ++++++++-------- dist/index.json | 16 ++++++++-------- ships/alliance_chieftain.json | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dist/index.js b/dist/index.js index f6d8c96..79e97e8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -97,7 +97,7 @@ module.exports = { name: "Alliance Chieftain", manufacturer: "Lakon", class: 2, - hullCost: 17007927, + hullCost: 18182883, speed: 235, boost: 337, boostEnergy: 19, @@ -105,7 +105,7 @@ module.exports = { baseArmour: 504, hardness: 70, hullMass: 420, - masslock: 12, + masslock: 13, pipSpeed: .03875, pitch: 38, roll: 90, @@ -114,7 +114,7 @@ module.exports = { }, retailCost: 18897696, bulkheads: [ { - id: "Bd", + id: "CI", edID: 128816576, eddbID: 813, grp: "bh", @@ -125,7 +125,7 @@ module.exports = { thermres: 0, hullboost: .8 }, { - id: "Be", + id: "CJ", edID: 128816577, eddbID: 814, grp: "bh", @@ -136,7 +136,7 @@ module.exports = { thermres: 0, hullboost: 1.52 }, { - id: "Bf", + id: "CK", edID: 128816578, eddbID: 815, grp: "bh", @@ -147,7 +147,7 @@ module.exports = { thermres: 0, hullboost: 2.5 }, { - id: "Bg", + id: "CL", edID: 128816579, eddbID: 816, grp: "bh", @@ -158,7 +158,7 @@ module.exports = { thermres: .5, hullboost: 2.5 }, { - id: "Bh", + id: "CM", edID: 128816580, eddbID: 817, grp: "bh", @@ -200,7 +200,7 @@ module.exports = { }, defaults: { standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ], - hardpoints: [ 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0 ], + hardpoints: [ 17, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0 ], internal: [ "03", "4e", "02", "", "2h" ] } }, diff --git a/dist/index.json b/dist/index.json index ded94d4..1408542 100644 --- a/dist/index.json +++ b/dist/index.json @@ -143,7 +143,7 @@ "name": "Alliance Chieftain", "manufacturer": "Lakon", "class": 2, - "hullCost": 17007927, + "hullCost": 18182883, "speed": 235, "boost": 337, "boostEnergy": 19, @@ -151,7 +151,7 @@ "baseArmour": 504, "hardness": 70, "hullMass": 420, - "masslock": 12, + "masslock": 13, "pipSpeed": 0.03875, "pitch": 38, "roll": 90, @@ -161,7 +161,7 @@ "retailCost": 18897696, "bulkheads": [ { - "id": "Bd", + "id": "CI", "edID": 128816576, "eddbID": 813, "grp": "bh", @@ -173,7 +173,7 @@ "hullboost": 0.8 }, { - "id": "Be", + "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", @@ -185,7 +185,7 @@ "hullboost": 1.52 }, { - "id": "Bf", + "id": "CK", "edID": 128816578, "eddbID": 815, "grp": "bh", @@ -197,7 +197,7 @@ "hullboost": 2.5 }, { - "id": "Bg", + "id": "CL", "edID": 128816579, "eddbID": 816, "grp": "bh", @@ -209,7 +209,7 @@ "hullboost": 2.5 }, { - "id": "Bh", + "id": "CM", "edID": 128816580, "eddbID": 817, "grp": "bh", @@ -289,8 +289,8 @@ "4C" ], "hardpoints": [ - 0, 17, + 0, 17, 0, 0, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 276c494..12a0828 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -6,7 +6,7 @@ "name": "Alliance Chieftain", "manufacturer": "Lakon", "class": 2, - "hullCost": 17007927, + "hullCost": 18182883, "speed": 235, "boost": 337, "boostEnergy": 19, @@ -14,7 +14,7 @@ "baseArmour": 504, "hardness": 70, "hullMass": 420, - "masslock": 12, + "masslock": 13, "pipSpeed": 0.03875, "pitch": 38, "roll": 90, @@ -23,11 +23,11 @@ }, "retailCost": 18897696, "bulkheads": [ - { "id": "Bd", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, - { "id": "Be", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, - { "id": "Bf", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 }, - { "id": "Bg", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, - { "id": "Bh", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } + { "id": "CI", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, + { "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "CK", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "CL", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "CM", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], @@ -40,7 +40,7 @@ }, "defaults": { "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"], - "hardpoints": [0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0], + "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0], "internal": ["03", "4e", "02", "", "2h"] } } From 53c59369467f5d3f7ef6ab0a375189ce45fef2e3 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Sat, 27 Jan 2018 07:02:45 +1100 Subject: [PATCH 5/9] heavy bulkheads heavier than the fas apparently --- dist/index.js | 8 ++++---- dist/index.json | 8 ++++---- ships/alliance_chieftain.json | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dist/index.js b/dist/index.js index 79e97e8..a3b3aba 100644 --- a/dist/index.js +++ b/dist/index.js @@ -130,7 +130,7 @@ module.exports = { eddbID: 814, grp: "bh", cost: 6803170, - mass: 19, + mass: 75, explres: -.4, kinres: -.2, thermres: 0, @@ -141,7 +141,7 @@ module.exports = { eddbID: 815, grp: "bh", cost: 15307134, - mass: 38, + mass: 150, explres: -.4, kinres: -.2, thermres: 0, @@ -152,7 +152,7 @@ module.exports = { eddbID: 816, grp: "bh", cost: 36175859, - mass: 38, + mass: 150, explres: -.5, kinres: -.75, thermres: .5, @@ -163,7 +163,7 @@ module.exports = { eddbID: 817, grp: "bh", cost: 40087682, - mass: 38, + mass: 150, explres: .2, kinres: .25, thermres: -.4, diff --git a/dist/index.json b/dist/index.json index 1408542..94d99fc 100644 --- a/dist/index.json +++ b/dist/index.json @@ -178,7 +178,7 @@ "eddbID": 814, "grp": "bh", "cost": 6803170, - "mass": 19, + "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, @@ -190,7 +190,7 @@ "eddbID": 815, "grp": "bh", "cost": 15307134, - "mass": 38, + "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, @@ -202,7 +202,7 @@ "eddbID": 816, "grp": "bh", "cost": 36175859, - "mass": 38, + "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, @@ -214,7 +214,7 @@ "eddbID": 817, "grp": "bh", "cost": 40087682, - "mass": 38, + "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 12a0828..ce0a262 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -24,10 +24,10 @@ "retailCost": 18897696, "bulkheads": [ { "id": "CI", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, - { "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, - { "id": "CK", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 }, - { "id": "CL", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, - { "id": "CM", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } + { "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, + { "id": "CK", "edID": 128816578, "eddbID": 815, "grp": "bh", "cost": 15307134, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 }, + { "id": "CL", "edID": 128816579, "eddbID": 816, "grp": "bh", "cost": 36175859, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 }, + { "id": "CM", "edID": 128816580, "eddbID": 817, "grp": "bh", "cost": 40087682, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 } ], "slots": { "standard": [6, 6, 5, 5, 6, 4, 4], From a86c5e910c9cd6a7a077a4d6e8f191ea81f7fe5f Mon Sep 17 00:00:00 2001 From: willyb321 Date: Sat, 27 Jan 2018 07:29:02 +1100 Subject: [PATCH 6/9] base armour fixed --- dist/index.js | 4 ++-- dist/index.json | 4 ++-- ships/alliance_chieftain.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index a3b3aba..3a6116d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -102,8 +102,8 @@ module.exports = { boost: 337, boostEnergy: 19, baseShieldStrength: 154, - baseArmour: 504, - hardness: 70, + baseArmour: 280, + hardness: 65, hullMass: 420, masslock: 13, pipSpeed: .03875, diff --git a/dist/index.json b/dist/index.json index 94d99fc..54a9124 100644 --- a/dist/index.json +++ b/dist/index.json @@ -148,8 +148,8 @@ "boost": 337, "boostEnergy": 19, "baseShieldStrength": 154, - "baseArmour": 504, - "hardness": 70, + "baseArmour": 280, + "hardness": 65, "hullMass": 420, "masslock": 13, "pipSpeed": 0.03875, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index ce0a262..0e10f78 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -11,8 +11,8 @@ "boost": 337, "boostEnergy": 19, "baseShieldStrength": 154, - "baseArmour": 504, - "hardness": 70, + "baseArmour": 280, + "hardness": 65, "hullMass": 420, "masslock": 13, "pipSpeed": 0.03875, From 859655b16566b908ae5454a296bcdf809c0fce11 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Sat, 27 Jan 2018 07:39:30 +1100 Subject: [PATCH 7/9] update pitch / roll / yaw thx taleden --- dist/index.js | 6 +++--- dist/index.json | 6 +++--- ships/alliance_chieftain.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/index.js b/dist/index.js index 3a6116d..5792ce4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -107,9 +107,9 @@ module.exports = { hullMass: 420, masslock: 13, pipSpeed: .03875, - pitch: 38, - roll: 90, - yaw: 12, + pitch: 39, + roll: 92, + yaw: 16, crew: 2 }, retailCost: 18897696, diff --git a/dist/index.json b/dist/index.json index 54a9124..73b6093 100644 --- a/dist/index.json +++ b/dist/index.json @@ -153,9 +153,9 @@ "hullMass": 420, "masslock": 13, "pipSpeed": 0.03875, - "pitch": 38, - "roll": 90, - "yaw": 12, + "pitch": 39, + "roll": 92, + "yaw": 16, "crew": 2 }, "retailCost": 18897696, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 0e10f78..4896f93 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -16,9 +16,9 @@ "hullMass": 420, "masslock": 13, "pipSpeed": 0.03875, - "pitch": 38, - "roll": 90, - "yaw": 12, + "pitch": 39, + "roll": 92, + "yaw": 16, "crew": 2 }, "retailCost": 18897696, From 3ee790b15059051e391d0f56b087d2cf1cc2d863 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Sat, 27 Jan 2018 09:54:43 +1100 Subject: [PATCH 8/9] fix speed --- dist/index.js | 4 ++-- dist/index.json | 4 ++-- ships/alliance_chieftain.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5792ce4..f6bfa1c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -98,8 +98,8 @@ module.exports = { manufacturer: "Lakon", class: 2, hullCost: 18182883, - speed: 235, - boost: 337, + speed: 230, + boost: 330, boostEnergy: 19, baseShieldStrength: 154, baseArmour: 280, diff --git a/dist/index.json b/dist/index.json index 73b6093..4217125 100644 --- a/dist/index.json +++ b/dist/index.json @@ -144,8 +144,8 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 18182883, - "speed": 235, - "boost": 337, + "speed": 230, + "boost": 330, "boostEnergy": 19, "baseShieldStrength": 154, "baseArmour": 280, diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index 4896f93..a8b208e 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -7,8 +7,8 @@ "manufacturer": "Lakon", "class": 2, "hullCost": 18182883, - "speed": 235, - "boost": 337, + "speed": 230, + "boost": 330, "boostEnergy": 19, "baseShieldStrength": 154, "baseArmour": 280, From de3df31419fe494a464748916cc50b36d9b270b5 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Sat, 27 Jan 2018 12:35:10 +1100 Subject: [PATCH 9/9] add horizons requirement to chieftan thanks @joshlcampbell --- dist/index.js | 3 +++ dist/index.json | 3 +++ ships/alliance_chieftain.json | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dist/index.js b/dist/index.js index f6bfa1c..b4c9de3 100644 --- a/dist/index.js +++ b/dist/index.js @@ -113,6 +113,9 @@ module.exports = { crew: 2 }, retailCost: 18897696, + requirements: { + horizons: true + }, bulkheads: [ { id: "CI", edID: 128816576, diff --git a/dist/index.json b/dist/index.json index 4217125..75ffb89 100644 --- a/dist/index.json +++ b/dist/index.json @@ -159,6 +159,9 @@ "crew": 2 }, "retailCost": 18897696, + "requirements": { + "horizons": true + }, "bulkheads": [ { "id": "CI", diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json index a8b208e..1fa3948 100644 --- a/ships/alliance_chieftain.json +++ b/ships/alliance_chieftain.json @@ -22,6 +22,9 @@ "crew": 2 }, "retailCost": 18897696, + "requirements": { + "horizons": true + }, "bulkheads": [ { "id": "CI", "edID": 128816576, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, { "id": "CJ", "edID": 128816577, "eddbID": 814, "grp": "bh", "cost": 6803170, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },