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

This commit is contained in:
Olivier Gagnon 2022-01-20 16:11:55 -05:00
commit f7d18efaf6
8 changed files with 36 additions and 32 deletions

44
dist/vendor.bundle.js vendored

File diff suppressed because one or more lines are too long

@ -113,7 +113,7 @@ The list contains the name of (i.e. the value returned by
| | | to any position from i to i+n. | | | | to any position from i to i+n. |
| | | | | | | |
| | | Assuming you are initially positioned at the start of the array, determine | | | | Assuming you are initially positioned at the start of the array, determine |
| | | whether you are able to reach the last index of the array. | | | | whether you are able to reach the last index of the array. |
+------------------------------------+------------------------------------------------------------------------------------------+ +------------------------------------+------------------------------------------------------------------------------------------+
| Merge Overlapping Intervals | | Given an array of intervals, merge all overlapping intervals. An interval | | Merge Overlapping Intervals | | Given an array of intervals, merge all overlapping intervals. An interval |
| | | is an array with two numbers, where the first number is always less than | | | | is an array with two numbers, where the first number is always less than |

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -48,7 +48,7 @@ for (let i = 0; i < scripts.length; ++i) {
```ts ```ts
// NS2: // NS2:
const ps = ns.ps("home"); const ps = ns.ps("home");
for (script of ps) { for (let script of ps) {
ns.tprint(`${script.filename} ${ps[i].threads}`); ns.tprint(`${script.filename} ${ps[i].threads}`);
ns.tprint(script.args); ns.tprint(script.args);
} }

@ -19,7 +19,7 @@ export const Literatures: IMap<Literature> = {};
"money on a server, and grow() increases the amount of money on a server by some percentage (multiplicatively)<br><br>" + "money on a server, and grow() increases the amount of money on a server by some percentage (multiplicatively)<br><br>" +
"-Because hack() and grow() work by percentages, they are more effective if the target server has a high amount of money. " + "-Because hack() and grow() work by percentages, they are more effective if the target server has a high amount of money. " +
"Therefore, you should try to increase the amount of money on a server (using grow()) to a certain amount before hacking it. Two " + "Therefore, you should try to increase the amount of money on a server (using grow()) to a certain amount before hacking it. Two " +
"import Netscript functions for this are getServerMoneyAvailable() and getServerMaxMoney()<br><br>" + "important Netscript functions for this are getServerMoneyAvailable() and getServerMaxMoney()<br><br>" +
"-Keep security level low. Security level affects everything when hacking. Two important Netscript functions " + "-Keep security level low. Security level affects everything when hacking. Two important Netscript functions " +
"for this are getServerSecurityLevel() and getServerMinSecurityLevel()<br><br>" + "for this are getServerSecurityLevel() and getServerMinSecurityLevel()<br><br>" +
"-Purchase additional servers by visiting 'Alpha Enterprises' in the city. They are relatively cheap " + "-Purchase additional servers by visiting 'Alpha Enterprises' in the city. They are relatively cheap " +

@ -8,6 +8,5 @@ export function StartSharing(threads: number): () => void {
} }
export function CalculateShareMult(): number { export function CalculateShareMult(): number {
console.log(`${sharePower} => ${CSM(sharePower)}`);
return CSM(sharePower); return CSM(sharePower);
} }

@ -30,6 +30,13 @@ export function LoadingScreen(): React.ReactElement {
const [show, setShow] = useState(false); const [show, setShow] = useState(false);
const [loaded, setLoaded] = useState(false); const [loaded, setLoaded] = useState(false);
const version = `v${CONSTANTS.VersionString} (${hash()})`;
if (process.env.NODE_ENV === "development") {
document.title = `[dev] Bitburner ${version}`;
} else {
document.title = `Bitburner ${version}`;
}
useEffect(() => { useEffect(() => {
const id = setTimeout(() => { const id = setTimeout(() => {
if (!loaded) setShow(true); if (!loaded) setShow(true);
@ -70,9 +77,7 @@ export function LoadingScreen(): React.ReactElement {
<CircularProgress size={150} color="primary" /> <CircularProgress size={150} color="primary" />
</Grid> </Grid>
<Grid item> <Grid item>
<Typography variant="h3"> <Typography variant="h3">Loading Bitburner {version}</Typography>
Loading Bitburner v{CONSTANTS.VersionString} ({hash()})
</Typography>
</Grid> </Grid>
{show && ( {show && (
<Grid item> <Grid item>