From 3db190c9a05ba3f4bd1e29e4c282e000a69f4c5e Mon Sep 17 00:00:00 2001 From: catloversg <152669316+catloversg@users.noreply.github.com> Date: Sun, 5 Jan 2025 07:44:55 +0700 Subject: [PATCH] MISC: Consistently use ManualHackMoney in terminal hack and script hack (#1868) --- src/Terminal/Terminal.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Terminal/Terminal.ts b/src/Terminal/Terminal.ts index 6d9929a31..01502efec 100644 --- a/src/Terminal/Terminal.ts +++ b/src/Terminal/Terminal.ts @@ -263,14 +263,18 @@ export class Terminal { Engine.Counters.checkFactionInvitations = 0; Engine.checkCounters(); - let moneyGained = calculatePercentMoneyHacked(server, Player) * currentNodeMults.ManualHackMoney; - moneyGained = Math.floor(server.moneyAvailable * moneyGained); + let moneyDrained = Math.floor(server.moneyAvailable * calculatePercentMoneyHacked(server, Player)); - if (moneyGained <= 0) { - moneyGained = 0; + if (moneyDrained <= 0) { + moneyDrained = 0; } // Safety check - server.moneyAvailable -= moneyGained; + server.moneyAvailable -= moneyDrained; + if (server.moneyAvailable < 0) { + server.moneyAvailable = 0; + } + + const moneyGained = moneyDrained * currentNodeMults.ManualHackMoney; Player.gainMoney(moneyGained, "hacking"); Player.gainHackingExp(expGainedOnSuccess); if (expGainedOnSuccess > 1) {