Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-20 13:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert more instances of formatNumber to numeralWrapper

Browse Source
This commit is contained in:
Matthew Goff 2018-10-13 09:55:50 -05:00 committed by danielyxie
parent 2521fe201a
commit 44ed46fc7a
2 changed files with 124 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
src/Player.js Normal file → Executable file
View File

@ -20,17 +20,14 @@ import {AllServers, Server, AddToAllServers} from "./Server";
import {Settings} from "./Settings"; import {Settings} from "./Settings";
import {SpecialServerIps, SpecialServerNames} from "./SpecialServerIps"; import {SpecialServerIps, SpecialServerNames} from "./SpecialServerIps";
import {SourceFiles, applySourceFile} from "./SourceFile"; import {SourceFiles, applySourceFile} from "./SourceFile";
import Decimal from "decimal.js"; import Decimal from "decimal.js";
import {numeralWrapper} from "./ui/numeralFormat"; import {numeralWrapper} from "./ui/numeralFormat";
import {dialogBoxCreate} from "../utils/DialogBox"; import {dialogBoxCreate} from "../utils/DialogBox";
import {clearEventListeners} from "../utils/uiHelpers/clearEventListeners"; import {clearEventListeners} from "../utils/uiHelpers/clearEventListeners";
import {createRandomIp} from "../utils/IPAddress"; import {createRandomIp} from "../utils/IPAddress";
import {Reviver, Generic_toJSON, import {Reviver, Generic_toJSON,
Generic_fromJSON} from "../utils/JSONReviver"; Generic_fromJSON} from "../utils/JSONReviver";
import {formatNumber, import {convertTimeMsToTimeElapsedString} from "../utils/StringHelperFunctions";
convertTimeMsToTimeElapsedString} from "../utils/StringHelperFunctions";
const CYCLES_PER_SEC = 1000 / CONSTANTS.MilliPerCycle; const CYCLES_PER_SEC = 1000 / CONSTANTS.MilliPerCycle;
@ -721,17 +718,17 @@ PlayerObject.prototype.work = function(numCycles) {
var txt = document.getElementById("work-in-progress-text"); var txt = document.getElementById("work-in-progress-text");
txt.innerHTML = "You are currently working as a " + this.companyPosition.positionName + txt.innerHTML = "You are currently working as a " + this.companyPosition.positionName +
" at " + this.companyName + " (Current Company Reputation: " + " at " + this.companyName + " (Current Company Reputation: " +
formatNumber(companyRep, 0) + ")<br><br>" + numeralWrapper.format(companyRep, '0,0') + ")<br><br>" +
"You have been working for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" + "You have been working for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" +
"You have earned: <br><br>" + "You have earned: <br><br>" +
"$" + formatNumber(this.workMoneyGained, 2) + " ($" + formatNumber(this.workMoneyGainRate * CYCLES_PER_SEC, 2) + " / sec) <br><br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + " ($" + numeralWrapper.format(this.workMoneyGainRate * CYCLES_PER_SEC, '0,0.00') + " / sec) <br><br>" +
formatNumber(this.workRepGained, 4) + " (" + formatNumber(this.workRepGainRate * CYCLES_PER_SEC, 4) + " / sec) reputation for this company <br><br>" + numeralWrapper.format(this.workRepGained, '0,0.0000') + " (" + numeralWrapper.format(this.workRepGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) reputation for this company <br><br>" +
formatNumber(this.workHackExpGained, 4) + " (" + formatNumber(this.workHackExpGainRate * CYCLES_PER_SEC, 4) + " / sec) hacking exp <br><br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workHackExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) hacking exp <br><br>" +
formatNumber(this.workStrExpGained, 4) + " (" + formatNumber(this.workStrExpGainRate * CYCLES_PER_SEC, 4) + " / sec) strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workStrExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " (" + formatNumber(this.workDefExpGainRate * CYCLES_PER_SEC, 4) + " / sec) defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDefExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " (" + formatNumber(this.workDexExpGainRate * CYCLES_PER_SEC, 4) + " / sec) dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDexExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " (" + formatNumber(this.workAgiExpGainRate * CYCLES_PER_SEC, 4) + " / sec) agility exp <br><br> " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workAgiExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) agility exp <br><br> " +
formatNumber(this.workChaExpGained, 4) + " (" + formatNumber(this.workChaExpGainRate * CYCLES_PER_SEC, 4) + " / sec) charisma exp <br><br>" + numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workChaExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) charisma exp <br><br>" +
"You will automatically finish after working for 8 hours. You can cancel earlier if you wish, " + "You will automatically finish after working for 8 hours. You can cancel earlier if you wish, " +
"but you will only gain half of the reputation you've earned so far." "but you will only gain half of the reputation you've earned so far."
} }
@ -750,14 +747,14 @@ PlayerObject.prototype.finishWork = function(cancelled, sing=false) {
this.updateSkillLevels(); this.updateSkillLevels();
var txt = "You earned a total of: <br>" + var txt = "You earned a total of: <br>" +
"$" + formatNumber(this.workMoneyGained, 2) + "<br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + "<br>" +
formatNumber(this.workRepGained, 4) + " reputation for the company <br>" + numeralWrapper.format(this.workRepGained, '0,0.0000') + " reputation for the company <br>" +
formatNumber(this.workHackExpGained, 4) + " hacking exp <br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp <br>" +
formatNumber(this.workStrExpGained, 4) + " strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " agility exp <br>" + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility exp <br>" +
formatNumber(this.workChaExpGained, 4) + " charisma exp<br>"; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma exp<br>";
if (cancelled) { if (cancelled) {
txt = "You worked a short shift of " + convertTimeMsToTimeElapsedString(this.timeWorked) + " <br><br> " + txt = "You worked a short shift of " + convertTimeMsToTimeElapsedString(this.timeWorked) + " <br><br> " +
@ -774,14 +771,14 @@ PlayerObject.prototype.finishWork = function(cancelled, sing=false) {
if (sing) { if (sing) {
var res = "You worked a short shift of " + convertTimeMsToTimeElapsedString(this.timeWorked) + " and " + var res = "You worked a short shift of " + convertTimeMsToTimeElapsedString(this.timeWorked) + " and " +
"earned $" + formatNumber(this.workMoneyGained, 2) + ", " + "earned $" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + ", " +
formatNumber(this.workRepGained, 4) + " reputation, " + numeralWrapper.format(this.workRepGained, '0,0.0000') + " reputation, " +
formatNumber(this.workHackExpGained, 4) + " hacking exp, " + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp, " +
formatNumber(this.workStrExpGained, 4) + " strength exp, " + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength exp, " +
formatNumber(this.workDefExpGained, 4) + " defense exp, " + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense exp, " +
formatNumber(this.workDexExpGained, 4) + " dexterity exp, " + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity exp, " +
formatNumber(this.workAgiExpGained, 4) + " agility exp, and " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility exp, and " +
formatNumber(this.workChaExpGained, 4) + " charisma exp."; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma exp.";
this.resetWorkStatus(); this.resetWorkStatus();
return res; return res;
} }
@ -843,17 +840,17 @@ PlayerObject.prototype.workPartTime = function(numCycles) {
var txt = document.getElementById("work-in-progress-text"); var txt = document.getElementById("work-in-progress-text");
txt.innerHTML = "You are currently working as a " + this.companyPosition.positionName + txt.innerHTML = "You are currently working as a " + this.companyPosition.positionName +
" at " + Player.companyName + " (Current Company Reputation: " + " at " + Player.companyName + " (Current Company Reputation: " +
formatNumber(companyRep, 0) + ")<br><br>" + numeralWrapper.format(companyRep, '0,0') + ")<br><br>" +
"You have been working for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" + "You have been working for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" +
"You have earned: <br><br>" + "You have earned: <br><br>" +
"$" + formatNumber(this.workMoneyGained, 2) + " ($" + formatNumber(this.workMoneyGainRate * CYCLES_PER_SEC, 2) + " / sec) <br><br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + " ($" + numeralWrapper.format(this.workMoneyGainRate * CYCLES_PER_SEC, '0,0.00') + " / sec) <br><br>" +
formatNumber(this.workRepGained, 4) + " (" + formatNumber(this.workRepGainRate * CYCLES_PER_SEC, 4) + " / sec) reputation for this company <br><br>" + numeralWrapper.format(this.workRepGained, '0,0.0000') + " (" + numeralWrapper.format(this.workRepGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) reputation for this company <br><br>" +
formatNumber(this.workHackExpGained, 4) + " (" + formatNumber(this.workHackExpGainRate * CYCLES_PER_SEC, 4) + " / sec) hacking exp <br><br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workHackExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) hacking exp <br><br>" +
formatNumber(this.workStrExpGained, 4) + " (" + formatNumber(this.workStrExpGainRate * CYCLES_PER_SEC, 4) + " / sec) strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workStrExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " (" + formatNumber(this.workDefExpGainRate * CYCLES_PER_SEC, 4) + " / sec) defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDefExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " (" + formatNumber(this.workDexExpGainRate * CYCLES_PER_SEC, 4) + " / sec) dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDexExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " (" + formatNumber(this.workAgiExpGainRate * CYCLES_PER_SEC, 4) + " / sec) agility exp <br><br> " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workAgiExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) agility exp <br><br> " +
formatNumber(this.workChaExpGained, 4) + " (" + formatNumber(this.workChaExpGainRate * CYCLES_PER_SEC, 4) + " / sec) charisma exp <br><br>" + numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workChaExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) charisma exp <br><br>" +
"You will automatically finish after working for 8 hours. You can cancel earlier if you wish, <br>" + "You will automatically finish after working for 8 hours. You can cancel earlier if you wish, <br>" +
"and there will be no penalty because this is a part-time job."; "and there will be no penalty because this is a part-time job.";
@ -868,14 +865,14 @@ PlayerObject.prototype.finishWorkPartTime = function(sing=false) {
this.updateSkillLevels(); this.updateSkillLevels();
var txt = "You earned a total of: <br>" + var txt = "You earned a total of: <br>" +
"$" + formatNumber(this.workMoneyGained, 2) + "<br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + "<br>" +
formatNumber(this.workRepGained, 4) + " reputation for the company <br>" + numeralWrapper.format(this.workRepGained, '0,0.0000') + " reputation for the company <br>" +
formatNumber(this.workHackExpGained, 4) + " hacking exp <br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp <br>" +
formatNumber(this.workStrExpGained, 4) + " strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " agility exp <br>" + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility exp <br>" +
formatNumber(this.workChaExpGained, 4) + " charisma exp<br>"; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma exp<br>";
txt = "You worked for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br> " + txt; txt = "You worked for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br> " + txt;
if (!sing) {dialogBoxCreate(txt);} if (!sing) {dialogBoxCreate(txt);}
@ -886,14 +883,14 @@ PlayerObject.prototype.finishWorkPartTime = function(sing=false) {
if (sing) { if (sing) {
var res = "You worked for " + convertTimeMsToTimeElapsedString(this.timeWorked) + " and " + var res = "You worked for " + convertTimeMsToTimeElapsedString(this.timeWorked) + " and " +
"earned a total of " + "earned a total of " +
"$" + formatNumber(this.workMoneyGained, 2) + ", " + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + ", " +
formatNumber(this.workRepGained, 4) + " reputation, " + numeralWrapper.format(this.workRepGained, '0,0.0000') + " reputation, " +
formatNumber(this.workHackExpGained, 4) + " hacking exp, " + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp, " +
formatNumber(this.workStrExpGained, 4) + " strength exp, " + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength exp, " +
formatNumber(this.workDefExpGained, 4) + " defense exp, " + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense exp, " +
formatNumber(this.workDexExpGained, 4) + " dexterity exp, " + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity exp, " +
formatNumber(this.workAgiExpGained, 4) + " agility exp, and " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility exp, and " +
formatNumber(this.workChaExpGained, 4) + " charisma exp"; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma exp";
this.resetWorkStatus(); this.resetWorkStatus();
return res; return res;
} }
@ -1012,17 +1009,17 @@ PlayerObject.prototype.workForFaction = function(numCycles) {
var txt = document.getElementById("work-in-progress-text"); var txt = document.getElementById("work-in-progress-text");
txt.innerHTML = "You are currently " + this.currentWorkFactionDescription + " for your faction " + faction.name + txt.innerHTML = "You are currently " + this.currentWorkFactionDescription + " for your faction " + faction.name +
" (Current Faction Reputation: " + formatNumber(faction.playerReputation, 0) + "). <br>" + " (Current Faction Reputation: " + numeralWrapper.format(faction.playerReputation, '0,0') + "). <br>" +
"You have been doing this for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" + "You have been doing this for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" +
"You have earned: <br><br>" + "You have earned: <br><br>" +
"$" + formatNumber(this.workMoneyGained, 2) + " (" + formatNumber(this.workMoneyGainRate * CYCLES_PER_SEC, 2) + " / sec) <br><br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + " (" + numeralWrapper.format(this.workMoneyGainRate * CYCLES_PER_SEC, '0,0.00') + " / sec) <br><br>" +
formatNumber(this.workRepGained, 4) + " (" + formatNumber(this.workRepGainRate * CYCLES_PER_SEC, 4) + " / sec) reputation for this faction <br><br>" + numeralWrapper.format(this.workRepGained, '0,0.0000') + " (" + numeralWrapper.format(this.workRepGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) reputation for this faction <br><br>" +
formatNumber(this.workHackExpGained, 4) + " (" + formatNumber(this.workHackExpGainRate * CYCLES_PER_SEC, 4) + " / sec) hacking exp <br><br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workHackExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) hacking exp <br><br>" +
formatNumber(this.workStrExpGained, 4) + " (" + formatNumber(this.workStrExpGainRate * CYCLES_PER_SEC, 4) + " / sec) strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workStrExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " (" + formatNumber(this.workDefExpGainRate * CYCLES_PER_SEC, 4) + " / sec) defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDefExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " (" + formatNumber(this.workDexExpGainRate * CYCLES_PER_SEC, 4) + " / sec) dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDexExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " (" + formatNumber(this.workAgiExpGainRate * CYCLES_PER_SEC, 4) + " / sec) agility exp <br><br> " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workAgiExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) agility exp <br><br> " +
formatNumber(this.workChaExpGained, 4) + " (" + formatNumber(this.workChaExpGainRate * CYCLES_PER_SEC, 4) + " / sec) charisma exp <br><br>" + numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workChaExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) charisma exp <br><br>" +
"You will automatically finish after working for 20 hours. You can cancel earlier if you wish.<br>" + "You will automatically finish after working for 20 hours. You can cancel earlier if you wish.<br>" +
"There is no penalty for cancelling earlier."; "There is no penalty for cancelling earlier.";
@ -1038,14 +1035,14 @@ PlayerObject.prototype.finishFactionWork = function(cancelled, sing=false) {
var txt = "You worked for your faction " + faction.name + " for a total of " + convertTimeMsToTimeElapsedString(this.timeWorked) + " <br><br> " + var txt = "You worked for your faction " + faction.name + " for a total of " + convertTimeMsToTimeElapsedString(this.timeWorked) + " <br><br> " +
"You earned a total of: <br>" + "You earned a total of: <br>" +
"$" + formatNumber(this.workMoneyGained, 2) + "<br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + "<br>" +
formatNumber(this.workRepGained, 4) + " reputation for the faction <br>" + numeralWrapper.format(this.workRepGained, '0,0.0000') + " reputation for the faction <br>" +
formatNumber(this.workHackExpGained, 4) + " hacking exp <br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp <br>" +
formatNumber(this.workStrExpGained, 4) + " strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " agility exp <br>" + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility exp <br>" +
formatNumber(this.workChaExpGained, 4) + " charisma exp<br>"; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma exp<br>";
if (!sing) {dialogBoxCreate(txt);} if (!sing) {dialogBoxCreate(txt);}
var mainMenu = document.getElementById("mainmenu-container"); var mainMenu = document.getElementById("mainmenu-container");
@ -1058,13 +1055,13 @@ PlayerObject.prototype.finishFactionWork = function(cancelled, sing=false) {
if (sing) { if (sing) {
var res="You worked for your faction " + faction.name + " for a total of " + convertTimeMsToTimeElapsedString(this.timeWorked) + ". " + var res="You worked for your faction " + faction.name + " for a total of " + convertTimeMsToTimeElapsedString(this.timeWorked) + ". " +
"You earned " + "You earned " +
formatNumber(this.workRepGained, 4) + " rep, " + numeralWrapper.format(this.workRepGained, '0,0.0000') + " rep, " +
formatNumber(this.workHackExpGained, 4) + " hacking exp, " + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp, " +
formatNumber(this.workStrExpGained, 4) + " str exp, " + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " str exp, " +
formatNumber(this.workDefExpGained, 4) + " def exp, " + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " def exp, " +
formatNumber(this.workDexExpGained, 4) + " dex exp, " + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dex exp, " +
formatNumber(this.workAgiExpGained, 4) + " agi exp, and " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agi exp, and " +
formatNumber(this.workChaExpGained, 4) + " cha exp."; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " cha exp.";
this.resetWorkStatus(); this.resetWorkStatus();
return res; return res;
} }
@ -1350,14 +1347,14 @@ PlayerObject.prototype.takeClass = function(numCycles) {
var txt = document.getElementById("work-in-progress-text"); var txt = document.getElementById("work-in-progress-text");
txt.innerHTML = "You have been " + className + " for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" + txt.innerHTML = "You have been " + className + " for " + convertTimeMsToTimeElapsedString(this.timeWorked) + "<br><br>" +
"This has cost you: <br>" + "This has cost you: <br>" +
"$" + formatNumber(this.workMoneyGained, 2) + " ($" + formatNumber(this.workMoneyLossRate * CYCLES_PER_SEC, 2) + " / sec) <br><br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + " ($" + numeralWrapper.format(this.workMoneyLossRate * CYCLES_PER_SEC, '0,0.00') + " / sec) <br><br>" +
"You have gained: <br>" + "You have gained: <br>" +
formatNumber(this.workHackExpGained, 4) + " (" + formatNumber(this.workHackExpGainRate * CYCLES_PER_SEC, 4) + " / sec) hacking exp <br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workHackExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) hacking exp <br>" +
formatNumber(this.workStrExpGained, 4) + " (" + formatNumber(this.workStrExpGainRate * CYCLES_PER_SEC, 4) + " / sec) strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workStrExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " (" + formatNumber(this.workDefExpGainRate * CYCLES_PER_SEC, 4) + " / sec) defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDefExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " (" + formatNumber(this.workDexExpGainRate * CYCLES_PER_SEC, 4) + " / sec) dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workDexExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " (" + formatNumber(this.workAgiExpGainRate * CYCLES_PER_SEC, 4) + " / sec) agility exp <br>" + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workAgiExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) agility exp <br>" +
formatNumber(this.workChaExpGained, 4) + " (" + formatNumber(this.workChaExpGainRate * CYCLES_PER_SEC, 4) + " / sec) charisma exp <br>" + numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " (" + numeralWrapper.format(this.workChaExpGainRate * CYCLES_PER_SEC, '0,0.0000') + " / sec) charisma exp <br>" +
"You may cancel at any time"; "You may cancel at any time";
} }
@ -1373,14 +1370,14 @@ PlayerObject.prototype.finishClass = function(sing=false) {
this.updateSkillLevels(); this.updateSkillLevels();
var txt = "After " + this.className + " for " + convertTimeMsToTimeElapsedString(this.timeWorked) + ", <br>" + var txt = "After " + this.className + " for " + convertTimeMsToTimeElapsedString(this.timeWorked) + ", <br>" +
"you spent a total of $" + formatNumber(this.workMoneyGained * -1, 2) + ". <br><br>" + "you spent a total of $" + numeralWrapper.format(this.workMoneyGained * -1, '0,0.00') + ". <br><br>" +
"You earned a total of: <br>" + "You earned a total of: <br>" +
formatNumber(this.workHackExpGained, 4) + " hacking exp <br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp <br>" +
formatNumber(this.workStrExpGained, 4) + " strength exp <br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength exp <br>" +
formatNumber(this.workDefExpGained, 4) + " defense exp <br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense exp <br>" +
formatNumber(this.workDexExpGained, 4) + " dexterity exp <br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity exp <br>" +
formatNumber(this.workAgiExpGained, 4) + " agility exp <br>" + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility exp <br>" +
formatNumber(this.workChaExpGained, 4) + " charisma exp<br>"; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma exp<br>";
if (!sing) {dialogBoxCreate(txt);} if (!sing) {dialogBoxCreate(txt);}
var mainMenu = document.getElementById("mainmenu-container"); var mainMenu = document.getElementById("mainmenu-container");
@ -1391,14 +1388,14 @@ PlayerObject.prototype.finishClass = function(sing=false) {
Engine.loadLocationContent(); Engine.loadLocationContent();
if (sing) { if (sing) {
var res="After " + this.className + " for " + convertTimeMsToTimeElapsedString(this.timeWorked) + ", " + var res="After " + this.className + " for " + convertTimeMsToTimeElapsedString(this.timeWorked) + ", " +
"you spent a total of $" + formatNumber(this.workMoneyGained * -1, 2) + ". " + "you spent a total of $" + numeralWrapper.format(this.workMoneyGained * -1, '0,0.00') + ". " +
"You earned a total of: " + "You earned a total of: " +
formatNumber(this.workHackExpGained, 3) + " hacking exp, " + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking exp, " +
formatNumber(this.workStrExpGained, 3) + " strength exp, " + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength exp, " +
formatNumber(this.workDefExpGained, 3) + " defense exp, " + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense exp, " +
formatNumber(this.workDexExpGained, 3) + " dexterity exp, " + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity exp, " +
formatNumber(this.workAgiExpGained, 3) + " agility exp, and " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility exp, and " +
formatNumber(this.workChaExpGained, 3) + " charisma exp"; numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma exp";
this.resetWorkStatus(); this.resetWorkStatus();
return res; return res;
} }
@ -1489,23 +1486,23 @@ PlayerObject.prototype.finishCrime = function(cancelled) {
if(this.singFnCrimeWorkerScript.disableLogs.ALL == null && this.singFnCrimeWorkerScript.disableLogs.commitCrime == null) { if(this.singFnCrimeWorkerScript.disableLogs.ALL == null && this.singFnCrimeWorkerScript.disableLogs.commitCrime == null) {
this.singFnCrimeWorkerScript.scriptRef.log("Crime successful! Gained " + this.singFnCrimeWorkerScript.scriptRef.log("Crime successful! Gained " +
numeralWrapper.format(this.workMoneyGained, "$0.000a") + ", " + numeralWrapper.format(this.workMoneyGained, "$0.000a") + ", " +
formatNumber(this.workHackExpGained, 3) + " hack exp, " + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hack exp, " +
formatNumber(this.workStrExpGained, 3) + " str exp, " + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " str exp, " +
formatNumber(this.workDefExpGained, 3) + " def exp, " + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " def exp, " +
formatNumber(this.workDexExpGained, 3) + " dex exp, " + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dex exp, " +
formatNumber(this.workAgiExpGained, 3) + " agi exp, " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agi exp, " +
formatNumber(this.workChaExpGained, 3) + " cha exp."); numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " cha exp.");
} }
} else { } else {
dialogBoxCreate("Crime successful! <br><br>" + dialogBoxCreate("Crime successful! <br><br>" +
"You gained:<br>"+ "You gained:<br>"+
"$" + formatNumber(this.workMoneyGained, 2) + "<br>" + "$" + numeralWrapper.format(this.workMoneyGained, '0,0.00') + "<br>" +
formatNumber(this.workHackExpGained, 4) + " hacking experience <br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking experience <br>" +
formatNumber(this.workStrExpGained, 4) + " strength experience<br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength experience<br>" +
formatNumber(this.workDefExpGained, 4) + " defense experience<br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense experience<br>" +
formatNumber(this.workDexExpGained, 4) + " dexterity experience<br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity experience<br>" +
formatNumber(this.workAgiExpGained, 4) + " agility experience<br>" + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility experience<br>" +
formatNumber(this.workChaExpGained, 4) + " charisma experience"); numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma experience");
} }
} else { } else {
@ -1519,22 +1516,22 @@ PlayerObject.prototype.finishCrime = function(cancelled) {
if (this.committingCrimeThruSingFn) { if (this.committingCrimeThruSingFn) {
if(this.singFnCrimeWorkerScript.disableLogs.ALL == null && this.singFnCrimeWorkerScript.disableLogs.commitCrime == null) { if(this.singFnCrimeWorkerScript.disableLogs.ALL == null && this.singFnCrimeWorkerScript.disableLogs.commitCrime == null) {
this.singFnCrimeWorkerScript.scriptRef.log("Crime failed! Gained " + this.singFnCrimeWorkerScript.scriptRef.log("Crime failed! Gained " +
formatNumber(this.workHackExpGained, 3) + " hack exp, " + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hack exp, " +
formatNumber(this.workStrExpGained, 3) + " str exp, " + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " str exp, " +
formatNumber(this.workDefExpGained, 3) + " def exp, " + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " def exp, " +
formatNumber(this.workDexExpGained, 3) + " dex exp, " + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dex exp, " +
formatNumber(this.workAgiExpGained, 3) + " agi exp, " + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agi exp, " +
formatNumber(this.workChaExpGained, 3) + " cha exp."); numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " cha exp.");
} }
} else { } else {
dialogBoxCreate("Crime failed! <br><br>" + dialogBoxCreate("Crime failed! <br><br>" +
"You gained:<br>"+ "You gained:<br>"+
formatNumber(this.workHackExpGained, 4) + " hacking experience <br>" + numeralWrapper.format(this.workHackExpGained, '0,0.0000') + " hacking experience <br>" +
formatNumber(this.workStrExpGained, 4) + " strength experience<br>" + numeralWrapper.format(this.workStrExpGained, '0,0.0000') + " strength experience<br>" +
formatNumber(this.workDefExpGained, 4) + " defense experience<br>" + numeralWrapper.format(this.workDefExpGained, '0,0.0000') + " defense experience<br>" +
formatNumber(this.workDexExpGained, 4) + " dexterity experience<br>" + numeralWrapper.format(this.workDexExpGained, '0,0.0000') + " dexterity experience<br>" +
formatNumber(this.workAgiExpGained, 4) + " agility experience<br>" + numeralWrapper.format(this.workAgiExpGained, '0,0.0000') + " agility experience<br>" +
formatNumber(this.workChaExpGained, 4) + " charisma experience"); numeralWrapper.format(this.workChaExpGained, '0,0.0000') + " charisma experience");
} }
} }

6
src/SaveObject.js Normal file → Executable file
View File

@ -24,7 +24,7 @@ import {Reviver, Generic_toJSON,
import {createElement} from "../utils/uiHelpers/createElement"; import {createElement} from "../utils/uiHelpers/createElement";
import {createPopup} from "../utils/uiHelpers/createPopup"; import {createPopup} from "../utils/uiHelpers/createPopup";
import {createStatusText} from "./ui/createStatusText"; import {createStatusText} from "./ui/createStatusText";
import {formatNumber} from "../utils/StringHelperFunctions"; import {numeralWrapper} from "./ui/numeralFormat";
import {removeElementById} from "../utils/uiHelpers/removeElementById"; import {removeElementById} from "../utils/uiHelpers/removeElementById";
import Decimal from "decimal.js"; import Decimal from "decimal.js";
@ -517,8 +517,8 @@ function loadImportedGame(saveObj, saveString) {
Player.lastUpdate = Engine._lastUpdate; Player.lastUpdate = Engine._lastUpdate;
Engine.start(); //Run main game loop and Scripts loop Engine.start(); //Run main game loop and Scripts loop
dialogBoxCreate("While you were offline, your scripts generated <span class='money-gold'>$" + dialogBoxCreate("While you were offline, your scripts generated <span class='money-gold'>$" +
formatNumber(offlineProductionFromScripts, 2) + "</span> and your Hacknet Nodes generated <span class='money-gold'>$" + numeralWrapper.format(offlineProductionFromScripts, '0,0.00') + "</span> and your Hacknet Nodes generated <span class='money-gold'>$" +
formatNumber(offlineProductionFromHacknetNodes, 2) + "</span>"); numeralWrapper.format(offlineProductionFromHacknetNodes, '0,0.00') + "</span>");
return true; return true;
} }