diff --git a/src/Augmentation/ui/PlayerMultipliers.tsx b/src/Augmentation/ui/PlayerMultipliers.tsx index d866bb340..99b49616d 100644 --- a/src/Augmentation/ui/PlayerMultipliers.tsx +++ b/src/Augmentation/ui/PlayerMultipliers.tsx @@ -43,43 +43,51 @@ function BitNodeModifiedStats(props: BitNodeModifiedStatsProps): React.ReactElem interface MultListProps { rows: (string | number)[][]; color: string; + noMargin?: boolean; } -function MultiplierList(props: MultListProps): React.ReactElement { - return ( - - {props.rows.map((data) => { - const mult = data[0] as string, - value = data[1] as number, - improved = data[2] as number | null, - bnMult = data[3] as number; +function MultiplierList({ rows, color, noMargin = false }: MultListProps): React.ReactElement { + const listItems = rows + .map((data) => { + const mult = data[0] as string, + value = data[1] as number, + improved = data[2] as number | null, + bnMult = data[3] as number; - if (improved) { - return ( - - - {mult} - - } - secondary={ - - - - - - } - disableTypography - /> - - ); - } - return <>; - })} - - ); + if (improved) { + return ( + + + {mult} + + } + secondary={ + + + + + + } + disableTypography + /> + + ); + } + return; + }) + .filter((i) => i !== undefined); + + if (listItems.length > 0) { + return ( + + {listItems} + + ); + } + return <>; } export function PlayerMultipliers(): React.ReactElement { @@ -125,7 +133,6 @@ export function PlayerMultipliers(): React.ReactElement { return ( - Multipliers -
-
-
-
-
-
-
-
-
-
diff --git a/src/ui/CharacterStats.tsx b/src/ui/CharacterStats.tsx index c35583bb8..e31bb3919 100644 --- a/src/ui/CharacterStats.tsx +++ b/src/ui/CharacterStats.tsx @@ -40,11 +40,12 @@ const EmployersModal = ({ open, onClose }: EmployersModalProps): React.ReactElem interface MultTableProps { rows: (string | number)[][]; color: string; + noMargin?: boolean; } function MultiplierTable(props: MultTableProps): React.ReactElement { return ( - +
{props.rows.map((data) => { const mult = data[0] as string, @@ -89,6 +90,7 @@ function BladeburnerMults(): React.ReactElement { ["Bladeburner Field Analysis", player.bladeburner_analysis_mult], ]} color={Settings.theme.primary} + noMargin /> ); } @@ -354,6 +356,10 @@ export function CharacterStats(): React.ReactElement {
When there is a dim number next to a multiplier, that means that the multiplier in question is being affected by BitNode multipliers. +
+
+ The dim number is the raw multiplier, and the undimmed number is the effective multiplier, as dictated + by the BitNode. } > @@ -379,7 +385,6 @@ export function CharacterStats(): React.ReactElement { ]} color={Settings.theme.hack} /> -
-
- -
- -
- -
- -
- @@ -477,8 +473,6 @@ export function CharacterStats(): React.ReactElement { ]} color={Settings.theme.primary} /> -
- -
- -
-