diff --git a/src/Faction/ui/FactionsRoot.tsx b/src/Faction/ui/FactionsRoot.tsx index fa7029174..181cdb582 100644 --- a/src/Faction/ui/FactionsRoot.tsx +++ b/src/Faction/ui/FactionsRoot.tsx @@ -232,7 +232,7 @@ export function FactionsRoot(props: IProps): React.ReactElement { sx={{ gap: 1, gridTemplateColumns: (invitations.length > 0 ? "1fr " : "") + "2fr", - [theme.breakpoints.down("lg")]: { gridTemplateColumns: "1fr", "& > span:nth-child(1)": { order: 1 } }, + [theme.breakpoints.down("lg")]: { gridTemplateColumns: "1fr", "& > span:nth-of-type(1)": { order: 1 } }, gridTemplateRows: "minmax(0, 1fr)", "& > span > .MuiBox-root": { display: "grid", diff --git a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts index 2c7e6f663..058c79b0c 100644 --- a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts +++ b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts @@ -15,7 +15,6 @@ export function process(this: IPlayer, cycles = 1): void { } } export function finish(this: IPlayer, cancelled: boolean): void { - console.error("finishing"); if (this.currentWork === null) return; this.currentWork.finish(this, cancelled); this.currentWork = null; diff --git a/src/Programs/ui/ProgramsRoot.tsx b/src/Programs/ui/ProgramsRoot.tsx index d50e4750f..b5838c8d1 100644 --- a/src/Programs/ui/ProgramsRoot.tsx +++ b/src/Programs/ui/ProgramsRoot.tsx @@ -87,37 +87,39 @@ export function ProgramsRoot(): React.ReactElement { sx={{ p: 1, opacity: player.hasProgram(program.name) ? 0.75 : 1 }} key={program.name} > - - {(player.hasProgram(program.name) && ) || - (create.req(player) && ) || } - {program.name} - - {!player.hasProgram(program.name) && create.req(player) && ( - - )} - {player.hasProgram(program.name) || getHackingLevelRemaining(create.level) === 0 || ( - - Unlocks in: {getHackingLevelRemaining(create.level)} hacking levels + <> + + {(player.hasProgram(program.name) && ) || + (create.req(player) && ) || } + {program.name} - )} - {curCompletion !== -1 && ( - - Current completion: {curCompletion}% - - )} - {create.tooltip} + {!player.hasProgram(program.name) && create.req(player) && ( + + )} + {player.hasProgram(program.name) || getHackingLevelRemaining(create.level) === 0 || ( + + Unlocks in: {getHackingLevelRemaining(create.level)} hacking levels + + )} + {curCompletion !== -1 && ( + + Current completion: {curCompletion}% + + )} + {create.tooltip} + ); })}