From 147a7393c563bd9167228427daf14a1ae8773285 Mon Sep 17 00:00:00 2001 From: Daniel Xie Date: Tue, 4 Jul 2017 10:42:47 -0500 Subject: [PATCH] Merged and updated top command implementation --- src/Constants.js | 3 +++ src/Terminal.js | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Constants.js b/src/Constants.js index 3ee847530..548b65c26 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -901,6 +901,9 @@ CONSTANTS = { "-You can now see what an Augmentation does and its price even while its locked

", LatestUpdate: + "v0.24.1
" + + + "-'top' Terminal command implemented courtesy of Github user LTCNugget

" + "v0.24.0
" + "-Players now have HP, which is displayed in the top right. To regain HP, visit the hospital. Currently " + "the only way to lose HP is through infiltration
" + diff --git a/src/Terminal.js b/src/Terminal.js index f7ac380f7..0fa07237f 100644 --- a/src/Terminal.js +++ b/src/Terminal.js @@ -1043,11 +1043,9 @@ var Terminal = { post("Script Threads RAM Usage"); var currRunningScripts = Player.getCurrentServer().runningScripts; - var currScripts = Player.getCurrentServer().scripts; //Iterate through scripts on current server - for(var i = 0; i < currScripts.length; i++) { - if(currRunningScripts.includes(currScripts[i].filename)) { //If the script is running - var script = currScripts[i]; + for(var i = 0; i < currRunningScripts.length; i++) { + var script = currRunningScripts[i]; //Calculate name padding var numSpacesScript = 26 - script.filename.length; //26 -> width of name column @@ -1058,12 +1056,10 @@ var Terminal = { var spacesThread = Array(numSpacesThread+1).join(" "); //Calculate and transform RAM usage - var ramUsage = script.ramUsage * script.threads * Math.pow(1.02, script.threads - 1); - ramUsage = ramUsage + "GB"; + ramUsage = (script.scriptRef.ramUsage * script.threads) + "GB"; var entry = [script.filename, spacesScript, script.threads, spacesThread, ramUsage]; post(entry.join("")); - } } break; case "unalias":