From 8eb59c3a7ecd8277ab95af1daa586e07213e825f Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 17 Oct 2024 09:32:23 +0200 Subject: [PATCH] sync --- Ramses/home/Library.js | 4 ++-- Ramses/home/corp/BuyTea.js | 9 +++++++++ Ramses/home/corp/ThrowParty.js | 10 ++++++++++ Ramses/home/lowram/lowhgw2.js | 6 ++++-- Ramses/home/testdistribute.js | 8 ++++++-- 5 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 Ramses/home/corp/BuyTea.js create mode 100644 Ramses/home/corp/ThrowParty.js diff --git a/Ramses/home/Library.js b/Ramses/home/Library.js index 01ec0e5..6612a0c 100644 --- a/Ramses/home/Library.js +++ b/Ramses/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/Ramses/home/corp/BuyTea.js b/Ramses/home/corp/BuyTea.js new file mode 100644 index 0000000..845783c --- /dev/null +++ b/Ramses/home/corp/BuyTea.js @@ -0,0 +1,9 @@ +/** @param {NS} ns */ +export async function main(ns) { + let [sDivName, sCity] = ns.args; + //ns.tprint("sDivName = " + sDivName); + //ns.tprint("sCity = " + sCity); + let bSuccess = ns.corporation.buyTea(sDivName, sCity) + //ns.tprint("bSuccess = " + bSuccess); + ns.writePort(ns.pid, bSuccess); +} \ No newline at end of file diff --git a/Ramses/home/corp/ThrowParty.js b/Ramses/home/corp/ThrowParty.js new file mode 100644 index 0000000..0a7759d --- /dev/null +++ b/Ramses/home/corp/ThrowParty.js @@ -0,0 +1,10 @@ +/** @param {NS} ns */ +export async function main(ns) { + let [sDivName, sCity, nSpend] = ns.args; + //ns.tprint("sDivName = " + sDivName); + //ns.tprint("sCity = " + sCity); + //ns.tprint("nSpend = " + nSpend); + let nMoraleMultiplier = ns.corporation.throwParty(sDivName, sCity, nSpend) + //ns.tprint("nMoraleMultiplier = " + nMoraleMultiplier); + ns.writePort(ns.pid, nMoraleMultiplier); +} \ No newline at end of file diff --git a/Ramses/home/lowram/lowhgw2.js b/Ramses/home/lowram/lowhgw2.js index 52055c2..8f9f276 100644 --- a/Ramses/home/lowram/lowhgw2.js +++ b/Ramses/home/lowram/lowhgw2.js @@ -34,11 +34,13 @@ export async function main(ns) { let nMaxThreads = 0; sortedList.forEach((entry) => { if (entry.rootAccess && entry.maxRam >= 1) { - ns.scp(aFiles, "home", entry.serverName); + if (entry.serverName !== "home") { + ns.scp(aFiles, entry.serverName, "home"); + } nMaxThreads += entry.maxRam / 1.75; } }) - let nMaxThreadsINT = Math.floor(nMaxThreads); + let nMaxThreadsINT = Math.floor(nMaxThreads - 64); ns.print("nMaxThreadsINT = " + nMaxThreadsINT); diff --git a/Ramses/home/testdistribute.js b/Ramses/home/testdistribute.js index 30c1c8a..e2a68a2 100644 --- a/Ramses/home/testdistribute.js +++ b/Ramses/home/testdistribute.js @@ -60,14 +60,18 @@ export async function main(ns) { 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); + if (entry.serverName !== "home") { + ns.scp(sScript, sHost, "home"); + } ns.exec(sScript, sHost, nThreads, sTarget, bRepeat, nMsecDelay); nThreads = 0; nFreeRAM = ns.getServerMaxRam(entry.serverName) - ns.getServerUsedRam(entry.serverName); } else if (nThreads >= 1 && entry.rootAccess && nFreeRAM >= nScriptSize) { let nThreadsDist = Math.floor(nFreeRAM / nScriptSize); - ns.scp(sScript, sHost); + if (entry.serverName !== "home") { + ns.scp(sScript, sHost, "home"); + } ns.print("room for : " + nThreadsDist + " scripts"); ns.exec(sScript, sHost, nThreadsDist, sTarget, bRepeat, nMsecDelay); nThreads -= nThreadsDist;