From a7045a234353de795494c0b3f378808b4a6d32aa Mon Sep 17 00:00:00 2001 From: borisflagell Date: Thu, 21 Apr 2022 19:20:16 +0200 Subject: [PATCH] Update HacknetServerElem.tsx Actually ran prettier this time. Apparently fixed my lint install : no error, no warning. --- src/Hacknet/ui/HacknetServerElem.tsx | 49 +++++++++++++--------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/src/Hacknet/ui/HacknetServerElem.tsx b/src/Hacknet/ui/HacknetServerElem.tsx index c029959aa..14abbeca4 100644 --- a/src/Hacknet/ui/HacknetServerElem.tsx +++ b/src/Hacknet/ui/HacknetServerElem.tsx @@ -60,17 +60,18 @@ export function HacknetServerElem(props: IProps): React.ReactElement { multiplier = Math.min(levelsToMax, purchaseMult as number); } - const base_increase = calculateHashGainRate(node.level + multiplier, 0, node.maxRam, node.cores, props.player.hacknet_node_money_mult) - - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.hacknet_node_money_mult); - const modded_increase = base_increase * (node.maxRam - node.ramUsed) / node.maxRam; + const base_increase = + calculateHashGainRate(node.level + multiplier, 0, node.maxRam, node.cores, props.player.hacknet_node_money_mult) - + calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.hacknet_node_money_mult); + const modded_increase = (base_increase * (node.maxRam - node.ramUsed)) / node.maxRam; const upgradeLevelCost = node.calculateLevelUpgradeCost(multiplier, props.player.hacknet_node_level_cost_mult); upgradeLevelButton = ( - + (base increase, attained when no script is running)
- + (effective increase, taking current RAM usage into account) + + (base increase, attained when no script is running)
+ + (effective increase, taking current RAM usage into account) } > @@ -118,28 +119,17 @@ export function HacknetServerElem(props: IProps): React.ReactElement { node.maxRam * Math.pow(2, multiplier), node.cores, props.player.hacknet_node_money_mult, - ) - calculateHashGainRate( - node.level, - 0, - node.maxRam, - node.cores, - props.player.hacknet_node_money_mult, - ); + ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.hacknet_node_money_mult); - const modded_increase = + const modded_increase = calculateHashGainRate( node.level, node.ramUsed, node.maxRam * Math.pow(2, multiplier), node.cores, props.player.hacknet_node_money_mult, - ) - calculateHashGainRate( - node.level, - node.ramUsed, - node.maxRam, - node.cores, - props.player.hacknet_node_money_mult, - ); + ) - + calculateHashGainRate(node.level, node.ramUsed, node.maxRam, node.cores, props.player.hacknet_node_money_mult); const upgradeRamCost = node.calculateRamUpgradeCost(multiplier, props.player.hacknet_node_ram_cost_mult); upgradeRamButton = ( @@ -180,9 +170,10 @@ export function HacknetServerElem(props: IProps): React.ReactElement { multiplier = Math.min(levelsToMax, purchaseMult as number); } - const base_increase = calculateHashGainRate(node.level, 0, node.maxRam, node.cores + multiplier, props.player.hacknet_node_money_mult) - - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.hacknet_node_money_mult); - const modded_increase = base_increase * (node.maxRam - node.ramUsed) / node.maxRam; + const base_increase = + calculateHashGainRate(node.level, 0, node.maxRam, node.cores + multiplier, props.player.hacknet_node_money_mult) - + calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.hacknet_node_money_mult); + const modded_increase = (base_increase * (node.maxRam - node.ramUsed)) / node.maxRam; const upgradeCoreCost = node.calculateCoreUpgradeCost(multiplier, props.player.hacknet_node_core_cost_mult); upgradeCoresButton = ( @@ -262,15 +253,19 @@ export function HacknetServerElem(props: IProps): React.ReactElement { - hashes producted by this server since last augment installation. + hashes producted by this server since last augment + installation.
current production rate.
- max production rate. (achieved when 100% Ram is allocated to it) + max production + rate. (achieved when 100% Ram is allocated to it)
- {numeralWrapper.formatRAM(node.ramUsed)} / {numeralWrapper.formatRAM(node.maxRam)} ({Math.round(100 * node.ramUsed / node.maxRam)}%) Ram allocated to script. + {numeralWrapper.formatRAM(node.ramUsed)} / {numeralWrapper.formatRAM(node.maxRam)} ( + {Math.round((100 * node.ramUsed) / node.maxRam)}%) Ram allocated to script.
- {numeralWrapper.formatRAM(node.maxRam - node.ramUsed)} / {numeralWrapper.formatRAM(node.maxRam)} ({Math.round(100 * (node.maxRam - node.ramUsed) / node.maxRam)}%) Ram allocated to hash production. + {numeralWrapper.formatRAM(node.maxRam - node.ramUsed)} / {numeralWrapper.formatRAM(node.maxRam)} ( + {Math.round((100 * (node.maxRam - node.ramUsed)) / node.maxRam)}%) Ram allocated to hash production. } >