From e594ff7eb1fda92c4264e3aeb0a9fecaeb9a486d Mon Sep 17 00:00:00 2001 From: Mizzajl Date: Thu, 17 Oct 2024 09:13:10 +0200 Subject: [PATCH] added { entry.serverOrgs = "" } { entry.serverCores = 1 } { entry.serverFiles = [] } to purchaseAndUpgradeServers(ns) in Library.js --- Mizzajl/home/Library.js | 4 ++-- Mizzajl/home/Start.js | 9 +++++++-- Mizzajl/home/purchaseServers.js | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Mizzajl/home/Library.js b/Mizzajl/home/Library.js index 01ec0e5..6612a0c 100644 --- a/Mizzajl/home/Library.js +++ b/Mizzajl/home/Library.js @@ -208,7 +208,7 @@ export async function purchaseAndUpgradeServers(ns) { if (ns.upgradePurchasedServer(currentServer, targetRam)) { ns.print(currentServer + " upgraded to " + targetRam + " GB RAM"); serverList = JSON.parse(ns.read("serverList.txt")); - let newServerList = serverList.map((entry) => { if (entry.serverName === currentServer) { entry.maxRam = targetRam } return entry }); + let newServerList = serverList.map((entry) => { if (entry.serverName === currentServer) { entry.maxRam = targetRam } { entry.serverOrgs = "" } { entry.serverCores = 1 } { entry.serverFiles = [] } return entry }); ns.write("serverList.txt", JSON.stringify(newServerList), "w"); ns.tprint(cCyan + "Server: " + currentServer + " upgraded to: " + targetRam.toLocaleString() + " GB" + cReset); ns.toast("Server: " + currentServer + " upgraded to: " + targetRam.toLocaleString() + " GB", "info", 10000); @@ -357,7 +357,7 @@ export async function distributeScript(ns, sScript, nThreads, [...args]) { aSortedList.forEach((entry) => { let sHost = entry.serverName; ns.print("sHost = " + sHost) - + let nFreeRAM = ns.getServerMaxRam(entry.serverName) - ns.getServerUsedRam(entry.serverName); if (nThreads >= 1 && entry.rootAccess && nFreeRAM >= nTotalSize) { ns.scp(sScript, sHost); diff --git a/Mizzajl/home/Start.js b/Mizzajl/home/Start.js index a82c06c..0b5c1dc 100644 --- a/Mizzajl/home/Start.js +++ b/Mizzajl/home/Start.js @@ -13,19 +13,24 @@ export async function main(ns) { const sMonitorScript = "autoexec.js"; const sServerListFile = "serverList.txt"; const sBestServerFile = "bestTarget.txt"; + const sWorkerList = "WorkerList.js"; await RunAndWait(ns, sServerListScript); - +/* const oServerList = JSON.parse(ns.read(sServerListFile)); const oHome = oServerList["home"]; const nHomeMaxRAM = oHome.maxRam; ns.print("nHomeMaxRAM = " + nHomeMaxRAM); +*/ + let oServerlist = JSON.parse(ns.read(sServerListFile)); + let nHomeMaxRAM = oServerlist.find((entry) => entry.serverName === "home").maxRam; + ns.print("nHomeMaxRAM = " + nHomeMaxRAM); if (!ns.isRunning(sGangScript)) { ns.run(sGangScript); } if (!ns.isRunning(sPServScript)) { ns.run(sPServScript); } await RunAndWait(ns, sBackdoorScript); await RunAndWait(ns, sUpdateTarget); - await RunAndWait(ns, sBatchController); + //await RunAndWait(ns, sBatchController); if (nHomeMaxRAM >= 256) { if (!ns.isRunning(sMonitorScript)) { ns.run(sMonitorScript); } } } \ No newline at end of file diff --git a/Mizzajl/home/purchaseServers.js b/Mizzajl/home/purchaseServers.js index dcd77cb..8c4ac5d 100644 --- a/Mizzajl/home/purchaseServers.js +++ b/Mizzajl/home/purchaseServers.js @@ -1,4 +1,4 @@ -import { getCracks, scanServerList, findBestTarget, crackingAndRooting, copyAndRunScript, purchaseAndUpgradeServers } from "/Library.js"; +import { purchaseAndUpgradeServers } from "/Library.js"; /** @param {NS} ns */ export async function main(ns) { await purchaseAndUpgradeServers(ns);