diff --git a/src/Crime/Crime.ts b/src/Crime/Crime.ts index 21158376f..a510cfd72 100644 --- a/src/Crime/Crime.ts +++ b/src/Crime/Crime.ts @@ -107,6 +107,7 @@ export class Crime { singularity: workerScript !== null, }), ); + p.focus = true; router.toWork(); return this.time; diff --git a/src/ui/React/CharacterOverview.tsx b/src/ui/React/CharacterOverview.tsx index dc7aa5d91..3922b419a 100644 --- a/src/ui/React/CharacterOverview.tsx +++ b/src/ui/React/CharacterOverview.tsx @@ -33,6 +33,7 @@ import { isGraftingWork } from "../../Work/GraftingWork"; import { isFactionWork } from "../../Work/FactionWork"; import { ReputationRate } from "./ReputationRate"; import { isCompanyWork } from "../../Work/CompanyWork"; +import { isCrimeWork } from "../../Work/CrimeWork"; interface IProps { save: () => void; @@ -149,6 +150,14 @@ function Work(): React.ReactElement { let details = <>; let header = <>; let innerText = <>; + if (isCrimeWork(player.currentWork)) { + const crime = player.currentWork.getCrime(); + const perc = ((player.currentWork.cyclesWorked * CONSTANTS._idleSpeed) / crime.time) * 100; + + details = <>{player.currentWork.crimeType}; + header = <>You are attempting to {player.currentWork.crimeType}; + innerText = <>{perc.toFixed(2)}%; + } if (isClassWork(player.currentWork)) { details = <>{player.currentWork.getClass().youAreCurrently}; header = <>You are {player.currentWork.getClass().youAreCurrently}; diff --git a/src/ui/WorkInProgressRoot.tsx b/src/ui/WorkInProgressRoot.tsx index ff3cf8395..95f975915 100644 --- a/src/ui/WorkInProgressRoot.tsx +++ b/src/ui/WorkInProgressRoot.tsx @@ -153,6 +153,10 @@ export function WorkInProgressRoot(): React.ReactElement { router.toLocation(Locations[LocationName.Slums]); player.finishNEWWork(true); }, + unfocus: () => { + router.toCity(); + player.stopFocusing(); + }, }, title: `You are attempting to ${crime.type}`,