felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-04-20 16:22:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #371 from d0sboots/hacking

Browse Source 
NETSCRIPT: Add `additionalMsec` to BasicHGWOptions
This commit is contained in:
Mughur
2023-02-19 07:42:11 +02:00
committed by GitHub
parent 79eca93ade dc9b1050bf
commit 2bd5741b22
23 changed files with 150 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NetscriptFunctions.ts
+13 -13
View File
@@ -144,7 +144,7 @@ export const ns: InternalAPI<NSFull> = {
// TODO 2.2: better type safety rework for functions using assertObjectType, then remove function.
const optsValidator: BasicHGWOptions = {};
assertObjectType(ctx, "opts", opts, optsValidator);
return helpers.hack(ctx, hostname, false, { threads: opts.threads, stock: opts.stock });
return helpers.hack(ctx, hostname, false, opts);
},
hackAnalyzeThreads: (ctx) => (_hostname, _hackAmount) => {
const hostname = helpers.string(ctx, "hostname", _hostname);
@@ -241,11 +241,11 @@ export const ns: InternalAPI<NSFull> = {
const hostname = helpers.string(ctx, "hostname", _hostname);
const optsValidator: BasicHGWOptions = {};
assertObjectType(ctx, "opts", opts, optsValidator);
const requestedThreads =
opts.threads === undefined
? ctx.workerScript.scriptRef.threads
: helpers.number(ctx, "opts.threads", opts.threads);
const threads = helpers.resolveNetscriptRequestedThreads(ctx, requestedThreads);
const threads = helpers.resolveNetscriptRequestedThreads(ctx, opts.threads);
const additionalMsec = helpers.number(ctx, "opts.additionalMsec", opts.additionalMsec ?? 0);
if (additionalMsec < 0) {
throw helpers.makeRuntimeErrorMsg(ctx, `additionalMsec must be non-negative, got ${additionalMsec}`);
}
const server = helpers.getServer(ctx, hostname);
if (!(server instanceof Server)) {
@@ -264,7 +264,7 @@ export const ns: InternalAPI<NSFull> = {
throw helpers.makeRuntimeErrorMsg(ctx, canHack.msg || "");
}
const growTime = calculateGrowTime(server, Player);
const growTime = calculateGrowTime(server, Player) + additionalMsec / 1000.0;
helpers.log(
ctx,
() =>
@@ -348,11 +348,11 @@ export const ns: InternalAPI<NSFull> = {
const hostname = helpers.string(ctx, "hostname", _hostname);
const optsValidator: BasicHGWOptions = {};
assertObjectType(ctx, "opts", opts, optsValidator);
const requestedThreads =
opts.threads === undefined
? ctx.workerScript.scriptRef.threads
: helpers.number(ctx, "opts.threads", opts.threads);
const threads = helpers.resolveNetscriptRequestedThreads(ctx, requestedThreads);
const threads = helpers.resolveNetscriptRequestedThreads(ctx, opts.threads);
const additionalMsec = helpers.number(ctx, "opts.additionalMsec", opts.additionalMsec ?? 0);
if (additionalMsec < 0) {
throw helpers.makeRuntimeErrorMsg(ctx, `additionalMsec must be non-negative, got ${additionalMsec}`);
}
const server = helpers.getServer(ctx, hostname);
if (!(server instanceof Server)) {
@@ -366,7 +366,7 @@ export const ns: InternalAPI<NSFull> = {
throw helpers.makeRuntimeErrorMsg(ctx, canHack.msg || "");
}
const weakenTime = calculateWeakenTime(server, Player);
const weakenTime = calculateWeakenTime(server, Player) + additionalMsec / 1000.0;
helpers.log(
ctx,
() =>