Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-22 23:53:48 +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-23 10:08:11 -04:00
commit eec75b0840
4 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Hacknet/HacknetServer.ts
View File

@ -20,6 +20,8 @@ import { createRandomIp } from "../utils/IPAddress";
import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver"; import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
interface IConstructorParams { interface IConstructorParams {
adminRights?: boolean; adminRights?: boolean;
hostname: string; hostname: string;

61
src/Locations/ui/SpecialLocation.tsx
View File

@ -21,6 +21,7 @@ import { LocationName } from "../data/LocationNames";
import { use } from "../../ui/Context"; import { use } from "../../ui/Context";
import { dialogBoxCreate } from "../../ui/React/DialogBox"; import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { SnackbarEvents } from "../../ui/React/Snackbar";
type IProps = { type IProps = {
loc: Location; loc: Location;
@ -75,7 +76,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
function renderNoodleBar(): React.ReactElement { function renderNoodleBar(): React.ReactElement {
function EatNoodles(): void { function EatNoodles(): void {
dialogBoxCreate(<>You ate some delicious noodles and feel refreshed.</>); SnackbarEvents.emit("You ate some delicious noodles and feel refreshed", "success");
} }
return <Button onClick={EatNoodles}>Eat noodles</Button>; return <Button onClick={EatNoodles}>Eat noodles</Button>;
@ -111,35 +112,35 @@ export function SpecialLocation(props: IProps): React.ReactElement {
function renderCotMG(): React.ReactElement { function renderCotMG(): React.ReactElement {
// prettier-ignore // prettier-ignore
const symbol = <Typography sx={{lineHeight: '1em',whiteSpace: 'pre'}}> const symbol = <Typography sx={{ lineHeight: '1em', whiteSpace: 'pre' }}>
{" `` "}<br /> {" `` "}<br />
{" -odmmNmds: "}<br /> {" -odmmNmds: "}<br />
{" `hNmo:..-omNh. "}<br /> {" `hNmo:..-omNh. "}<br />
{" yMd` `hNh "}<br /> {" yMd` `hNh "}<br />
{" mMd oNm "}<br /> {" mMd oNm "}<br />
{" oMNo .mM/ "}<br /> {" oMNo .mM/ "}<br />
{" `dMN+ -mM+ "}<br /> {" `dMN+ -mM+ "}<br />
{" -mMNo -mN+ "}<br /> {" -mMNo -mN+ "}<br />
{" .+- :mMNo/mN/ "}<br /> {" .+- :mMNo/mN/ "}<br />
{":yNMd. :NMNNN/ "}<br /> {":yNMd. :NMNNN/ "}<br />
{"-mMMMh. /NMMh` "}<br /> {"-mMMMh. /NMMh` "}<br />
{" .dMMMd. /NMMMy` "}<br /> {" .dMMMd. /NMMMy` "}<br />
{" `yMMMd. /NNyNMMh` "}<br /> {" `yMMMd. /NNyNMMh` "}<br />
{" `sMMMd. +Nm: +NMMh. "}<br /> {" `sMMMd. +Nm: +NMMh. "}<br />
{" oMMMm- oNm: /NMMd. "}<br /> {" oMMMm- oNm: /NMMd. "}<br />
{" +NMMmsMm- :mMMd. "}<br /> {" +NMMmsMm- :mMMd. "}<br />
{" /NMMMm- -mMMd. "}<br /> {" /NMMMm- -mMMd. "}<br />
{" /MMMm- -mMMd. "}<br /> {" /MMMm- -mMMd. "}<br />
{" `sMNMMm- .mMmo "}<br /> {" `sMNMMm- .mMmo "}<br />
{" `sMd:hMMm. ./. "}<br /> {" `sMd:hMMm. ./. "}<br />
{" `yMy` `yNMd` "}<br /> {" `yMy` `yNMd` "}<br />
{" `hMs` oMMy "}<br /> {" `hMs` oMMy "}<br />
{" `hMh sMN- "}<br /> {" `hMh sMN- "}<br />
{" /MM- .NMo "}<br /> {" /MM- .NMo "}<br />
{" +MM: :MM+ "}<br /> {" +MM: :MM+ "}<br />
{" sNNo-.`.-omNy` "}<br /> {" sNNo-.`.-omNy` "}<br />
{" -smNNNNmdo- "}<br /> {" -smNNNNmdo- "}<br />
{" `..` "}</Typography> {" `..` "}</Typography>
return ( return (
<> <>

61
src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx
View File

@ -59,6 +59,7 @@ import { Money } from "../../ui/React/Money";
import React from "react"; import React from "react";
import { serverMetadata } from "../../Server/data/servers"; import { serverMetadata } from "../../Server/data/servers";
import { SnackbarEvents } from "../../ui/React/Snackbar";
export function init(this: IPlayer): void { export function init(this: IPlayer): void {
/* Initialize Player's home computer */ /* Initialize Player's home computer */
@ -1530,20 +1531,20 @@ export function finishCrime(this: IPlayer, cancelled: boolean): string {
if (ws.disableLogs.ALL == null && ws.disableLogs.commitCrime == null) { if (ws.disableLogs.ALL == null && ws.disableLogs.commitCrime == null) {
ws.scriptRef.log( ws.scriptRef.log(
"Crime successful! Gained " + "Crime successful! Gained " +
numeralWrapper.formatMoney(this.workMoneyGained) + numeralWrapper.formatMoney(this.workMoneyGained) +
", " + ", " +
numeralWrapper.formatExp(this.workHackExpGained) + numeralWrapper.formatExp(this.workHackExpGained) +
" hack exp, " + " hack exp, " +
numeralWrapper.formatExp(this.workStrExpGained) + numeralWrapper.formatExp(this.workStrExpGained) +
" str exp, " + " str exp, " +
numeralWrapper.formatExp(this.workDefExpGained) + numeralWrapper.formatExp(this.workDefExpGained) +
" def exp, " + " def exp, " +
numeralWrapper.formatExp(this.workDexExpGained) + numeralWrapper.formatExp(this.workDexExpGained) +
" dex exp, " + " dex exp, " +
numeralWrapper.formatExp(this.workAgiExpGained) + numeralWrapper.formatExp(this.workAgiExpGained) +
" agi exp, " + " agi exp, " +
numeralWrapper.formatExp(this.workChaExpGained) + numeralWrapper.formatExp(this.workChaExpGained) +
" cha exp.", " cha exp.",
); );
} }
} else { } else {
@ -1582,18 +1583,18 @@ export function finishCrime(this: IPlayer, cancelled: boolean): string {
if (ws.disableLogs.ALL == null && ws.disableLogs.commitCrime == null) { if (ws.disableLogs.ALL == null && ws.disableLogs.commitCrime == null) {
ws.scriptRef.log( ws.scriptRef.log(
"Crime failed! Gained " + "Crime failed! Gained " +
numeralWrapper.formatExp(this.workHackExpGained) + numeralWrapper.formatExp(this.workHackExpGained) +
" hack exp, " + " hack exp, " +
numeralWrapper.formatExp(this.workStrExpGained) + numeralWrapper.formatExp(this.workStrExpGained) +
" str exp, " + " str exp, " +
numeralWrapper.formatExp(this.workDefExpGained) + numeralWrapper.formatExp(this.workDefExpGained) +
" def exp, " + " def exp, " +
numeralWrapper.formatExp(this.workDexExpGained) + numeralWrapper.formatExp(this.workDexExpGained) +
" dex exp, " + " dex exp, " +
numeralWrapper.formatExp(this.workAgiExpGained) + numeralWrapper.formatExp(this.workAgiExpGained) +
" agi exp, " + " agi exp, " +
numeralWrapper.formatExp(this.workChaExpGained) + numeralWrapper.formatExp(this.workChaExpGained) +
" cha exp.", " cha exp.",
); );
} }
} else { } else {
@ -1697,13 +1698,7 @@ export function regenerateHp(this: IPlayer, amt: number): void {
export function hospitalize(this: IPlayer): number { export function hospitalize(this: IPlayer): number {
const cost = getHospitalizationCost(this); const cost = getHospitalizationCost(this);
if (Settings.SuppressHospitalizationPopup === false) { if (Settings.SuppressHospitalizationPopup === false) {
dialogBoxCreate( SnackbarEvents.emit(`You've been Hospitalized for ${numeralWrapper.formatMoney(cost)}`, "warning");
<>
You were in critical condition! You were taken to the hospital where luckily they were able to save your life.
You were charged&nbsp;
<Money money={cost} />
</>,
);
} }
this.loseMoney(cost); this.loseMoney(cost);

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

@ -302,7 +302,7 @@ export function refreshTheme(): void {
border: "1px solid " + Settings.theme.well, border: "1px solid " + Settings.theme.well,
}, },
standardSuccess: { standardSuccess: {
color: Settings.theme.primaryLight, color: Settings.theme.primarylight,
}, },
standardError: { standardError: {
color: Settings.theme.errorlight, color: Settings.theme.errorlight,