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

Merge pull request #1412 from danielyxie/dev

Browse Source 
fix logbox newlines and corp researching multiple times
This commit is contained in:
hydroflame 2021-10-04 12:37:35 -04:00 committed by GitHub
commit 15df0361e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.bundle.js
View File

File diff suppressed because one or more lines are too long

2
main.bundle.js.map
View File

File diff suppressed because one or more lines are too long

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

@ -122,7 +122,7 @@ function WarehouseRoot(props: IProps): React.ReactElement {
</> </>
); );
} }
console.log(division.products);
for (const prodName in division.products) { for (const prodName in division.products) {
const prod = division.products[prodName]; const prod = division.products[prodName];
if (prod === undefined) continue; if (prod === undefined) continue;

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

@ -25,7 +25,7 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
if (n === null) return <></>; if (n === null) return <></>;
const r = ResearchMap[n.text]; const r = ResearchMap[n.text];
let disabled = division.sciResearch.qty < r.cost; let disabled = division.sciResearch.qty < r.cost || n.researched;
const parent = n.parent; const parent = n.parent;
if (parent !== null) { if (parent !== null) {
disabled = disabled || !parent.researched; disabled = disabled || !parent.researched;

2
src/ui/React/LogBoxManager.tsx
View File

@ -147,7 +147,7 @@ function LogWindow(props: IProps): React.ReactElement {
</Box> </Box>
</Paper> </Paper>
<Paper> <Paper>
<Box maxHeight="25vh" overflow="scroll" sx={{ overflowWrap: "break-word" }}> <Box maxHeight="25vh" overflow="scroll" sx={{ overflowWrap: "break-word", whiteSpace: "pre-line" }}>
{props.script.logs.map( {props.script.logs.map(
(line: string, i: number): JSX.Element => ( (line: string, i: number): JSX.Element => (
<Typography key={i}> <Typography key={i}>