mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-12-19 04:35:46 +01:00
UI: Memoize character overview (#247)
This commit is contained in:
parent
addcee73fc
commit
149d687fd6
@ -432,11 +432,17 @@ export function GameRoot(): React.ReactElement {
|
|||||||
<BypassWrapper content={bypassGame ? mainPage : null}>
|
<BypassWrapper content={bypassGame ? mainPage : null}>
|
||||||
<SnackbarProvider>
|
<SnackbarProvider>
|
||||||
<Overview mode={ITutorial.isRunning ? "tutorial" : "overview"}>
|
<Overview mode={ITutorial.isRunning ? "tutorial" : "overview"}>
|
||||||
{!ITutorial.isRunning ? (
|
{(parentOpen) =>
|
||||||
<CharacterOverview save={() => saveObject.saveGame()} killScripts={killAllScripts} />
|
!ITutorial.isRunning ? (
|
||||||
) : (
|
<CharacterOverview
|
||||||
<InteractiveTutorialRoot />
|
parentOpen={parentOpen}
|
||||||
)}
|
save={() => saveObject.saveGame()}
|
||||||
|
killScripts={killAllScripts}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<InteractiveTutorialRoot />
|
||||||
|
)
|
||||||
|
}
|
||||||
</Overview>
|
</Overview>
|
||||||
{withSidebar ? (
|
{withSidebar ? (
|
||||||
<Box display="flex" flexDirection="row" width="100%">
|
<Box display="flex" flexDirection="row" width="100%">
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// Root React Component for the Corporation UI
|
// Root React Component for the Corporation UI
|
||||||
import React, { useState, useEffect } from "react";
|
import React, { useMemo, useState, useEffect } from "react";
|
||||||
|
|
||||||
import { Theme, useTheme } from "@mui/material/styles";
|
import { Theme, useTheme } from "@mui/material/styles";
|
||||||
import makeStyles from "@mui/styles/makeStyles";
|
import makeStyles from "@mui/styles/makeStyles";
|
||||||
@ -38,41 +38,11 @@ import { isCompanyWork } from "../../Work/CompanyWork";
|
|||||||
import { isCrimeWork } from "../../Work/CrimeWork";
|
import { isCrimeWork } from "../../Work/CrimeWork";
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
|
parentOpen: boolean;
|
||||||
save: () => void;
|
save: () => void;
|
||||||
killScripts: () => void;
|
killScripts: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
function Intelligence(): React.ReactElement {
|
|
||||||
const theme = useTheme();
|
|
||||||
const classes = useStyles();
|
|
||||||
if (Player.skills.intelligence === 0) return <></>;
|
|
||||||
const progress = Player.calculateSkillProgress(Player.exp.intelligence);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<TableRow>
|
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cell }}>
|
|
||||||
<Typography classes={{ root: classes.int }}>Int </Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cell }}>
|
|
||||||
<Typography classes={{ root: classes.int }}>{formatNumber(Player.skills.intelligence, 0)}</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cell }}>
|
|
||||||
<Typography id="overview-int-hook" classes={{ root: classes.int }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow>
|
|
||||||
{!Settings.DisableOverviewProgressBars && (
|
|
||||||
<StatsProgressOverviewCell progress={progress} color={theme.colors.int} />
|
|
||||||
)}
|
|
||||||
</TableRow>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function Bladeburner(): React.ReactElement {
|
function Bladeburner(): React.ReactElement {
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
const bladeburner = Player.bladeburner;
|
const bladeburner = Player.bladeburner;
|
||||||
@ -81,18 +51,28 @@ function Bladeburner(): React.ReactElement {
|
|||||||
if (action.type === "Idle") return <></>;
|
if (action.type === "Idle") return <></>;
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<TableRow>
|
{useMemo(
|
||||||
<TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
|
() => (
|
||||||
<Typography>Bladeburner:</Typography>
|
<TableRow>
|
||||||
</TableCell>
|
<TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
|
||||||
</TableRow>
|
<Typography>Bladeburner:</Typography>
|
||||||
<TableRow>
|
</TableCell>
|
||||||
<TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
|
</TableRow>
|
||||||
<Typography>
|
),
|
||||||
{action.type}: {action.name}
|
[classes.cellNone],
|
||||||
</Typography>
|
)}
|
||||||
</TableCell>
|
{useMemo(
|
||||||
</TableRow>
|
() => (
|
||||||
|
<TableRow>
|
||||||
|
<TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
|
||||||
|
<Typography>
|
||||||
|
{action.type}: {action.name}
|
||||||
|
</Typography>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
),
|
||||||
|
[classes.cellNone, action.type, action.name],
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -101,15 +81,13 @@ interface WorkInProgressOverviewProps {
|
|||||||
tooltip: React.ReactNode;
|
tooltip: React.ReactNode;
|
||||||
header: React.ReactNode;
|
header: React.ReactNode;
|
||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
onClickFocus: () => void;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function WorkInProgressOverview({
|
const onClickFocusWork = (): void => {
|
||||||
tooltip,
|
Player.startFocusing();
|
||||||
children,
|
Router.toPage(Page.Work);
|
||||||
onClickFocus,
|
};
|
||||||
header,
|
function WorkInProgressOverview({ tooltip, children, header }: WorkInProgressOverviewProps): React.ReactElement {
|
||||||
}: WorkInProgressOverviewProps): React.ReactElement {
|
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@ -127,22 +105,23 @@ function WorkInProgressOverview({
|
|||||||
<Typography className={classes.workSubtitles}>{children}</Typography>
|
<Typography className={classes.workSubtitles}>{children}</Typography>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
<TableRow>
|
{useMemo(
|
||||||
<TableCell component="th" scope="row" align="center" colSpan={2} classes={{ root: classes.cellNone }}>
|
() => (
|
||||||
<Button sx={{ mt: 1 }} onClick={onClickFocus}>
|
<TableRow>
|
||||||
Focus
|
<TableCell component="th" scope="row" align="center" colSpan={2} classes={{ root: classes.cellNone }}>
|
||||||
</Button>
|
<Button sx={{ mt: 1 }} onClick={onClickFocusWork}>
|
||||||
</TableCell>
|
Focus
|
||||||
</TableRow>
|
</Button>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
),
|
||||||
|
[classes.cellNone],
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function Work(): React.ReactElement {
|
function Work(): React.ReactElement {
|
||||||
const onClickFocus = (): void => {
|
|
||||||
Player.startFocusing();
|
|
||||||
Router.toPage(Page.Work);
|
|
||||||
};
|
|
||||||
if (Player.currentWork === null || Player.focus) return <></>;
|
if (Player.currentWork === null || Player.focus) return <></>;
|
||||||
|
|
||||||
let details = <></>;
|
let details = <></>;
|
||||||
@ -219,7 +198,7 @@ function Work(): React.ReactElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<WorkInProgressOverview tooltip={details} header={header} onClickFocus={onClickFocus}>
|
<WorkInProgressOverview tooltip={details} header={header}>
|
||||||
{innerText}
|
{innerText}
|
||||||
</WorkInProgressOverview>
|
</WorkInProgressOverview>
|
||||||
);
|
);
|
||||||
@ -275,13 +254,63 @@ const useStyles = makeStyles((theme: Theme) =>
|
|||||||
|
|
||||||
export { useStyles as characterOverviewStyles };
|
export { useStyles as characterOverviewStyles };
|
||||||
|
|
||||||
export function CharacterOverview({ save, killScripts }: IProps): React.ReactElement {
|
function rowWithHook(name: string, value: string, className: string, cellNone: string): React.ReactElement {
|
||||||
|
return useMemo(
|
||||||
|
() => (
|
||||||
|
<TableRow>
|
||||||
|
<TableCell component="th" scope="row" classes={{ root: cellNone }}>
|
||||||
|
<Typography classes={{ root: className }}>{name} </Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align="right" classes={{ root: cellNone }}>
|
||||||
|
<Typography classes={{ root: className }}>{value}</Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align="right" classes={{ root: cellNone }}>
|
||||||
|
<Typography id={"overview-" + name.toLowerCase() + "-str-hook"} classes={{ root: className }}>
|
||||||
|
{/*Hook for player scripts*/}
|
||||||
|
</Typography>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
),
|
||||||
|
[name, value, className, cellNone],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function statItem(
|
||||||
|
name: string,
|
||||||
|
value: number,
|
||||||
|
className: string,
|
||||||
|
cellNone: string,
|
||||||
|
themeColor: React.CSSProperties["color"],
|
||||||
|
exp: number,
|
||||||
|
mult: number,
|
||||||
|
bitNodeMult: number,
|
||||||
|
): React.ReactElement[] {
|
||||||
|
return [
|
||||||
|
rowWithHook(name, formatNumber(value, 0), className, cellNone),
|
||||||
|
useMemo(() => {
|
||||||
|
const progress = Player.calculateSkillProgress(exp, mult * bitNodeMult);
|
||||||
|
return (
|
||||||
|
<TableRow>
|
||||||
|
{!Settings.DisableOverviewProgressBars && (
|
||||||
|
<StatsProgressOverviewCell progress={progress} color={themeColor} />
|
||||||
|
)}
|
||||||
|
</TableRow>
|
||||||
|
);
|
||||||
|
}, [Settings.DisableOverviewProgressBars, themeColor, exp, mult, bitNodeMult]),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CharacterOverview({ parentOpen, save, killScripts }: IProps): React.ReactElement {
|
||||||
const [killOpen, setKillOpen] = useState(false);
|
const [killOpen, setKillOpen] = useState(false);
|
||||||
const setRerender = useState(false)[1];
|
const setRerender = useState(false)[1];
|
||||||
|
// Don't rerender while the overview is closed.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const id = setInterval(() => setRerender((old) => !old), 600);
|
if (parentOpen) {
|
||||||
return () => clearInterval(id);
|
const id = setInterval(() => setRerender((old) => !old), 600);
|
||||||
}, []);
|
return () => clearInterval(id);
|
||||||
|
}
|
||||||
|
return () => null;
|
||||||
|
}, [parentOpen]);
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
|
|
||||||
@ -289,219 +318,166 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
|
|||||||
Player.exp.hacking,
|
Player.exp.hacking,
|
||||||
Player.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier,
|
Player.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier,
|
||||||
);
|
);
|
||||||
const strengthProgress = Player.calculateSkillProgress(
|
|
||||||
Player.exp.strength,
|
|
||||||
Player.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier,
|
|
||||||
);
|
|
||||||
const defenseProgress = Player.calculateSkillProgress(
|
|
||||||
Player.exp.defense,
|
|
||||||
Player.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier,
|
|
||||||
);
|
|
||||||
const dexterityProgress = Player.calculateSkillProgress(
|
|
||||||
Player.exp.dexterity,
|
|
||||||
Player.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier,
|
|
||||||
);
|
|
||||||
const agilityProgress = Player.calculateSkillProgress(
|
|
||||||
Player.exp.agility,
|
|
||||||
Player.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier,
|
|
||||||
);
|
|
||||||
const charismaProgress = Player.calculateSkillProgress(
|
|
||||||
Player.exp.charisma,
|
|
||||||
Player.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier,
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Table sx={{ display: "block", m: 1 }}>
|
<Table sx={{ display: "block", m: 1 }}>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
<TableRow>
|
{rowWithHook(
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
"HP",
|
||||||
<Typography classes={{ root: classes.hp }}>HP </Typography>
|
numeralWrapper.formatHp(Player.hp.current) + "\u00a0/\u00a0" + numeralWrapper.formatHp(Player.hp.max),
|
||||||
</TableCell>
|
classes.hp,
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
classes.cellNone,
|
||||||
<Typography classes={{ root: classes.hp }}>
|
)}
|
||||||
{numeralWrapper.formatHp(Player.hp.current)} / {numeralWrapper.formatHp(Player.hp.max)}
|
{rowWithHook("Money", numeralWrapper.formatMoney(Player.money), classes.money, classes.cellNone)}
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography id="overview-hp-hook" classes={{ root: classes.hp }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow>
|
{useMemo(
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
// Hack is a special-case, because of its overview-hack-hook placement
|
||||||
<Typography classes={{ root: classes.money }}>Money </Typography>
|
() => (
|
||||||
</TableCell>
|
<TableRow>
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
||||||
<Typography classes={{ root: classes.money }}>{numeralWrapper.formatMoney(Player.money)}</Typography>
|
<Typography classes={{ root: classes.hack }}>Hack </Typography>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
||||||
<Typography id="overview-money-hook" classes={{ root: classes.money }}>
|
<Typography classes={{ root: classes.hack }}>{formatNumber(Player.skills.hacking, 0)}</Typography>
|
||||||
{/*Hook for player scripts*/}
|
</TableCell>
|
||||||
</Typography>
|
</TableRow>
|
||||||
</TableCell>
|
),
|
||||||
</TableRow>
|
[Player.skills.hacking, classes.hack, classes.cellNone],
|
||||||
|
)}
|
||||||
|
{useMemo(
|
||||||
|
() => (
|
||||||
|
<TableRow>
|
||||||
|
{!Settings.DisableOverviewProgressBars && (
|
||||||
|
<StatsProgressOverviewCell progress={hackingProgress} color={theme.colors.hack} />
|
||||||
|
)}
|
||||||
|
</TableRow>
|
||||||
|
),
|
||||||
|
[Settings.DisableOverviewProgressBars, Player.exp.hacking, Player.mults.hacking, theme.colors.hack],
|
||||||
|
)}
|
||||||
|
{useMemo(
|
||||||
|
() => (
|
||||||
|
<TableRow>
|
||||||
|
<TableCell component="th" scope="row" classes={{ root: classes.cell }}>
|
||||||
|
<Typography classes={{ root: classes.hack }}></Typography>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell align="right" classes={{ root: classes.cell }}>
|
||||||
|
<Typography id="overview-hack-hook" classes={{ root: classes.hack }}>
|
||||||
|
{/*Hook for player scripts*/}
|
||||||
|
</Typography>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
),
|
||||||
|
[classes.cell, classes.hack],
|
||||||
|
)}
|
||||||
|
|
||||||
<TableRow>
|
{statItem(
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
"Str",
|
||||||
<Typography classes={{ root: classes.hack }}>Hack </Typography>
|
Player.skills.strength,
|
||||||
</TableCell>
|
classes.combat,
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
classes.cellNone,
|
||||||
<Typography classes={{ root: classes.hack }}>{formatNumber(Player.skills.hacking, 0)}</Typography>
|
theme.colors.combat,
|
||||||
</TableCell>
|
Player.exp.strength,
|
||||||
</TableRow>
|
Player.mults.strength,
|
||||||
<TableRow>
|
BitNodeMultipliers.StrengthLevelMultiplier,
|
||||||
{!Settings.DisableOverviewProgressBars && (
|
)}
|
||||||
<StatsProgressOverviewCell progress={hackingProgress} color={theme.colors.hack} />
|
{statItem(
|
||||||
|
"Def",
|
||||||
|
Player.skills.defense,
|
||||||
|
classes.combat,
|
||||||
|
classes.cellNone,
|
||||||
|
theme.colors.combat,
|
||||||
|
Player.exp.defense,
|
||||||
|
Player.mults.defense,
|
||||||
|
BitNodeMultipliers.DefenseLevelMultiplier,
|
||||||
|
)}
|
||||||
|
{statItem(
|
||||||
|
"Dex",
|
||||||
|
Player.skills.dexterity,
|
||||||
|
classes.combat,
|
||||||
|
classes.cellNone,
|
||||||
|
theme.colors.combat,
|
||||||
|
Player.exp.dexterity,
|
||||||
|
Player.mults.dexterity,
|
||||||
|
BitNodeMultipliers.DexterityLevelMultiplier,
|
||||||
|
)}
|
||||||
|
{statItem(
|
||||||
|
"Agi",
|
||||||
|
Player.skills.agility,
|
||||||
|
classes.combat,
|
||||||
|
classes.cellNone,
|
||||||
|
theme.colors.combat,
|
||||||
|
Player.exp.agility,
|
||||||
|
Player.mults.agility,
|
||||||
|
BitNodeMultipliers.AgilityLevelMultiplier,
|
||||||
|
)}
|
||||||
|
{statItem(
|
||||||
|
"Cha",
|
||||||
|
Player.skills.charisma,
|
||||||
|
classes.cha,
|
||||||
|
classes.cellNone,
|
||||||
|
theme.colors.cha,
|
||||||
|
Player.exp.charisma,
|
||||||
|
Player.mults.charisma,
|
||||||
|
BitNodeMultipliers.CharismaLevelMultiplier,
|
||||||
|
)}
|
||||||
|
{Player.skills.intelligence !== 0 &&
|
||||||
|
statItem(
|
||||||
|
"Int",
|
||||||
|
Player.skills.intelligence,
|
||||||
|
classes.int,
|
||||||
|
classes.cellNone,
|
||||||
|
theme.colors.int,
|
||||||
|
Player.exp.intelligence,
|
||||||
|
1,
|
||||||
|
1,
|
||||||
)}
|
)}
|
||||||
</TableRow>
|
{useMemo(
|
||||||
<TableRow>
|
() => (
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cell }}>
|
<TableRow>
|
||||||
<Typography classes={{ root: classes.hack }}></Typography>
|
<TableCell component="th" scope="row" classes={{ root: classes.cell }}>
|
||||||
</TableCell>
|
<Typography id="overview-extra-hook-0" classes={{ root: classes.hack }}>
|
||||||
<TableCell align="right" classes={{ root: classes.cell }}>
|
{/*Hook for player scripts*/}
|
||||||
<Typography id="overview-hack-hook" classes={{ root: classes.hack }}>
|
</Typography>
|
||||||
{/*Hook for player scripts*/}
|
</TableCell>
|
||||||
</Typography>
|
<TableCell component="th" scope="row" align="right" classes={{ root: classes.cell }}>
|
||||||
</TableCell>
|
<Typography id="overview-extra-hook-1" classes={{ root: classes.hack }}>
|
||||||
</TableRow>
|
{/*Hook for player scripts*/}
|
||||||
|
</Typography>
|
||||||
<TableRow>
|
</TableCell>
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
<TableCell component="th" scope="row" align="right" classes={{ root: classes.cell }}>
|
||||||
<Typography classes={{ root: classes.combat }}>Str </Typography>
|
<Typography id="overview-extra-hook-2" classes={{ root: classes.hack }}>
|
||||||
</TableCell>
|
{/*Hook for player scripts*/}
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
</Typography>
|
||||||
<Typography classes={{ root: classes.combat }}>{formatNumber(Player.skills.strength, 0)}</Typography>
|
</TableCell>
|
||||||
</TableCell>
|
</TableRow>
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
),
|
||||||
<Typography id="overview-str-hook" classes={{ root: classes.combat }}>
|
[classes.cell, classes.hack],
|
||||||
{/*Hook for player scripts*/}
|
)}
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
<TableRow>
|
|
||||||
{!Settings.DisableOverviewProgressBars && (
|
|
||||||
<StatsProgressOverviewCell progress={strengthProgress} color={theme.colors.combat} />
|
|
||||||
)}
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow>
|
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography classes={{ root: classes.combat }}>Def </Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography classes={{ root: classes.combat }}>{formatNumber(Player.skills.defense, 0)}</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography id="overview-def-hook" classes={{ root: classes.combat }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
<TableRow>
|
|
||||||
{!Settings.DisableOverviewProgressBars && (
|
|
||||||
<StatsProgressOverviewCell progress={defenseProgress} color={theme.colors.combat} />
|
|
||||||
)}
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow>
|
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography classes={{ root: classes.combat }}>Dex </Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography classes={{ root: classes.combat }}>{formatNumber(Player.skills.dexterity, 0)}</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography id="overview-dex-hook" classes={{ root: classes.combat }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
<TableRow>
|
|
||||||
{!Settings.DisableOverviewProgressBars && (
|
|
||||||
<StatsProgressOverviewCell progress={dexterityProgress} color={theme.colors.combat} />
|
|
||||||
)}
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow>
|
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cell }}>
|
|
||||||
<Typography classes={{ root: classes.combat }}>Agi </Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cell }}>
|
|
||||||
<Typography classes={{ root: classes.combat }}>{formatNumber(Player.skills.agility, 0)}</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cell }}>
|
|
||||||
<Typography id="overview-agi-hook" classes={{ root: classes.combat }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
<TableRow>
|
|
||||||
{!Settings.DisableOverviewProgressBars && (
|
|
||||||
<StatsProgressOverviewCell progress={agilityProgress} color={theme.colors.combat} />
|
|
||||||
)}
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow>
|
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography classes={{ root: classes.cha }}>Cha </Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography classes={{ root: classes.cha }}>{formatNumber(Player.skills.charisma, 0)}</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell align="right" classes={{ root: classes.cellNone }}>
|
|
||||||
<Typography id="overview-cha-hook" classes={{ root: classes.cha }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
<TableRow>
|
|
||||||
{!Settings.DisableOverviewProgressBars && (
|
|
||||||
<StatsProgressOverviewCell progress={charismaProgress} color={theme.colors.cha} />
|
|
||||||
)}
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<Intelligence />
|
|
||||||
|
|
||||||
<TableRow>
|
|
||||||
<TableCell component="th" scope="row" classes={{ root: classes.cell }}>
|
|
||||||
<Typography id="overview-extra-hook-0" classes={{ root: classes.hack }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell component="th" scope="row" align="right" classes={{ root: classes.cell }}>
|
|
||||||
<Typography id="overview-extra-hook-1" classes={{ root: classes.hack }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
<TableCell component="th" scope="row" align="right" classes={{ root: classes.cell }}>
|
|
||||||
<Typography id="overview-extra-hook-2" classes={{ root: classes.hack }}>
|
|
||||||
{/*Hook for player scripts*/}
|
|
||||||
</Typography>
|
|
||||||
</TableCell>
|
|
||||||
</TableRow>
|
|
||||||
<Work />
|
<Work />
|
||||||
<Bladeburner />
|
<Bladeburner />
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
<Box sx={{ display: "flex", borderTop: `1px solid ${Settings.theme.welllight}` }}>
|
{useMemo(
|
||||||
<Box sx={{ display: "flex", flex: 1, justifyContent: "flex-start", alignItems: "center" }}>
|
() => (
|
||||||
<IconButton aria-label="save game" onClick={save}>
|
<Box sx={{ display: "flex", borderTop: `1px solid ${Settings.theme.welllight}` }}>
|
||||||
<Tooltip title={Settings.AutosaveInterval !== 0 ? "Save game" : "Save game (auto-saves are disabled!)"}>
|
<Box sx={{ display: "flex", flex: 1, justifyContent: "flex-start", alignItems: "center" }}>
|
||||||
<SaveIcon color={Settings.AutosaveInterval !== 0 ? "primary" : "error"} />
|
<IconButton aria-label="save game" onClick={save}>
|
||||||
</Tooltip>
|
<Tooltip title={Settings.AutosaveInterval !== 0 ? "Save game" : "Save game (auto-saves are disabled!)"}>
|
||||||
</IconButton>
|
<SaveIcon color={Settings.AutosaveInterval !== 0 ? "primary" : "error"} />
|
||||||
</Box>
|
</Tooltip>
|
||||||
<Box sx={{ display: "flex", flex: 1, justifyContent: "flex-end", alignItems: "center" }}>
|
</IconButton>
|
||||||
<IconButton aria-label="kill all scripts" onClick={() => setKillOpen(true)}>
|
</Box>
|
||||||
<Tooltip title="Kill all running scripts">
|
<Box sx={{ display: "flex", flex: 1, justifyContent: "flex-end", alignItems: "center" }}>
|
||||||
<ClearAllIcon color="error" />
|
<IconButton aria-label="kill all scripts" onClick={() => setKillOpen(true)}>
|
||||||
</Tooltip>
|
<Tooltip title="Kill all running scripts">
|
||||||
</IconButton>
|
<ClearAllIcon color="error" />
|
||||||
</Box>
|
</Tooltip>
|
||||||
</Box>
|
</IconButton>
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
),
|
||||||
|
[Settings.theme.welllight, save, Settings.AutosaveInterval],
|
||||||
|
)}
|
||||||
<KillScriptsModal open={killOpen} onClose={() => setKillOpen(false)} killScripts={killScripts} />
|
<KillScriptsModal open={killOpen} onClose={() => setKillOpen(false)} killScripts={killScripts} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
@ -53,7 +53,7 @@ const useStyles = makeStyles({
|
|||||||
});
|
});
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
children: JSX.Element[] | JSX.Element | React.ReactElement[] | React.ReactElement;
|
children: (parentOpen: boolean) => JSX.Element[] | JSX.Element | React.ReactElement[] | React.ReactElement;
|
||||||
mode: "tutorial" | "overview";
|
mode: "tutorial" | "overview";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,7 +141,7 @@ export function Overview({ children, mode }: IProps): React.ReactElement {
|
|||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
<Collapse in={open} className={classes.collapse}>
|
<Collapse in={open} className={classes.collapse}>
|
||||||
{children}
|
{children(open)}
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</Paper>
|
</Paper>
|
||||||
</Draggable>
|
</Draggable>
|
||||||
|
Loading…
Reference in New Issue
Block a user