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

fix previous commit

Browse Source
This commit is contained in:
Snarling 2022-09-12 18:05:48 -04:00
parent a21b1029d7
commit c9ee938bc6
2 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/ui/GameRoot.tsx
View File

@ -476,49 +476,47 @@ export function GameRoot(): React.ReactElement {
} }
return ( return (
<Context.Player.Provider value={Player}> <>
<Context.Router.Provider value={Router}> <ErrorBoundary key={errorBoundaryKey} softReset={softReset}>
<ErrorBoundary key={errorBoundaryKey} softReset={softReset}> <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 ? (
{!ITutorial.isRunning ? ( <CharacterOverview save={() => saveObject.saveGame()} killScripts={killAllScripts} />
<CharacterOverview save={() => saveObject.saveGame()} killScripts={killAllScripts} />
) : (
<InteractiveTutorialRoot />
)}
</Overview>
{withSidebar ? (
<Box display="flex" flexDirection="row" width="100%">
<SidebarRoot
page={page}
opened={sidebarOpened}
onToggled={(isOpened) => {
setSideBarOpened(isOpened);
Settings.IsSidebarOpened = isOpened;
}}
/>
<Box className={classes.root}>{mainPage}</Box>
</Box>
) : ( ) : (
<InteractiveTutorialRoot />
)}
</Overview>
{withSidebar ? (
<Box display="flex" flexDirection="row" width="100%">
<SidebarRoot
page={page}
opened={sidebarOpened}
onToggled={(isOpened) => {
setSideBarOpened(isOpened);
Settings.IsSidebarOpened = isOpened;
}}
/>
<Box className={classes.root}>{mainPage}</Box> <Box className={classes.root}>{mainPage}</Box>
)} </Box>
<Unclickable /> ) : (
{withPopups && ( <Box className={classes.root}>{mainPage}</Box>
<> )}
<LogBoxManager /> <Unclickable />
<AlertManager /> {withPopups && (
<PromptManager /> <>
<InvitationModal /> <LogBoxManager />
<Snackbar /> <AlertManager />
</> <PromptManager />
)} <InvitationModal />
<Apr1 /> <Snackbar />
</SnackbarProvider> </>
</BypassWrapper> )}
</ErrorBoundary> <Apr1 />
<V2Modal /> </SnackbarProvider>
</Context.Router.Provider> </BypassWrapper>
</Context.Player.Provider> </ErrorBoundary>
<V2Modal />
</>
); );
} }

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

@ -212,7 +212,7 @@ function Work(): React.ReactElement {
); );
innerText = ( innerText = (
<> <>
<Reputation reputation={companyWork.getCompany().PlayerReputation} /> rep <Reputation reputation={companyWork.getCompany().playerReputation} /> rep
<br />( <br />(
<ReputationRate reputation={companyWork.getGainRates().reputation * (1000 / CONSTANTS._idleSpeed)} />) <ReputationRate reputation={companyWork.getGainRates().reputation * (1000 / CONSTANTS._idleSpeed)} />)
</> </>