From 2382dc6d91f158ffaf41a97835c87b324143c134 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Mon, 23 Jan 2017 13:03:57 +0000 Subject: [PATCH] Fixes for data prior to release --- dist/index.js | 559 +++++++++++++----- dist/index.json | 645 +++++++++++++++------ modifications/blueprints.json | 454 +++++++++++---- modifications/modifications.json | 1 + modifications/modules.json | 5 + modules/hardpoints/cannon.json | 22 +- modules/hardpoints/fragment_cannon.json | 20 +- modules/hardpoints/missile_rack.json | 12 +- modules/hardpoints/multi_cannon.json | 22 +- modules/hardpoints/plasma_accelerator.json | 8 +- modules/hardpoints/point_defence.json | 2 +- modules/hardpoints/torpedo_pylon.json | 4 +- package.json | 2 +- 13 files changed, 1271 insertions(+), 485 deletions(-) diff --git a/dist/index.js b/dist/index.js index 72d10df..1522310 100644 --- a/dist/index.js +++ b/dist/index.js @@ -7199,7 +7199,7 @@ module.exports = { rating: "F", reload: 4, rof: 7.69, - speed: 1600, + shotspeed: 1600, thermload: .1 }, { ammo: 2100, @@ -7228,7 +7228,7 @@ module.exports = { rating: "G", reload: 5, rof: 8.33, - speed: 1600, + shotspeed: 1600, thermload: .1 }, { ammo: 2100, @@ -7257,7 +7257,7 @@ module.exports = { rating: "G", reload: 4, rof: 7.14, - speed: 1600, + shotspeed: 1600, thermload: 0 }, { ammo: 1e3, @@ -7287,7 +7287,7 @@ module.exports = { rating: "F", reload: 4, rof: 4.3, - speed: 1800, + shotspeed: 1800, thermload: .2 }, { ammo: 2100, @@ -7316,7 +7316,7 @@ module.exports = { rating: "E", reload: 4, rof: 7.14, - speed: 1600, + shotspeed: 1600, thermload: .2 }, { ammo: 2100, @@ -7345,7 +7345,7 @@ module.exports = { rating: "F", reload: 5, rof: 7.69, - speed: 1600, + shotspeed: 1600, thermload: .2 }, { ammo: 2100, @@ -7374,7 +7374,7 @@ module.exports = { rating: "F", reload: 4, rof: 6.25, - speed: 1600, + shotspeed: 1600, thermload: .1 }, { ammo: 2100, @@ -7403,7 +7403,7 @@ module.exports = { rating: "C", reload: 4, rof: 5.88, - speed: 1600, + shotspeed: 1600, thermload: .3 }, { ammo: 2100, @@ -7432,7 +7432,7 @@ module.exports = { rating: "C", reload: 5, rof: 6.665, - speed: 1600, + shotspeed: 1600, thermload: .3 }, { ammo: 2100, @@ -7462,7 +7462,7 @@ module.exports = { reload: 4, rof: 3.03, roundspershot: 2, - speed: 1600, + shotspeed: 1600, thermload: .4 }, { ammo: 2100, @@ -7492,7 +7492,7 @@ module.exports = { reload: 5, rof: 3.365, roundspershot: 2, - speed: 1600, + shotspeed: 1600, thermload: .5 } ], c: [ { @@ -7522,7 +7522,7 @@ module.exports = { rating: "D", reload: 3, rof: .5, - speed: 1200, + shotspeed: 1200, thermload: 1.4 }, { ammo: 100, @@ -7551,7 +7551,7 @@ module.exports = { rating: "E", reload: 4, rof: .52, - speed: 1e3, + shotspeed: 1e3, thermload: 1.3 }, { ammo: 100, @@ -7580,7 +7580,7 @@ module.exports = { rating: "F", reload: 4, rof: .435, - speed: 1e3, + shotspeed: 1e3, thermload: .7 }, { ammo: 120, @@ -7609,7 +7609,7 @@ module.exports = { rating: "D", reload: 3, rof: .465, - speed: 1051, + shotspeed: 1051, thermload: 2.1 }, { ammo: 100, @@ -7638,7 +7638,7 @@ module.exports = { rating: "D", reload: 4, rof: .485, - speed: 875, + shotspeed: 875, thermload: 1.9 }, { ammo: 100, @@ -7667,7 +7667,7 @@ module.exports = { rating: "E", reload: 4, rof: .405, - speed: 875, + shotspeed: 875, thermload: 1 }, { ammo: 120, @@ -7696,7 +7696,7 @@ module.exports = { rating: "C", reload: 3, rof: .425, - speed: 959, + shotspeed: 959, thermload: 3.2 }, { ammo: 100, @@ -7727,7 +7727,7 @@ module.exports = { rating: "C", reload: 4, rof: .445, - speed: 800, + shotspeed: 800, thermload: 2.9 }, { ammo: 100, @@ -7756,7 +7756,7 @@ module.exports = { rating: "D", reload: 4, rof: .37, - speed: 800, + shotspeed: 800, thermload: 1.6 }, { ammo: 120, @@ -7787,7 +7787,7 @@ module.exports = { rating: "B", reload: 3, rof: .385, - speed: 900, + shotspeed: 900, thermload: 4.8 }, { ammo: 100, @@ -7818,7 +7818,7 @@ module.exports = { rating: "B", reload: 4, rof: .4, - speed: 750, + shotspeed: 750, thermload: 4.4 } ], fc: [ { @@ -7850,7 +7850,7 @@ module.exports = { reload: 2.5, rof: 5.555, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: .4 }, { ammo: 180, @@ -7881,7 +7881,7 @@ module.exports = { reload: 2.5, rof: 5.88, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: .4 }, { ammo: 180, @@ -7912,7 +7912,7 @@ module.exports = { reload: 2.5, rof: 4.76, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: .2 }, { ammo: 180, @@ -7943,7 +7943,7 @@ module.exports = { reload: 2.5, rof: 5, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: .7 }, { ammo: 180, @@ -7974,7 +7974,7 @@ module.exports = { reload: 2.5, rof: 5.26, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: .8 }, { ammo: 180, @@ -8005,7 +8005,7 @@ module.exports = { reload: 2.5, rof: 4.345, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: .4 }, { ammo: 180, @@ -8036,7 +8036,7 @@ module.exports = { reload: 2.5, rof: 4.545, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: 1.1 }, { ammo: 180, @@ -8067,7 +8067,7 @@ module.exports = { reload: 2.5, rof: 4.76, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: 1.4 }, { ammo: 180, @@ -8098,7 +8098,7 @@ module.exports = { reload: 2.5, rof: 4, roundspershot: 12, - speed: 667, + shotspeed: 667, thermload: .7 }, { ammo: 180, @@ -8130,7 +8130,7 @@ module.exports = { reload: 2.5, rof: 4.5, roundspershot: 12, - speed: 1e3, + shotspeed: 1e3, thermload: 1.1 } ], rg: [ { @@ -8254,7 +8254,7 @@ module.exports = { rating: "C", reload: 6, rof: .33, - speed: 875, + shotspeed: 875, thermload: 15.6 }, { ammo: 100, @@ -8285,7 +8285,7 @@ module.exports = { rating: "B", reload: 6, rof: .29, - speed: 875, + shotspeed: 875, thermload: 21.8 }, { ammo: 300, @@ -8318,7 +8318,7 @@ module.exports = { rating: "B", reload: 6, rof: .8, - speed: 875, + shotspeed: 875, thermload: 11 }, { ammo: 100, @@ -8349,7 +8349,7 @@ module.exports = { rating: "A", reload: 6, rof: .25, - speed: 875, + shotspeed: 875, thermload: 29.5 } ], mr: [ { @@ -8378,7 +8378,7 @@ module.exports = { rating: "B", reload: 5, rof: .5, - speed: 750, + shotspeed: 750, thermload: 3.6 }, { ammo: 6, @@ -8406,7 +8406,7 @@ module.exports = { rating: "B", reload: 12, rof: .333, - speed: 625, + shotspeed: 625, thermload: 3.6 }, { ammo: 48, @@ -8436,7 +8436,7 @@ module.exports = { rating: "B", reload: 5, rof: .5, - speed: 750, + shotspeed: 750, thermload: 3.6 }, { ammo: 18, @@ -8466,7 +8466,7 @@ module.exports = { rating: "B", reload: 12, rof: .333, - speed: 625, + shotspeed: 625, thermload: 3.6 }, { ammo: 48, @@ -8495,7 +8495,7 @@ module.exports = { rating: "B", reload: 5, rof: .333, - speed: 750, + shotspeed: 750, thermload: 3.6 }, { ammo: 120, @@ -8528,7 +8528,7 @@ module.exports = { reload: 5, rof: 2, roundspershot: 4, - speed: 600, + shotspeed: 600, thermload: 3.6 } ], tp: [ { @@ -8557,7 +8557,7 @@ module.exports = { rating: "I", reload: 5, rof: 1, - speed: 250, + shotspeed: 250, thermload: 45 }, { ammo: 2, @@ -8585,7 +8585,7 @@ module.exports = { rating: "I", reload: 5, rof: 1, - speed: 250, + shotspeed: 250, thermload: 50 } ], nl: [ { @@ -9099,7 +9099,7 @@ module.exports = { rating: "I", reload: .4, rof: 10, - speed: 1e3, + shotspeed: 1e3, thermload: .1 } ] }, @@ -15670,43 +15670,43 @@ module.exports = { features: { "1": { engcap: [ -.03, 0 ], - engrate: [ -.25, -.16 ], + engrate: [ .25, .16 ], syscap: [ -.03, 0 ], - sysrate: [ -.25, -.16 ], + sysrate: [ .25, .16 ], wepcap: [ -.03, 0 ], - weprate: [ -.25, -.16 ] + weprate: [ .25, .16 ] }, "2": { engcap: [ -.06, -.01 ], - engrate: [ -.25, -.16 ], + engrate: [ .25, .16 ], syscap: [ -.06, -.01 ], - sysrate: [ -.25, -.16 ], + sysrate: [ .25, .16 ], wepcap: [ -.06, -.01 ], - weprate: [ -.25, -.16 ] + weprate: [ .25, .16 ] }, "3": { engcap: [ -.09, -.02 ], - engrate: [ -.25, -.16 ], + engrate: [ .25, .16 ], syscap: [ -.09, -.02 ], - sysrate: [ -.25, -.16 ], + sysrate: [ .25, .16 ], wepcap: [ -.09, -.02 ], - weprate: [ -.25, -.16 ] + weprate: [ .25, .16 ] }, "4": { engcap: [ -.12, -.03 ], - engrate: [ -.25, -.16 ], + engrate: [ .25, -.16 ], syscap: [ -.12, -.03 ], - sysrate: [ -.25, -.16 ], + sysrate: [ .25, .16 ], wepcap: [ -.12, -.03 ], - weprate: [ -.25, -.16 ] + weprate: [ .25, .16 ] }, "5": { engcap: [ -.15, -.04 ], - engrate: [ -.25, -.16 ], + engrate: [ .25, .16 ], syscap: [ -.15, -.04 ], - sysrate: [ -.25, -.16 ], + sysrate: [ .25, .16 ], wepcap: [ -.15, -.04 ], - weprate: [ -.25, -.16 ] + weprate: [ .25, .16 ] } }, name: "Charge enhanced" @@ -16469,6 +16469,26 @@ module.exports = { }, Weapon_DoubleShot: { id: 82, + components: { + "1": { + Carbon: 1 + }, + "2": { + Carbon: 1, + "Mechanical Equipment": 1 + }, + "3": { + Carbon: 1, + "Cracked Industrial Firmware": 1, + "Mechanical Equipment": 1 + }, + "4": { + "Mechanical Components": 1, + "Security Firmware Patch": 1, + Vanadium: 1 + }, + "5": {} + }, features: { "1": { ammo: [ .1, .2 ], @@ -16505,39 +16525,87 @@ module.exports = { }, Weapon_Efficient: { id: 83, - features: { + components: { "1": { - damage: [ 0, .05 ], - thermload: [ -.3, -.4 ] + Sulphur: 1 }, "2": { - damage: [ .01, .06 ], - power: [ 0, -.1 ], - thermload: [ -.35, -.45 ] + "Heat Dispersion Plate": 1, + Sulphur: 1 }, "3": { - damage: [ .02, .07 ], + Chromium: 1, + "Exceptional Scrambed Emission Data": 1, + "Heat Exchangers": 1 + }, + "4": { + "Heat Vanes": 1, + "Irregular Emission Data": 1, + Selenium: 1 + }, + "5": { + Cadmium: 1, + "Proto Heat Radiators": 1, + "Heatsink Interlink": 1 + } + }, + features: { + "1": { + damage: [ 0, .04 ], + thermload: [ -.31, -.4 ] + }, + "2": { + damage: [ .01, .05 ], + power: [ 0, -.1 ], + thermload: [ -.36, -.45 ] + }, + "3": { + damage: [ .01, .07 ], distdraw: [ -.15, -.25 ], - power: [ -.05, -.2 ], + power: [ -.06, -.2 ], thermload: [ -.4, -.5 ] }, "4": { damage: [ .03, .08 ], distdraw: [ -.2, -.3 ], - power: [ -.1, -.3 ], + power: [ -.1, -.31 ], thermload: [ -.45, -.55 ] }, "5": { - damage: [ .04, .09 ], - distdraw: [ -.25, -.35 ], + damage: [ .03, .09 ], + distdraw: [ -.25, -.36 ], power: [ -.14, -.4 ], - thermload: [ -.5, -.6 ] + thermload: [ -.5, -.61 ] } }, name: "Efficient" }, Weapon_Focused: { id: 84, + components: { + "1": { + Iron: 1 + }, + "2": { + "Conductive Components": 1, + Iron: 1 + }, + "3": { + Chromium: 1, + "Conductive Ceramics": 1, + Iron: 1 + }, + "4": { + "Focus Crystals": 1, + Germanium: 1, + "Polymer Capacitors": 1 + }, + "5": { + "Military Supercapacitors": 1, + Niobium: 1, + "Refined Focus Crystals": 1 + } + }, features: { "1": { burstrof: [ .2, .08 ], @@ -16573,33 +16641,57 @@ module.exports = { }, Weapon_HighCapacity: { id: 85, + components: { + "1": { + "Mechanical Scrap": 1 + }, + "2": { + "Mechanical Scrap": 1, + Vanadium: 1 + }, + "3": { + "Mechanical Scrap": 1, + Niobium: 1, + Vanadium: 1 + }, + "4": { + "High Density Composites": 1, + "Mechanical Equipment": 1, + Tin: 1 + }, + "5": { + "Mechanical Components": 1, + "Military Supercapacitors": 1, + "Proprietary Composites": 1 + } + }, features: { "1": { - ammo: [ .17, .66 ], - clip: [ .1, .61 ], + ammo: [ .1, .59 ], + clip: [ .1, .59 ], mass: [ .25, .1 ], reload: [ .2, 0 ], power: [ .2, .1 ] }, "2": { - ammo: [ .24, .75 ], - clip: [ .2, .7 ], + ammo: [ .19, .69 ], + clip: [ .2, .69 ], mass: [ .5, .2 ], reload: [ .39, .1 ], power: [ .25, .14 ] }, "3": { - ammo: [ .34, .83 ], - clip: [ .31, .81 ], - mass: [ .75, .25 ], + ammo: [ .29, .79 ], + clip: [ .29, .79 ], + mass: [ .75, .29 ], reload: [ .61, .2 ], power: [ .31, .2 ] }, "4": { - ammo: [ .41, .91 ], - clip: [ .4, .9 ], + ammo: [ .39, .89 ], + clip: [ .39, .89 ], mass: [ 1, .39 ], - reload: [ .81, .31 ], + reload: [ .79, .29 ], power: [ .35, .25 ] }, "5": { @@ -16614,70 +16706,123 @@ module.exports = { }, Weapon_LightWeight: { id: 86, + components: { + "1": { + Phosphorous: 1 + }, + "2": { + Manganese: 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + Manganese: 1, + "Salvaged Alloys": 1 + }, + "4": { + "Conductive Components": 1, + "Phase Alloys": 1, + "Proto Light Alloys": 1 + }, + "5": { + "Conductive Ceramics": 1, + "Proto Light Alloys": 1, + "Proto Radiolic Alloys": 1 + } + }, features: { "1": { distdraw: [ -.02, -.04 ], integrity: [ -.2, 0 ], - mass: [ -.1, -.15 ], + mass: [ -.11, -.15 ], power: [ -.02, -.04 ] }, "2": { distdraw: [ -.04, -.08 ], - integrity: [ -.3, -.1 ], - mass: [ -.2, -.35 ], + integrity: [ -.31, -.1 ], + mass: [ -.2, -.36 ], power: [ -.04, -.08 ] }, "3": { distdraw: [ -.06, -.12 ], integrity: [ -.4, -.2 ], - mass: [ -.3, -.55 ], + mass: [ -.31, -.55 ], power: [ -.06, -.12 ] }, "4": { distdraw: [ -.08, -.16 ], - integrity: [ -.5, -.3 ], + integrity: [ -.5, -.31 ], mass: [ -.4, -.75 ], power: [ -.08, -.16 ] }, "5": { distdraw: [ -.1, -.2 ], - integrity: [ -.6, -.4 ], + integrity: [ -.61, -.4 ], mass: [ -.5, -.9 ], - power: [ -.12, -.2 ] + power: [ -.1, -.2 ] } }, name: "Lightweight" }, Weapon_LongRange: { id: 87, + components: { + "1": { + Sulphur: 1 + }, + "2": { + "Modified Consumer Firmware": 1, + Sulphur: 1 + }, + "3": { + "Focus Crystals": 1, + "Modified Consumer Firmware": 1, + Sulphur: 1 + }, + "4": { + "Conductive Polymers": 1, + "Focus Crystals": 1, + "Modified Consumer Firmware": 1 + }, + "5": { + "Biotech Conductors": 1, + "Cracked Industrial Firmware": 1, + "Thermic Alloys": 1 + } + }, features: { "1": { fallofffromrange: [ 1, 1 ], mass: [ .1, 0 ], + shotspeed: [ .1, .19 ], range: [ .1, .2 ] }, "2": { fallofffromrange: [ 1, 1 ], - mass: [ .2, .05 ], - power: [ .05, 0 ], + mass: [ .2, .04 ], + power: [ .04, 0 ], + shotspeed: [ .19, .39 ], range: [ .2, .4 ] }, "3": { fallofffromrange: [ 1, 1 ], - mass: [ .3, .1 ], - power: [ .1, .05 ], - range: [ .3, .6 ] + mass: [ .29, .1 ], + power: [ .1, .04 ], + shotspeed: [ .29, .59 ], + range: [ .31, .61 ] }, "4": { fallofffromrange: [ 1, 1 ], - mass: [ .4, .15 ], - power: [ .15, .1 ], - range: [ .4, .8 ] + mass: [ .39, .14 ], + power: [ .14, .1 ], + shotspeed: [ .39, .79 ], + range: [ .4, .81 ] }, "5": { fallofffromrange: [ 1, 1 ], mass: [ .5, .2 ], - power: [ .2, .15 ], + power: [ .2, .14 ], + shotspeed: [ .5, 1 ], range: [ .5, 1 ] } }, @@ -16685,36 +16830,60 @@ module.exports = { }, Weapon_Overcharged: { id: 88, - features: { + components: { "1": { - clip: [ -.05, -.03 ], - damage: [ .15, .25 ], - distdraw: [ .9, .45 ], - jitter: [ 1, .4 ], - thermload: [ .45, .3 ] + Nickel: 1 }, "2": { - clip: [ -.1, -.06 ], - damage: [ .2, .3 ], - distdraw: [ .8, .4 ], - jitter: [ .8, .3 ], - thermload: [ .3, .15 ] + "Conductive Components": 1, + Nickel: 1 }, "3": { - clip: [ -.15, -.09 ], + "Conductive Components": 1, + "Electrochemical Arrays": 1, + Nickel: 1 + }, + "4": { + "Conductive Ceramics": 1, + "Polymer Capaciters": 1, + Zinc: 1 + }, + "5": { + "Conductive Polymers": 1, + "Modified Embedded Firmware": 1, + Zirconium: 1 + } + }, + features: { + "1": { + clip: [ -.05, -.04 ], + damage: [ .14, .25 ], + distdraw: [ .89, .45 ], + jitter: [ 1, .4 ], + thermload: [ .45, .29 ] + }, + "2": { + clip: [ -.11, -.06 ], + damage: [ .2, .29 ], + distdraw: [ .81, .4 ], + jitter: [ .8, .3 ], + thermload: [ .29, .14 ] + }, + "3": { + clip: [ -.16, -.1 ], damage: [ .25, .35 ], distdraw: [ .7, .35 ], jitter: [ .6, .2 ], - thermload: [ .15, 0 ] + thermload: [ .14, 0 ] }, "4": { - clip: [ -.2, -.12 ], - damage: [ .3, .4 ], - distdraw: [ .6, .3 ], + clip: [ -.21, -.12 ], + damage: [ .29, .39 ], + distdraw: [ .61, .29 ], jitter: [ .4, .1 ] }, "5": { - clip: [ -.25, -.15 ], + clip: [ -.25, -.16 ], damage: [ .35, .45 ], distdraw: [ .5, .25 ] } @@ -16723,49 +16892,97 @@ module.exports = { }, Weapon_RapidFire: { id: 89, - features: { + components: { "1": { - burstrof: [ -.15, -.2 ], - damage: [ -.07, -.05 ], - jitter: [ 2.5, 1.25 ], - reload: [ -.1, -.25 ] + "Mechanical Scrap": 1 }, "2": { - burstrof: [ -.2, -.25 ], - damage: [ -.09, -.07 ], - distdraw: [ -.1, -.2 ], - jitter: [ 2, 1 ], - reload: [ -.2, -.35 ] + "Heat Dispersion Plate": 1, + "Mechanical Scrap": 1 }, "3": { - burstrof: [ -.25, -.3 ], - damage: [ -.11, -.09 ], - distdraw: [ -.15, -.25 ], - jitter: [ 1.5, .75 ], - reload: [ -.3, -.45 ] + "Mechanical Equipment": 1, + "Precipitated Aloys": 1, + "Specialised Legacy Firmware": 1 + }, + "4": { + "Mechanical Components": 1, + "Modified Consumer Firmware": 1, + "Thermic Alloys": 1 + }, + "5": { + "Configurable Components": 1, + "Precipitated Alloys": 1, + Technetium: 1 + } + }, + features: { + "1": { + damage: [ -.07, -.06 ], + jitter: [ 2.5, 1.25 ], + reload: [ -.11, -.25 ], + rof: [ .17, .25 ] + }, + "2": { + damage: [ -.1, -.07 ], + distdraw: [ -.1, -.2 ], + jitter: [ 2, 1 ], + reload: [ -.2, -.36 ], + rof: [ .25, .34 ] + }, + "3": { + damage: [ -.11, -.1 ], + distdraw: [ -.15, -.25 ], + jitter: [ 1.5, .75 ], + reload: [ -.31, -.45 ], + rof: [ .34, .42 ] }, "4": { - burstrof: [ -.3, -.35 ], damage: [ -.13, -.11 ], distdraw: [ -.2, -.3 ], jitter: [ 1, .5 ], - reload: [ -.4, -.55 ] + reload: [ -.4, -.55 ], + rof: [ .42, .53 ] }, "5": { - burstrof: [ -.35, -.4 ], damage: [ -.15, -.13 ], - distdraw: [ -.25, -.35 ], + distdraw: [ -.25, -.36 ], jitter: [ .5, .25 ], - reload: [ -.5, -.65 ] + reload: [ -.5, -.65 ], + rof: [ .53, .66 ] } }, name: "Rapid fire" }, Weapon_ShortRange: { id: 90, + components: { + "1": { + Nickel: 1 + }, + "2": { + "Modified Consumer Firmware": 1, + Nickel: 1 + }, + "3": { + "Electrochemical Arrays": 1, + "Modified Consumer Firmware": 1, + Nickel: 1 + }, + "4": { + "Conductive Polymers": 1, + "Electrochemical Arrays": 1, + "Modified Consumer Firmware": 1 + }, + "5": { + "Biotech Conductors": 1, + "Configurable Components": 1, + "Cracked Industrial Firmware": 1 + } + }, features: { "1": { - damage: [ .04, .09 ], + damage: [ .03, .09 ], range: [ -.35, -.1 ] }, "2": { @@ -16774,28 +16991,52 @@ module.exports = { thermload: [ .2, .1 ] }, "3": { - damage: [ .12, .27 ], + damage: [ .11, .26 ], integrity: [ -.2, -.1 ], range: [ -.55, -.3 ], thermload: [ .3, .2 ] }, "4": { - damage: [ .16, .36 ], - integrity: [ -.3, -.2 ], + damage: [ .15, .35 ], + integrity: [ -.31, -.2 ], range: [ -.65, -.4 ], - thermload: [ .4, .3 ] + thermload: [ .39, .29 ] }, "5": { damage: [ .2, .45 ], - integrity: [ -.4, -.3 ], + integrity: [ -.4, -.31 ], range: [ -.75, -.5 ], - thermload: [ .5, .4 ] + thermload: [ .5, .39 ] } }, name: "Short range" }, Weapon_Sturdy: { id: 91, + components: { + "1": { + Nickel: 1 + }, + "2": { + Nickel: 1, + "Shield Emitters": 1 + }, + "3": { + Nickel: 1, + "Shield Emitters": 1, + Tungsten: 1 + }, + "4": { + Molybdenum: 1, + Tungsten: 1, + Zinc: 1 + }, + "5": { + "High Density Composites": 1, + Molybdenum: 1, + Technetium: 1 + } + }, features: { "1": { integrity: [ .2, .5 ], @@ -16803,21 +17044,27 @@ module.exports = { thermload: [ 0, -.1 ] }, "2": { - integrity: [ .4, 1 ], + integrity: [ .39, 1 ], mass: [ 1, .5 ], - thermload: [ -.05, -.15 ] + thermload: [ -.06, -.15 ] }, "3": { - integrity: [ .6, 1.5 ], + integrity: [ .61, 1.5 ], mass: [ 1.5, 1 ], - piercing: [ 0, .15 ], - thermload: [ -.1, -.2 ] + piercing: [ 0, .14 ], + thermload: [ -.11, -.2 ] }, "4": { + integrity: [ .81, 2 ], + mass: [ 2, 1.5 ], + piercing: [ .1, .29 ], + thermload: [ -.15, -.25 ] + }, + "5": { integrity: [ 1, 2.5 ], mass: [ 2.5, 2 ], piercing: [ .2, .45 ], - thermload: [ -.2, -.3 ] + thermload: [ -.2, -.31 ] } }, name: "Sturdy" @@ -17034,6 +17281,12 @@ module.exports = { type: "percentage", method: "multiplicative" }, + shotspeed: { + id: 43, + name: "shotspeed", + type: "percentage", + method: "multiplicative" + }, spinup: { id: 32, name: "spinup", @@ -17463,7 +17716,7 @@ module.exports = { Weapon_ShortRange: [ 1, 2, 3, 4, 5 ], Weapon_Sturdy: [ 1, 2, 3, 4, 5 ] }, - modifications: [ "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "mass", "piercing", "power", "range", "thermload" ] + modifications: [ "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "thermload" ] }, bsg: { blueprints: { @@ -17485,7 +17738,7 @@ module.exports = { Weapon_ShortRange: [ 1, 2, 3, 4, 5 ], Weapon_Sturdy: [ 1, 2, 3, 4, 5 ] }, - modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ] + modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ] }, cc: { blueprints: { @@ -17539,7 +17792,7 @@ module.exports = { Weapon_RapidFire: [ 1, 2, 3, 4, 5 ], Weapon_Sturdy: [ 1, 2, 3, 4, 5 ] }, - modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ] + modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ] }, fh: { blueprints: {}, @@ -17632,7 +17885,7 @@ module.exports = { Weapon_ShortRange: [ 1, 2, 3, 4, 5 ], Weapon_Sturdy: [ 1, 2, 3, 4, 5 ] }, - modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ] + modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ] }, ml: { blueprints: {}, @@ -17671,7 +17924,7 @@ module.exports = { Weapon_ShortRange: [ 1, 2, 3, 4, 5 ], Weapon_Sturdy: [ 1, 2, 3, 4, 5 ] }, - modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ] + modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ] }, pas: { blueprints: {}, diff --git a/dist/index.json b/dist/index.json index 6f53a4c..657a94e 100644 --- a/dist/index.json +++ b/dist/index.json @@ -9165,7 +9165,7 @@ "rating": "F", "reload": 4, "rof": 7.69, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.1 }, { @@ -9195,7 +9195,7 @@ "rating": "G", "reload": 5, "rof": 8.33, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.1 }, { @@ -9225,7 +9225,7 @@ "rating": "G", "reload": 4, "rof": 7.14, - "speed": 1600, + "shotspeed": 1600, "thermload": 0 }, { @@ -9256,7 +9256,7 @@ "rating": "F", "reload": 4, "rof": 4.3, - "speed": 1800, + "shotspeed": 1800, "thermload": 0.2 }, { @@ -9286,7 +9286,7 @@ "rating": "E", "reload": 4, "rof": 7.14, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.2 }, { @@ -9316,7 +9316,7 @@ "rating": "F", "reload": 5, "rof": 7.69, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.2 }, { @@ -9346,7 +9346,7 @@ "rating": "F", "reload": 4, "rof": 6.25, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.1 }, { @@ -9376,7 +9376,7 @@ "rating": "C", "reload": 4, "rof": 5.88, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.3 }, { @@ -9406,7 +9406,7 @@ "rating": "C", "reload": 5, "rof": 6.665, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.3 }, { @@ -9437,7 +9437,7 @@ "reload": 4, "rof": 3.03, "roundspershot": 2, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.4 }, { @@ -9468,7 +9468,7 @@ "reload": 5, "rof": 3.365, "roundspershot": 2, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.5 } ], @@ -9500,7 +9500,7 @@ "rating": "D", "reload": 3, "rof": 0.5, - "speed": 1200, + "shotspeed": 1200, "thermload": 1.4 }, { @@ -9530,7 +9530,7 @@ "rating": "E", "reload": 4, "rof": 0.52, - "speed": 1000, + "shotspeed": 1000, "thermload": 1.3 }, { @@ -9560,7 +9560,7 @@ "rating": "F", "reload": 4, "rof": 0.435, - "speed": 1000, + "shotspeed": 1000, "thermload": 0.7 }, { @@ -9590,7 +9590,7 @@ "rating": "D", "reload": 3, "rof": 0.465, - "speed": 1051, + "shotspeed": 1051, "thermload": 2.1 }, { @@ -9620,7 +9620,7 @@ "rating": "D", "reload": 4, "rof": 0.485, - "speed": 875, + "shotspeed": 875, "thermload": 1.9 }, { @@ -9650,7 +9650,7 @@ "rating": "E", "reload": 4, "rof": 0.405, - "speed": 875, + "shotspeed": 875, "thermload": 1 }, { @@ -9680,7 +9680,7 @@ "rating": "C", "reload": 3, "rof": 0.425, - "speed": 959, + "shotspeed": 959, "thermload": 3.2 }, { @@ -9712,7 +9712,7 @@ "rating": "C", "reload": 4, "rof": 0.445, - "speed": 800, + "shotspeed": 800, "thermload": 2.9 }, { @@ -9742,7 +9742,7 @@ "rating": "D", "reload": 4, "rof": 0.37, - "speed": 800, + "shotspeed": 800, "thermload": 1.6 }, { @@ -9774,7 +9774,7 @@ "rating": "B", "reload": 3, "rof": 0.385, - "speed": 900, + "shotspeed": 900, "thermload": 4.8 }, { @@ -9806,7 +9806,7 @@ "rating": "B", "reload": 4, "rof": 0.4, - "speed": 750, + "shotspeed": 750, "thermload": 4.4 } ], @@ -9840,7 +9840,7 @@ "reload": 2.5, "rof": 5.555, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.4 }, { @@ -9872,7 +9872,7 @@ "reload": 2.5, "rof": 5.88, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.4 }, { @@ -9904,7 +9904,7 @@ "reload": 2.5, "rof": 4.76, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.2 }, { @@ -9936,7 +9936,7 @@ "reload": 2.5, "rof": 5, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.7 }, { @@ -9968,7 +9968,7 @@ "reload": 2.5, "rof": 5.26, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.8 }, { @@ -10000,7 +10000,7 @@ "reload": 2.5, "rof": 4.345, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.4 }, { @@ -10032,7 +10032,7 @@ "reload": 2.5, "rof": 4.545, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 1.1 }, { @@ -10064,7 +10064,7 @@ "reload": 2.5, "rof": 4.76, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 1.4 }, { @@ -10096,7 +10096,7 @@ "reload": 2.5, "rof": 4, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.7 }, { @@ -10129,7 +10129,7 @@ "reload": 2.5, "rof": 4.5, "roundspershot": 12, - "speed": 1000, + "shotspeed": 1000, "thermload": 1.1 } ], @@ -10259,7 +10259,7 @@ "rating": "C", "reload": 6, "rof": 0.33, - "speed": 875, + "shotspeed": 875, "thermload": 15.6 }, { @@ -10291,7 +10291,7 @@ "rating": "B", "reload": 6, "rof": 0.29, - "speed": 875, + "shotspeed": 875, "thermload": 21.8 }, { @@ -10325,7 +10325,7 @@ "rating": "B", "reload": 6, "rof": 0.8, - "speed": 875, + "shotspeed": 875, "thermload": 11 }, { @@ -10357,7 +10357,7 @@ "rating": "A", "reload": 6, "rof": 0.25, - "speed": 875, + "shotspeed": 875, "thermload": 29.5 } ], @@ -10388,7 +10388,7 @@ "rating": "B", "reload": 5, "rof": 0.5, - "speed": 750, + "shotspeed": 750, "thermload": 3.6 }, { @@ -10417,7 +10417,7 @@ "rating": "B", "reload": 12, "rof": 0.333, - "speed": 625, + "shotspeed": 625, "thermload": 3.6 }, { @@ -10448,7 +10448,7 @@ "rating": "B", "reload": 5, "rof": 0.5, - "speed": 750, + "shotspeed": 750, "thermload": 3.6 }, { @@ -10479,7 +10479,7 @@ "rating": "B", "reload": 12, "rof": 0.333, - "speed": 625, + "shotspeed": 625, "thermload": 3.6 }, { @@ -10509,7 +10509,7 @@ "rating": "B", "reload": 5, "rof": 0.333, - "speed": 750, + "shotspeed": 750, "thermload": 3.6 }, { @@ -10543,7 +10543,7 @@ "reload": 5, "rof": 2, "roundspershot": 4, - "speed": 600, + "shotspeed": 600, "thermload": 3.6 } ], @@ -10574,7 +10574,7 @@ "rating": "I", "reload": 5, "rof": 1, - "speed": 250, + "shotspeed": 250, "thermload": 45 }, { @@ -10603,7 +10603,7 @@ "rating": "I", "reload": 5, "rof": 1, - "speed": 250, + "shotspeed": 250, "thermload": 50 } ], @@ -11157,7 +11157,7 @@ "rating": "I", "reload": 0.4, "rof": 10, - "speed": 1000, + "shotspeed": 1000, "thermload": 0.1 } ] @@ -20248,24 +20248,24 @@ 0 ], "engrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "syscap": [ -0.03, 0 ], "sysrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "wepcap": [ -0.03, 0 ], "weprate": [ - -0.25, - -0.16 + 0.25, + 0.16 ] }, "2": { @@ -20274,24 +20274,24 @@ -0.01 ], "engrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "syscap": [ -0.06, -0.01 ], "sysrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "wepcap": [ -0.06, -0.01 ], "weprate": [ - -0.25, - -0.16 + 0.25, + 0.16 ] }, "3": { @@ -20300,24 +20300,24 @@ -0.02 ], "engrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "syscap": [ -0.09, -0.02 ], "sysrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "wepcap": [ -0.09, -0.02 ], "weprate": [ - -0.25, - -0.16 + 0.25, + 0.16 ] }, "4": { @@ -20326,7 +20326,7 @@ -0.03 ], "engrate": [ - -0.25, + 0.25, -0.16 ], "syscap": [ @@ -20334,16 +20334,16 @@ -0.03 ], "sysrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "wepcap": [ -0.12, -0.03 ], "weprate": [ - -0.25, - -0.16 + 0.25, + 0.16 ] }, "5": { @@ -20352,24 +20352,24 @@ -0.04 ], "engrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "syscap": [ -0.15, -0.04 ], "sysrate": [ - -0.25, - -0.16 + 0.25, + 0.16 ], "wepcap": [ -0.15, -0.04 ], "weprate": [ - -0.25, - -0.16 + 0.25, + 0.16 ] } }, @@ -22267,6 +22267,26 @@ }, "Weapon_DoubleShot": { "id": 82, + "components": { + "1": { + "Carbon": 1 + }, + "2": { + "Carbon": 1, + "Mechanical Equipment": 1 + }, + "3": { + "Carbon": 1, + "Cracked Industrial Firmware": 1, + "Mechanical Equipment": 1 + }, + "4": { + "Mechanical Components": 1, + "Security Firmware Patch": 1, + "Vanadium": 1 + }, + "5": {} + }, "features": { "1": { "ammo": [ @@ -22363,34 +22383,58 @@ }, "Weapon_Efficient": { "id": 83, + "components": { + "1": { + "Sulphur": 1 + }, + "2": { + "Heat Dispersion Plate": 1, + "Sulphur": 1 + }, + "3": { + "Chromium": 1, + "Exceptional Scrambed Emission Data": 1, + "Heat Exchangers": 1 + }, + "4": { + "Heat Vanes": 1, + "Irregular Emission Data": 1, + "Selenium": 1 + }, + "5": { + "Cadmium": 1, + "Proto Heat Radiators": 1, + "Heatsink Interlink": 1 + } + }, "features": { "1": { "damage": [ 0, - 0.05 + 0.04 ], "thermload": [ - -0.3, + -0.31, -0.4 ] }, "2": { "damage": [ 0.01, - 0.06 + 0.05 ], "power": [ 0, -0.1 ], "thermload": [ - -0.35, + -0.36, -0.45 ] }, "3": { "damage": [ - 0.02, + 0.01, 0.07 ], "distdraw": [ @@ -22398,7 +22442,7 @@ -0.25 ], "power": [ - -0.05, + -0.06, -0.2 ], "thermload": [ @@ -22417,7 +22461,7 @@ ], "power": [ -0.1, - -0.3 + -0.31 ], "thermload": [ -0.45, @@ -22426,12 +22470,12 @@ }, "5": { "damage": [ - 0.04, + 0.03, 0.09 ], "distdraw": [ -0.25, - -0.35 + -0.36 ], "power": [ -0.14, @@ -22439,7 +22483,7 @@ ], "thermload": [ -0.5, - -0.6 + -0.61 ] } }, @@ -22447,6 +22491,30 @@ }, "Weapon_Focused": { "id": 84, + "components": { + "1": { + "Iron": 1 + }, + "2": { + "Conductive Components": 1, + "Iron": 1 + }, + "3": { + "Chromium": 1, + "Conductive Ceramics": 1, + "Iron": 1 + }, + "4": { + "Focus Crystals": 1, + "Germanium": 1, + "Polymer Capacitors": 1 + }, + "5": { + "Military Supercapacitors": 1, + "Niobium": 1, + "Refined Focus Crystals": 1 + } + }, "features": { "1": { "burstrof": [ @@ -22539,15 +22607,39 @@ }, "Weapon_HighCapacity": { "id": 85, + "components": { + "1": { + "Mechanical Scrap": 1 + }, + "2": { + "Mechanical Scrap": 1, + "Vanadium": 1 + }, + "3": { + "Mechanical Scrap": 1, + "Niobium": 1, + "Vanadium": 1 + }, + "4": { + "High Density Composites": 1, + "Mechanical Equipment": 1, + "Tin": 1 + }, + "5": { + "Mechanical Components": 1, + "Military Supercapacitors": 1, + "Proprietary Composites": 1 + } + }, "features": { "1": { "ammo": [ - 0.17, - 0.66 + 0.1, + 0.59 ], "clip": [ 0.1, - 0.61 + 0.59 ], "mass": [ 0.25, @@ -22564,12 +22656,12 @@ }, "2": { "ammo": [ - 0.24, - 0.75 + 0.19, + 0.69 ], "clip": [ 0.2, - 0.7 + 0.69 ], "mass": [ 0.5, @@ -22586,16 +22678,16 @@ }, "3": { "ammo": [ - 0.34, - 0.83 + 0.29, + 0.79 ], "clip": [ - 0.31, - 0.81 + 0.29, + 0.79 ], "mass": [ 0.75, - 0.25 + 0.29 ], "reload": [ 0.61, @@ -22608,20 +22700,20 @@ }, "4": { "ammo": [ - 0.41, - 0.91 + 0.39, + 0.89 ], "clip": [ - 0.4, - 0.9 + 0.39, + 0.89 ], "mass": [ 1, 0.39 ], "reload": [ - 0.81, - 0.31 + 0.79, + 0.29 ], "power": [ 0.35, @@ -22655,6 +22747,30 @@ }, "Weapon_LightWeight": { "id": 86, + "components": { + "1": { + "Phosphorous": 1 + }, + "2": { + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "4": { + "Conductive Components": 1, + "Phase Alloys": 1, + "Proto Light Alloys": 1 + }, + "5": { + "Conductive Ceramics": 1, + "Proto Light Alloys": 1, + "Proto Radiolic Alloys": 1 + } + }, "features": { "1": { "distdraw": [ @@ -22666,7 +22782,7 @@ 0 ], "mass": [ - -0.1, + -0.11, -0.15 ], "power": [ @@ -22680,12 +22796,12 @@ -0.08 ], "integrity": [ - -0.3, + -0.31, -0.1 ], "mass": [ -0.2, - -0.35 + -0.36 ], "power": [ -0.04, @@ -22702,7 +22818,7 @@ -0.2 ], "mass": [ - -0.3, + -0.31, -0.55 ], "power": [ @@ -22717,7 +22833,7 @@ ], "integrity": [ -0.5, - -0.3 + -0.31 ], "mass": [ -0.4, @@ -22734,7 +22850,7 @@ -0.2 ], "integrity": [ - -0.6, + -0.61, -0.4 ], "mass": [ @@ -22742,7 +22858,7 @@ -0.9 ], "power": [ - -0.12, + -0.1, -0.2 ] } @@ -22751,6 +22867,30 @@ }, "Weapon_LongRange": { "id": 87, + "components": { + "1": { + "Sulphur": 1 + }, + "2": { + "Modified Consumer Firmware": 1, + "Sulphur": 1 + }, + "3": { + "Focus Crystals": 1, + "Modified Consumer Firmware": 1, + "Sulphur": 1 + }, + "4": { + "Conductive Polymers": 1, + "Focus Crystals": 1, + "Modified Consumer Firmware": 1 + }, + "5": { + "Biotech Conductors": 1, + "Cracked Industrial Firmware": 1, + "Thermic Alloys": 1 + } + }, "features": { "1": { "fallofffromrange": [ @@ -22761,6 +22901,10 @@ 0.1, 0 ], + "shotspeed": [ + 0.1, + 0.19 + ], "range": [ 0.1, 0.2 @@ -22773,12 +22917,16 @@ ], "mass": [ 0.2, - 0.05 + 0.04 ], "power": [ - 0.05, + 0.04, 0 ], + "shotspeed": [ + 0.19, + 0.39 + ], "range": [ 0.2, 0.4 @@ -22790,16 +22938,20 @@ 1 ], "mass": [ - 0.3, + 0.29, 0.1 ], "power": [ 0.1, - 0.05 + 0.04 + ], + "shotspeed": [ + 0.29, + 0.59 ], "range": [ - 0.3, - 0.6 + 0.31, + 0.61 ] }, "4": { @@ -22808,16 +22960,20 @@ 1 ], "mass": [ - 0.4, - 0.15 + 0.39, + 0.14 ], "power": [ - 0.15, + 0.14, 0.1 ], + "shotspeed": [ + 0.39, + 0.79 + ], "range": [ 0.4, - 0.8 + 0.81 ] }, "5": { @@ -22831,7 +22987,11 @@ ], "power": [ 0.2, - 0.15 + 0.14 + ], + "shotspeed": [ + 0.5, + 1 ], "range": [ 0.5, @@ -22843,18 +23003,42 @@ }, "Weapon_Overcharged": { "id": 88, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Conductive Components": 1, + "Nickel": 1 + }, + "3": { + "Conductive Components": 1, + "Electrochemical Arrays": 1, + "Nickel": 1 + }, + "4": { + "Conductive Ceramics": 1, + "Polymer Capaciters": 1, + "Zinc": 1 + }, + "5": { + "Conductive Polymers": 1, + "Modified Embedded Firmware": 1, + "Zirconium": 1 + } + }, "features": { "1": { "clip": [ -0.05, - -0.03 + -0.04 ], "damage": [ - 0.15, + 0.14, 0.25 ], "distdraw": [ - 0.9, + 0.89, 0.45 ], "jitter": [ @@ -22863,20 +23047,20 @@ ], "thermload": [ 0.45, - 0.3 + 0.29 ] }, "2": { "clip": [ - -0.1, + -0.11, -0.06 ], "damage": [ 0.2, - 0.3 + 0.29 ], "distdraw": [ - 0.8, + 0.81, 0.4 ], "jitter": [ @@ -22884,14 +23068,14 @@ 0.3 ], "thermload": [ - 0.3, - 0.15 + 0.29, + 0.14 ] }, "3": { "clip": [ - -0.15, - -0.09 + -0.16, + -0.1 ], "damage": [ 0.25, @@ -22906,22 +23090,22 @@ 0.2 ], "thermload": [ - 0.15, + 0.14, 0 ] }, "4": { "clip": [ - -0.2, + -0.21, -0.12 ], "damage": [ - 0.3, - 0.4 + 0.29, + 0.39 ], "distdraw": [ - 0.6, - 0.3 + 0.61, + 0.29 ], "jitter": [ 0.4, @@ -22931,7 +23115,7 @@ "5": { "clip": [ -0.25, - -0.15 + -0.16 ], "damage": [ 0.35, @@ -22947,32 +23131,52 @@ }, "Weapon_RapidFire": { "id": 89, + "components": { + "1": { + "Mechanical Scrap": 1 + }, + "2": { + "Heat Dispersion Plate": 1, + "Mechanical Scrap": 1 + }, + "3": { + "Mechanical Equipment": 1, + "Precipitated Aloys": 1, + "Specialised Legacy Firmware": 1 + }, + "4": { + "Mechanical Components": 1, + "Modified Consumer Firmware": 1, + "Thermic Alloys": 1 + }, + "5": { + "Configurable Components": 1, + "Precipitated Alloys": 1, + "Technetium": 1 + } + }, "features": { "1": { - "burstrof": [ - -0.15, - -0.2 - ], "damage": [ -0.07, - -0.05 + -0.06 ], "jitter": [ 2.5, 1.25 ], "reload": [ - -0.1, + -0.11, -0.25 + ], + "rof": [ + 0.17, + 0.25 ] }, "2": { - "burstrof": [ - -0.2, - -0.25 - ], "damage": [ - -0.09, + -0.1, -0.07 ], "distdraw": [ @@ -22985,17 +23189,17 @@ ], "reload": [ -0.2, - -0.35 + -0.36 + ], + "rof": [ + 0.25, + 0.34 ] }, "3": { - "burstrof": [ - -0.25, - -0.3 - ], "damage": [ -0.11, - -0.09 + -0.1 ], "distdraw": [ -0.15, @@ -23006,15 +23210,15 @@ 0.75 ], "reload": [ - -0.3, + -0.31, -0.45 + ], + "rof": [ + 0.34, + 0.42 ] }, "4": { - "burstrof": [ - -0.3, - -0.35 - ], "damage": [ -0.13, -0.11 @@ -23030,20 +23234,20 @@ "reload": [ -0.4, -0.55 + ], + "rof": [ + 0.42, + 0.53 ] }, "5": { - "burstrof": [ - -0.35, - -0.4 - ], "damage": [ -0.15, -0.13 ], "distdraw": [ -0.25, - -0.35 + -0.36 ], "jitter": [ 0.5, @@ -23052,6 +23256,10 @@ "reload": [ -0.5, -0.65 + ], + "rof": [ + 0.53, + 0.66 ] } }, @@ -23059,10 +23267,34 @@ }, "Weapon_ShortRange": { "id": 90, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Modified Consumer Firmware": 1, + "Nickel": 1 + }, + "3": { + "Electrochemical Arrays": 1, + "Modified Consumer Firmware": 1, + "Nickel": 1 + }, + "4": { + "Conductive Polymers": 1, + "Electrochemical Arrays": 1, + "Modified Consumer Firmware": 1 + }, + "5": { + "Biotech Conductors": 1, + "Configurable Components": 1, + "Cracked Industrial Firmware": 1 + } + }, "features": { "1": { "damage": [ - 0.04, + 0.03, 0.09 ], "range": [ @@ -23086,8 +23318,8 @@ }, "3": { "damage": [ - 0.12, - 0.27 + 0.11, + 0.26 ], "integrity": [ -0.2, @@ -23104,11 +23336,11 @@ }, "4": { "damage": [ - 0.16, - 0.36 + 0.15, + 0.35 ], "integrity": [ - -0.3, + -0.31, -0.2 ], "range": [ @@ -23116,8 +23348,8 @@ -0.4 ], "thermload": [ - 0.4, - 0.3 + 0.39, + 0.29 ] }, "5": { @@ -23127,7 +23359,7 @@ ], "integrity": [ -0.4, - -0.3 + -0.31 ], "range": [ -0.75, @@ -23135,7 +23367,7 @@ ], "thermload": [ 0.5, - 0.4 + 0.39 ] } }, @@ -23143,6 +23375,30 @@ }, "Weapon_Sturdy": { "id": 91, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Shield Emitters": 1 + }, + "3": { + "Nickel": 1, + "Shield Emitters": 1, + "Tungsten": 1 + }, + "4": { + "Molybdenum": 1, + "Tungsten": 1, + "Zinc": 1 + }, + "5": { + "High Density Composites": 1, + "Molybdenum": 1, + "Technetium": 1 + } + }, "features": { "1": { "integrity": [ @@ -23160,7 +23416,7 @@ }, "2": { "integrity": [ - 0.4, + 0.39, 1 ], "mass": [ @@ -23168,13 +23424,13 @@ 0.5 ], "thermload": [ - -0.05, + -0.06, -0.15 ] }, "3": { "integrity": [ - 0.6, + 0.61, 1.5 ], "mass": [ @@ -23183,14 +23439,32 @@ ], "piercing": [ 0, - 0.15 + 0.14 ], "thermload": [ - -0.1, + -0.11, -0.2 ] }, "4": { + "integrity": [ + 0.81, + 2 + ], + "mass": [ + 2, + 1.5 + ], + "piercing": [ + 0.1, + 0.29 + ], + "thermload": [ + -0.15, + -0.25 + ] + }, + "5": { "integrity": [ 1, 2.5 @@ -23205,7 +23479,7 @@ ], "thermload": [ -0.2, - -0.3 + -0.31 ] } }, @@ -23423,6 +23697,12 @@ "type": "percentage", "method": "multiplicative" }, + "shotspeed": { + "id": 43, + "name": "shotspeed", + "type": "percentage", + "method": "multiplicative" + }, "spinup": { "id": 32, "name": "spinup", @@ -23951,6 +24231,7 @@ "distdraw", "fallofffromrange", "integrity", + "jitter", "mass", "piercing", "power", @@ -24079,6 +24360,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, @@ -24296,6 +24578,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, @@ -24656,6 +24939,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, @@ -24837,6 +25121,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 74d1dd0..45f1c97 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -1579,43 +1579,43 @@ "features": { "1": { "engcap": [ -0.03, 0 ], - "engrate": [ -0.25, -0.16 ], + "engrate": [ 0.25, 0.16 ], "syscap": [ -0.03, 0 ], - "sysrate": [ -0.25, -0.16 ], + "sysrate": [ 0.25, 0.16 ], "wepcap": [ -0.03, 0 ], - "weprate": [ -0.25, -0.16 ] + "weprate": [ 0.25, 0.16 ] }, "2": { "engcap": [ -0.06, -0.01 ], - "engrate": [ -0.25, -0.16 ], + "engrate": [ 0.25, 0.16 ], "syscap": [ -0.06, -0.01 ], - "sysrate": [ -0.25, -0.16 ], + "sysrate": [ 0.25, 0.16 ], "wepcap": [ -0.06, -0.01 ], - "weprate": [ -0.25, -0.16 ] + "weprate": [ 0.25, 0.16 ] }, "3": { "engcap": [ -0.09, -0.02 ], - "engrate": [ -0.25, -0.16 ], + "engrate": [ 0.25, 0.16 ], "syscap": [ -0.09, -0.02 ], - "sysrate": [ -0.25, -0.16 ], + "sysrate": [ 0.25, 0.16 ], "wepcap": [ -0.09, -0.02 ], - "weprate": [ -0.25, -0.16 ] + "weprate": [ 0.25, 0.16 ] }, "4": { "engcap": [ -0.12, -0.03 ], - "engrate": [ -0.25, -0.16 ], + "engrate": [ 0.25,-0.16 ], "syscap": [ -0.12, -0.03 ], - "sysrate": [ -0.25, -0.16 ], + "sysrate": [ 0.25, 0.16 ], "wepcap": [ -0.12, -0.03 ], - "weprate": [ -0.25, -0.16 ] + "weprate": [ 0.25, 0.16 ] }, "5": { "engcap": [ -0.15, -0.04 ], - "engrate": [ -0.25, -0.16 ], + "engrate": [ 0.25, 0.16 ], "syscap": [ -0.15, -0.04 ], - "sysrate": [ -0.25, -0.16 ], + "sysrate": [ 0.25, 0.16 ], "wepcap": [ -0.15, -0.04 ], - "weprate": [ -0.25, -0.16 ] + "weprate": [ 0.25, 0.16 ] } }, "name": "Charge enhanced" @@ -2378,6 +2378,27 @@ }, "Weapon_DoubleShot": { "id": 82, + "components": { + "1": { + "Carbon": 1 + }, + "2": { + "Carbon": 1, + "Mechanical Equipment": 1 + }, + "3": { + "Carbon": 1, + "Cracked Industrial Firmware": 1, + "Mechanical Equipment": 1 + }, + "4": { + "Mechanical Components": 1, + "Security Firmware Patch": 1, + "Vanadium": 1 + }, + "5": { + } + }, "features": { "1": { "ammo": [ 0.1, 0.2 ], @@ -2414,39 +2435,87 @@ }, "Weapon_Efficient": { "id": 83, - "features": { + "components": { "1": { - "damage": [ 0, 0.05 ], - "thermload": [ -0.3, -0.4 ] + "Sulphur": 1 }, "2": { - "damage": [ 0.01, 0.06 ], - "power": [ 0, -0.1 ], - "thermload": [ -0.35, -0.45 ] + "Heat Dispersion Plate": 1, + "Sulphur": 1 }, "3": { - "damage": [ 0.02, 0.07 ], + "Chromium": 1, + "Exceptional Scrambed Emission Data": 1, + "Heat Exchangers": 1 + }, + "4": { + "Heat Vanes": 1, + "Irregular Emission Data": 1, + "Selenium": 1 + }, + "5": { + "Cadmium": 1, + "Proto Heat Radiators": 1, + "Heatsink Interlink": 1 + } + }, + "features": { + "1": { + "damage": [ 0, 0.04 ], + "thermload": [ -0.31, -0.4 ] + }, + "2": { + "damage": [ 0.01, 0.05 ], + "power": [ 0, -0.1 ], + "thermload": [ -0.36, -0.45 ] + }, + "3": { + "damage": [ 0.01, 0.07 ], "distdraw": [ -0.15, -0.25 ], - "power": [ -0.05, -0.2 ], + "power": [ -0.06, -0.2 ], "thermload": [ -0.4, -0.5 ] }, "4": { "damage": [ 0.03, 0.08 ], "distdraw": [ -0.2, -0.3 ], - "power": [ -0.1, -0.3 ], + "power": [ -0.1, -0.31 ], "thermload": [ -0.45, -0.55 ] }, "5": { - "damage": [ 0.04, 0.09 ], - "distdraw": [ -0.25, -0.35 ], + "damage": [ 0.03, 0.09 ], + "distdraw": [ -0.25, -0.36 ], "power": [ -0.14, -0.4 ], - "thermload": [ -0.5, -0.6 ] + "thermload": [ -0.5, -0.61 ] } }, "name": "Efficient" }, "Weapon_Focused": { "id": 84, + "components": { + "1": { + "Iron": 1 + }, + "2": { + "Conductive Components": 1, + "Iron": 1 + }, + "3": { + "Chromium": 1, + "Conductive Ceramics": 1, + "Iron": 1 + }, + "4": { + "Focus Crystals": 1, + "Germanium": 1, + "Polymer Capacitors": 1 + }, + "5": { + "Military Supercapacitors": 1, + "Niobium": 1, + "Refined Focus Crystals": 1 + } + }, "features": { "1": { "burstrof": [ 0.2, 0.08 ], @@ -2482,33 +2551,57 @@ }, "Weapon_HighCapacity": { "id": 85, + "components": { + "1": { + "Mechanical Scrap": 1 + }, + "2": { + "Mechanical Scrap": 1, + "Vanadium": 1 + }, + "3": { + "Mechanical Scrap": 1, + "Niobium": 1, + "Vanadium": 1 + }, + "4": { + "High Density Composites": 1, + "Mechanical Equipment": 1, + "Tin": 1 + }, + "5": { + "Mechanical Components": 1, + "Military Supercapacitors": 1, + "Proprietary Composites": 1 + } + }, "features": { "1": { - "ammo": [ 0.17, 0.66 ], - "clip": [ 0.1, 0.61 ], + "ammo": [ 0.1, 0.59 ], + "clip": [ 0.1, 0.59 ], "mass": [ 0.25, 0.1 ], "reload": [ 0.2, 0 ], "power": [ 0.2, 0.1 ] }, "2": { - "ammo": [ 0.24, 0.75 ], - "clip": [ 0.2, 0.7 ], + "ammo": [ 0.19, 0.69 ], + "clip": [ 0.2, 0.69 ], "mass": [ 0.5, 0.2 ], "reload": [ 0.39, 0.1 ], "power": [ 0.25, 0.14 ] }, "3": { - "ammo": [ 0.34, 0.83 ], - "clip": [ 0.31, 0.81 ], - "mass": [ 0.75, 0.25 ], + "ammo": [ 0.29, 0.79 ], + "clip": [ 0.29, 0.79 ], + "mass": [ 0.75, 0.29 ], "reload": [ 0.61, 0.2 ], "power": [ 0.31, 0.2 ] }, "4": { - "ammo": [ 0.41, 0.91 ], - "clip": [ 0.4, 0.9 ], + "ammo": [ 0.39, 0.89 ], + "clip": [ 0.39, 0.89], "mass": [ 1, 0.39 ], - "reload": [ 0.81, 0.31 ], + "reload": [ 0.79, 0.29 ], "power": [ 0.35, 0.25 ] }, "5": { @@ -2523,70 +2616,123 @@ }, "Weapon_LightWeight": { "id": 86, + "components": { + "1": { + "Phosphorous": 1 + }, + "2": { + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "4": { + "Conductive Components": 1, + "Phase Alloys": 1, + "Proto Light Alloys": 1 + }, + "5": { + "Conductive Ceramics": 1, + "Proto Light Alloys": 1, + "Proto Radiolic Alloys": 1 + } + }, "features": { "1": { "distdraw": [ -0.02, -0.04 ], "integrity": [ -0.2, 0 ], - "mass": [ -0.1, -0.15 ], + "mass": [ -0.11, -0.15 ], "power": [ -0.02, -0.04 ] }, "2": { "distdraw": [ -0.04, -0.08 ], - "integrity": [ -0.3, -0.1 ], - "mass": [ -0.2, -0.35 ], + "integrity": [ -0.31, -0.1 ], + "mass": [ -0.2, -0.36 ], "power": [ -0.04, -0.08 ] }, "3": { "distdraw": [ -0.06, -0.12 ], "integrity": [ -0.4, -0.2 ], - "mass": [ -0.3, -0.55 ], + "mass": [ -0.31, -0.55 ], "power": [ -0.06, -0.12 ] }, "4": { "distdraw": [ -0.08, -0.16 ], - "integrity": [ -0.5, -0.3 ], + "integrity": [ -0.5, -0.31 ], "mass": [ -0.4, -0.75 ], "power": [ -0.08, -0.16 ] }, "5": { "distdraw": [ -0.1, -0.2 ], - "integrity": [ -0.6, -0.4 ], + "integrity": [ -0.61, -0.4 ], "mass": [ -0.5, -0.9 ], - "power": [ -0.12, -0.2 ] + "power": [ -0.1, -0.2 ] } }, "name": "Lightweight" }, "Weapon_LongRange": { "id": 87, + "components": { + "1": { + "Sulphur": 1 + }, + "2": { + "Modified Consumer Firmware": 1, + "Sulphur": 1 + }, + "3": { + "Focus Crystals": 1, + "Modified Consumer Firmware": 1, + "Sulphur": 1 + }, + "4": { + "Conductive Polymers": 1, + "Focus Crystals": 1, + "Modified Consumer Firmware": 1 + }, + "5": { + "Biotech Conductors": 1, + "Cracked Industrial Firmware": 1, + "Thermic Alloys": 1 + } + }, "features": { "1": { "fallofffromrange": [ 1, 1 ], "mass": [ 0.1, 0 ], + "shotspeed": [ 0.1, 0.19 ], "range": [ 0.1, 0.2 ] }, "2": { "fallofffromrange": [ 1, 1 ], - "mass": [ 0.2, 0.05 ], - "power": [ 0.05, 0 ], + "mass": [ 0.2, 0.04 ], + "power": [ 0.04, 0 ], + "shotspeed": [ 0.19, 0.39 ], "range": [ 0.2, 0.4 ] }, "3": { "fallofffromrange": [ 1, 1 ], - "mass": [ 0.3, 0.1 ], - "power": [ 0.1, 0.05 ], - "range": [ 0.3, 0.6 ] + "mass": [ 0.29, 0.1 ], + "power": [ 0.1, 0.04 ], + "shotspeed": [ 0.29, 0.59 ], + "range": [ 0.31, 0.61 ] }, "4": { "fallofffromrange": [ 1, 1 ], - "mass": [ 0.4, 0.15 ], - "power": [ 0.15, 0.1 ], - "range": [ 0.4, 0.8 ] + "mass": [ 0.39, 0.14 ], + "power": [ 0.14, 0.1 ], + "shotspeed": [ 0.39, 0.79 ], + "range": [ 0.4, 0.81 ] }, "5": { "fallofffromrange": [ 1, 1 ], "mass": [ 0.5, 0.2 ], - "power": [ 0.2, 0.15 ], + "power": [ 0.2, 0.14 ], + "shotspeed": [ 0.5, 1 ], "range": [ 0.5, 1 ] } }, @@ -2594,36 +2740,60 @@ }, "Weapon_Overcharged": { "id": 88, - "features": { + "components": { "1": { - "clip": [ -0.05, -0.03 ], - "damage": [ 0.15, 0.25 ], - "distdraw": [ 0.9, 0.45 ], - "jitter": [ 1, 0.4 ], - "thermload": [ 0.45, 0.3 ] + "Nickel": 1 }, "2": { - "clip": [ -0.1, -0.06 ], - "damage": [ 0.2, 0.3 ], - "distdraw": [ 0.8, 0.4 ], - "jitter": [ 0.8, 0.3 ], - "thermload": [ 0.3, 0.15 ] + "Conductive Components": 1, + "Nickel": 1 }, "3": { - "clip": [ -0.15, -0.09 ], + "Conductive Components": 1, + "Electrochemical Arrays": 1, + "Nickel": 1 + }, + "4": { + "Conductive Ceramics": 1, + "Polymer Capaciters": 1, + "Zinc": 1 + }, + "5": { + "Conductive Polymers": 1, + "Modified Embedded Firmware": 1, + "Zirconium": 1 + } + }, + "features": { + "1": { + "clip": [ -0.05, -0.04 ], + "damage": [ 0.14, 0.25 ], + "distdraw": [ 0.89, 0.45 ], + "jitter": [ 1, 0.4 ], + "thermload": [ 0.45, 0.29 ] + }, + "2": { + "clip": [ -0.11, -0.06 ], + "damage": [ 0.2, 0.29 ], + "distdraw": [ 0.81, 0.4 ], + "jitter": [ 0.8, 0.3 ], + "thermload": [ 0.29, 0.14 ] + }, + "3": { + "clip": [ -0.16, -0.1 ], "damage": [ 0.25, 0.35 ], "distdraw": [ 0.7, 0.35 ], "jitter": [ 0.6, 0.2 ], - "thermload": [ 0.15, 0 ] + "thermload": [ 0.14, 0 ] }, "4": { - "clip": [ -0.2, -0.12 ], - "damage": [ 0.3, 0.4 ], - "distdraw": [ 0.6, 0.3 ], + "clip": [ -0.21, -0.12 ], + "damage": [ 0.29, 0.39 ], + "distdraw": [ 0.61, 0.29 ], "jitter": [ 0.4, 0.1 ] }, "5": { - "clip": [ -0.25, -0.15 ], + "clip": [ -0.25, -0.16 ], "damage": [ 0.35, 0.45 ], "distdraw": [ 0.5, 0.25 ] } @@ -2632,49 +2802,97 @@ }, "Weapon_RapidFire": { "id": 89, - "features": { + "components": { "1": { - "burstrof": [ -0.15, -0.2 ], - "damage": [ -0.07, -0.05 ], - "jitter": [ 2.5, 1.25 ], - "reload": [ -0.1, -0.25 ] + "Mechanical Scrap": 1 }, "2": { - "burstrof": [ -0.2, -0.25 ], - "damage": [ -0.09, -0.07 ], - "distdraw": [ -0.1, -0.2 ], - "jitter": [ 2, 1 ], - "reload": [ -0.2, -0.35 ] + "Heat Dispersion Plate": 1, + "Mechanical Scrap": 1 }, "3": { - "burstrof": [ -0.25, -0.3 ], - "damage": [ -0.11, -0.09 ], - "distdraw": [ -0.15, -0.25 ], - "jitter": [ 1.5, 0.75 ], - "reload": [ -0.3, -0.45 ] + "Mechanical Equipment": 1, + "Precipitated Aloys": 1, + "Specialised Legacy Firmware": 1 + }, + "4": { + "Mechanical Components": 1, + "Modified Consumer Firmware": 1, + "Thermic Alloys": 1 + }, + "5": { + "Configurable Components": 1, + "Precipitated Alloys": 1, + "Technetium": 1 + } + }, + "features": { + "1": { + "damage": [ -0.07, -0.06 ], + "jitter": [ 2.5, 1.25 ], + "reload": [ -0.11, -0.25 ], + "rof": [ 0.17, 0.25 ] + }, + "2": { + "damage": [ -0.1, -0.07 ], + "distdraw": [ -0.1, -0.2 ], + "jitter": [ 2, 1 ], + "reload": [ -0.2, -0.36 ], + "rof": [ 0.25, 0.34 ] + }, + "3": { + "damage": [ -0.11, -0.1 ], + "distdraw": [ -0.15, -0.25 ], + "jitter": [ 1.5, 0.75 ], + "reload": [ -0.31, -0.45 ], + "rof": [ 0.34, 0.42 ] }, "4": { - "burstrof": [ -0.3, -0.35 ], "damage": [ -0.13, -0.11 ], "distdraw": [ -0.2, -0.3 ], "jitter": [ 1, 0.5 ], - "reload": [ -0.4, -0.55 ] + "reload": [ -0.4, -0.55 ], + "rof": [ 0.42, 0.53 ] }, "5": { - "burstrof": [ -0.35, -0.4 ], "damage": [ -0.15, -0.13 ], - "distdraw": [ -0.25, -0.35 ], + "distdraw": [ -0.25, -0.36 ], "jitter": [ 0.5, 0.25 ], - "reload": [ -0.5, -0.65 ] + "reload": [ -0.5, -0.65 ], + "rof": [ 0.53, 0.66 ] } }, "name": "Rapid fire" }, "Weapon_ShortRange": { "id": 90, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Modified Consumer Firmware": 1, + "Nickel": 1 + }, + "3": { + "Electrochemical Arrays": 1, + "Modified Consumer Firmware": 1, + "Nickel": 1 + }, + "4": { + "Conductive Polymers": 1, + "Electrochemical Arrays": 1, + "Modified Consumer Firmware": 1 + }, + "5": { + "Biotech Conductors": 1, + "Configurable Components": 1, + "Cracked Industrial Firmware": 1 + } + }, "features": { "1": { - "damage": [ 0.04, 0.09 ], + "damage": [ 0.03, 0.09 ], "range": [ -0.35, -0.1 ] }, "2": { @@ -2683,28 +2901,52 @@ "thermload": [ 0.2, 0.1 ] }, "3": { - "damage": [ 0.12, 0.27 ], + "damage": [ 0.11, 0.26 ], "integrity": [ -0.2, -0.1 ], "range": [ -0.55, -0.3 ], "thermload": [ 0.3, 0.2 ] }, "4": { - "damage": [ 0.16, 0.36 ], - "integrity": [ -0.3, -0.2 ], + "damage": [ 0.15, 0.35 ], + "integrity": [ -0.31, -0.2 ], "range": [ -0.65, -0.4 ], - "thermload": [ 0.4, 0.3 ] + "thermload": [ 0.39, 0.29 ] }, "5": { "damage": [ 0.2, 0.45 ], - "integrity": [ -0.4, -0.3 ], + "integrity": [ -0.4, -0.31 ], "range": [ -0.75, -0.5 ], - "thermload": [ 0.5, 0.4 ] + "thermload": [ 0.5, 0.39 ] } }, "name": "Short range" }, "Weapon_Sturdy": { "id": 91, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Shield Emitters": 1 + }, + "3": { + "Nickel": 1, + "Shield Emitters": 1, + "Tungsten": 1 + }, + "4": { + "Molybdenum": 1, + "Tungsten": 1, + "Zinc": 1 + }, + "5": { + "High Density Composites": 1, + "Molybdenum": 1, + "Technetium": 1 + } + }, "features": { "1": { "integrity": [ 0.2, 0.5 ], @@ -2712,27 +2954,27 @@ "thermload": [ 0, -0.1 ] }, "2": { - "integrity": [ 0.4, 1 ], + "integrity": [ 0.39, 1 ], "mass": [ 1, 0.5 ], - "thermload": [ -0.05, -0.15 ] + "thermload": [ -0.06, -0.15 ] }, "3": { - "integrity": [ 0.6, 1.5 ], + "integrity": [ 0.61, 1.5 ], "mass": [ 1.5, 1 ], - "piercing": [ 0, 0.15 ], - "thermload": [ -0.1, -0.2 ] + "piercing": [ 0, 0.14 ], + "thermload": [ -0.11, -0.2 ] }, "4": { - "integrity": [ 0.8, 2 ], + "integrity": [ 0.81, 2 ], "mass": [ 2, 1.5 ], - "piercing": [ 0.1, 0.3 ], + "piercing": [ 0.1, 0.29 ], "thermload": [ -0.15, -0.25 ] }, - "4": { + "5": { "integrity": [ 1, 2.5 ], "mass": [ 2.5, 2 ], "piercing": [ 0.2, 0.45 ], - "thermload": [ -0.2, -0.3 ] + "thermload": [ -0.2, -0.31 ] } }, "name": "Sturdy" diff --git a/modifications/modifications.json b/modifications/modifications.json index 665acb2..4f40d1c 100644 --- a/modifications/modifications.json +++ b/modifications/modifications.json @@ -34,6 +34,7 @@ "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative"}, "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative"}, "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative"}, + "shotspeed": {"id": 43, "name": "shotspeed", "type": "percentage", "method": "multiplicative"}, "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative"}, "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative"}, "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative"}, diff --git a/modifications/modules.json b/modifications/modules.json index 2c9de63..09a3c6b 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -41,6 +41,7 @@ "distdraw", "fallofffromrange", "integrity", + "jitter", "mass", "piercing", "power", @@ -97,6 +98,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, @@ -192,6 +194,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, @@ -354,6 +357,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, @@ -443,6 +447,7 @@ "range", "reload", "rof", + "shotspeed", "thermload" ] }, diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index 88bc367..adb9edd 100644 --- a/modules/hardpoints/cannon.json +++ b/modules/hardpoints/cannon.json @@ -27,7 +27,7 @@ "rating": "D", "reload": 3, "rof": 0.5, - "speed": 1200, + "shotspeed": 1200, "thermload": 1.4 }, { @@ -57,7 +57,7 @@ "rating": "E", "reload": 4, "rof": 0.52, - "speed": 1000, + "shotspeed": 1000, "thermload": 1.3 }, { @@ -87,7 +87,7 @@ "rating": "F", "reload": 4, "rof": 0.435, - "speed": 1000, + "shotspeed": 1000, "thermload": 0.7 }, { @@ -117,7 +117,7 @@ "rating": "D", "reload": 3, "rof": 0.465, - "speed": 1051, + "shotspeed": 1051, "thermload": 2.1 }, { @@ -147,7 +147,7 @@ "rating": "D", "reload": 4, "rof": 0.485, - "speed": 875, + "shotspeed": 875, "thermload": 1.9 }, { @@ -177,7 +177,7 @@ "rating": "E", "reload": 4, "rof": 0.405, - "speed": 875, + "shotspeed": 875, "thermload": 1 }, { @@ -207,7 +207,7 @@ "rating": "C", "reload": 3, "rof": 0.425, - "speed": 959, + "shotspeed": 959, "thermload": 3.2 }, { @@ -239,7 +239,7 @@ "rating": "C", "reload": 4, "rof": 0.445, - "speed": 800, + "shotspeed": 800, "thermload": 2.9 }, { @@ -269,7 +269,7 @@ "rating": "D", "reload": 4, "rof": 0.37, - "speed": 800, + "shotspeed": 800, "thermload": 1.6 }, { @@ -301,7 +301,7 @@ "rating": "B", "reload": 3, "rof": 0.385, - "speed": 900, + "shotspeed": 900, "thermload": 4.8 }, { @@ -333,7 +333,7 @@ "rating": "B", "reload": 4, "rof": 0.4, - "speed": 750, + "shotspeed": 750, "thermload": 4.4 } ] diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json index 795462a..c4a24f7 100644 --- a/modules/hardpoints/fragment_cannon.json +++ b/modules/hardpoints/fragment_cannon.json @@ -29,7 +29,7 @@ "reload": 2.5, "rof": 5.555, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.4 }, { @@ -61,7 +61,7 @@ "reload": 2.5, "rof": 5.88, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.4 }, { @@ -93,7 +93,7 @@ "reload": 2.5, "rof": 4.76, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.2 }, { @@ -125,7 +125,7 @@ "reload": 2.5, "rof": 5, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.7 }, { @@ -157,7 +157,7 @@ "reload": 2.5, "rof": 5.26, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.8 }, { @@ -189,7 +189,7 @@ "reload": 2.5, "rof": 4.345, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.4 }, { @@ -221,7 +221,7 @@ "reload": 2.5, "rof": 4.545, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 1.1 }, { @@ -253,7 +253,7 @@ "reload": 2.5, "rof": 4.76, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 1.4 }, { @@ -285,7 +285,7 @@ "reload": 2.5, "rof": 4, "roundspershot": 12, - "speed": 667, + "shotspeed": 667, "thermload": 0.7 }, { @@ -318,7 +318,7 @@ "reload": 2.5, "rof": 4.5, "roundspershot": 12, - "speed": 1000, + "shotspeed": 1000, "thermload": 1.1 } ] diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json index baa75e7..160147c 100644 --- a/modules/hardpoints/missile_rack.json +++ b/modules/hardpoints/missile_rack.json @@ -26,7 +26,7 @@ "rating": "B", "reload": 5, "rof": 0.5, - "speed": 750, + "shotspeed": 750, "thermload": 3.6 }, { @@ -55,7 +55,7 @@ "rating": "B", "reload": 12, "rof": 0.333, - "speed": 625, + "shotspeed": 625, "thermload": 3.6 }, { @@ -86,7 +86,7 @@ "rating": "B", "reload": 5, "rof": 0.5, - "speed": 750, + "shotspeed": 750, "thermload": 3.6 }, { @@ -117,7 +117,7 @@ "rating": "B", "reload": 12, "rof": 0.333, - "speed": 625, + "shotspeed": 625, "thermload": 3.6 }, { @@ -147,7 +147,7 @@ "rating": "B", "reload": 5, "rof": 0.333, - "speed": 750, + "shotspeed": 750, "thermload": 3.6 }, { @@ -181,7 +181,7 @@ "reload": 5, "rof": 2, "roundspershot": 4, - "speed": 600, + "shotspeed": 600, "thermload": 3.6 } ] diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index 89f12d5..4869f88 100644 --- a/modules/hardpoints/multi_cannon.json +++ b/modules/hardpoints/multi_cannon.json @@ -27,7 +27,7 @@ "rating": "F", "reload": 4, "rof": 7.69, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.1 }, { @@ -57,7 +57,7 @@ "rating": "G", "reload": 5, "rof": 8.33, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.1 }, { @@ -87,7 +87,7 @@ "rating": "G", "reload": 4, "rof": 7.14, - "speed": 1600, + "shotspeed": 1600, "thermload": 0 }, { @@ -118,7 +118,7 @@ "rating": "F", "reload": 4, "rof": 4.3, - "speed": 1800, + "shotspeed": 1800, "thermload": 0.2 }, { @@ -148,7 +148,7 @@ "rating": "E", "reload": 4, "rof": 7.14, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.2 }, { @@ -178,7 +178,7 @@ "rating": "F", "reload": 5, "rof": 7.69, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.2 }, { @@ -208,7 +208,7 @@ "rating": "F", "reload": 4, "rof": 6.25, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.1 }, { @@ -238,7 +238,7 @@ "rating": "C", "reload": 4, "rof": 5.88, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.3 }, { @@ -268,7 +268,7 @@ "rating": "C", "reload": 5, "rof": 6.665, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.3 }, { @@ -299,7 +299,7 @@ "reload": 4, "rof": 3.03, "roundspershot": 2, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.4 }, { @@ -330,7 +330,7 @@ "reload": 5, "rof": 3.365, "roundspershot": 2, - "speed": 1600, + "shotspeed": 1600, "thermload": 0.5 } ] diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index cfd3c70..756b7dd 100644 --- a/modules/hardpoints/plasma_accelerator.json +++ b/modules/hardpoints/plasma_accelerator.json @@ -29,7 +29,7 @@ "rating": "C", "reload": 6, "rof": 0.33, - "speed": 875, + "shotspeed": 875, "thermload": 15.6 }, { @@ -61,7 +61,7 @@ "rating": "B", "reload": 6, "rof": 0.29, - "speed": 875, + "shotspeed": 875, "thermload": 21.8 }, { @@ -95,7 +95,7 @@ "rating": "B", "reload": 6, "rof": 0.8, - "speed": 875, + "shotspeed": 875, "thermload": 11 }, { @@ -127,7 +127,7 @@ "rating": "A", "reload": 6, "rof": 0.25, - "speed": 875, + "shotspeed": 875, "thermload": 29.5 } ] diff --git a/modules/hardpoints/point_defence.json b/modules/hardpoints/point_defence.json index 9c8a2e3..ed05246 100644 --- a/modules/hardpoints/point_defence.json +++ b/modules/hardpoints/point_defence.json @@ -25,7 +25,7 @@ "rating": "I", "reload": 0.4, "rof": 10, - "speed": 1000, + "shotspeed": 1000, "thermload": 0.1 } ] diff --git a/modules/hardpoints/torpedo_pylon.json b/modules/hardpoints/torpedo_pylon.json index 7fd1309..d2c3a3d 100644 --- a/modules/hardpoints/torpedo_pylon.json +++ b/modules/hardpoints/torpedo_pylon.json @@ -26,7 +26,7 @@ "rating": "I", "reload": 5, "rof": 1, - "speed": 250, + "shotspeed": 250, "thermload": 45 }, { @@ -55,7 +55,7 @@ "rating": "I", "reload": 5, "rof": 1, - "speed": 250, + "shotspeed": 250, "thermload": 50 } ] diff --git a/package.json b/package.json index 9169458..170c330 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis-data", - "version": "2.2.9", + "version": "2.2.10", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis-data"