diff --git a/src/Bladeburner.js b/src/Bladeburner.js index 2ff0b5850..abd21897b 100644 --- a/src/Bladeburner.js +++ b/src/Bladeburner.js @@ -50,6 +50,9 @@ import { createPopup } from "../utils/uiHelpers/createPopup"; import { removeElement } from "../utils/uiHelpers/removeElement"; import { removeElementById } from "../utils/uiHelpers/removeElementById"; +import { StatsTable } from "./ui/React/StatsTable"; +import ReactDOM from "react-dom"; + const stealthIcon = ` ` const killIcon = `` @@ -1211,10 +1214,7 @@ Bladeburner.prototype.initializeDomElementRefs = function() { overviewChaos: null, overviewSkillPoints: null, overviewBonusTime: null, - overviewAugSuccessMult: null, - overviewAugMaxStaminaMult: null, - overviewAugStaminaGainMult: null, - overviewAugAnalysisMult: null, + overviewAugMults: null, // Actions and Skills Content actionsAndSkillsDesc: null, @@ -1397,10 +1397,7 @@ Bladeburner.prototype.createOverviewContent = function() { DomElems.overviewSkillPoints = createElement("p", {display:"block"}); - DomElems.overviewAugSuccessMult = createElement("p", {display:"block"}); - DomElems.overviewAugMaxStaminaMult = createElement("p", {display:"block"}); - DomElems.overviewAugStaminaGainMult = createElement("p", {display:"block"}); - DomElems.overviewAugAnalysisMult = createElement("p", {display:"block"}); + DomElems.overviewAugMults = createElement("div", {display:"block"}); DomElems.overviewDiv.appendChild(DomElems.overviewRank); @@ -1418,10 +1415,7 @@ Bladeburner.prototype.createOverviewContent = function() { DomElems.overviewDiv.appendChild(DomElems.overviewBonusTime); DomElems.overviewDiv.appendChild(DomElems.overviewSkillPoints); appendLineBreaks(DomElems.overviewDiv, 1); - DomElems.overviewDiv.appendChild(DomElems.overviewAugSuccessMult); - DomElems.overviewDiv.appendChild(DomElems.overviewAugMaxStaminaMult); - DomElems.overviewDiv.appendChild(DomElems.overviewAugStaminaGainMult); - DomElems.overviewDiv.appendChild(DomElems.overviewAugAnalysisMult); + DomElems.overviewDiv.appendChild(DomElems.overviewAugMults); // Travel to new city button appendLineBreaks(DomElems.overviewDiv, 1); @@ -1783,10 +1777,12 @@ Bladeburner.prototype.updateOverviewContent = function() { 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: " + convertTimeMsToTimeElapsedString(this.storedCycles/BladeburnerConstants.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) + "%"; - DomElems.overviewAugAnalysisMult.innerText = "Aug. Field Analysis Mult: " + formatNumber(Player.bladeburner_analysis_mult*100, 1) + "%"; + ReactDOM.render(StatsTable([ + ["Aug. Success Chance mult: ", formatNumber(Player.bladeburner_success_chance_mult*100, 1) + "%"], + ["Aug. Max Stamina mult: ", formatNumber(Player.bladeburner_max_stamina_mult*100, 1) + "%"], + ["Aug. Stamina Gain mult: ", formatNumber(Player.bladeburner_stamina_gain_mult*100, 1) + "%"], + ["Aug. Field Analysis mult: ", formatNumber(Player.bladeburner_analysis_mult*100, 1) + "%"], + ]), DomElems.overviewAugMults); } Bladeburner.prototype.updateActionAndSkillsContent = function() { diff --git a/src/Faction/ui/PurchaseableAugmentation.tsx b/src/Faction/ui/PurchaseableAugmentation.tsx index 89a8cb04e..0ac99525c 100644 --- a/src/Faction/ui/PurchaseableAugmentation.tsx +++ b/src/Faction/ui/PurchaseableAugmentation.tsx @@ -119,7 +119,7 @@ export class PurchaseableAugmentation extends React.Component { statusTxt = `UNLOCKED - ${numeralWrapper.formatMoney(moneyCost)}`; } else { disabled = true; - statusTxt = `LOCKED (Requires ${numeralWrapper.format(repCost, "0,0.0")} faction reputation - ${numeralWrapper.formatMoney(moneyCost)})`; + statusTxt = `LOCKED (Requires ${numeralWrapper.format(repCost, "0.000a")} faction reputation - ${numeralWrapper.formatMoney(moneyCost)})`; color = "red"; }