From 78069c26e52326c5f2770b560046cee1ceff2c57 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 23 Dec 2017 12:16:41 +0000 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 04/11] 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 05/11] 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 06/11] 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" From c0e12d060a9fe727d4ef296618a61df683c02ace Mon Sep 17 00:00:00 2001 From: willyb321 Date: Tue, 16 Jan 2018 08:04:42 +1100 Subject: [PATCH 07/11] Fix KWS time to scan --- dist/index.js | 3 +++ dist/index.json | 3 +++ modifications/modifierActions.json | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dist/index.js b/dist/index.js index 7121b24..ee73be5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -21686,6 +21686,9 @@ module.exports = { OutfittingFieldType_DSS_RateMult: { scanrate: 1 }, + OutfittingFieldType_ScannerTimeToScan: { + scantime: 1 + }, OutfittingFieldType_ScannerRange: { range: 1 }, diff --git a/dist/index.json b/dist/index.json index a3e2ca9..830765e 100644 --- a/dist/index.json +++ b/dist/index.json @@ -29055,6 +29055,9 @@ "OutfittingFieldType_DSS_RateMult": { "scanrate": 1 }, + "OutfittingFieldType_ScannerTimeToScan": { + "scantime": 1 + }, "OutfittingFieldType_ScannerRange": { "range": 1 }, diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index 3aa93b1..e140a1c 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -56,6 +56,9 @@ "OutfittingFieldType_DSS_RateMult": { "scanrate": 1 }, + "OutfittingFieldType_ScannerTimeToScan": { + "scantime": 1 + }, "OutfittingFieldType_ScannerRange": { "range": 1 }, From 6d6926e4cf9070822721f7a729aab049e9aa6023 Mon Sep 17 00:00:00 2001 From: Sean McIntyre Date: Mon, 22 Jan 2018 14:25:39 -0500 Subject: [PATCH 08/11] Implementing AX modules --- .gitignore | 3 +- dist/index.js | 278 +++++++++++++++++ dist/index.json | 292 ++++++++++++++++++ modifications/modules.json | 25 +- modules/hardpoints/ax_missile_rack.json | 120 +++++++ modules/hardpoints/ax_multi_cannon.json | 124 ++++++++ .../shutdown_field_neutraliser.json | 22 ++ modules/hardpoints/xeno_scanner.json | 20 ++ modules/index.js | 6 +- package-lock.json | 2 +- 10 files changed, 888 insertions(+), 4 deletions(-) create mode 100644 modules/hardpoints/ax_missile_rack.json create mode 100644 modules/hardpoints/ax_multi_cannon.json create mode 100644 modules/hardpoints/shutdown_field_neutraliser.json create mode 100644 modules/hardpoints/xeno_scanner.json diff --git a/.gitignore b/.gitignore index 613618a..7f66379 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules node_modules/* *.log -.idea \ No newline at end of file +.idea + diff --git a/dist/index.js b/dist/index.js index 7121b24..73a21ce 100644 --- a/dist/index.js +++ b/dist/index.js @@ -7806,6 +7806,123 @@ module.exports = { shotspeed: 1600, thermload: .51 } ], + axmc: [ { + ammo: 2100, + breachdmg: 2.8, + breachmax: .5, + breachmin: .8, + class: 2, + clip: 100, + cost: 379e3, + damage: 3.3, + damagedist: { + X: 1 + }, + distdraw: .11, + edID: 128788701, + eddbID: 1618, + falloff: 2e3, + grp: "axmc", + id: "x0", + integrity: 51, + mass: 4, + mount: "F", + piercing: 17, + power: .46, + range: 4e3, + rating: "E", + reload: 4, + rof: 7.1, + shotspeed: 1600, + thermload: .2 + }, { + ammo: 2100, + breachdmg: .4, + breachmax: .5, + breachmin: .5, + class: 2, + clip: 90, + cost: 1826500, + damage: 1.7, + damagedist: { + X: 1 + }, + distdraw: .06, + edID: 128793059, + eddbID: 1619, + falloff: 2e3, + grp: "axmc", + id: "x1", + integrity: 51, + mass: 4, + mount: "T", + piercing: 17, + power: .5, + range: 4e3, + rating: "F", + reload: 4, + rof: 6.2, + shotspeed: 1600, + thermload: .1 + }, { + ammo: 2100, + breachdmg: 5.2, + breachmax: .5, + breachmin: .8, + class: 3, + clip: 100, + cost: 1181500, + damage: 6.1, + damagedist: { + X: 1 + }, + distdraw: .18, + edID: 128788702, + eddbID: 1625, + falloff: 2e3, + grp: "axmc", + id: "x2", + integrity: 64, + mass: 8, + mount: "F", + piercing: 33, + power: .64, + range: 4e3, + rating: "C", + reload: 4, + rof: 5.9, + shotspeed: 1600, + thermload: .3 + }, { + ammo: 2100, + breachdmg: .8, + breachmax: .5, + breachmin: .5, + class: 3, + clip: 90, + cost: 3821600, + damage: 3.3, + damagedist: { + X: 1 + }, + distdraw: .06, + edID: 128793060, + eddbID: 1626, + falloff: 2e3, + grp: "axmc", + id: "x3", + integrity: 64, + mass: 8, + mount: "T", + piercing: 33, + power: .64, + range: 4e3, + rating: "E", + reload: 4, + rof: 6.2, + shotspeed: 1600, + thermload: .1 + } ], c: [ { ammo: 120, breachdmg: 17.1, @@ -8843,6 +8960,119 @@ module.exports = { shotspeed: 600, thermload: 3.6 } ], + axmr: [ { + ammo: 64, + breachdmg: .1, + breachmax: .8, + breachmin: 1, + class: 2, + clip: 8, + cost: 540900, + damage: 64, + damagedist: { + X: 1 + }, + distdraw: .14, + edID: 128788699, + eddbID: 1614, + grp: "axmr", + id: "x4", + integrity: 51, + mass: 4, + missile: "D", + mount: "F", + piercing: 60, + power: 1.2, + rating: "B", + reload: 5, + rof: .5, + shotspeed: 750, + thermload: 2.4 + }, { + ammo: 64, + breachdmg: .1, + breachmax: .8, + breachmin: 1, + class: 2, + clip: 8, + cost: 2022700, + damage: 50, + damagedist: { + X: 1 + }, + distdraw: .08, + edID: 128788704, + eddbID: 1615, + grp: "axmr", + id: "x5", + integrity: 51, + mass: 4, + missile: "D", + mount: "T", + piercing: 60, + power: 1.2, + rating: "B", + reload: 5, + rof: .5, + shotspeed: 750, + thermload: 1.5 + }, { + ammo: 128, + breachdmg: .1, + breachmax: .8, + breachmin: 1, + class: 3, + clip: 12, + cost: 1352250, + damage: 64, + damagedist: { + X: 1 + }, + distdraw: .24, + edID: 128788700, + eddbID: 1623, + grp: "axmr", + id: "x6", + integrity: 64, + mass: 8, + missile: "D", + mount: "F", + piercing: 60, + power: 1.62, + rating: "A", + reload: 5, + rof: .5, + shotspeed: 750, + thermload: 3.6 + }, { + ammo: 128, + breachdmg: .1, + breachmax: .8, + breachmin: 1, + class: 3, + clip: 12, + cost: 4056750, + damage: 64, + damagedist: { + X: 1 + }, + distdraw: .14, + edID: 128788705, + eddbID: 1624, + grp: "axmr", + id: "x7", + integrity: 64, + mass: 8, + missile: "D", + mount: "T", + piercing: 60, + power: 1.75, + rating: "A", + reload: 5, + rof: .5, + shotspeed: 750, + thermload: 1.9 + } ], tp: [ { ammo: 1, breachdmg: 60, @@ -9466,6 +9696,38 @@ module.exports = { rof: 10, shotspeed: 1e3, thermload: .1 + } ], + sfn: [ { + class: 0, + cost: 63e3, + edID: 128771884, + eddbID: 1622, + grp: "sfn", + id: "sfn", + integrity: 35, + mass: 1.3, + name: "Shutdown Field Neutraliser", + passive: 1, + power: .2, + rating: "F", + cooldown: 10, + duration: 1, + range: 3e3 + } ], + xs: [ { + class: 0, + cost: 365700, + edID: 128793115, + eddbID: 1616, + grp: "xs", + id: "xs", + integrity: 56, + mass: 1.3, + name: "Xeno Scanner", + power: .2, + range: 500, + rating: "E", + scantime: 10 } ] }, internal: { @@ -23642,6 +23904,10 @@ module.exports = { modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ], specials: [ "special_auto_loader", "special_corrosive_shell", "special_emissive_munitions", "special_incendiary_rounds", "special_smart_rounds", "special_thermalshock" ] }, + axmc: { + blueprints: {}, + modifications: [] + }, ml: { blueprints: {}, modifications: [] @@ -23729,6 +23995,10 @@ module.exports = { specials_S: [ "special_drag_munitions", "special_emissive_munitions", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ], specials_D: [ "special_drag_munitions", "special_emissive_munitions", "special_fsd_interrupt", "special_overload_munitions", "special_penetrator_payload", "special_thermal_cascade" ] }, + axmr: { + blueprints: {}, + modifications: [] + }, mrp: { blueprints: {}, modifications: [] @@ -24808,6 +25078,10 @@ module.exports = { }, modifications: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "thermres" ] }, + sfn: { + blueprints: {}, + modifications: [] + }, sc: { blueprints: {}, modifications: [] @@ -24986,6 +25260,10 @@ module.exports = { }, modifications: [ "mass", "angle", "range", "scanrate" ] }, + xs: { + blueprints: {}, + modifications: [] + }, t: { blueprints: { Engine_Dirty: { diff --git a/dist/index.json b/dist/index.json index a3e2ca9..49eef85 100644 --- a/dist/index.json +++ b/dist/index.json @@ -9919,6 +9919,128 @@ "thermload": 0.51 } ], + "axmc": [ + { + "ammo": 2100, + "breachdmg": 2.8, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 2, + "clip": 100, + "cost": 379000, + "damage": 3.3, + "damagedist": { + "X": 1 + }, + "distdraw": 0.11, + "edID": 128788701, + "eddbID": 1618, + "falloff": 2000, + "grp": "axmc", + "id": "x0", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 17, + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "rof": 7.1, + "shotspeed": 1600, + "thermload": 0.2 + }, + { + "ammo": 2100, + "breachdmg": 0.4, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 2, + "clip": 90, + "cost": 1826500, + "damage": 1.7, + "damagedist": { + "X": 1 + }, + "distdraw": 0.06, + "edID": 128793059, + "eddbID": 1619, + "falloff": 2000, + "grp": "axmc", + "id": "x1", + "integrity": 51, + "mass": 4, + "mount": "T", + "piercing": 17, + "power": 0.5, + "range": 4000, + "rating": "F", + "reload": 4, + "rof": 6.2, + "shotspeed": 1600, + "thermload": 0.1 + }, + { + "ammo": 2100, + "breachdmg": 5.2, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 3, + "clip": 100, + "cost": 1181500, + "damage": 6.1, + "damagedist": { + "X": 1 + }, + "distdraw": 0.18, + "edID": 128788702, + "eddbID": 1625, + "falloff": 2000, + "grp": "axmc", + "id": "x2", + "integrity": 64, + "mass": 8, + "mount": "F", + "piercing": 33, + "power": 0.64, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 5.9, + "shotspeed": 1600, + "thermload": 0.3 + }, + { + "ammo": 2100, + "breachdmg": 0.8, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 3, + "clip": 90, + "cost": 3821600, + "damage": 3.3, + "damagedist": { + "X": 1 + }, + "distdraw": 0.06, + "edID": 128793060, + "eddbID": 1626, + "falloff": 2000, + "grp": "axmc", + "id": "x3", + "integrity": 64, + "mass": 8, + "mount": "T", + "piercing": 33, + "power": 0.64, + "range": 4000, + "rating": "E", + "reload": 4, + "rof": 6.2, + "shotspeed": 1600, + "thermload": 0.1 + } + ], "c": [ { "ammo": 120, @@ -10995,6 +11117,124 @@ "thermload": 3.6 } ], + "axmr": [ + { + "ammo": 64, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 540900, + "damage": 64, + "damagedist": { + "X": 1 + }, + "distdraw": 0.14, + "edID": 128788699, + "eddbID": 1614, + "grp": "axmr", + "id": "x4", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 2.4 + }, + { + "ammo": 64, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 2022700, + "damage": 50, + "damagedist": { + "X": 1 + }, + "distdraw": 0.08, + "edID": 128788704, + "eddbID": 1615, + "grp": "axmr", + "id": "x5", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 1.5 + }, + { + "ammo": 128, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 1352250, + "damage": 64, + "damagedist": { + "X": 1 + }, + "distdraw": 0.24, + "edID": 128788700, + "eddbID": 1623, + "grp": "axmr", + "id": "x6", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.62, + "rating": "A", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 3.6 + }, + { + "ammo": 128, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 4056750, + "damage": 64, + "damagedist": { + "X": 1 + }, + "distdraw": 0.14, + "edID": 128788705, + "eddbID": 1624, + "grp": "axmr", + "id": "x7", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.75, + "rating": "A", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 1.9 + } + ], "tp": [ { "ammo": 1, @@ -11663,6 +11903,42 @@ "shotspeed": 1000, "thermload": 0.1 } + ], + "sfn": [ + { + "class": 0, + "cost": 63000, + "edID": 128771884, + "eddbID": 1622, + "grp": "sfn", + "id": "sfn", + "integrity": 35, + "mass": 1.3, + "name": "Shutdown Field Neutraliser", + "passive": 1, + "power": 0.2, + "rating": "F", + "cooldown": 10, + "duration": 1, + "range": 3000 + } + ], + "xs": [ + { + "class": 0, + "cost": 365700, + "edID": 128793115, + "eddbID": 1616, + "grp": "xs", + "id": "xs", + "integrity": 56, + "mass": 1.3, + "name": "Xeno Scanner", + "power": 0.2, + "range": 500, + "rating": "E", + "scantime": 10 + } ] }, "internal": { @@ -32343,6 +32619,10 @@ "special_thermalshock" ] }, + "axmc": { + "blueprints": {}, + "modifications": [] + }, "ml": { "blueprints": {}, "modifications": [] @@ -32510,6 +32790,10 @@ "special_thermal_cascade" ] }, + "axmr": { + "blueprints": {}, + "modifications": [] + }, "mrp": { "blueprints": {}, "modifications": [] @@ -34507,6 +34791,10 @@ "thermres" ] }, + "sfn": { + "blueprints": {}, + "modifications": [] + }, "sc": { "blueprints": {}, "modifications": [] @@ -34885,6 +35173,10 @@ "scanrate" ] }, + "xs": { + "blueprints": {}, + "modifications": [] + }, "t": { "blueprints": { "Engine_Dirty": { diff --git a/modifications/modules.json b/modifications/modules.json index bc104c1..e134fd3 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -3013,6 +3013,12 @@ "special_thermalshock" ] }, + "axmc": { + "blueprints": { + }, + "modifications": [ + ] + }, "ml": { "blueprints": { }, @@ -3182,6 +3188,12 @@ "special_thermal_cascade" ] }, + "axmr": { + "blueprints": { + }, + "modifications": [ + ] + }, "mrp": { "blueprints": { }, @@ -5193,6 +5205,12 @@ "thermres" ] }, + "sfn": { + "blueprints": { + }, + "modifications": [ + ] + }, "sc": { "blueprints": { }, @@ -5573,7 +5591,12 @@ "scanrate" ] }, - + "xs": { + "blueprints": { + }, + "modifications": [ + ] + }, "t": { "blueprints": { "Engine_Dirty": { diff --git a/modules/hardpoints/ax_missile_rack.json b/modules/hardpoints/ax_missile_rack.json new file mode 100644 index 0000000..898ed7e --- /dev/null +++ b/modules/hardpoints/ax_missile_rack.json @@ -0,0 +1,120 @@ +{ + "axmr": [ + { + "ammo": 64, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 540900, + "damage": 64, + "damagedist": { + "X": 1 + }, + "distdraw": 0.14, + "edID": 128788699, + "eddbID": 1614, + "grp": "axmr", + "id": "x4", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 2.4 + }, + { + "ammo": 64, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 2, + "clip": 8, + "cost": 2022700, + "damage": 50, + "damagedist": { + "X": 1 + }, + "distdraw": 0.08, + "edID": 128788704, + "eddbID": 1615, + "grp": "axmr", + "id": "x5", + "integrity": 51, + "mass": 4, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 1.5 + }, + { + "ammo": 128, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 1352250, + "damage": 64, + "damagedist": { + "X": 1 + }, + "distdraw": 0.24, + "edID": 128788700, + "eddbID": 1623, + "grp": "axmr", + "id": "x6", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "F", + "piercing": 60, + "power": 1.62, + "rating": "A", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 3.6 + }, + { + "ammo": 128, + "breachdmg": 0.1, + "breachmax": 0.8, + "breachmin": 1, + "class": 3, + "clip": 12, + "cost": 4056750, + "damage": 64, + "damagedist": { + "X": 1 + }, + "distdraw": 0.14, + "edID": 128788705, + "eddbID": 1624, + "grp": "axmr", + "id": "x7", + "integrity": 64, + "mass": 8, + "missile": "D", + "mount": "T", + "piercing": 60, + "power": 1.75, + "rating": "A", + "reload": 5, + "rof": 0.5, + "shotspeed": 750, + "thermload": 1.9 + } + ] +} \ No newline at end of file diff --git a/modules/hardpoints/ax_multi_cannon.json b/modules/hardpoints/ax_multi_cannon.json new file mode 100644 index 0000000..54a7d6b --- /dev/null +++ b/modules/hardpoints/ax_multi_cannon.json @@ -0,0 +1,124 @@ +{ + "axmc": [ + { + "ammo": 2100, + "breachdmg": 2.8, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 2, + "clip": 100, + "cost": 379000, + "damage": 3.3, + "damagedist": { + "X": 1 + }, + "distdraw": 0.11, + "edID": 128788701, + "eddbID": 1618, + "falloff": 2000, + "grp": "axmc", + "id": "x0", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 17, + "power": 0.46, + "range": 4000, + "rating": "E", + "reload": 4, + "rof": 7.1, + "shotspeed": 1600, + "thermload": 0.2 + }, + { + "ammo": 2100, + "breachdmg": 0.4, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 2, + "clip": 90, + "cost": 1826500, + "damage": 1.7, + "damagedist": { + "X": 1 + }, + "distdraw": 0.06, + "edID": 128793059, + "eddbID": 1619, + "falloff": 2000, + "grp": "axmc", + "id": "x1", + "integrity": 51, + "mass": 4, + "mount": "T", + "piercing": 17, + "power": 0.5, + "range": 4000, + "rating": "F", + "reload": 4, + "rof": 6.2, + "shotspeed": 1600, + "thermload": 0.1 + }, + { + "ammo": 2100, + "breachdmg": 5.2, + "breachmax": 0.5, + "breachmin": 0.8, + "class": 3, + "clip": 100, + "cost": 1181500, + "damage": 6.1, + "damagedist": { + "X": 1 + }, + "distdraw": 0.18, + "edID": 128788702, + "eddbID": 1625, + "falloff": 2000, + "grp": "axmc", + "id": "x2", + "integrity": 64, + "mass": 8, + "mount": "F", + "piercing": 33, + "power": 0.64, + "range": 4000, + "rating": "C", + "reload": 4, + "rof": 5.9, + "shotspeed": 1600, + "thermload": 0.3 + }, + { + "ammo": 2100, + "breachdmg": 0.8, + "breachmax": 0.5, + "breachmin": 0.5, + "class": 3, + "clip": 90, + "cost": 3821600, + "damage": 3.3, + "damagedist": { + "X": 1 + }, + "distdraw": 0.06, + "edID": 128793060, + "eddbID": 1626, + "falloff": 2000, + "grp": "axmc", + "id": "x3", + "integrity": 64, + "mass": 8, + "mount": "T", + "piercing": 33, + "power": 0.64, + "range": 4000, + "rating": "E", + "reload": 4, + "rof": 6.2, + "shotspeed": 1600, + "thermload": 0.1 + } + ] +} \ No newline at end of file diff --git a/modules/hardpoints/shutdown_field_neutraliser.json b/modules/hardpoints/shutdown_field_neutraliser.json new file mode 100644 index 0000000..dc9d526 --- /dev/null +++ b/modules/hardpoints/shutdown_field_neutraliser.json @@ -0,0 +1,22 @@ +{ + "sfn": [ + { + "class": 0, + "cost": 63000, + "edID": 128771884, + "eddbID": 1622, + "grp": "sfn", + "id": "sfn", + "integrity": 35, + "mass": 1.3, + "name": "Shutdown Field Neutraliser", + "passive": 1, + "power": 0.2, + "rating": "F", + "cooldown": 10, + "duration": 1, + "range": 3000 + } + ] +} + \ No newline at end of file diff --git a/modules/hardpoints/xeno_scanner.json b/modules/hardpoints/xeno_scanner.json new file mode 100644 index 0000000..09b8956 --- /dev/null +++ b/modules/hardpoints/xeno_scanner.json @@ -0,0 +1,20 @@ +{ + "xs": [ + { + "class": 0, + "cost": 365700, + "edID": 128793115, + "eddbID": 1616, + "grp": "xs", + "id": "xs", + "integrity": 56, + "mass": 1.3, + "name": "Xeno Scanner", + "power": 0.2, + "range": 500, + "rating": "E", + "scantime": 10 + } + ] +} + \ No newline at end of file diff --git a/modules/index.js b/modules/index.js index 5b68c25..12bbc7d 100644 --- a/modules/index.js +++ b/modules/index.js @@ -14,11 +14,13 @@ module.exports = { ul: require('./hardpoints/burst_laser').ul, bl: require('./hardpoints/beam_laser').bl, mc: require('./hardpoints/multi_cannon').mc, + axmc: require('./hardpoints/ax_multi_cannon').axmc, c: require('./hardpoints/cannon').c, fc: require('./hardpoints/fragment_cannon').fc, rg: require('./hardpoints/rail_gun').rg, pa: require('./hardpoints/plasma_accelerator').pa, mr: require('./hardpoints/missile_rack').mr, + axmr: require('./hardpoints/ax_missile_rack').axmr, tp: require('./hardpoints/torpedo_pylon').tp, nl: require('./hardpoints/mine_launcher').nl, ml: require('./hardpoints/mining_laser').ml, @@ -29,7 +31,9 @@ module.exports = { ch: require('./hardpoints/chaff_launcher').ch, ec: require('./hardpoints/electronic_countermeasure').ec, hs: require('./hardpoints/heat_sink_launcher').hs, - po: require('./hardpoints/point_defence').po + po: require('./hardpoints/point_defence').po, + sfn: require('./hardpoints/shutdown_field_neutraliser').sfn, + xs: require('./hardpoints/xeno_scanner').xs }, internal: { am: require('./internal/auto_field_maintenance_unit').am, diff --git a/package-lock.json b/package-lock.json index 2fd8dfc..bb86062 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "coriolis-data", - "version": "2.4.0", + "version": "2.4.3", "lockfileVersion": 1, "requires": true, "dependencies": { From e05a77333b0b23cd3ca0abad805d152d92c60c18 Mon Sep 17 00:00:00 2001 From: Sean McIntyre Date: Mon, 22 Jan 2018 16:23:48 -0500 Subject: [PATCH 09/11] Adding missing stats. Confirming in-game. --- modules/hardpoints/ax_missile_rack.json | 4 ++++ modules/hardpoints/shutdown_field_neutraliser.json | 1 + modules/hardpoints/xeno_scanner.json | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/hardpoints/ax_missile_rack.json b/modules/hardpoints/ax_missile_rack.json index 898ed7e..9189e39 100644 --- a/modules/hardpoints/ax_missile_rack.json +++ b/modules/hardpoints/ax_missile_rack.json @@ -15,6 +15,7 @@ "distdraw": 0.14, "edID": 128788699, "eddbID": 1614, + "falloff": 10000, "grp": "axmr", "id": "x4", "integrity": 51, @@ -44,6 +45,7 @@ "distdraw": 0.08, "edID": 128788704, "eddbID": 1615, + "falloff": 10000, "grp": "axmr", "id": "x5", "integrity": 51, @@ -73,6 +75,7 @@ "distdraw": 0.24, "edID": 128788700, "eddbID": 1623, + "falloff": 10000, "grp": "axmr", "id": "x6", "integrity": 64, @@ -102,6 +105,7 @@ "distdraw": 0.14, "edID": 128788705, "eddbID": 1624, + "falloff": 10000, "grp": "axmr", "id": "x7", "integrity": 64, diff --git a/modules/hardpoints/shutdown_field_neutraliser.json b/modules/hardpoints/shutdown_field_neutraliser.json index dc9d526..ed9bf1d 100644 --- a/modules/hardpoints/shutdown_field_neutraliser.json +++ b/modules/hardpoints/shutdown_field_neutraliser.json @@ -12,6 +12,7 @@ "name": "Shutdown Field Neutraliser", "passive": 1, "power": 0.2, + "activepower": 0.25, "rating": "F", "cooldown": 10, "duration": 1, diff --git a/modules/hardpoints/xeno_scanner.json b/modules/hardpoints/xeno_scanner.json index 09b8956..7149906 100644 --- a/modules/hardpoints/xeno_scanner.json +++ b/modules/hardpoints/xeno_scanner.json @@ -2,7 +2,7 @@ "xs": [ { "class": 0, - "cost": 365700, + "cost": 365698, "edID": 128793115, "eddbID": 1616, "grp": "xs", @@ -13,7 +13,9 @@ "power": 0.2, "range": 500, "rating": "E", - "scantime": 10 + "boot": 2, + "scantime": 10, + "angle": 23 } ] } From 618802ff81a99bc11750c0b21ebc260f40229665 Mon Sep 17 00:00:00 2001 From: Sean McIntyre Date: Mon, 22 Jan 2018 16:43:10 -0500 Subject: [PATCH 10/11] Forgot Remote Release Flak Launcher --- dist/index.js | 72 +++++++++++++++++- dist/index.json | 75 ++++++++++++++++++- modifications/modules.json | 6 ++ .../remote_release_flak_launcher.json | 63 ++++++++++++++++ modules/index.js | 1 + 5 files changed, 213 insertions(+), 4 deletions(-) create mode 100644 modules/hardpoints/remote_release_flak_launcher.json diff --git a/dist/index.js b/dist/index.js index 73a21ce..48d9ca8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8561,6 +8561,63 @@ module.exports = { shotspeed: 1e3, thermload: 1.1 } ], + rfl: [ { + ammo: 32, + breachdmg: 1.7, + breachmax: 1, + breachmin: 1, + class: 2, + clip: 1, + cost: 261800, + damage: 34, + damagedist: { + E: 1 + }, + distdraw: .24, + edID: 128785626, + eddbID: 1620, + falloff: 1e5, + grp: "rfl", + id: "x8", + integrity: 51, + mass: 4, + mount: "F", + piercing: 60, + power: 1.2, + rating: "B", + reload: 2, + rof: .5, + shotspeed: 550, + thermload: 3.6 + }, { + ammo: 32, + breachdmg: 1.7, + breachmax: 1, + breachmin: 1, + class: 2, + clip: 1, + cost: 1259200, + damage: 34, + damagedist: { + E: 1 + }, + distdraw: .24, + edID: 128793058, + eddbID: 1621, + falloff: 1e5, + grp: "rfl", + id: "x9", + integrity: 51, + mass: 4, + mount: "T", + piercing: 60, + power: 1.2, + rating: "B", + reload: 2, + rof: .5, + shotspeed: 550, + thermload: 3.6 + } ], rg: [ { ammo: 80, breachdmg: 22.2, @@ -8975,6 +9032,7 @@ module.exports = { distdraw: .14, edID: 128788699, eddbID: 1614, + falloff: 1e4, grp: "axmr", id: "x4", integrity: 51, @@ -9003,6 +9061,7 @@ module.exports = { distdraw: .08, edID: 128788704, eddbID: 1615, + falloff: 1e4, grp: "axmr", id: "x5", integrity: 51, @@ -9031,6 +9090,7 @@ module.exports = { distdraw: .24, edID: 128788700, eddbID: 1623, + falloff: 1e4, grp: "axmr", id: "x6", integrity: 64, @@ -9059,6 +9119,7 @@ module.exports = { distdraw: .14, edID: 128788705, eddbID: 1624, + falloff: 1e4, grp: "axmr", id: "x7", integrity: 64, @@ -9709,6 +9770,7 @@ module.exports = { name: "Shutdown Field Neutraliser", passive: 1, power: .2, + activepower: .25, rating: "F", cooldown: 10, duration: 1, @@ -9716,7 +9778,7 @@ module.exports = { } ], xs: [ { class: 0, - cost: 365700, + cost: 365698, edID: 128793115, eddbID: 1616, grp: "xs", @@ -9727,7 +9789,9 @@ module.exports = { power: .2, range: 500, rating: "E", - scantime: 10 + boot: 2, + scantime: 10, + angle: 23 } ] }, internal: { @@ -23156,6 +23220,10 @@ module.exports = { modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ], specials: [ "special_corrosive_shell", "special_blinding_shell", "special_incendiary_rounds", "special_drag_munitions", "special_screening_shell" ] }, + rfl: { + blueprints: {}, + modifications: [] + }, fh: { blueprints: {}, modifications: [] diff --git a/dist/index.json b/dist/index.json index 49eef85..8195953 100644 --- a/dist/index.json +++ b/dist/index.json @@ -10702,6 +10702,66 @@ "thermload": 1.1 } ], + "rfl": [ + { + "ammo": 32, + "breachdmg": 1.7, + "breachmax": 1, + "breachmin": 1, + "class": 2, + "clip": 1, + "cost": 261800, + "damage": 34, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128785626, + "eddbID": 1620, + "falloff": 100000, + "grp": "rfl", + "id": "x8", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 2, + "rof": 0.5, + "shotspeed": 550, + "thermload": 3.6 + }, + { + "ammo": 32, + "breachdmg": 1.7, + "breachmax": 1, + "breachmin": 1, + "class": 2, + "clip": 1, + "cost": 1259200, + "damage": 34, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128793058, + "eddbID": 1621, + "falloff": 100000, + "grp": "rfl", + "id": "x9", + "integrity": 51, + "mass": 4, + "mount": "T", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 2, + "rof": 0.5, + "shotspeed": 550, + "thermload": 3.6 + } + ], "rg": [ { "ammo": 80, @@ -11133,6 +11193,7 @@ "distdraw": 0.14, "edID": 128788699, "eddbID": 1614, + "falloff": 10000, "grp": "axmr", "id": "x4", "integrity": 51, @@ -11162,6 +11223,7 @@ "distdraw": 0.08, "edID": 128788704, "eddbID": 1615, + "falloff": 10000, "grp": "axmr", "id": "x5", "integrity": 51, @@ -11191,6 +11253,7 @@ "distdraw": 0.24, "edID": 128788700, "eddbID": 1623, + "falloff": 10000, "grp": "axmr", "id": "x6", "integrity": 64, @@ -11220,6 +11283,7 @@ "distdraw": 0.14, "edID": 128788705, "eddbID": 1624, + "falloff": 10000, "grp": "axmr", "id": "x7", "integrity": 64, @@ -11917,6 +11981,7 @@ "name": "Shutdown Field Neutraliser", "passive": 1, "power": 0.2, + "activepower": 0.25, "rating": "F", "cooldown": 10, "duration": 1, @@ -11926,7 +11991,7 @@ "xs": [ { "class": 0, - "cost": 365700, + "cost": 365698, "edID": 128793115, "eddbID": 1616, "grp": "xs", @@ -11937,7 +12002,9 @@ "power": 0.2, "range": 500, "rating": "E", - "scantime": 10 + "boot": 2, + "scantime": 10, + "angle": 23 } ] }, @@ -31257,6 +31324,10 @@ "special_screening_shell" ] }, + "rfl": { + "blueprints": {}, + "modifications": [] + }, "fh": { "blueprints": {}, "modifications": [] diff --git a/modifications/modules.json b/modifications/modules.json index e134fd3..743ccfb 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -1647,6 +1647,12 @@ "special_screening_shell" ] }, + "rfl": { + "blueprints": { + }, + "modifications": [ + ] + }, "fh": { "blueprints": { }, diff --git a/modules/hardpoints/remote_release_flak_launcher.json b/modules/hardpoints/remote_release_flak_launcher.json new file mode 100644 index 0000000..a3f605a --- /dev/null +++ b/modules/hardpoints/remote_release_flak_launcher.json @@ -0,0 +1,63 @@ +{ + "rfl": [ + { + "ammo": 32, + "breachdmg": 1.7, + "breachmax": 1, + "breachmin": 1, + "class": 2, + "clip": 1, + "cost": 261800, + "damage": 34.0, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128785626, + "eddbID": 1620, + "falloff": 100000, + "grp": "rfl", + "id": "x8", + "integrity": 51, + "mass": 4, + "mount": "F", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 2, + "rof": 0.5, + "shotspeed": 550, + "thermload": 3.6 + }, + { + "ammo": 32, + "breachdmg": 1.7, + "breachmax": 1, + "breachmin": 1, + "class": 2, + "clip": 1, + "cost": 1259200, + "damage": 34.0, + "damagedist": { + "E": 1 + }, + "distdraw": 0.24, + "edID": 128793058, + "eddbID": 1621, + "falloff": 100000, + "grp": "rfl", + "id": "x9", + "integrity": 51, + "mass": 4, + "mount": "T", + "piercing": 60, + "power": 1.2, + "rating": "B", + "reload": 2, + "rof": 0.5, + "shotspeed": 550, + "thermload": 3.6 + } + ] +} + \ No newline at end of file diff --git a/modules/index.js b/modules/index.js index 12bbc7d..7f4527c 100644 --- a/modules/index.js +++ b/modules/index.js @@ -17,6 +17,7 @@ module.exports = { axmc: require('./hardpoints/ax_multi_cannon').axmc, c: require('./hardpoints/cannon').c, fc: require('./hardpoints/fragment_cannon').fc, + rfl: require('./hardpoints/remote_release_flak_launcher.json').rfl, rg: require('./hardpoints/rail_gun').rg, pa: require('./hardpoints/plasma_accelerator').pa, mr: require('./hardpoints/missile_rack').mr, From 04bebeb2d8f5f7962bf6954e468b67e2444d63a5 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 24 Jan 2018 09:13:02 +0000 Subject: [PATCH 11/11] Version Bump --- ChangeLog.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index ef86917..bdaf6fd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +#2.5.1 + * AX Modules + * Fixed some engineering values + #2.5.0 * Willyb321 fixed engineering. Some stuff doesn't work. We currently believe this is FDevs fault and not ours. diff --git a/package-lock.json b/package-lock.json index bb86062..777a6c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "coriolis-data", - "version": "2.4.3", + "version": "2.5.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 512ec48..1ec2fe6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis-data", - "version": "2.5.0", + "version": "2.5.1", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis-data"