felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-04-18 15:28:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

softReset now accepts a callback script like installAugmentations

Browse Source
This commit is contained in:
Olivier Gagnon
2021-03-11 20:37:58 -05:00
parent 486d025572
commit cae28e2d25
3 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/NetscriptFunctions.js
View File

@@ -74,6 +74,8 @@ import {
AddToAllServers,
createUniqueRandomIp,
} from "./Server/AllServers";
import { RunningScript } from "./Script/RunningScript";
import { startWorkerScript } from "./NetscriptWorker";
import { Server } from "./Server/Server";
import {
GetServerByHostname,
@@ -529,6 +531,31 @@ function NetscriptFunctions(workerScript) {
return Augmentations[name];
}
const runAfterReset = function(cbScript=null) {
//Run a script after reset
console.log(cbScript);
if (cbScript && isString(cbScript)) {
console.log('here');
const home = Player.getHomeComputer();
for (const script of home.scripts) {
console.log('here 2'+script);
if (script.filename === cbScript) {
console.log('here 3');
const ramUsage = script.ramUsage;
const ramAvailable = home.maxRam - home.ramUsed;
if (ramUsage > ramAvailable) {
console.log('here 4');
return; // Not enough RAM
}
const runningScriptObj = new RunningScript(script, []); // No args
runningScriptObj.threads = 1; // Only 1 thread
console.log('running!');
startWorkerScript(runningScriptObj, home);
}
}
}
}
return {
hacknet : {
numNodes : function() {
@@ -3242,7 +3269,8 @@ function NetscriptFunctions(workerScript) {
workerScript.log("softReset", "Soft resetting. This will cause this script to be killed");
setTimeoutRef(() => {
prestigeAugmentation(cbScript);
prestigeAugmentation();
runAfterReset(cbScript);
}, 0);
// Prevent workerScript from "finishing execution naturally"
@@ -3260,7 +3288,8 @@ function NetscriptFunctions(workerScript) {
Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain);
workerScript.log("installAugmentations", "Installing Augmentations. This will cause this script to be killed");
setTimeoutRef(() => {
installAugmentations(cbScript);
installAugmentations();
runAfterReset(cbScript);
}, 0);
workerScript.running = false; // Prevent workerScript from "finishing execution naturally"