felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-05-05 23:27:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added dynamic array functioanlity. Refactored tail so that it displays a dynamic popup with log contents

Browse Source
This commit is contained in:
Daniel Xie
2017-06-14 20:19:52 -05:00
parent 4aa7edb576
commit 6fe0ec1ea5
13 changed files with 236 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NetscriptEvaluator.js
+13 -21
View File
@@ -40,25 +40,13 @@ function evaluate(exp, workerScript) {
}
try {
var res = env.get(exp.value);
if (exp.index) {
//If theres an index field, then this variable is supposed to be an array
//and the user needs to be indexing it
if (res.constructor === Array || res instanceof Array) {
var iPromise = evaluate(exp.index.value, workerScript);
iPromise.then(function(i) {
if (i >= res.length || i < 0) {
return reject(makeRuntimeRejectMsg(workerScript, "Out of bounds: Invalid index in [] operator"));
} else {
return evaluate(res[i], workerScript);
}
}).then(function(res) {
resolve(res);
}).catch(function(e) {
reject(e);
});
} else {
reject(makeRuntimeRejectMsg(workerScript, "Trying to access a non-array variable using the [] operator"));
}
if (res.constructor === Array || res instanceof Array) {
var evalArrayPromise = netscriptArray(exp, workerScript);
evalArrayPromise.then(function(res) {
resolve(res);
}, function(e) {
reject(e);
});
} else {
resolve(res);
}
@@ -763,7 +751,7 @@ function evaluateHacknetNode(exp, workerScript) {
return new Promise(function(resolve, reject) {
setTimeout(function() {
if (exp.index == null) {
if ((exp.op.type == "call" && exp.op.value == "length") ||
if ((exp.op.type == "call" && exp.op.func.value == "length") ||
(exp.op.type == "var" && exp.op.value == "length")) {
resolve(Player.hacknetNodes.length);
workerScript.scriptRef.log("hacknetnodes.length returned " + Player.hacknetNodes.length);
@@ -978,6 +966,7 @@ function runScriptFromScript(server, scriptname, workerScript, threads=1) {
script.numTimesHackMap = new AllServersMap();
script.numTimesGrowMap = new AllServersMap();
script.numTimesWeakenMap = new AllServersMap();
script.logs = [];
addWorkerScript(script, server);
resolve(true);
return;
@@ -1022,7 +1011,10 @@ function scriptCalculateHackingTime(server) {
//The same as Player's calculateExpGain() function but takes in the server as an argument
function scriptCalculateExpGain(server) {
return (server.hackDifficulty * Player.hacking_exp_mult * 0.9);
if (server.baseDifficulty == null) {
server.baseDifficulty = server.hackDifficulty;
}
return (server.baseDifficulty * Player.hacking_exp_mult * 0.5 + 4);
}
//The same as Player's calculatePercentMoneyHacked() function but takes in the server as an argument