diff --git a/src/Bladeburner/Bladeburner.ts b/src/Bladeburner/Bladeburner.ts index 3da34f507..4b65ac0a9 100644 --- a/src/Bladeburner/Bladeburner.ts +++ b/src/Bladeburner/Bladeburner.ts @@ -33,7 +33,7 @@ import { Factions } from "../Faction/Factions"; import { calculateHospitalizationCost } from "../Hospital/Hospital"; import { dialogBoxCreate } from "../ui/React/DialogBox"; import { Settings } from "../Settings/Settings"; -import { getTimestamp } from "../utils/helpers/getTimestamp"; +import { formatTime } from "../utils/helpers/formatTime"; import { joinFaction } from "../Faction/FactionHelpers"; import { isSleeveInfiltrateWork } from "../PersonObjects/Sleeve/Work/SleeveInfiltrateWork"; import { isSleeveSupportWork } from "../PersonObjects/Sleeve/Work/SleeveSupportWork"; @@ -185,7 +185,9 @@ export class Bladeburner { log(input: string): void { // Adds a timestamp and then just calls postToConsole - this.postToConsole(`[${getTimestamp()}] ${input}`); + this.postToConsole( + `[${formatTime(Settings.TimestampsFormat !== "" ? Settings.TimestampsFormat : "yyyy-MM-dd HH:mm:ss")}] ${input}`, + ); } resetAction(): void { diff --git a/src/utils/helpers/getTimestamp.ts b/src/utils/helpers/getTimestamp.ts deleted file mode 100644 index c1f989b33..000000000 --- a/src/utils/helpers/getTimestamp.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** Returns a MM/DD HH:MM timestamp for the current time */ -export function getTimestamp(): string { - const d: Date = new Date(); - // A negative slice value takes from the end of the string rather than the beginning. - const stringWidth = -2; - const formattedHours: string = `0${d.getHours()}`.slice(stringWidth); - const formattedMinutes: string = `0${d.getMinutes()}`.slice(stringWidth); - const formattedSeconds: string = `0${d.getSeconds()}`.slice(stringWidth); - - return `${d.getMonth() + 1}/${d.getDate()} ${formattedHours}:${formattedMinutes}:${formattedSeconds}`; -}