From ad99e37c6694a1eec0dcd6fa9b167fdd29164da6 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Tue, 5 Jun 2018 07:39:45 +1000 Subject: [PATCH] Fix OC PP Closes EDCD/coriolis#285 --- dist/index.js | 80 +++++++++++++++++-- dist/index.json | 144 ++++++++++++++++++++++++++++++++-- modifications/blueprints.json | 6 +- 3 files changed, 216 insertions(+), 14 deletions(-) diff --git a/dist/index.js b/dist/index.js index 305b751..224a62e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -20059,7 +20059,7 @@ module.exports = { features: { eff: [ .15, .15 ], integrity: [ -.15, -.15 ], - pgen: [ .12, .19 ] + pgen: [ .19, .26 ] } }, "4": { @@ -20071,7 +20071,7 @@ module.exports = { features: { eff: [ .2, .2 ], integrity: [ -.2, -.2 ], - pgen: [ .19, .33 ] + pgen: [ .26, .33 ] } }, "5": { @@ -20083,7 +20083,7 @@ module.exports = { features: { eff: [ .25, .25 ], integrity: [ -.25, -.25 ], - pgen: [ .3, .4 ] + pgen: [ .33, .4 ] } } }, @@ -22528,6 +22528,76 @@ module.exports = { name: "Lightweight" }, Weapon_LongRange: { + fdname: "Weapon_LongRange", + grades: { + "1": { + components: { + Sulphur: 1 + }, + features: { + fallofffromrange: [ 0, .2 ], + mass: [ .1, .1 ], + power: [ .03, .03 ], + range: [ 0, .2 ] + } + }, + "2": { + components: { + "Modified Consumer Firmware": 1, + Sulphur: 1 + }, + features: { + fallofffromrange: [ .2, .4 ], + mass: [ .15, .15 ], + power: [ .06, .06 ], + range: [ .2, .4 ] + } + }, + "3": { + components: { + "Focus Crystals": 1, + "Modified Consumer Firmware": 1, + Sulphur: 1 + }, + features: { + fallofffromrange: [ .4, .6 ], + mass: [ .2, .2 ], + power: [ .09, .09 ], + range: [ .4, .6 ] + } + }, + "4": { + components: { + "Conductive Polymers": 1, + "Focus Crystals": 1, + "Modified Consumer Firmware": 1 + }, + features: { + fallofffromrange: [ .6, .8 ], + mass: [ .25, .25 ], + power: [ .12, .12 ], + range: [ .6, .8 ] + } + }, + "5": { + components: { + "Biotech Conductors": 1, + "Cracked Industrial Firmware": 1, + "Thermic Alloys": 1 + }, + features: { + fallofffromrange: [ .8, 1 ], + mass: [ .3, .3 ], + power: [ .15, .15 ], + range: [ .8, 1 ] + } + } + }, + id: 87, + modulename: [ "Weapon" ], + name: "Long range" + }, + Weapon_LongRange_ShotSpeed: { fdname: "Weapon_LongRange", grades: { "1": { @@ -24173,7 +24243,7 @@ module.exports = { } } }, - Weapon_LongRange: { + Weapon_LongRange_ShotSpeed: { grades: { "1": { engineers: [ "The Sarge", "Tod McQuinn" ] @@ -25729,7 +25799,7 @@ module.exports = { } } }, - Weapon_LongRange: { + Weapon_LongRange_ShotSpeed: { grades: { "1": { engineers: [ "Bill Turner", "Zacariah Nemo" ] diff --git a/dist/index.json b/dist/index.json index 98a17a4..d3ff03d 100644 --- a/dist/index.json +++ b/dist/index.json @@ -25563,8 +25563,8 @@ -0.15 ], "pgen": [ - 0.12, - 0.19 + 0.19, + 0.26 ] } }, @@ -25584,7 +25584,7 @@ -0.2 ], "pgen": [ - 0.19, + 0.26, 0.33 ] } @@ -25605,7 +25605,7 @@ -0.25 ], "pgen": [ - 0.3, + 0.33, 0.4 ] } @@ -29893,6 +29893,138 @@ "name": "Lightweight" }, "Weapon_LongRange": { + "fdname": "Weapon_LongRange", + "grades": { + "1": { + "components": { + "Sulphur": 1 + }, + "features": { + "fallofffromrange": [ + 0, + 0.2 + ], + "mass": [ + 0.1, + 0.1 + ], + "power": [ + 0.03, + 0.03 + ], + "range": [ + 0, + 0.2 + ] + } + }, + "2": { + "components": { + "Modified Consumer Firmware": 1, + "Sulphur": 1 + }, + "features": { + "fallofffromrange": [ + 0.2, + 0.4 + ], + "mass": [ + 0.15, + 0.15 + ], + "power": [ + 0.06, + 0.06 + ], + "range": [ + 0.2, + 0.4 + ] + } + }, + "3": { + "components": { + "Focus Crystals": 1, + "Modified Consumer Firmware": 1, + "Sulphur": 1 + }, + "features": { + "fallofffromrange": [ + 0.4, + 0.6 + ], + "mass": [ + 0.2, + 0.2 + ], + "power": [ + 0.09, + 0.09 + ], + "range": [ + 0.4, + 0.6 + ] + } + }, + "4": { + "components": { + "Conductive Polymers": 1, + "Focus Crystals": 1, + "Modified Consumer Firmware": 1 + }, + "features": { + "fallofffromrange": [ + 0.6, + 0.8 + ], + "mass": [ + 0.25, + 0.25 + ], + "power": [ + 0.12, + 0.12 + ], + "range": [ + 0.6, + 0.8 + ] + } + }, + "5": { + "components": { + "Biotech Conductors": 1, + "Cracked Industrial Firmware": 1, + "Thermic Alloys": 1 + }, + "features": { + "fallofffromrange": [ + 0.8, + 1 + ], + "mass": [ + 0.3, + 0.3 + ], + "power": [ + 0.15, + 0.15 + ], + "range": [ + 0.8, + 1 + ] + } + } + }, + "id": 87, + "modulename": [ + "Weapon" + ], + "name": "Long range" + }, + "Weapon_LongRange_ShotSpeed": { "fdname": "Weapon_LongRange", "grades": { "1": { @@ -32161,7 +32293,7 @@ } } }, - "Weapon_LongRange": { + "Weapon_LongRange_ShotSpeed": { "grades": { "1": { "engineers": [ @@ -34998,7 +35130,7 @@ } } }, - "Weapon_LongRange": { + "Weapon_LongRange_ShotSpeed": { "grades": { "1": { "engineers": [ diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 5399c12..64b2207 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -3801,7 +3801,7 @@ "features": { "eff": [ 0.15, 0.15 ], "integrity": [ -0.15, -0.15 ], - "pgen": [ 0.12, 0.19 ] + "pgen": [ 0.19, 0.26 ] } }, "4": { @@ -3813,7 +3813,7 @@ "features": { "eff": [ 0.2, 0.2 ], "integrity": [ -0.2, -0.2 ], - "pgen": [ 0.19, 0.33 ] + "pgen": [ 0.26, 0.33 ] } }, "5": { @@ -3825,7 +3825,7 @@ "features": { "eff": [ 0.25, 0.25 ], "integrity": [ -0.25, -0.25 ], - "pgen": [ 0.3, 0.4 ] + "pgen": [ 0.33, 0.4 ] } } },