Merge pull request #1440 from danielyxie/dev

growthanalyze allows cores argument
This commit is contained in:
hydroflame 2021-10-08 12:10:48 -04:00 committed by GitHub
commit d05afc64b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions

@ -1,12 +1,13 @@
growthAnalyze() Netscript Function growthAnalyze() Netscript Function
================================== ==================================
.. js:function:: growthAnalyze(hostname, growthAmount) .. js:function:: growthAnalyze(hostname, growthAmount[, cores])
:RAM cost: 1 GB :RAM cost: 1 GB
:param string hostname: Hostname of server to analyze. :param string hostname: Hostname of server to analyze.
:param number growthAmount: Multiplicative factor by which the server is :param number growthAmount: Multiplicative factor by which the server is
grown. Decimal form. Must be >= 1. grown. Decimal form. Must be >= 1.
:param number cores: Amount of cores on the server that would run the growth, defaults to 1
:returns: The amount of :doc:`grow<grow>` threads needed to grow the specified :returns: The amount of :doc:`grow<grow>` threads needed to grow the specified
server by the specified amount. server by the specified amount.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -862,7 +862,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
return Promise.resolve(moneyAfter / moneyBefore); return Promise.resolve(moneyAfter / moneyBefore);
}); });
}, },
growthAnalyze: function (ip: any, growth: any): any { growthAnalyze: function (ip: any, growth: any, cores: any = 1): any {
updateDynamicRam("growthAnalyze", getRamCost("growthAnalyze")); updateDynamicRam("growthAnalyze", getRamCost("growthAnalyze"));
// Check argument validity // Check argument validity
@ -875,7 +875,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
throw makeRuntimeErrorMsg("growthAnalyze", `Invalid argument: growth must be numeric and >= 1, is ${growth}.`); throw makeRuntimeErrorMsg("growthAnalyze", `Invalid argument: growth must be numeric and >= 1, is ${growth}.`);
} }
return numCycleForGrowth(server, Number(growth), Player, 1); return numCycleForGrowth(server, Number(growth), Player, cores);
}, },
weaken: function (ip: any, { threads: requestedThreads }: any = {}): any { weaken: function (ip: any, { threads: requestedThreads }: any = {}): any {
updateDynamicRam("weaken", getRamCost("weaken")); updateDynamicRam("weaken", getRamCost("weaken"));