From 78069c26e52326c5f2770b560046cee1ceff2c57 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 23 Dec 2017 12:16:41 +0000 Subject: [PATCH 1/6] T10 Utility Patch --- dist/index.js | 4 ++-- dist/index.json | 18 +++++++++++++++++- ships/type_10_defender.json | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dist/index.js b/dist/index.js index 8241ce0..f916eba 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2831,7 +2831,7 @@ module.exports = { } ], slots: { standard: [ 8, 7, 7, 5, 6, 4, 6 ], - hardpoints: [ 3, 3, 3, 3, 2, 2, 2, 1, 1 ], + hardpoints: [ 3, 3, 3, 3, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ], internal: [ 8, 7, 6, 5, 4, 4, 3, 3, 2, { class: 5, name: "Military", @@ -2852,7 +2852,7 @@ module.exports = { }, defaults: { standard: [ "6E", "7E", "6E", "5E", "6E", "4E", "6C" ], - hardpoints: [ 0, 0, 0, 0, 17, 17, 0, 0, 0 ], + hardpoints: [ 0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], internal: [ "06", "05", "4j", "03", "02", 0, "01", 0, "2h", 0, 0 ] } }, diff --git a/dist/index.json b/dist/index.json index d38202a..6262462 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4440,7 +4440,15 @@ 2, 2, 1, - 1 + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 ], "internal": [ 8, @@ -4491,6 +4499,14 @@ 17, 0, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 0 ], "internal": [ diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index b136e8c..a230a05 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -32,12 +32,12 @@ ], "slots": { "standard": [8, 7, 7, 5, 6, 4, 6], - "hardpoints": [3, 3, 3, 3, 2, 2, 2, 1, 1], + "hardpoints": [3, 3, 3, 3, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0], "internal": [8, 7, 6, 5, 4, 4, 3, 3, 2,{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },{ "class": 5, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }] }, "defaults": { "standard": ["6E", "7E", "6E", "5E", "6E", "4E", "6C"], - "hardpoints": [0, 0, 0, 0, 17, 17, 0, 0, 0], + "hardpoints": [0, 0, 0, 0, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "internal": ["06", "05", "4j", "03", "02", 0, "01", 0, "2h", 0, 0] } } From 92e4c09a613f23e14f0e738e7d64ba0be4640a46 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 24 Dec 2017 09:43:28 +0000 Subject: [PATCH 2/6] Dear FDev, have you heard of consistant naming: PATCH --- ships/type_10_defender.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index a230a05..8f92cd7 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -11,7 +11,7 @@ "boost": 219, "boostEnergy": 19, "baseShieldStrength": 99, - "baseArmour": 1044, + "baseArmour": 1879, "hardness": 75, "hullMass": 1200, "masslock": 26, From 59a31cbb9f97c11e6a853c2f81da39f07cebb1a9 Mon Sep 17 00:00:00 2001 From: TheHeavyMachine <34802197+TheHeavyMachine@users.noreply.github.com> Date: Sun, 24 Dec 2017 10:54:15 +0100 Subject: [PATCH 3/6] Update type_10_defender.json (#15) The value in baseShieldStrength seems to be incorrect. MJ value displayed in coriolis (31mj) doesn't match the righ shielding value for the Type 10 stock build (99mj). After some testing "baseShieldStrength": 320, seems to work outputting the right mj value. --- ships/type_10_defender.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index 8f92cd7..f56854d 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -10,7 +10,7 @@ "speed": 179, "boost": 219, "boostEnergy": 19, - "baseShieldStrength": 99, + "baseShieldStrength": 320, "baseArmour": 1879, "hardness": 75, "hullMass": 1200, @@ -42,4 +42,4 @@ } } } - \ No newline at end of file + From 3bc828140aaf4e8551abd0b13937ce7cc8a74a1e Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 24 Dec 2017 16:54:59 +0000 Subject: [PATCH 4/6] Conflict Resolve --- dist/index.js | 4 ++-- dist/index.json | 4 ++-- ships/type_10_defender.json | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index f916eba..cffeff3 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2760,8 +2760,8 @@ module.exports = { speed: 179, boost: 219, boostEnergy: 19, - baseShieldStrength: 99, - baseArmour: 1044, + baseShieldStrength: 320, + baseArmour: 580, hardness: 75, hullMass: 1200, masslock: 26, diff --git a/dist/index.json b/dist/index.json index 6262462..2085755 100644 --- a/dist/index.json +++ b/dist/index.json @@ -4346,8 +4346,8 @@ "speed": 179, "boost": 219, "boostEnergy": 19, - "baseShieldStrength": 99, - "baseArmour": 1044, + "baseShieldStrength": 320, + "baseArmour": 580, "hardness": 75, "hullMass": 1200, "masslock": 26, diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index f56854d..aeb533f 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -10,8 +10,13 @@ "speed": 179, "boost": 219, "boostEnergy": 19, +<<<<<<< HEAD "baseShieldStrength": 320, "baseArmour": 1879, +======= + "baseShieldStrength": 320, + "baseArmour": 580, +>>>>>>> 5dcfa6b... Final value for baseArmour "hardness": 75, "hullMass": 1200, "masslock": 26, From dfbbad974013766d458a1f943365a5e7e939c50d Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 24 Dec 2017 16:57:51 +0000 Subject: [PATCH 5/6] Confict Resolved --- ships/type_10_defender.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json index aeb533f..f2c49c7 100644 --- a/ships/type_10_defender.json +++ b/ships/type_10_defender.json @@ -10,13 +10,8 @@ "speed": 179, "boost": 219, "boostEnergy": 19, -<<<<<<< HEAD - "baseShieldStrength": 320, - "baseArmour": 1879, -======= "baseShieldStrength": 320, "baseArmour": 580, ->>>>>>> 5dcfa6b... Final value for baseArmour "hardness": 75, "hullMass": 1200, "masslock": 26, From 24add08beadfe60145407727a739b36417ab629a Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 11 Jan 2018 21:57:08 +0000 Subject: [PATCH 6/6] Version Bump --- ChangeLog.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7e31833..ef86917 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +#2.5.0 + * Willyb321 fixed engineering. Some stuff doesn't work. We currently believe this is FDevs fault and not ours. + #2.4.3 * T10 Defender diff --git a/package.json b/package.json index 8a9fbe6..512ec48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis-data", - "version": "2.4.3", + "version": "2.5.0", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis-data"