many fixes

src/ui/React/CharacterOverview.tsx

@@ -79,6 +79,68 @@ function Work(): React.ReactElement {
   const router = use.Router();
   const classes = useStyles();
   if (!player.isWorking || player.focus) return <></>;
+
+  if (player.className !== "") {
+    return (
+      <>
+        <TableRow>
+          <TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
+            <Typography>Work&nbsp;in&nbsp;progress:</Typography>
+          </TableCell>
+        </TableRow>
+        <TableRow>
+          <TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
+            <Typography>{player.className}</Typography>
+          </TableCell>
+        </TableRow>
+        <TableRow>
+          <TableCell component="th" scope="row" align="center" colSpan={2} classes={{ root: classes.cellNone }}>
+            <Button
+              onClick={() => {
+                player.startFocusing();
+                router.toWork();
+              }}
+            >
+              Focus
+            </Button>
+          </TableCell>
+        </TableRow>
+      </>
+    );
+  }
+
+  if (player.createProgramName !== "") {
+    return (
+      <>
+        <TableRow>
+          <TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
+            <Typography>Work&nbsp;in&nbsp;progress:</Typography>
+          </TableCell>
+        </TableRow>
+        <TableRow>
+          <TableCell component="th" scope="row" colSpan={2} classes={{ root: classes.cellNone }}>
+            <Typography>
+              {player.createProgramName}{" "}
+              {((player.timeWorkedCreateProgram / player.timeNeededToCompleteWork) * 100).toFixed(2)}%
+            </Typography>
+          </TableCell>
+        </TableRow>
+        <TableRow>
+          <TableCell component="th" scope="row" align="center" colSpan={2} classes={{ root: classes.cellNone }}>
+            <Button
+              onClick={() => {
+                player.startFocusing();
+                router.toWork();
+              }}
+            >
+              Focus
+            </Button>
+          </TableCell>
+        </TableRow>
+      </>
+    );
+  }
+
   return (
     <>
       <TableRow>
@@ -158,17 +220,29 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
   const theme = useTheme();
 
   const hackingProgress = player.calculateSkillProgress(
-    player.hacking_exp, player.hacking_mult * BitNodeMultipliers.HackingLevelMultiplier);
+    player.hacking_exp,
+    player.hacking_mult * BitNodeMultipliers.HackingLevelMultiplier,
+  );
   const strengthProgress = player.calculateSkillProgress(
-    player.strength_exp, player.strength_mult * BitNodeMultipliers.StrengthLevelMultiplier);
+    player.strength_exp,
+    player.strength_mult * BitNodeMultipliers.StrengthLevelMultiplier,
+  );
   const defenseProgress = player.calculateSkillProgress(
-    player.defense_exp, player.defense_mult * BitNodeMultipliers.DefenseLevelMultiplier);
+    player.defense_exp,
+    player.defense_mult * BitNodeMultipliers.DefenseLevelMultiplier,
+  );
   const dexterityProgress = player.calculateSkillProgress(
-    player.dexterity_exp, player.dexterity_mult * BitNodeMultipliers.DexterityLevelMultiplier);
+    player.dexterity_exp,
+    player.dexterity_mult * BitNodeMultipliers.DexterityLevelMultiplier,
+  );
   const agilityProgress = player.calculateSkillProgress(
-    player.agility_exp, player.agility_mult * BitNodeMultipliers.AgilityLevelMultiplier);
+    player.agility_exp,
+    player.agility_mult * BitNodeMultipliers.AgilityLevelMultiplier,
+  );
   const charismaProgress = player.calculateSkillProgress(
-    player.charisma_exp, player.charisma_mult * BitNodeMultipliers.CharismaLevelMultiplier);
+    player.charisma_exp,
+    player.charisma_mult * BitNodeMultipliers.CharismaLevelMultiplier,
+  );
 
   return (
     <>
@@ -216,7 +290,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
             <StatsProgressOverviewCell progress={hackingProgress} color={theme.colors.hack} />
           </TableRow>
           <TableRow>
-          <TableCell component="th" scope="row" classes={{ root: classes.cell }}>
+            <TableCell component="th" scope="row" classes={{ root: classes.cell }}>
               <Typography classes={{ root: classes.hack }}></Typography>
             </TableCell>
             <TableCell align="right" classes={{ root: classes.cell }}>

src/ui/WorkInProgressRoot.tsx

@@ -62,14 +62,44 @@ export function WorkInProgressRoot(): React.ReactElement {
             <Reputation reputation={player.workRepGained} /> (
             <ReputationRate reputation={player.workRepGainRate * CYCLES_PER_SEC} />) reputation for this faction <br />
             <br />
-            {player.workHackExpGained > 0 && <>{numeralWrapper.formatExp(player.workHackExpGained)} ({numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec) hacking exp <br /></>}
+            {player.workHackExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workHackExpGained)} (
+                {numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec) hacking exp <br />
+              </>
+            )}
             <br />
-            {player.workStrExpGained > 0 && <>{numeralWrapper.formatExp(player.workStrExpGained)} ({numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec) strength exp <br /></>}
-            {player.workDefExpGained > 0 && <>{numeralWrapper.formatExp(player.workDefExpGained)} ({numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec) defense exp <br /></>}
-            {player.workDexExpGained > 0 && <>{numeralWrapper.formatExp(player.workDexExpGained)} ({numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec) dexterity exp <br /></>}
-            {player.workAgiExpGained > 0 && <>{numeralWrapper.formatExp(player.workAgiExpGained)} ({numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec) agility exp <br /></>}
+            {player.workStrExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workStrExpGained)} (
+                {numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec) strength exp <br />
+              </>
+            )}
+            {player.workDefExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDefExpGained)} (
+                {numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec) defense exp <br />
+              </>
+            )}
+            {player.workDexExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDexExpGained)} (
+                {numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec) dexterity exp <br />
+              </>
+            )}
+            {player.workAgiExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workAgiExpGained)} (
+                {numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec) agility exp <br />
+              </>
+            )}
             <br />
-            {player.workChaExpGained > 0 && <>{numeralWrapper.formatExp(player.workChaExpGained)} ({numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec) charisma exp <br /></>}
+            {player.workChaExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workChaExpGained)} (
+                {numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec) charisma exp <br />
+              </>
+            )}
             <br />
             You will automatically finish after working for 20 hours. You can cancel earlier if you wish.
             <br />
@@ -93,6 +123,12 @@ export function WorkInProgressRoot(): React.ReactElement {
       router.toCity();
     }
 
+    function unfocus(): void {
+      router.toFaction(faction);
+      router.toCity();
+      player.stopFocusing();
+    }
+
     let stopText = "";
     if (
       className == CONSTANTS.ClassGymStrength ||
@@ -117,17 +153,50 @@ export function WorkInProgressRoot(): React.ReactElement {
             <br />
             <br />
             You have gained: <br />
-            {player.workHackExpGained > 0 && <>{numeralWrapper.formatExp(player.workHackExpGained)} ({numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec) hacking exp <br /></>}
-            {player.workStrExpGained > 0 && <>{numeralWrapper.formatExp(player.workStrExpGained)} ({numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec) strength exp <br /></>}
-            {player.workDefExpGained > 0 && <>{numeralWrapper.formatExp(player.workDefExpGained)} ({numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec) defense exp <br /></>}
-            {player.workDexExpGained > 0 && <>{numeralWrapper.formatExp(player.workDexExpGained)} ({numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec) dexterity exp <br /></>}
-            {player.workAgiExpGained > 0 && <>{numeralWrapper.formatExp(player.workAgiExpGained)} ({numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec) agility exp <br /></>}
-            {player.workChaExpGained > 0 && <>{numeralWrapper.formatExp(player.workChaExpGained)} ({numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec) charisma exp <br /></>}
+            {player.workHackExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workHackExpGained)} (
+                {numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec) hacking exp <br />
+              </>
+            )}
+            {player.workStrExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workStrExpGained)} (
+                {numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec) strength exp <br />
+              </>
+            )}
+            {player.workDefExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDefExpGained)} (
+                {numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec) defense exp <br />
+              </>
+            )}
+            {player.workDexExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDexExpGained)} (
+                {numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec) dexterity exp <br />
+              </>
+            )}
+            {player.workAgiExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workAgiExpGained)} (
+                {numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec) agility exp <br />
+              </>
+            )}
+            {player.workChaExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workChaExpGained)} (
+                {numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec) charisma exp <br />
+              </>
+            )}
             You may cancel at any time
           </Typography>
         </Grid>
         <Grid item>
-          <Button onClick={cancel}>{stopText}</Button>
+          <Button sx={{ mx: 2 }} onClick={cancel}>
+            {stopText}
+          </Button>
+          <Button onClick={unfocus}>Do something else simultaneously</Button>
         </Grid>
       </Grid>
     );
@@ -173,26 +242,50 @@ export function WorkInProgressRoot(): React.ReactElement {
             <Reputation reputation={player.workRepGained} /> (
             <ReputationRate reputation={player.workRepGainRate * CYCLES_PER_SEC} />) reputation for this company <br />
             <br />
-            {player.workHackExpGained > 0 && <>{numeralWrapper.formatExp(player.workHackExpGained)} (
-            {`${numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) hacking exp <br /></>}
+            {player.workHackExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workHackExpGained)} (
+                {`${numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) hacking exp <br />
+              </>
+            )}
             <br />
-            {player.workStrExpGained > 0 && <>{numeralWrapper.formatExp(player.workStrExpGained)} (
-            {`${numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) strength exp <br /></>}
-            {player.workDefExpGained > 0 && <>{numeralWrapper.formatExp(player.workDefExpGained)} (
-            {`${numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) defense exp <br /></>}
-            {player.workDexExpGained > 0 && <>{numeralWrapper.formatExp(player.workDexExpGained)} (
-            {`${numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) dexterity exp <br /></>}
-            {player.workAgiExpGained > 0 && <>{numeralWrapper.formatExp(player.workAgiExpGained)} (
-            {`${numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) agility exp <br /></>}
+            {player.workStrExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workStrExpGained)} (
+                {`${numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) strength exp <br />
+              </>
+            )}
+            {player.workDefExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDefExpGained)} (
+                {`${numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) defense exp <br />
+              </>
+            )}
+            {player.workDexExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDexExpGained)} (
+                {`${numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) dexterity exp <br />
+              </>
+            )}
+            {player.workAgiExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workAgiExpGained)} (
+                {`${numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) agility exp <br />
+              </>
+            )}
             <br />
-            {player.workChaExpGained > 0 && <>{numeralWrapper.formatExp(player.workChaExpGained)} (
-            {`${numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) charisma exp <br /></>}
+            {player.workChaExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workChaExpGained)} (
+                {`${numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) charisma exp <br />
+              </>
+            )}
             <br />
             You will automatically finish after working for 8 hours. You can cancel earlier if you wish, but you will
             only gain {penaltyString} of the reputation you've earned so far.
@@ -244,26 +337,50 @@ export function WorkInProgressRoot(): React.ReactElement {
             <ReputationRate reputation={player.workRepGainRate * CYCLES_PER_SEC} />
             ) reputation for this company <br />
             <br />
-            {player.workHackExpGained > 0 && <>{numeralWrapper.formatExp(player.workHackExpGained)} (
-            {`${numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) hacking exp <br /></>}
+            {player.workHackExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workHackExpGained)} (
+                {`${numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) hacking exp <br />
+              </>
+            )}
             <br />
-            {player.workStrExpGained > 0 && <>{numeralWrapper.formatExp(player.workStrExpGained)} (
-            {`${numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) strength exp <br /></>}
-            {player.workDefExpGained > 0 && <>{numeralWrapper.formatExp(player.workDefExpGained)} (
-            {`${numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) defense exp <br /></>}
-            {player.workDexExpGained > 0 && <>{numeralWrapper.formatExp(player.workDexExpGained)} (
-            {`${numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) dexterity exp <br /></>}
-            {player.workAgiExpGained > 0 && <>{numeralWrapper.formatExp(player.workAgiExpGained)} (
-            {`${numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) agility exp <br /></>}
+            {player.workStrExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workStrExpGained)} (
+                {`${numeralWrapper.formatExp(player.workStrExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) strength exp <br />
+              </>
+            )}
+            {player.workDefExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDefExpGained)} (
+                {`${numeralWrapper.formatExp(player.workDefExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) defense exp <br />
+              </>
+            )}
+            {player.workDexExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workDexExpGained)} (
+                {`${numeralWrapper.formatExp(player.workDexExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) dexterity exp <br />
+              </>
+            )}
+            {player.workAgiExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workAgiExpGained)} (
+                {`${numeralWrapper.formatExp(player.workAgiExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) agility exp <br />
+              </>
+            )}
             <br />
-            {player.workChaExpGained > 0 && <>{numeralWrapper.formatExp(player.workChaExpGained)} (
-            {`${numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec`}
-            ) charisma exp <br /></>}
+            {player.workChaExpGained > 0 && (
+              <>
+                {numeralWrapper.formatExp(player.workChaExpGained)} (
+                {`${numeralWrapper.formatExp(player.workChaExpGainRate * CYCLES_PER_SEC)} / sec`}
+                ) charisma exp <br />
+              </>
+            )}
             <br />
             You will automatically finish after working for 8 hours. You can cancel earlier if you wish, and there will
             be no penalty because this is a part-time job.
@@ -321,6 +438,14 @@ export function WorkInProgressRoot(): React.ReactElement {
   }
 
   if (player.createProgramName !== "") {
+    function cancel(): void {
+      player.finishCreateProgramWork(true);
+      router.toTerminal();
+    }
+    function unfocus(): void {
+      router.toTerminal();
+      player.stopFocusing();
+    }
     return (
       <Grid container direction="column" justifyContent="center" alignItems="center" style={{ minHeight: "100vh" }}>
         <Grid item>
@@ -336,14 +461,10 @@ export function WorkInProgressRoot(): React.ReactElement {
           </Typography>
         </Grid>
         <Grid item>
-          <Button
-            onClick={() => {
-              player.finishCreateProgramWork(true);
-              router.toTerminal();
-            }}
-          >
+          <Button sx={{ mx: 2 }} onClick={cancel}>
             Cancel work on creating program
           </Button>
+          <Button onClick={unfocus}>Do something else simultaneously</Button>
         </Grid>
       </Grid>
     );