From c248ca93838154bf3d0ae8ca71b4010e91dc68a8 Mon Sep 17 00:00:00 2001 From: danielyxie Date: Thu, 27 Sep 2018 17:08:51 -0500 Subject: [PATCH] Added RAM usage calculations for wget() Netscript fn --- src/Constants.js | 1 + src/NetscriptFunctions.js | 4 ++++ src/Script.js | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/src/Constants.js b/src/Constants.js index 88a06b68d..fec913152 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -85,6 +85,7 @@ let CONSTANTS = { ScriptGetScriptRamCost: 0.1, ScriptGetHackTimeRamCost: 0.05, ScriptGetFavorToDonate: 0.10, + ScriptWgetRamCost: 5, ScriptCodingContractBaseRamCost:10, ScriptSingularityFn1RamCost: 1, diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js index 3c873fd21..286659564 100644 --- a/src/NetscriptFunctions.js +++ b/src/NetscriptFunctions.js @@ -2262,6 +2262,10 @@ function NetscriptFunctions(workerScript) { }); }, wget : async function(url, target, ip=workerScript.serverIp) { + if (workerScript.checkingRam) { + return updateStaticRam("wget", CONSTANTS.ScriptWgetRamCost); + } + updateDynamicRam("wget", CONSTANTS.ScriptWgetRamCost); if (!isScriptFilename(target) && !target.endsWith(".txt")) { workerSript.log(`ERROR: wget() failed because of an invalid target file: ${target}. Target file must be a script or text file`); return false; diff --git a/src/Script.js b/src/Script.js index 241433162..34d01d8ec 100755 --- a/src/Script.js +++ b/src/Script.js @@ -517,6 +517,12 @@ function parseOnlyRamCalculate(server, code, workerScript) { function applyFuncRam(func) { if (typeof func === "function") { try { + let res; + if (func instance of (async () => {}).constructor) { + + } else { + + } let res = func.apply(null, []); if (typeof res === "number") { return res;