From 4bdb34bc7b51c48c011c9b180ead02beb48addff Mon Sep 17 00:00:00 2001 From: danielyxie Date: Tue, 19 Mar 2019 17:53:46 -0700 Subject: [PATCH] numCycleForGrowth() function now accoutns for BitNode growth multiplier. Cleaned up docuemntation --- doc/source/netscript/basicfunctions/enableLog.rst | 2 +- doc/source/netscript/basicfunctions/purchaseServer.rst | 2 +- .../netscript/singularityfunctions/workForCompany.rst | 6 +++++- src/Augmentation/AugmentationHelpers.js | 6 +++--- src/Constants.ts | 3 ++- src/Server/ServerHelpers.ts | 5 +++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/doc/source/netscript/basicfunctions/enableLog.rst b/doc/source/netscript/basicfunctions/enableLog.rst index 46b445d53..691b9f133 100644 --- a/doc/source/netscript/basicfunctions/enableLog.rst +++ b/doc/source/netscript/basicfunctions/enableLog.rst @@ -1,5 +1,5 @@ enableLog() Netscript Function -============================= +============================== .. js:function:: enableLog(fn) diff --git a/doc/source/netscript/basicfunctions/purchaseServer.rst b/doc/source/netscript/basicfunctions/purchaseServer.rst index 250077ef6..91052c33b 100644 --- a/doc/source/netscript/basicfunctions/purchaseServer.rst +++ b/doc/source/netscript/basicfunctions/purchaseServer.rst @@ -4,7 +4,7 @@ purchaseServer() Netscript Function .. js:function:: purchaseServer(hostname, ram) :param string hostname: Hostname of the purchased server - :param number ram: Amount of RAM of the purchased server. Must be a power of 2 (2, 4, 8, 16, etc.). Maximum value of getPurchasedServerMaxRam() + :param number ram: Amount of RAM of the purchased server. Must be a power of 2. Maximum value of :js:func:`getPurchasedServerMaxRam` :RAM cost: 2.25 GB Purchased a server with the specified hostname and amount of RAM. diff --git a/doc/source/netscript/singularityfunctions/workForCompany.rst b/doc/source/netscript/singularityfunctions/workForCompany.rst index fde4d11d7..1c660a26c 100644 --- a/doc/source/netscript/singularityfunctions/workForCompany.rst +++ b/doc/source/netscript/singularityfunctions/workForCompany.rst @@ -1,7 +1,11 @@ workForCompany() Netscript Function =================================== -.. js:function:: workForCompany() +.. js:function:: workForCompany(companyName=lastCompany) + + :param string companyName: Name of company to work for. Must be an exact match. + Optional. If not specified, this argument defaults to + the last job that you worked If you are not in BitNode-4, then you must have Level 2 of Source-File 4 in order to use this function. diff --git a/src/Augmentation/AugmentationHelpers.js b/src/Augmentation/AugmentationHelpers.js index 2d056969c..61eb510e6 100644 --- a/src/Augmentation/AugmentationHelpers.js +++ b/src/Augmentation/AugmentationHelpers.js @@ -1213,19 +1213,19 @@ function initAugmentations() { //Illuminati var QLink = new Augmentation({ - name:AugmentationNames.QLink, repCost:750e3, moneyCost:10e12, + name:AugmentationNames.QLink, repCost:750e3, moneyCost:5e12, info:"A brain implant that wirelessly connects you to the Illuminati's " + "quantum supercomputer, allowing you to access and use its incredible " + "computing power.

" + "This augmentation:
" + - "Increases the player's hacking skill by 100%.
" + + "Increases the player's hacking skill by 50%.
" + "Increases the player's hacking speed by 50%.
" + "Increases the player's chance of successfully performing a hack by 150%.
" + "Increases the amount of money the player gains from hacking by 500%.", hacking_speed_mult: 1.5, hacking_chance_mult: 2.5, hacking_money_mult: 6, - hacking_mult: 2, + hacking_mult: 1.5, }); QLink.addToFactions(["Illuminati"]); if (augmentationExists(AugmentationNames.QLink)) { diff --git a/src/Constants.ts b/src/Constants.ts index 5b3a5cdf9..eb639ad8e 100644 --- a/src/Constants.ts +++ b/src/Constants.ts @@ -302,9 +302,10 @@ export let CONSTANTS: IMap = { ** Training employees is now 3x more effective ** Bug Fix: An industry's products are now properly separated between different cities + * The QLink Augemntation is now significantly stronger (by hydroflame) * Added a Netscript API for Duplicate Sleeves (by hydroflame) * Modified the multipliers of BitNode-3 and BitNode-8 to make them slightly harder - * After installing Augmentations, Duplicate Sleeves will now default to Synchronize if their Shock is 0 + * After installing Augmentations, Duplicate Sleeves will now default to Synchronize if their Shock is 0 * Bug Fix: Bladeburner's Hyperbolic Regeneration Chamber should no longer instantly refill all stamina * Bug Fix: The cost of purchasing Augmentations for Duplicate Sleeves no longer scales with how many Augs you've purchased for yourself ` diff --git a/src/Server/ServerHelpers.ts b/src/Server/ServerHelpers.ts index e443deb0c..cd173fd03 100644 --- a/src/Server/ServerHelpers.ts +++ b/src/Server/ServerHelpers.ts @@ -18,7 +18,8 @@ export function numCycleForGrowth(server: Server, growth: number, p: IPlayer) { const serverGrowthPercentage = server.serverGrowth / 100; - const cycles = Math.log(growth)/(Math.log(ajdGrowthRate) * p.hacking_grow_mult * serverGrowthPercentage); + const cycles = Math.log(growth)/(Math.log(ajdGrowthRate) * p.hacking_grow_mult * serverGrowthPercentage * BitNodeMultipliers.ServerGrowthRate); + return cycles; } @@ -96,7 +97,7 @@ export function GetServerByHostname(hostname: string): Server | null { } } } - + return null; }