diff --git a/src/Bladeburner.js b/src/Bladeburner.js index 0f661d4b6..33dc06496 100644 --- a/src/Bladeburner.js +++ b/src/Bladeburner.js @@ -31,6 +31,7 @@ import { KEY } from "../utils/helpers/keyCodes"; import { removeChildrenFromElement } from "../utils/uiHelpers/removeChildrenFromElement"; import { appendLineBreaks } from "../utils/uiHelpers/appendLineBreaks"; +import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions"; import { createElement } from "../utils/uiHelpers/createElement"; import { createPopup } from "../utils/uiHelpers/createPopup"; import { removeElement } from "../utils/uiHelpers/removeElement"; @@ -2349,7 +2350,7 @@ Bladeburner.prototype.updateOverviewContent = function() { DomElems.overviewEstComms.childNodes[0].nodeValue = "Est. Synthoid Communities: " + formatNumber(this.getCurrentCity().comms, 0); DomElems.overviewChaos.childNodes[0].nodeValue = "City Chaos: " + formatNumber(this.getCurrentCity().chaos); DomElems.overviewSkillPoints.innerText = "Skill Points: " + formatNumber(this.skillPoints, 0); - DomElems.overviewBonusTime.childNodes[0].nodeValue = "Bonus time: " + this.storedCycles/CyclesPerSecond; + DomElems.overviewBonusTime.childNodes[0].nodeValue = "Bonus time: " + convertTimeMsToTimeElapsedString(this.storedCycles/CyclesPerSecond*1000); DomElems.overviewAugSuccessMult.innerText = "Aug. Success Chance Mult: " + formatNumber(Player.bladeburner_success_chance_mult*100, 1) + "%"; DomElems.overviewAugMaxStaminaMult.innerText = "Aug. Max Stamina Mult: " + formatNumber(Player.bladeburner_max_stamina_mult*100, 1) + "%"; DomElems.overviewAugStaminaGainMult.innerText = "Aug. Stamina Gain Mult: " + formatNumber(Player.bladeburner_stamina_gain_mult*100, 1) + "%"; diff --git a/src/Constants.ts b/src/Constants.ts index f8f27cd90..68a7d2620 100644 --- a/src/Constants.ts +++ b/src/Constants.ts @@ -246,7 +246,8 @@ export let CONSTANTS: IMap = { Misc. * Fixed an issue where SF3 was listed as infinitly repeatable and SF12 as having a limit of 3. - * Fixed an issue where the gang equipment screen would freeze the game if a + * Fixed an issue where the gang equipment screen would freeze the game if a script installed augmentations while it is open. + * All BonusTime now displays in the 'H M S' format ` } diff --git a/src/Corporation/ui/Overview.jsx b/src/Corporation/ui/Overview.jsx index 822566609..0c7c26d33 100644 --- a/src/Corporation/ui/Overview.jsx +++ b/src/Corporation/ui/Overview.jsx @@ -10,6 +10,7 @@ import { CorporationUpgrades } from "../data/CorporationUpgrades"; import { CONSTANTS } from "../../Constants"; import { numeralWrapper } from "../../ui/numeralFormat"; +import { convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions"; export class Overview extends BaseReactComponent { // Generic Function for Creating a button @@ -71,9 +72,9 @@ export class Overview extends BaseReactComponent { `Private Shares: ${numeralWrapper.format(this.corp().totalShares - this.corp().issuedShares - this.corp().numShares, "0.000a")}` + "



"; - const storedTime = this.corp().storedCycles * CONSTANTS.MilliPerCycle / 1000; - if (storedTime > 15) { - txt += `Bonus Time: ${storedTime} seconds

`; + const storedTime = this.corp().storedCycles * CONSTANTS.MilliPerCycle; + if (storedTime > 15000) { + txt += `Bonus time: ${convertTimeMsToTimeElapsedString(storedTime)}

`; } let prodMult = this.corp().getProductionMultiplier(), diff --git a/src/Gang.js b/src/Gang.js index ab25fa74f..171d861cd 100644 --- a/src/Gang.js +++ b/src/Gang.js @@ -33,6 +33,7 @@ import { createPopup } from "../utils/uiHelpers/createPopup"; import { removeChildrenFromElement } from "../utils/uiHelpers/removeChildrenFromElement"; import { removeElement } from "../utils/uiHelpers/removeElement"; import { removeElementById } from "../utils/uiHelpers/removeElementById"; +import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions"; // Constants @@ -1670,7 +1671,7 @@ Gang.prototype.updateGangContent = function() { const CyclesPerSecond = 1000 / Engine._idleSpeed; UIElems.gangInfo.appendChild(createElement("p", { // Stored Cycles - innerText: `Bonus time(s): ${this.storedCycles / CyclesPerSecond}`, + innerText: `Bonus time: ${convertTimeMsToTimeElapsedString(this.storedCycles / CyclesPerSecond*1000)}`, display: "inline-block", tooltip: "You gain bonus time while offline or when the game is inactive (e.g. when the tab is throttled by the browser). " + "Bonus time makes the Gang mechanic progress faster, up to 5x the normal speed",