Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2025-03-07 11:04:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added an autosave feature that auto saves every minute. Made the updateHackProgress() take in the number of cycles that have passed when calculating its progress

Browse Source
This commit is contained in:
Daniel Xie
2016-12-02 15:57:20 -06:00
parent eb31a0bd74
commit 6d9f0669ba
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Netscript/NetscriptWorker.js
View File

@ -9,10 +9,10 @@
function WorkerScript() {
this.name = "";
this.running = false;
this.serverHostname = null;
this.serverIp = null;
this.code = "";
this.env = new Environment();
this.timeout = null;
this.output = "";
}
//Array containing all scripts that are running across all servers, to easily run them all

4
src/Terminal.js
View File

@ -385,6 +385,8 @@ var Terminal = {
case "scp":
//TODO
break;
case "tail":
break;
case "top":
//TODO List each's script RAM usage
break;
@ -481,7 +483,7 @@ var Terminal = {
var s = new WorkerScript();
s.name = filename;
s.code = Player.getCurrentServer().scripts[i].code;
s.hostname = Player.getCurrentServer().hostname;
s.serverIp = Player.getCurrentServer().ip;
workerScripts.push(s);
console.log("Pushed script onto workerScripts");
return;

37
src/engine.js
View File

@ -150,6 +150,7 @@ var Engine = {
//Get time difference
var _thisUpdate = new Date().getTime();
var diff = _thisUpdate - Engine._lastUpdate;
var offset = diff % Engine._idleSpeed;
//Divide this by cycle time to determine how many cycles have elapsed since last update
diff = Math.floor(diff / Engine._idleSpeed);
@ -157,12 +158,35 @@ var Engine = {
if (diff > 0) {
//Update the game engine by the calculated number of cycles
Engine.updateGame(diff);
Engine._lastUpdate = _thisUpdate;
Engine._lastUpdate = _thisUpdate - offset;
}
window.requestAnimationFrame(Engine.idleTimer);
},
//Counters for the main event loop. Represent the number of game cycles are required
//for something to happen.
Counters: {
autoSaveCounter: 300,
},
decrementAllCounters: function(numCycles = 1) {
for (var counter in Engine.Counters) {
if (Engine.Counters.hasOwnProperty(counter)) {
Engine.Counters[counter] = Engine.Counters[counter] - numCycles;
}
}
},
//Checks if any counters are 0 and if they are, executes whatever
//is necessary and then resets the counter
checkCounters: function() {
if (Engine.Counters.autoSaveCounter <= 0) {
Engine.saveGame();
Engine.Counters.autoSaveCounter = 300;
}
},
//TODO Account for numCycles in Code, hasn't been done yet
updateGame: function(numCycles = 1) {
//Manual hack
@ -175,8 +199,10 @@ var Engine = {
Engine._actionTimeStr = "Time left: ";
Player.startAction = false;
}
Engine.updateHackProgress();
Engine.decrementAllCounters(numCycles);
Engine.checkCounters();
Engine.updateHackProgress(numCycles);
},
/* Calculates the hack progress for a manual (non-scripted) hack and updates the progress bar/time accordingly */
@ -186,10 +212,11 @@ var Engine = {
_actionProgressStr: "[ ]",
_actionProgressBarCount: 1,
_actionInProgress: false,
updateHackProgress: function() {
updateHackProgress: function(numCycles = 1) {
if (Engine._actionInProgress == true) {
//TODO Do this calculation based on numCycles rather than idle speed
Engine._actionTimeLeft -= (Engine._idleSpeed/ 1000); //Substract idle speed (ms)
var timeElapsedMilli = numCycles * Engine._idleSpeed;
Engine._actionTimeLeft -= (timeElapsedMilli/ 1000); //Substract idle speed (ms)
//Calculate percent filled
var percent = Math.round((1 - Engine._actionTimeLeft / Engine._totalActionTime) * 100);