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

Merge pull request #1460 from danielyxie/dev

Browse Source 
few bugfix
This commit is contained in:
hydroflame 2021-10-11 14:27:21 -04:00 committed by GitHub
commit 944360f846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/vendor.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

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

9
src/NetscriptFunctions.ts
View File

@ -720,7 +720,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
hacknet: hacknet, hacknet: hacknet,
sprintf: sprintf, sprintf: sprintf,
vsprintf: vsprintf, vsprintf: vsprintf,
scan: function (ip: any = workerScript.hostname, hostnames: any = true): any { scan: function (ip: any = workerScript.hostname): any {
updateDynamicRam("scan", getRamCost("scan")); updateDynamicRam("scan", getRamCost("scan"));
const server = GetServer(ip); const server = GetServer(ip);
if (server == null) { if (server == null) {
@ -728,14 +728,9 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
} }
const out = []; const out = [];
for (let i = 0; i < server.serversOnNetwork.length; i++) { for (let i = 0; i < server.serversOnNetwork.length; i++) {
let entry;
const s = getServerOnNetwork(server, i); const s = getServerOnNetwork(server, i);
if (s === null) continue; if (s === null) continue;
if (hostnames) { const entry = s.hostname;
entry = s.hostname;
} else {
entry = s.hostname;
}
if (entry == null) { if (entry == null) {
continue; continue;
} }

27
src/ui/React/ThemeEditorModal.tsx
View File

@ -2,6 +2,8 @@ import React, { useState } from "react";
import { Modal } from "./Modal"; import { Modal } from "./Modal";
import Button from "@mui/material/Button"; import Button from "@mui/material/Button";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import Tooltip from "@mui/material/Tooltip";
import Paper from "@mui/material/Paper";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import IconButton from "@mui/material/IconButton"; import IconButton from "@mui/material/IconButton";
import ReplyIcon from "@mui/icons-material/Reply"; import ReplyIcon from "@mui/icons-material/Reply";
@ -87,17 +89,22 @@ export function ThemeEditorModal(props: IProps): React.ReactElement {
return ( return (
<Modal open={props.open} onClose={props.onClose}> <Modal open={props.open} onClose={props.onClose}>
<Button color="primary">primary</Button> <Paper>
<Button color="secondary">secondary</Button> <Tooltip open={true} placement={"top"} title={<Typography>Example tooltip</Typography>}>
<Button color="warning">warning</Button> <Button color="primary">primary button</Button>
<Button color="info">info</Button> </Tooltip>
<Button color="error">error</Button> <Button color="secondary">secondary button</Button>
<Typography color="primary">primary</Typography> <Button color="warning">warning button</Button>
<Typography color="secondary">secondary</Typography> <Button color="info">info button</Button>
<Typography color="warning">warning</Typography> <Button color="error">error button</Button>
<Typography color="info">info</Typography> <Button disabled>disabled button</Button>
<Typography color="error">error</Typography> <Typography color="primary">text with primary color</Typography>
<Typography color="secondary">text with secondary color</Typography>
<Typography color="error">text with error color</Typography>
<TextField value={"Text field"} />
</Paper>
<br /> <br />
<Typography>Warning: Editing the theme is very slow.</Typography>
<ColorEditor <ColorEditor
name="primarylight" name="primarylight"
onColorChange={onColorChange} onColorChange={onColorChange}