more work on bn13

src/ui/React/GameOptionsRoot.tsx

@@ -19,6 +19,7 @@ import List from "@mui/material/List";
 import ListItem from "@mui/material/ListItem";
 import Link from "@mui/material/Link";
 import Tooltip from "@mui/material/Tooltip";
+import TextField from "@mui/material/TextField";
 
 import DownloadIcon from "@mui/icons-material/Download";
 import UploadIcon from "@mui/icons-material/Upload";
@@ -30,6 +31,7 @@ import { ThemeEditorModal } from "./ThemeEditorModal";
 
 import { Settings } from "../../Settings/Settings";
 import { save, deleteGame } from "../../db";
+import { formatTime } from "../../utils/helpers/formatTime";
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -66,9 +68,6 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
   const [suppressBuyAugmentationConfirmation, setSuppressBuyAugmentationConfirmation] = useState(
     Settings.SuppressBuyAugmentationConfirmation,
   );
-  const [suppressHospitalizationPopup, setSuppressHospitalizationPopup] = useState(
-    Settings.SuppressHospitalizationPopup,
-  );
 
   const [suppressBladeburnerPopup, setSuppressBladeburnerPopup] = useState(Settings.SuppressBladeburnerPopup);
 
@@ -76,7 +75,7 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
   const [disableASCIIArt, setDisableASCIIArt] = useState(Settings.DisableASCIIArt);
   const [disableTextEffects, setDisableTextEffects] = useState(Settings.DisableTextEffects);
   const [enableBashHotkeys, setEnableBashHotkeys] = useState(Settings.EnableBashHotkeys);
-  const [enableTimestamps, setEnableTimestamps] = useState(Settings.EnableTimestamps);
+  const [timestampFormat, setTimestampFormat] = useState(Settings.TimestampsFormat);
   const [saveGameOnFileSave, setSaveGameOnFileSave] = useState(Settings.SaveGameOnFileSave);
 
   const [locale, setLocale] = useState(Settings.Locale);
@@ -129,11 +128,6 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
     Settings.SuppressBuyAugmentationConfirmation = event.target.checked;
   }
 
-  function handleSuppressHospitalizationPopupChange(event: React.ChangeEvent<HTMLInputElement>): void {
-    setSuppressHospitalizationPopup(event.target.checked);
-    Settings.SuppressHospitalizationPopup = event.target.checked;
-  }
-
   function handleSuppressBladeburnerPopupChange(event: React.ChangeEvent<HTMLInputElement>): void {
     setSuppressBladeburnerPopup(event.target.checked);
     Settings.SuppressBladeburnerPopup = event.target.checked;
@@ -162,9 +156,9 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
     setEnableBashHotkeys(event.target.checked);
     Settings.EnableBashHotkeys = event.target.checked;
   }
-  function handleEnableTimestampsChange(event: React.ChangeEvent<HTMLInputElement>): void {
-    setEnableTimestamps(event.target.checked);
-    Settings.EnableTimestamps = event.target.checked;
+  function handleTimestampFormatChange(event: React.ChangeEvent<HTMLInputElement>): void {
+    setTimestampFormat(event.target.value);
+    Settings.TimestampsFormat = event.target.value;
   }
   function handleSaveGameOnFile(event: React.ChangeEvent<HTMLInputElement>): void {
     setSaveGameOnFileSave(event.target.checked);
@@ -229,7 +223,7 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
                 value={execTime}
                 onChange={handleExecTimeChange}
                 step={1}
-                min={10}
+                min={5}
                 max={100}
                 valueLabelDisplay="auto"
               />
@@ -326,7 +320,7 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
                       </Typography>
                     }
                   >
-                    <Typography>Suppress messages</Typography>
+                    <Typography>Suppress story messages</Typography>
                   </Tooltip>
                 }
               />
@@ -388,25 +382,6 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
                 }
               />
             </ListItem>
-            <ListItem>
-              <FormControlLabel
-                control={
-                  <Switch checked={suppressHospitalizationPopup} onChange={handleSuppressHospitalizationPopupChange} />
-                }
-                label={
-                  <Tooltip
-                    title={
-                      <Typography>
-                        If this is set, a popup message will no longer be shown when you are hospitalized after taking
-                        too much damage.
-                      </Typography>
-                    }
-                  >
-                    <Typography>Suppress hospitalization popup</Typography>
-                  </Tooltip>
-                }
-              />
-            </ListItem>
             {!!props.player.bladeburner && (
               <ListItem>
                 <FormControlLabel
@@ -493,21 +468,34 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
               />
             </ListItem>
             <ListItem>
-              <FormControlLabel
-                control={<Switch checked={enableTimestamps} onChange={handleEnableTimestampsChange} />}
-                label={
-                  <Tooltip
-                    title={
-                      <Typography>
-                        Terminal commands and log entries will be timestamped. The timestamp will have the format: M/D
-                        h:m
-                      </Typography>
-                    }
-                  >
-                    <Typography>Enable timestamps</Typography>
-                  </Tooltip>
+              <Tooltip
+                title={
+                  <Typography>
+                    Terminal commands and log entries will be timestamped. See
+                    https://date-fns.org/docs/Getting-Started/
+                  </Typography>
                 }
-              />
+              >
+                <span>
+                  <TextField
+                    InputProps={{
+                      startAdornment: (
+                        <Typography
+                          color={
+                            formatTime(timestampFormat) === "format error" && timestampFormat !== ""
+                              ? "error"
+                              : "success"
+                          }
+                        >
+                          Timestamp&nbsp;format:&nbsp;
+                        </Typography>
+                      ),
+                    }}
+                    value={timestampFormat}
+                    onChange={handleTimestampFormatChange}
+                  />
+                </span>
+              </Tooltip>
             </ListItem>
 
             <ListItem>