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

Fix #944 merge errors

Browse Source
This commit is contained in:
Snarling 2023-12-27 04:35:58 -05:00
parent ccf0aa4771
commit 550829a1c3
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Go/ui/GoGameboardWrapper.tsx
View File

@ -243,7 +243,7 @@ export function GoGameboardWrapper({ showInstructions }: IProps): React.ReactEle
<br /> <br />
<Typography variant={"h6"} className={classes.opponentLabel}> <Typography variant={"h6"} className={classes.opponentLabel}>
{opponent !== opponents.none ? "Subnet owner: " : ""}{" "} {opponent !== opponents.none ? "Subnet owner: " : ""}{" "}
{opponent === opponents.w0r1d_d43m0n ? <CorruptableText content={opponent} /> : opponent} {opponent === opponents.w0r1d_d43m0n ? <CorruptableText content={opponent} spoiler={false} /> : opponent}
</Typography> </Typography>
<br /> <br />
</Box> </Box>

6
src/Go/ui/GoHistoryPage.tsx
View File

@ -54,7 +54,11 @@ export const GoHistoryPage = (): React.ReactElement => {
<Typography> <Typography>
{" "} {" "}
<strong className={classes.keyText}> <strong className={classes.keyText}>
{faction === opponents.w0r1d_d43m0n ? <CorruptableText content="????????????" /> : faction} {faction === opponents.w0r1d_d43m0n ? (
<CorruptableText content="????????????" spoiler={false} />
) : (
faction
)}
</strong> </strong>
</Typography> </Typography>
<Table sx={{ display: "table", mb: 1, width: "100%" }}> <Table sx={{ display: "table", mb: 1, width: "100%" }}>

6
src/Go/ui/GoSubnetSearch.tsx
View File

@ -73,7 +73,7 @@ export const GoSubnetSearch = ({ open, search, cancel, showInstructions }: IProp
{opponentFactions.map((faction) => ( {opponentFactions.map((faction) => (
<MenuItem key={faction} value={faction}> <MenuItem key={faction} value={faction}>
{faction === opponents.w0r1d_d43m0n ? ( {faction === opponents.w0r1d_d43m0n ? (
<CorruptableText content="???????????????" /> <CorruptableText content="???????????????" spoiler={false} />
) : ( ) : (
`${faction} (${opponentDetails[faction].description})` `${faction} (${opponentDetails[faction].description})`
)} )}
@ -120,8 +120,8 @@ export const GoSubnetSearch = ({ open, search, cancel, showInstructions }: IProp
<Typography> <Typography>
{opponent === opponents.w0r1d_d43m0n ? ( {opponent === opponents.w0r1d_d43m0n ? (
<> <>
<CorruptableText content={opponentDetails[opponent].flavorText.slice(0, 40)} /> <CorruptableText content={opponentDetails[opponent].flavorText.slice(0, 40)} spoiler={false} />
<CorruptableText content={opponentDetails[opponent].flavorText.slice(40)} /> <CorruptableText content={opponentDetails[opponent].flavorText.slice(40)} spoiler={false} />
</> </>
) : ( ) : (
opponentDetails[opponent].flavorText opponentDetails[opponent].flavorText

2
src/Locations/ui/GenericLocation.tsx
View File

@ -95,7 +95,7 @@ export function GenericLocation({ loc }: IProps): React.ReactElement {
<> <>
<Button onClick={() => Router.toPage(Page.City)}>Return to World</Button> <Button onClick={() => Router.toPage(Page.City)}>Return to World</Button>
<Typography variant="h4" sx={{ mt: 1 }}> <Typography variant="h4" sx={{ mt: 1 }}>
{backdoorInstalled ? ( {backdoorInstalled && serverMeta ? (
<Tooltip title={`Backdoor installed on ${serverMeta.hostname}.`}> <Tooltip title={`Backdoor installed on ${serverMeta.hostname}.`}>
<span> <span>
<CorruptableText content={loc.name} spoiler={false} /> <CorruptableText content={loc.name} spoiler={false} />