Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-26 09:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4132 from danielyxie/fix-2962

Browse Source 
UI: FIX #2962 Add a setting to display middle time unit in Time Elapsed String
This commit is contained in:
hydroflame 2022-09-23 01:14:15 -03:00 committed by GitHub
commit 4d40338e0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GameOptions/ui/InterfacePage.tsx
View File

@ -50,6 +50,12 @@ export const InterfacePage = (): React.ReactElement => {
<>If this is set all references to memory will use GiB instead of GB, in accordance with IEC 60027-2.</>
}
/>
<OptionSwitch
checked={Settings.ShowMiddleNullTimeUnit}
onChange={(newValue) => (Settings.ShowMiddleNullTimeUnit = newValue)}
text="Show all intermediary times unit, even when null."
tooltip={<>ex : 1 hours 13 seconds becomes 1 hours 0 minutes 13 seconds.</>}
/>
<Tooltip
title={
<Typography>

7
src/Settings/Settings.ts
View File

@ -154,6 +154,11 @@ interface IDefaultSettings {
*/
UseIEC60027_2: boolean;
/*
* Display intermediary time unit when their value is null
*/
ShowMiddleNullTimeUnit: boolean;
/*
* Character overview settings
*/
@ -222,6 +227,7 @@ export const defaultSettings: IDefaultSettings = {
SuppressSavedGameToast: false,
SuppressAutosaveDisabledWarnings: false,
UseIEC60027_2: false,
ShowMiddleNullTimeUnit: false,
ExcludeRunningScriptsFromSave: false,
IsSidebarOpened: true,
@ -265,6 +271,7 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
SuppressSavedGameToast: defaultSettings.SuppressSavedGameToast,
SuppressAutosaveDisabledWarnings: defaultSettings.SuppressAutosaveDisabledWarnings,
UseIEC60027_2: defaultSettings.UseIEC60027_2,
ShowMiddleNullTimeUnit: defaultSettings.ShowMiddleNullTimeUnit,
ExcludeRunningScriptsFromSave: defaultSettings.ExcludeRunningScriptsFromSave,
IsSidebarOpened: defaultSettings.IsSidebarOpened,

5
src/utils/StringHelperFunctions.ts
View File

@ -1,3 +1,4 @@
import { Settings } from "../Settings/Settings";
import { EqualityFunc } from "../types";
import { isString } from "./helpers/isString";
@ -39,10 +40,10 @@ function convertTimeMsToTimeElapsedString(time: number, showMilli = false): stri
if (days > 0) {
res += `${days} days `;
}
if (hours > 0) {
if (hours > 0 || (Settings.ShowMiddleNullTimeUnit && res != "")) {
res += `${hours} hours `;
}
if (minutes > 0) {
if (minutes > 0 || (Settings.ShowMiddleNullTimeUnit && res != "")) {
res += `${minutes} minutes `;
}
res += `${seconds} seconds`;