diff --git a/src/Augmentation/ui/PlayerMultipliers.tsx b/src/Augmentation/ui/PlayerMultipliers.tsx index 4321472d2..807d86802 100644 --- a/src/Augmentation/ui/PlayerMultipliers.tsx +++ b/src/Augmentation/ui/PlayerMultipliers.tsx @@ -11,6 +11,7 @@ import TableBody from "@mui/material/TableBody"; import TableRow from "@mui/material/TableRow"; import Typography from "@mui/material/Typography"; import Box from "@mui/material/Box"; +import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers"; function calculateAugmentedStats(): any { const augP: any = {}; @@ -24,7 +25,7 @@ function calculateAugmentedStats(): any { return augP; } -function Improvements({ r }: { r: number }): React.ReactElement { +function Improvements({ r, m }: { r: number; m: number }): React.ReactElement { if (r) { return ( <> @@ -32,7 +33,9 @@ function Improvements({ r }: { r: number }): React.ReactElement {  {"=>"}  - {numeralWrapper.formatPercentage(r)} + + {numeralWrapper.formatPercentage(r)} + ); @@ -40,7 +43,17 @@ function Improvements({ r }: { r: number }): React.ReactElement { return <>; } -function MultiplierTable({ rows }: { rows: [string, number, number][] }): React.ReactElement { +interface IBN5StatsProps { + base: number; + mult: number; +} + +function BN5Stat(props: IBN5StatsProps): React.ReactElement { + if (props.mult === 1) return <>; + return <>({numeralWrapper.formatPercentage(props.base * props.mult)}); +} + +function MultiplierTable({ rows }: { rows: [string, number, number, number][] }): React.ReactElement { return ( @@ -50,9 +63,11 @@ function MultiplierTable({ rows }: { rows: [string, number, number][] }): React. {r[0]} multiplier:  - {numeralWrapper.formatPercentage(r[1])} + + {numeralWrapper.formatPercentage(r[1])} + - + ))} @@ -73,21 +88,25 @@ export function PlayerMultipliers(): React.ReactElement { "Bladeburner Success Chance", Player.bladeburner_success_chance_mult, Player.bladeburner_success_chance_mult * mults.bladeburner_success_chance_mult, + 1, ], [ "Bladeburner Max Stamina", Player.bladeburner_max_stamina_mult, Player.bladeburner_max_stamina_mult * mults.bladeburner_max_stamina_mult, + 1, ], [ "Bladeburner Stamina Gain", Player.bladeburner_stamina_gain_mult, Player.bladeburner_stamina_gain_mult * mults.bladeburner_stamina_gain_mult, + 1, ], [ "Bladeburner Field Analysis", Player.bladeburner_analysis_mult, Player.bladeburner_analysis_mult * mults.bladeburner_analysis_mult, + 1, ], ]} /> @@ -102,58 +121,98 @@ export function PlayerMultipliers(): React.ReactElement {






@@ -164,26 +223,31 @@ export function PlayerMultipliers(): React.ReactElement { "Hacknet Node production ", Player.hacknet_node_money_mult, Player.hacknet_node_money_mult * mults.hacknet_node_money_mult, + BitNodeMultipliers.HacknetNodeMoney, ], [ "Hacknet Node purchase cost ", Player.hacknet_node_purchase_cost_mult, Player.hacknet_node_purchase_cost_mult * mults.hacknet_node_purchase_cost_mult, + 1, ], [ "Hacknet Node RAM upgrade cost ", Player.hacknet_node_ram_cost_mult, Player.hacknet_node_ram_cost_mult * mults.hacknet_node_ram_cost_mult, + 1, ], [ "Hacknet Node Core purchase cost ", Player.hacknet_node_core_cost_mult, Player.hacknet_node_core_cost_mult * mults.hacknet_node_core_cost_mult, + 1, ], [ "Hacknet Node level upgrade cost ", Player.hacknet_node_level_cost_mult, Player.hacknet_node_level_cost_mult * mults.hacknet_node_level_cost_mult, + 1, ], ]} /> @@ -191,17 +255,32 @@ export function PlayerMultipliers(): React.ReactElement {