Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-29 19:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:danielyxie/bitburner into dev

Browse Source
This commit is contained in:
Olivier Gagnon 2021-10-28 23:04:40 -04:00
commit 2926ee0fc0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Corporation/ui/LevelableUpgrade.tsx
View File

@ -44,7 +44,7 @@ export function LevelableUpgrade(props: IProps): React.ReactElement {
<MoneyCost money={cost} corp={corp} /> <MoneyCost money={cost} corp={corp} />
</Button> </Button>
<Tooltip title={tooltip}> <Tooltip title={tooltip}>
<Typography>{data[4]} </Typography> <Typography>{data[4]} - lvl {level}</Typography>
</Tooltip> </Tooltip>
</Box> </Box>
</Grid> </Grid>

10
src/Corporation/ui/PurchaseMaterialModal.tsx
View File

@ -25,15 +25,15 @@ function BulkPurchaseText(props: IBulkPurchaseTextProps): React.ReactElement {
const maxAmount = (props.warehouse.size - props.warehouse.sizeUsed) / matSize; const maxAmount = (props.warehouse.size - props.warehouse.sizeUsed) / matSize;
if (parsedAmt * matSize > maxAmount) { if (parsedAmt * matSize > maxAmount) {
return <>Not enough warehouse space to purchase this amount</>; return <><Typography color={"error"}>Not enough warehouse space to purchase this amount</Typography></>;
} else if (isNaN(cost)) { } else if (isNaN(cost)) {
return <>Invalid put for Bulk Purchase amount</>; return <><Typography color={"error"}>Invalid put for Bulk Purchase amount</Typography></>;
} else { } else {
return ( return (
<> <><Typography>
Purchasing {numeralWrapper.format(parsedAmt, "0,0.00")} of {props.mat.name} will cost{" "} Purchasing {numeralWrapper.format(parsedAmt, "0,0.00")} of {props.mat.name} will cost{" "}
{numeralWrapper.formatMoney(cost)} {numeralWrapper.formatMoney(cost)}</Typography>
</> </>
); );
} }
} }