diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index ee4f7e5797d66dbfbd5d95120b2df0f6f5201d8c..408f3ea2a3ea14758a3233799ab6df730b1b3660 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -4121,9 +4121,13 @@ window.commaNum = function(s) {
return s.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
};
-window.cashFormat = function(s) {
+window.cashNumFormat = function(s) {
if(!s) { s = 0; }
- return "¤"+commaNum(Math.round(s * 100) / 100);
+ return commaNum(Math.round(s * 100) / 100);
+};
+
+window.cashFormat = function(s) {
+ return "¤"+cashNumFormat(s);
};
window.isFloat = function(n){
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index cbd57cddbbb24df027b89998e4deed4be55ee83c..b1f8dba638ffacc060ac0bbd0cb18029f1c83e65 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -486,9 +486,13 @@ window.commaNum = function(s) {
return s.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
};
-window.cashFormat = function(s) {
+window.cashNumFormat = function(s) {
if(!s) { s = 0; }
- return "¤"+commaNum(Math.round(s * 100) / 100);
+ return commaNum(Math.round(s * 100) / 100);
+};
+
+window.cashFormat = function(s) {
+ return "¤"+cashNumFormat(s);
};
window.isFloat = function(n){
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 16b8d2741fdc727058c01e4eb974c6889d69805e..b4f671a172d75d17f71180a1567347c03c9aed8f 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -39,7 +39,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
}
</style>
-
+
<table class="finances" border="1">
<tr>
<th><h2>Jobs</h2></th>
@@ -47,128 +47,128 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<th>Expense</th>
<th>Totals</th>
</tr>
-
+
<<if $lastWeeksCashIncome.whore || $lastWeeksCashExpenses.whore>> /* If it's not 0, it will return true. */
<tr>
<td>Whores</td>
- <td>$lastWeeksCashIncome.whore</td>
- <td>$lastWeeksCashExpenses.whore</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.whore)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.whore)>></td>
<td>
<<set $lastWeeksCashProfits.whore = ($lastWeeksCashIncome.whore + $lastWeeksCashExpenses.whore)>>
- $lastWeeksCashProfits.whore
+ <<= cashNumFormat($lastWeeksCashProfits.whore)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.rest || $lastWeeksCashExpenses.rest>>
<tr>
<td>Resting</td>
- <td>$lastWeeksCashIncome.rest</td>
- <td>$lastWeeksCashExpenses.rest</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.rest)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.rest)>></td>
<td>
<<set $lastWeeksCashProfits.rest = ($lastWeeksCashIncome.rest + $lastWeeksCashExpenses.rest)>>
- $lastWeeksCashProfits.rest
+ <<= cashNumFormat($lastWeeksCashProfits.rest)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.fucktoy || $lastWeeksCashExpenses.fucktoy>>
<tr>
<td>Fucktoys <<if $Concubine != 0>>including your concubine <</if>>($fuckSlaves slaves)</td>
- <td>Rep: $lastWeeksCashIncome.fucktoy</td>
- <td>$lastWeeksCashExpenses.fucktoy</td>
+ <td>Rep: <<= cashNumFormat($lastWeeksCashIncome.fucktoy)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.fucktoy)>></td>
<td>
<<set $lastWeeksCashProfits.fucktoy = (+ $lastWeeksCashExpenses.fucktoy)>>
- $lastWeeksCashProfits.fucktoy
+ <<= cashNumFormat($lastWeeksCashProfits.fucktoy)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.subordinateSlave || $lastWeeksCashExpenses.subordinateSlave>>
<tr>
<td>subordinateSlaves</td>
- <td>$lastWeeksCashIncome.subordinateSlave</td>
- <td>$lastWeeksCashExpenses.subordinateSlave</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.subordinateSlave)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.subordinateSlave)>></td>
<td>
<<set $lastWeeksCashProfits.subordinateSlave = ($lastWeeksCashIncome.subordinateSlave + $lastWeeksCashExpenses.subordinateSlave)>>
- $lastWeeksCashProfits.subordinateSlave
+ <<= cashNumFormat($lastWeeksCashProfits.subordinateSlave)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.houseServant || $lastWeeksCashExpenses.houseServant>>
<tr>
<td>HouseServants</td>
- <td>$lastWeeksCashIncome.houseServant</td>
- <td>$lastWeeksCashExpenses.houseServant</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.houseServant)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.houseServant)>></td>
<td>
<<set $lastWeeksCashProfits.houseServant = ($lastWeeksCashIncome.houseServant + $lastWeeksCashExpenses.houseServant)>>
- $lastWeeksCashProfits.houseServant
+ <<= cashNumFormat($lastWeeksCashProfits.houseServant)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.confined || $lastWeeksCashExpenses.confined>>
<tr>
<td>Confined</td>
- <td>$lastWeeksCashIncome.confined</td>
- <td>$lastWeeksCashExpenses.confined</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.confined)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.confined)>></td>
<td>
<<set $lastWeeksCashProfits.confined = ($lastWeeksCashIncome.confined + $lastWeeksCashExpenses.confined)>>
- $lastWeeksCashProfits.confined
+ <<= cashNumFormat($lastWeeksCashProfits.confined)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.publicServant || $lastWeeksCashExpenses.publicServant>>
<tr>
<td>Public servants</td>
- <td>Rep: $lastWeeksCashIncome.publicServant</td>
- <td>$lastWeeksCashExpenses.publicServant</td>
+ <td>Rep: <<= cashNumFormat($lastWeeksCashIncome.publicServant)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.publicServant)>></td>
<td>
<<set $lastWeeksCashProfits.publicServant = ($lastWeeksCashIncome.publicServant + $lastWeeksCashExpenses.publicServant)>>
- $lastWeeksCashProfits.publicServant
+ <<= cashNumFormat($lastWeeksCashProfits.publicServant)>>
</td>
</tr>
- <</if>>
-
+ <</if>>
+
<<if $lastWeeksCashIncome.classes || $lastWeeksCashExpenses.classes>>
<tr>
<td>Classes</td>
- <td>$lastWeeksCashIncome.classes</td>
- <td>$lastWeeksCashExpenses.classes</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.classes)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.classes)>></td>
<td>
<<set $lastWeeksCashProfits.classes = ($lastWeeksCashIncome.classes + $lastWeeksCashExpenses.classes)>>
- $lastWeeksCashProfits.classes
+ <<= cashNumFormat($lastWeeksCashProfits.classes)>>
</td>
</tr>
<</if>>
-
-
+
+
<<if $lastWeeksCashIncome.milked || $lastWeeksCashExpenses.milked>>
<tr>
- <td>Milked</td>
- <td>$lastWeeksCashIncome.milked</td>
- <td>$lastWeeksCashExpenses.milked</td>
+ <td>Milked</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.milked)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.milked)>></td>
<td>
<<set $lastWeeksCashProfits.milked = ($lastWeeksCashIncome.milked + $lastWeeksCashExpenses.milked)>>
- $lastWeeksCashProfits.milked
+ <<= cashNumFormat($lastWeeksCashProfits.milked)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.gloryhole || $lastWeeksCashExpenses.gloryhole>>
<tr>
<td>Gloryhole</td>
- <td>$lastWeeksCashIncome.gloryhole</td>
- <td>$lastWeeksCashExpenses.gloryhole</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.gloryhole)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.gloryhole)>></td>
<td>
<<set $lastWeeksCashProfits.gloryhole = ($lastWeeksCashIncome.gloryhole + $lastWeeksCashExpenses.gloryhole)>>
- $lastWeeksCashProfits.gloryhole
+ <<= cashNumFormat($lastWeeksCashProfits.gloryhole)>>
</td>
</tr>
<</if>>
-
+
<tr>
<h2>Structures</h2>
</tr>
@@ -179,11 +179,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $brothel > 0>>
<tr>
<td>[[$brothelName|Brothel][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($brothelSlaves slaves)</td>
- <td>$lastWeeksCashIncome.brothel</td>
- <td>$lastWeeksCashExpenses.brothel</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.brothel)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.brothel)>></td>
<td>
<<set $lastWeeksCashProfits.brothel = ($lastWeeksCashIncome.brothel + $lastWeeksCashExpenses.brothel)>>
- $lastWeeksCashProfits.brothel
+ <<= cashNumFormat($lastWeeksCashProfits.brothel)>>
</td>
</tr>
<</if>>
@@ -191,23 +191,23 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.brothelAds || $lastWeeksCashExpenses.brothelAds>>
<tr>
<td>[[Brothel Ads|Brothel Advertisement][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] also increase the income of whoring slaves in "jobs."</td>
- <td>$lastWeeksCashIncome.brothelAds</td>
- <td>$lastWeeksCashExpenses.brothelAds</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.brothelAds)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.brothelAds)>></td>
<td>
<<set $lastWeeksCashProfits.brothelAds = ($lastWeeksCashIncome.brothelAds + $lastWeeksCashExpenses.brothelAds)>>
- $lastWeeksCashProfits.brothelAds
+ <<= cashNumFormat($lastWeeksCashProfits.brothelAds)>>
</td>
</tr>
<</if>>
-
+
<<if $club > 0>>
<tr>
<td>[[$clubName|Club][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($clubSlaves slaves)</td>
- <td>Rep:$lastWeeksCashIncome.club</td>
- <td>$lastWeeksCashExpenses.club</td>
+ <td>Rep:<<= cashNumFormat($lastWeeksCashIncome.club)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.club)>></td>
<td>
<<set $lastWeeksCashProfits.club = ($lastWeeksCashIncome.club + $lastWeeksCashExpenses.club)>>
- $lastWeeksCashProfits.club
+ <<= cashNumFormat($lastWeeksCashProfits.club)>>
</td>
</tr>
<</if>>
@@ -215,11 +215,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.clubAds || $lastWeeksCashExpenses.clubAds>>
<tr>
<td>[[Club Ads|Club Advertisement][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
- <td>$lastWeeksCashIncome.clubAds</td>
- <td>$lastWeeksCashExpenses.clubAds</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.clubAds)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.clubAds)>></td>
<td>
<<set $lastWeeksCashProfits.clubAds = ($lastWeeksCashIncome.clubAds + $lastWeeksCashExpenses.clubAds)>>
- $lastWeeksCashProfits.clubAds
+ <<= cashNumFormat($lastWeeksCashProfits.clubAds)>>
</td>
</tr>
<</if>>
@@ -227,110 +227,110 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $arcade > 0>>
<tr>
<td>[[$arcadeName|Arcade][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($arcadeSlaves slaves)</td>
- <td>$lastWeeksCashIncome.arcade</td>
- <td>$lastWeeksCashExpenses.arcade</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.arcade)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.arcade)>></td>
<td>
<<set $lastWeeksCashProfits.arcade = ($lastWeeksCashIncome.arcade + $lastWeeksCashExpenses.arcade)>>
- $lastWeeksCashProfits.arcade
+ <<= cashNumFormat($lastWeeksCashProfits.arcade)>>
</td>
</tr>
<</if>>
-
+
<<if $dairy > 0>>
<tr>
<td>[[$dairyName|Dairy][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($dairySlaves slaves)</td>
- <td>$lastWeeksCashIncome.dairy</td>
- <td>$lastWeeksCashExpenses.dairy</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.dairy)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.dairy)>></td>
<td>
<<set $lastWeeksCashProfits.dairy = ($lastWeeksCashIncome.dairy + $lastWeeksCashExpenses.dairy)>>
- $lastWeeksCashProfits.dairy
+ <<= cashNumFormat($lastWeeksCashProfits.dairy)>>
</td>
</tr>
<</if>>
-
- <<if ($servantsQuarters > 0) && ($servantsQuartersUpgradeMonitoring > 0)>>
+
+ <<if ($servantsQuarters > 0) && ($servantsQuartersUpgradeMonitoring > 0)>>
<tr>
<td>[[Servants' Quarters][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($servantsQuartersSlaves slaves)</td>
- <td>$lastWeeksCashIncome.servantsQuarters</td> /*Does not count servants who are serving, only what Stewardess makes. If I can find savings, perhaps show as negative expense? */
- <td>$lastWeeksCashExpenses.servantsQuarters</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.servantsQuarters)>></td> /*Does not count servants who are serving, only what Stewardess makes. If I can find savings, perhaps show as negative expense? */
+ <td><<= cashNumFormat($lastWeeksCashExpenses.servantsQuarters)>></td>
<td>
<<set $lastWeeksCashProfits.servantsQuarters = ($lastWeeksCashIncome.servantsQuarters + $lastWeeksCashExpenses.servantsQuarters)>>
//$lastWeeksCashProfits.servantsQuarters//
</td>
</tr>
<</if>>
-
+
<<if ($masterSuiteUpgradePregnancy == 1)>>
<tr>
<td>[[Master Suite][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($masterSuiteSlaves slaves)</td>
- <td>Rep: $lastWeeksCashIncome.masterSuite</td>
- <td>$lastWeeksCashExpenses.masterSuite</td>
+ <td>Rep: <<= cashNumFormat($lastWeeksCashIncome.masterSuite)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.masterSuite)>></td>
<td>
<<set $lastWeeksCashProfits.masterSuite = ($lastWeeksCashIncome.masterSuite + $lastWeeksCashExpenses.masterSuite)>>
- $lastWeeksCashProfits.masterSuite
+ <<= cashNumFormat($lastWeeksCashProfits.masterSuite)>>
</td>
</tr>
<</if>>
-
+
<<if $schoolroom>>
<tr>
<td>[[$schoolroomName|Schoolroom][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($schoolroomSlaves slaves)</td>
- <td>$lastWeeksCashIncome.school</td>
- <td>$lastWeeksCashExpenses.school</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.school)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.school)>></td>
<td>
<<set $lastWeeksCashProfits.school = ($lastWeeksCashIncome.school + $lastWeeksCashExpenses.school)>>
- $lastWeeksCashProfits.school
+ <<= cashNumFormat($lastWeeksCashProfits.school)>>
</td>
</tr>
<</if>>
-
+
<<if $spa>>
<tr>
<td>[[$spaName|Spa][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($spaSlaves slaves)</td>
- <td>$lastWeeksCashIncome.spa</td>
- <td>$lastWeeksCashExpenses.spa</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.spa)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.spa)>></td>
<td>
<<set $lastWeeksCashProfits.spa = ($lastWeeksCashIncome.spa + $lastWeeksCashExpenses.spa)>>
- $lastWeeksCashProfits.spa
+ <<= cashNumFormat($lastWeeksCashProfits.spa)>>
</td>
</tr>
<</if>>
-
+
<<if $clinic>>
<tr>
<td>[[$clinicName|Clinic][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($clinicSlaves slaves)</td>
- <td>$lastWeeksCashIncome.clinic</td>
- <td>$lastWeeksCashExpenses.clinic</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.clinic)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.clinic)>></td>
<td>
<<set $lastWeeksCashProfits.clinic = ($lastWeeksCashIncome.clinic + $lastWeeksCashExpenses.clinic)>>
- $lastWeeksCashProfits.clinic
+ <<= cashNumFormat($lastWeeksCashProfits.clinic)>>
</td>
</tr>
<</if>>
-
+
<<if $cellblock>>
<tr>
<td>[[$cellblockName|Cellblock][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($cellblockSlaves slaves)</td>
- <td>$lastWeeksCashIncome.cellblock</td>
- <td>$lastWeeksCashExpenses.cellblock</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.cellblock)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.cellblock)>></td>
<td>
<<set $lastWeeksCashProfits.cellblock = ($lastWeeksCashIncome.cellblock + $lastWeeksCashExpenses.cellblock)>>
- $lastWeeksCashProfits.cellblock
+ <<= cashNumFormat($lastWeeksCashProfits.cellblock)>>
</td>
</tr>
<</if>>
-
+
<<if $researchLab.built == "true">>
<tr>
<td>[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]: Maintenance</td>
- <td>$lastWeeksCashIncome.lab</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.lab)>></td>
<td>
<<set $lastWeeksCashExpenses.lab = (100*$researchLab.maxSpace)>>
- $lastWeeksCashExpenses.lab
+ <<= cashNumFormat($lastWeeksCashExpenses.lab)>>
</td>
<td>
<<set $lastWeeksCashProfits.lab = ($lastWeeksCashIncome.lab + $lastWeeksCashExpenses.lab)>>
- $lastWeeksCashProfits.lab
+ <<= cashNumFormat($lastWeeksCashProfits.lab)>>
</td>
</tr>
@@ -339,42 +339,42 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<tr>
<td>[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]: ($researchLab.hired scientists)</td>
<td></td>
- <td><<print (300*$researchLab.hired)>></td>
- <td><<print (300*$researchLab.hired)>></td>
+ <td><<print cashNumFormat(300*$researchLab.hired)>></td>
+ <td><<print cashNumFormat(300*$researchLab.hired)>></td>
</tr>
<</if>>
<<if $researchLab.menials != 0>>
<tr>
<td>[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]: ($researchLab.menials menial Slaves)</td>
<td></td>
- <td><<print (100*$researchLab.menials)>></td>
- <td><<print (100*$researchLab.menials)>></td>
+ <td><<print cashNumFormat(100*$researchLab.menials)>></td>
+ <td><<print cashNumFormat(100*$researchLab.menials)>></td>
</tr>
<</if>>
//
<</if>>
-
+
<<if $lastWeeksCashIncome.cyberMod || $lastWeeksCashExpenses.cyberMod>>
<tr>
<td>CyberMod</td>
- <td>$lastWeeksCashIncome.cyberMod</td>
- <td>$lastWeeksCashExpenses.cyberMod</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.cyberMod)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.cyberMod)>></td>
<td>
<<set $lastWeeksCashProfits.cyberMod = ($lastWeeksCashIncome.cyberMod + $lastWeeksCashExpenses.cyberMod)>>
- $lastWeeksCashProfits.cyberMod
+ <<= cashNumFormat($lastWeeksCashProfits.cyberMod)>>
</td>
</tr>
<</if>>
-
+
<<if $incubator>>
<tr>
<td>[[$incubatorName|Incubator][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($incubatorSlaves slaves)</td>
- <td>$lastWeeksCashIncome.incubator</td>
- <td>$lastWeeksCashExpenses.incubator</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.incubator)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.incubator)>></td>
<td>
<<set $lastWeeksCashProfits.incubator = ($lastWeeksCashIncome.incubator + $lastWeeksCashExpenses.incubator)>>
- $lastWeeksCashProfits.incubator
+ <<= cashNumFormat($lastWeeksCashProfits.incubator)>>
</td>
</tr>
<</if>>
@@ -382,11 +382,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $nursery>>
<tr>
<td>[[$nurseryName|Nursery][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($nurserySlaves slaves)</td>
- <td>$lastWeeksCashIncome.nursery</td>
- <td>$lastWeeksCashExpenses.nursery</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.nursery)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.nursery)>></td>
<td>
<<set $lastWeeksCashProfits.nursery = ($lastWeeksCashIncome.nursery + $lastWeeksCashExpenses.nursery)>>
- $lastWeeksCashProfits.nursery
+ <<= cashNumFormat($lastWeeksCashProfits.nursery)>>
</td>
</tr>
<</if>>
@@ -394,11 +394,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $farmyard>>
<tr>
<td>[[$farmyardName|Farmyard][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($farmyardSlaves slaves)</td>
- <td>$lastWeeksCashIncome.farmyard</td>
- <td>$lastWeeksCashExpenses.farmyard</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.farmyard)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.farmyard)>></td>
<td>
<<set $lastWeeksCashProfits.farmyard = ($lastWeeksCashIncome.farmyard + $lastWeeksCashExpenses.farmyard)>>
- $lastWeeksCashProfits.farmyard
+ <<= cashNumFormat($lastWeeksCashProfits.farmyard)>>
</td>
</tr>
<</if>>
@@ -406,11 +406,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $pit>>
<tr>
<td>[[$pitName|Pit][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($fighterIDs.length fighters)</td>
- <td>$lastWeeksCashIncome.pit</td>
- <td>$lastWeeksCashExpenses.pit</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.pit)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.pit)>></td>
<td>
<<set $lastWeeksCashProfits.pit = ($lastWeeksCashIncome.pit + $lastWeeksCashExpenses.pit)>>
- $lastWeeksCashProfits.pit
+ <<= cashNumFormat($lastWeeksCashProfits.pit)>>
</td>
</tr>
<</if>>
@@ -418,11 +418,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.arcologyImprovement || $lastWeeksCashExpenses.arcologyImprovement>>
<tr>
<td>Arcology construction and repair</td>
- <td>$lastWeeksCashIncome.arcologyImprovement</td>
- <td>$lastWeeksCashExpenses.arcologyImprovement</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.arcologyImprovement)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.arcologyImprovement)>></td>
<td>
<<set $lastWeeksCashProfits.arcologyImprovement = ($lastWeeksCashIncome.arcologyImprovement + $lastWeeksCashExpenses.arcologyImprovement)>>
- $lastWeeksCashProfits.arcologyImprovement
+ <<= cashNumFormat($lastWeeksCashProfits.arcologyImprovement)>>
</td>
</tr>
<</if>>
@@ -430,11 +430,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.environment || $lastWeeksCashExpenses.environment>>
<tr>
<td>Environment</td>
- <td>$lastWeeksCashIncome.environment</td>
- <td>$lastWeeksCashExpenses.environment</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.environment)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.environment)>></td>
<td>
<<set $lastWeeksCashProfits.environment = ($lastWeeksCashIncome.environment + $lastWeeksCashExpenses.environment)>>
- $lastWeeksCashProfits.environment
+ <<= cashNumFormat($lastWeeksCashProfits.environment)>>
</td>
</tr>
<</if>>
@@ -448,38 +448,38 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
Weather
<</if>>
</td>
- <td>$lastWeeksCashIncome.weather</td>
- <td>$lastWeeksCashExpenses.weather</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.weather)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.weather)>></td>
<td>
<<set $lastWeeksCashProfits.weather = ($lastWeeksCashIncome.weather + $lastWeeksCashExpenses.weather)>>
- $lastWeeksCashProfits.weather
+ <<= cashNumFormat($lastWeeksCashProfits.weather)>>
</td>
</tr>
<</if>>
-
+
<tr>
<h2>Slaves</h2>
</tr>
-
+
<tr>
<td>[[Slave maintenance|Costs Report][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] (food, hormones) ($slaves.length slaves)</td>
- <td>$lastWeeksCashIncome.slaveUpkeep</td>
- <td>$lastWeeksCashExpenses.slaveUpkeep</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.slaveUpkeep)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.slaveUpkeep)>></td>
<td>
<<set $lastWeeksCashProfits.slaveUpkeep = ($lastWeeksCashIncome.slaveUpkeep + $lastWeeksCashExpenses.slaveUpkeep)>>
$lastWeeksCashProfits.slaveUpkeep
</td>
</tr>
-
+
<<if $lastWeeksCashIncome.extraMilk || $lastWeeksCashExpenses.extraMilk>>
<tr>
<td>Extra Milk</td>
- <td>$lastWeeksCashIncome.extraMilk</td>
- <td>$lastWeeksCashExpenses.extraMilk</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.extraMilk)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.extraMilk)>></td>
<td>
<<set $lastWeeksCashProfits.extraMilk = ($lastWeeksCashIncome.extraMilk + $lastWeeksCashExpenses.extraMilk)>>
- $lastWeeksCashProfits.extraMilk
+ <<= cashNumFormat($lastWeeksCashProfits.extraMilk)>>
</td>
</tr>
<</if>>
@@ -487,22 +487,22 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.extraMilk || $lastWeeksCashExpenses.extraMilk>>
<tr>
<td>Extra Milk</td>
- <td>$lastWeeksCashIncome.extraMilk</td>
- <td>$lastWeeksCashExpenses.extraMilk</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.extraMilk)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.extraMilk)>></td>
<td>
<<set $lastWeeksCashProfits.extraMilk = ($lastWeeksCashIncome.extraMilk + $lastWeeksCashExpenses.extraMilk)>>
- $lastWeeksCashProfits.extraMilk
+ <<= cashNumFormat($lastWeeksCashProfits.extraMilk)>>
</td>
</tr>
<</if>>
<<if $marketAssistantLimit>>
<tr>
<td>Menials: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td>
- <td>$lastWeeksCashIncome.menialTradesTransfer</td>
- <td>$lastWeeksCashExpenses.menialTradesTransfer</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.menialTradesTransfer)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.menialTradesTransfer)>></td>
<td>
<<set $lastWeeksCashProfits.menialTradesTransfer = ($lastWeeksCashIncome.menialTradesTransfer + $lastWeeksCashExpenses.menialTradesTransfer)>>
- $lastWeeksCashProfits.menialTradesTransfer
+ <<= cashNumFormat($lastWeeksCashProfits.menialTradesTransfer)>>
</td>
</tr>
<</if>>
@@ -510,11 +510,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if ($lastWeeksCashIncome.menialTrades) || ($lastWeeksCashExpenses.menialTrades)>>
<tr>
<td>Menials: labor</td>
- <td>$lastWeeksCashIncome.menialTrades</td>
- <td>$lastWeeksCashExpenses.menialTrades</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.menialTrades)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.menialTrades)>></td>
<td>
<<set $lastWeeksCashProfits.menialTrades = ($lastWeeksCashIncome.menialTrades + $lastWeeksCashExpenses.menialTrades)>>
- $lastWeeksCashProfits.menialTrades
+ <<= cashNumFormat($lastWeeksCashProfits.menialTrades)>>
</td>
</tr>
<</if>>
@@ -522,11 +522,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.fuckdolls || $lastWeeksCashExpenses.fuckdolls>>
<tr>
<td>Fuckdolls</td>
- <td>$lastWeeksCashIncome.fuckdolls</td>
- <td>$lastWeeksCashExpenses.fuckdolls</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.fuckdolls)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.fuckdolls)>></td>
<td>
<<set $lastWeeksCashProfits.fuckdolls = ($lastWeeksCashIncome.fuckdolls + $lastWeeksCashExpenses.fuckdolls)>>
- $lastWeeksCashProfits.fuckdolls
+ <<= cashNumFormat($lastWeeksCashProfits.fuckdolls)>>
</td>
</tr>
<</if>>
@@ -534,11 +534,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if ($lastWeeksCashIncome.menialBioreactors) || ($lastWeeksCashExpenses.menialBioreactors)>>
<tr>
<td>Menials: bioreactors</td>
- <td>$lastWeeksCashIncome.menialBioreactors</td>
- <td>$lastWeeksCashExpenses.menialBioreactors</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.menialBioreactors)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.menialBioreactors)>></td>
<td>
<<set $lastWeeksCashProfits.menialBioreactors = ($lastWeeksCashIncome.menialBioreactors + $lastWeeksCashExpenses.menialBioreactors)>>
- $lastWeeksCashProfits.menialBioreactors
+ <<= cashNumFormat($lastWeeksCashProfits.menialBioreactors)>>
</td>
</tr>
<</if>>
@@ -546,25 +546,25 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if ($lastWeeksCashIncome.fuckDollBioFactory) || ($lastWeeksCashExpenses.fuckDollBioFactory)>>
<tr>
<td>Menials: labor</td>
- <td>$lastWeeksCashIncome.fuckDollBioFactory</td>
- <td>$lastWeeksCashExpenses.fuckDollBioFactory</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.fuckDollBioFactory)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.fuckDollBioFactory)>></td>
<td>
<<set $lastWeeksCashProfits.fuckDollBioFactory = ($lastWeeksCashIncome.fuckDollBioFactory + $lastWeeksCashExpenses.fuckDollBioFactory)>>
- $lastWeeksCashProfits.fuckDollBioFactory
+ <<= cashNumFormat($lastWeeksCashProfits.fuckDollBioFactory)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.porn || $lastWeeksCashExpenses.porn>>
<tr>
<td>Porn</td>
- <td>$lastWeeksCashIncome.porn</td>
- <td>$lastWeeksCashExpenses.porn</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.porn)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.porn)>></td>
<td>
<<set $lastWeeksCashProfits.porn = ($lastWeeksCashIncome.porn + $lastWeeksCashExpenses.porn)>>
- $lastWeeksCashProfits.porn
+ <<= cashNumFormat($lastWeeksCashProfits.porn)>>
</td>
</tr>
<</if>>
@@ -572,25 +572,25 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.recruiter || $lastWeeksCashExpenses.recruiter>>
<tr>
<td>Recruiter</td>
- <td>$lastWeeksCashIncome.recruiter</td>
- <td>$lastWeeksCashExpenses.recruiter</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.recruiter)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.recruiter)>></td>
<td>
<<set $lastWeeksCashProfits.recruiter = ($lastWeeksCashIncome.recruiter + $lastWeeksCashExpenses.recruiter)>>
- $lastWeeksCashProfits.recruiter
+ <<= cashNumFormat($lastWeeksCashProfits.recruiter)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.slaveTransfer || $lastWeeksCashExpenses.slaveTransfer>>
<tr>
<td>Buying/Selling Major Slaves</td>
- <td>$lastWeeksCashIncome.slaveTransfer</td>
- <td>$lastWeeksCashExpenses.slaveTransfer</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.slaveTransfer)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.slaveTransfer)>></td>
<td>
<<set $lastWeeksCashProfits.slaveTransfer = ($lastWeeksCashIncome.slaveTransfer + $lastWeeksCashExpenses.slaveTransfer)>>
- $lastWeeksCashProfits.slaveTransfer
+ <<= cashNumFormat($lastWeeksCashProfits.slaveTransfer)>>
</td>
</tr>
<</if>>
@@ -598,11 +598,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.fuckdollsTransfer || $lastWeeksCashExpenses.fuckdollsTransfer>>
<tr>
<td>Buying/Selling Fuckdolls</td>
- <td>$lastWeeksCashIncome.fuckdollsTransfer</td>
- <td>$lastWeeksCashExpenses.fuckdollsTransfer</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.fuckdollsTransfer)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.fuckdollsTransfer)>></td>
<td>
<<set $lastWeeksCashProfits.fuckdollsTransfer = ($lastWeeksCashIncome.fuckdollsTransfer + $lastWeeksCashExpenses.fuckdollsTransfer)>>
- $lastWeeksCashProfits.fuckdollsTransfer
+ <<= cashNumFormat($lastWeeksCashProfits.fuckdollsTransfer)>>
</td>
</tr>
<</if>>
@@ -610,11 +610,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.babyTransfer || $lastWeeksCashExpenses.babyTransfer>>
<tr>
<td>Buying/Selling Babies</td>
- <td>$lastWeeksCashIncome.babyTransfer</td>
- <td>$lastWeeksCashExpenses.babyTransfer</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.babyTransfer)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.babyTransfer)>></td>
<td>
<<set $lastWeeksCashProfits.babyTransfer = ($lastWeeksCashIncome.babyTransfer + $lastWeeksCashExpenses.babyTransfer)>>
- $lastWeeksCashProfits.babyTransfer
+ <<= cashNumFormat($lastWeeksCashProfits.babyTransfer)>>
</td>
</tr>
<</if>>
@@ -622,11 +622,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.menialRetirement || $lastWeeksCashExpenses.menialRetirement>>
<tr>
<td>Menials retiring</td>
- <td>$lastWeeksCashIncome.menialRetirement</td>
- <td>$lastWeeksCashExpenses.menialRetirement</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.menialRetirement)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.menialRetirement)>></td>
<td>
<<set $lastWeeksCashProfits.menialRetirement = ($lastWeeksCashIncome.menialRetirement + $lastWeeksCashExpenses.menialRetirement)>>
- $lastWeeksCashProfits.menialRetirement
+ <<= cashNumFormat($lastWeeksCashProfits.menialRetirement)>>
</td>
</tr>
<</if>>
@@ -634,11 +634,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.slaveMod || $lastWeeksCashExpenses.slaveMod>>
<tr>
<td>Slave Modification</td>
- <td>$lastWeeksCashIncome.slaveMod</td>
- <td>$lastWeeksCashExpenses.slaveMod</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.slaveMod)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.slaveMod)>></td>
<td>
<<set $lastWeeksCashProfits.slaveMod = ($lastWeeksCashIncome.slaveMod + $lastWeeksCashExpenses.slaveMod)>>
- $lastWeeksCashProfits.slaveMod
+ <<= cashNumFormat($lastWeeksCashProfits.slaveMod)>>
</td>
</tr>
<</if>>
@@ -646,11 +646,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.slaveSurgery || $lastWeeksCashExpenses.slaveSurgery>>
<tr>
<td>Slave Surgery</td>
- <td>$lastWeeksCashIncome.slaveSurgery</td>
- <td>$lastWeeksCashExpenses.slaveSurgery</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.slaveSurgery)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.slaveSurgery)>></td>
<td>
<<set $lastWeeksCashProfits.slaveSurgery = ($lastWeeksCashIncome.slaveSurgery + $lastWeeksCashExpenses.slaveSurgery)>>
- $lastWeeksCashProfits.slaveSurgery
+ <<= cashNumFormat($lastWeeksCashProfits.slaveSurgery)>>
</td>
</tr>
<</if>>
@@ -658,11 +658,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.birth || $lastWeeksCashExpenses.birth>>
<tr>
<td>Slave Surgery</td>
- <td>$lastWeeksCashIncome.birth</td>
- <td>$lastWeeksCashExpenses.birth</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.birth)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.birth)>></td>
<td>
<<set $lastWeeksCashProfits.birth = ($lastWeeksCashIncome.birth + $lastWeeksCashExpenses.birth)>>
- $lastWeeksCashProfits.birth
+ <<= cashNumFormat($lastWeeksCashProfits.birth)>>
</td>
</tr>
<</if>>
@@ -671,15 +671,15 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<tr>
<h2>Finance</h2>
</tr>
-
+
<<if $lastWeeksCashIncome.personalBusiness || $lastWeeksCashExpenses.personalBusiness>>
<tr>
<td>Personal Business</td>
- <td>$lastWeeksCashIncome.personalBusiness</td>
- <td>$lastWeeksCashExpenses.personalBusiness</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.personalBusiness)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.personalBusiness)>></td>
<td>
<<set $lastWeeksCashProfits.personalBusiness = ($lastWeeksCashIncome.personalBusiness + $lastWeeksCashExpenses.personalBusiness)>>
- $lastWeeksCashProfits.personalBusiness
+ <<= cashNumFormat($lastWeeksCashProfits.personalBusiness)>>
</td>
</tr>
<</if>>
@@ -692,22 +692,22 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<else>>
<td>Since you are used to a fairly normal life, your personal living expenses are:</td>
<</if>>
- <td>$lastWeeksCashIncome.personalLivingExpenses</td>
- <td>$lastWeeksCashExpenses.personalLivingExpenses</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.personalLivingExpenses)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.personalLivingExpenses)>></td>
<td>
<<set $lastWeeksCashProfits.personalLivingExpenses = ($lastWeeksCashIncome.personalLivingExpenses + $lastWeeksCashExpenses.personalLivingExpenses)>>
- $lastWeeksCashProfits.personalLivingExpenses
+ <<= cashNumFormat($lastWeeksCashProfits.personalLivingExpenses)>>
</td>
</tr>
<<if $lastWeeksCashIncome.PCtraining || $lastWeeksCashExpenses.PCtraining>>
<tr>
<td>Your training</td>
- <td>$lastWeeksCashIncome.PCtraining</td>
- <td>$lastWeeksCashExpenses.PCtraining</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.PCtraining)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.PCtraining)>></td>
<td>
<<set $lastWeeksCashProfits.PCtraining = ($lastWeeksCashIncome.PCtraining + $lastWeeksCashExpenses.PCtraining)>>
- $lastWeeksCashProfits.PCtraining
+ <<= cashNumFormat($lastWeeksCashProfits.PCtraining)>>
</td>
</tr>
<</if>>
@@ -715,11 +715,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.PCmedical || $lastWeeksCashExpenses.PCmedical>>
<tr>
<td>Your medical expenses</td>
- <td>$lastWeeksCashIncome.PCmedical</td>
- <td>$lastWeeksCashExpenses.PCmedical</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.PCmedical)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.PCmedical)>></td>
<td>
<<set $lastWeeksCashProfits.PCmedical = ($lastWeeksCashIncome.PCmedical + $lastWeeksCashExpenses.PCmedical)>>
- $lastWeeksCashProfits.PCmedical
+ <<= cashNumFormat($lastWeeksCashProfits.PCmedical)>>
</td>
</tr>
<</if>>
@@ -727,11 +727,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.PCskills || $lastWeeksCashExpenses.PCskills>>
<tr>
<td>Your skills</td>
- <td>$lastWeeksCashIncome.PCskills</td>
- <td>$lastWeeksCashExpenses.PCskills</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.PCskills)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.PCskills)>></td>
<td>
<<set $lastWeeksCashProfits.PCskills = ($lastWeeksCashIncome.PCskills + $lastWeeksCashExpenses.PCskills)>>
- $lastWeeksCashProfits.PCskills
+ <<= cashNumFormat($lastWeeksCashProfits.PCskills)>>
</td>
</tr>
<</if>>
@@ -743,8 +743,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
(and bribes)
<</if>>
</td>
- <td>$lastWeeksCashIncome.rents</td>
- <td>$lastWeeksCashExpenses.rents</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.rents)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.rents)>></td>
<td>
<<set $lastWeeksCashProfits.rents = ($lastWeeksCashIncome.rents + $lastWeeksCashExpenses.rents)>>
$lastWeeksCashIncome.rents
@@ -754,11 +754,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.stocks || $personalShares > 0>>
<tr>
<td>Stock dividends on ($personalShares/<<print ($publicShares + $personalShares)>> shares), paying <<print ($lastWeeksCashIncome.stocks/$personalShares*100)>>% per share.</td>
- <td>$lastWeeksCashIncome.stocks</td>
- <td>$lastWeeksCashExpenses.stocks</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.stocks)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.stocks)>></td>
<td>
<<set $lastWeeksCashProfits.stocks = ($lastWeeksCashIncome.stocks + $lastWeeksCashExpenses.stocks)>>
- $lastWeeksCashProfits.stocks
+ <<= cashNumFormat($lastWeeksCashProfits.stocks)>>
</td>
</tr>
<</if>>
@@ -766,11 +766,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.stocksTraded|| $lastWeeksCashExpenses.stocksTraded>>
<tr>
<td>Stock trading</td>
- <td>$lastWeeksCashIncome.stocksTraded</td>
- <td>$lastWeeksCashExpenses.stocksTraded</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.stocksTraded)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.stocksTraded)>></td>
<td>
<<set $lastWeeksCashProfits.stocksTraded = ($lastWeeksCashIncome.stocksTraded + $lastWeeksCashExpenses.stocksTraded)>>
- $lastWeeksCashProfits.stocksTraded
+ <<= cashNumFormat($lastWeeksCashProfits.stocksTraded)>>
</td>
</tr>
<</if>>
@@ -778,11 +778,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.fines || $lastWeeksCashExpenses.fines>>
<tr>
<td>Fines</td>
- <td>$lastWeeksCashIncome.fines</td>
- <td>$lastWeeksCashExpenses.fines</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.fines)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.fines)>></td>
<td>
<<set $lastWeeksCashProfits.fines = ($lastWeeksCashIncome.fines + $lastWeeksCashExpenses.fines)>>
- $lastWeeksCashProfits.fines
+ <<= cashNumFormat($lastWeeksCashProfits.fines)>>
</td>
</tr>
<</if>>
@@ -790,11 +790,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.event || $lastWeeksCashExpenses.event>>
<tr>
<td>Events</td>
- <td>$lastWeeksCashIncome.event</td>
- <td>$lastWeeksCashExpenses.event</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.event)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.event)>></td>
<td>
<<set $lastWeeksCashProfits.event = ($lastWeeksCashIncome.event + $lastWeeksCashExpenses.event)>>
- $lastWeeksCashProfits.event
+ <<= cashNumFormat($lastWeeksCashProfits.event)>>
</td>
</tr>
<</if>>
@@ -802,11 +802,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.war || $lastWeeksCashExpenses.war>>
<tr>
<td>Archology conflict</td>
- <td>$lastWeeksCashIncome.war</td>
- <td>$lastWeeksCashExpenses.war</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.war)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.war)>></td>
<td>
<<set $lastWeeksCashProfits.war = ($lastWeeksCashIncome.war + $lastWeeksCashExpenses.war)>>
- $lastWeeksCashProfits.war
+ <<= cashNumFormat($lastWeeksCashProfits.war)>>
</td>
</tr>
<</if>>
@@ -826,23 +826,23 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
[[Medicine trainer|Personal Attention Select][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] fees
<</if>>
</td>
- <td>$lastWeeksCashIncome.PCtraining</td>
- <td>$lastWeeksCashExpenses.PCtraining</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.PCtraining)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.PCtraining)>></td>
<td>
<<set $lastWeeksCashProfits.PCtraining = ($lastWeeksCashIncome.PCtraining + $lastWeeksCashExpenses.PCtraining)>>
- $lastWeeksCashProfits.PCtraining
+ <<= cashNumFormat($lastWeeksCashProfits.PCtraining)>>
</td>
- </tr>
+ </tr>
<</if>>
<<if $lastWeeksCashIncome.capEx || $lastWeeksCashExpenses.capEx>>
<tr>
<td>Capital Expenses</td>
- <td>$lastWeeksCashIncome.capEx</td>
- <td>$lastWeeksCashExpenses.capEx</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.capEx)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.capEx)>></td>
<td>
<<set $lastWeeksCashProfits.capEx = ($lastWeeksCashIncome.capEx + $lastWeeksCashExpenses.capEx)>>
- $lastWeeksCashProfits.capEx
+ <<= cashNumFormat($lastWeeksCashProfits.capEx)>>
</td>
</tr>
<</if>>
@@ -850,39 +850,39 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.cheating || $lastWeeksCashExpenses.cheating>>
<tr>
<td>CHEATING</td>
- <td>$lastWeeksCashIncome.cheating</td>
- <td>$lastWeeksCashExpenses.cheating</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.cheating)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.cheating)>></td>
<td>
<<set $lastWeeksCashProfits.cheating = ($lastWeeksCashIncome.cheating + $lastWeeksCashExpenses.cheating)>>
- $lastWeeksCashProfits.cheating
+ <<= cashNumFormat($lastWeeksCashProfits.cheating)>>
</td>
</tr>
<</if>>
-
+
<tr>
<h2>Policies</h2>
- </tr>
-
+ </tr>
+
<<if $lastWeeksCashIncome.policies || $lastWeeksCashExpenses.policies>>
<tr>
<td>[[Policies|Policies][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
- <td>$lastWeeksCashIncome.policies</td>
- <td>$lastWeeksCashExpenses.policies</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.policies)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.policies)>></td>
<td>
<<set $lastWeeksCashProfits.policies = ($lastWeeksCashIncome.policies + $lastWeeksCashExpenses.policies)>>
- $lastWeeksCashProfits.policies
+ <<= cashNumFormat($lastWeeksCashProfits.policies)>>
</td>
- </tr>
+ </tr>
<</if>>
<<if $FSSpending != 0>>
<tr>
<td>[[Society Shaping|Future Society][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
- <td>$lastWeeksCashIncome.futureSocieties</td>
- <td>$lastWeeksCashExpenses.futureSocieties</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.futureSocieties)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.futureSocieties)>></td>
<td>
<<set $lastWeeksCashProfits.futureSocieties = ($lastWeeksCashIncome.futureSocieties + $lastWeeksCashExpenses.futureSocieties)>>
- $lastWeeksCashProfits.futureSocieties
+ <<= cashNumFormat($lastWeeksCashProfits.futureSocieties)>>
</td>
</tr>
<</if>>
@@ -908,23 +908,23 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<else>> Unknown school expense
<</if>>
</td>
- <td>$lastWeeksCashIncome.schoolBacking</td>
- <td>$lastWeeksCashExpenses.schoolBacking</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.schoolBacking)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.schoolBacking)>></td>
<td>
<<set $lastWeeksCashProfits.schoolBacking = ($lastWeeksCashIncome.schoolBacking + $lastWeeksCashExpenses.schoolBacking)>>
- $lastWeeksCashProfits.schoolBacking
+ <<= cashNumFormat($lastWeeksCashProfits.schoolBacking)>>
</td>
- </tr>
+ </tr>
<</if>>
-
+
<<if $citizenOrphanageTotal > 0>>
<tr>
<td>Education of $citizenOrphanageTotal of your slaves' children in citizen schools</td>
- <td>$lastWeeksCashIncome.citizenOrphanage</td>
- <td>$lastWeeksCashExpenses.citizenOrphanage</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.citizenOrphanage)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.citizenOrphanage)>></td>
<td>
<<set $lastWeeksCashProfits.citizenOrphanage = ($lastWeeksCashIncome.citizenOrphanage + $lastWeeksCashExpenses.citizenOrphanage)>>
- $lastWeeksCashProfits.citizenOrphanage
+ <<= cashNumFormat($lastWeeksCashProfits.citizenOrphanage)>>
</td>
</tr>
<</if>>
@@ -932,11 +932,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $privateOrphanageTotal > 0>>
<tr>
<td>Private tutelage of $privateOrphanageTotal of your slaves' children</td>
- <td>$lastWeeksCashIncome.privateOrphanage</td>
- <td>$lastWeeksCashExpenses.privateOrphanage</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.privateOrphanage)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.privateOrphanage)>></td>
<td>
<<set $lastWeeksCashProfits.privateOrphanage = ($lastWeeksCashIncome.privateOrphanage + $lastWeeksCashExpenses.privateOrphanage)>>
- $lastWeeksCashProfits.privateOrphanage
+ <<= cashNumFormat($lastWeeksCashProfits.privateOrphanage)>>
</td>
</tr>
<</if>>
@@ -947,23 +947,23 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $barracks>><<else>><br>//@@.red;Cost increased by the lack of a barracks.@@//<</if>>
<<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>
</td>
- <td>$lastWeeksCashIncome.mercenaries</td>
- <td>$lastWeeksCashExpenses.mercenaries</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.mercenaries)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.mercenaries)>></td>
<td>
<<set $lastWeeksCashProfits.mercenaries = ($lastWeeksCashIncome.mercenaries + $lastWeeksCashExpenses.mercenaries)>>
- $lastWeeksCashProfits.mercenaries
+ <<= cashNumFormat($lastWeeksCashProfits.mercenaries)>>
</td>
</tr>
<</if>>
-
+
<<if $lastWeeksCashIncome.securityExpansion || $lastWeeksCashExpenses.securityExpansion>>
<tr>
<td>Security Expansion</td>
- <td>$lastWeeksCashIncome.securityExpansion</td>
- <td>$lastWeeksCashExpenses.securityExpansion</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.securityExpansion)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.securityExpansion)>></td>
<td>
<<set $lastWeeksCashProfits.securityExpansion = ($lastWeeksCashIncome.securityExpansion + $lastWeeksCashExpenses.securityExpansion)>>
- $lastWeeksCashProfits.securityExpansion
+ <<= cashNumFormat($lastWeeksCashProfits.securityExpansion)>>
</td>
</tr>
<</if>>
@@ -971,33 +971,33 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.specialForces || $lastWeeksCashExpenses.specialForces>>
<tr>
<td>Special Forces</td>
- <td>$lastWeeksCashIncome.specialForces</td>
- <td>$lastWeeksCashExpenses.specialForces</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.specialForces)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.specialForces)>></td>
<td>
<<set $lastWeeksCashProfits.specialForces = ($lastWeeksCashIncome.specialForces + $lastWeeksCashExpenses.specialForces)>>
- $lastWeeksCashProfits.specialForces
+ <<= cashNumFormat($lastWeeksCashProfits.specialForces)>>
</td>
</tr>
<</if>>
-
+
<<if $securityForceActive > 0>>
<tr>
<td>Acquisitions: [[$securityForceName|SFM Barracks][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
- <td>$lastWeeksCashIncome.mercenaries</td>
- <td>$lastWeeksCashExpenses.mercenaries</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.mercenaries)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.mercenaries)>></td>
<td>
<<set $lastWeeksCashProfits.mercenaries = ($lastWeeksCashIncome.mercenaries + $lastWeeksCashExpenses.mercenaries)>>
- $lastWeeksCashProfits.mercenaries
+ <<= cashNumFormat($lastWeeksCashProfits.mercenaries)>>
</td>
</tr>
<</if>>
-
+
<<if (def $peacekeepers) and ($peacekeepers != 0) >>
<<if $peacekeepers.undermining != 0>>
<tr>
<td>Undermine political support for the nearby old world peacekeeping mission.</td>
- <td>$lastWeeksCashIncome.peacekeepers</td>
- <td>$lastWeeksCashExpenses.peacekeepers</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.peacekeepers)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.peacekeepers)>></td>
<td>
<<set $lastWeeksCashProfits.peacekeepers = ($lastWeeksCashIncome.peacekeepers + $lastWeeksCashExpenses.peacekeepers)>>
$lastWeeksCashProfits.peacekeepers
@@ -1005,39 +1005,39 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
<</if>>
-
+
<<if $lastWeeksCashIncome.recruiter || $lastWeeksCashExpenses.recruiter>>
<tr>
<td>__Recruiting__</td>
- <td>$lastWeeksCashIncome.recruiter</td>
- <td>$lastWeeksCashExpenses.recruiter</td>
+ <td><<= cashNumFormat($lastWeeksCashIncome.recruiter)>></td>
+ <td><<= cashNumFormat($lastWeeksCashExpenses.recruiter)>></td>
<td>
<<set $lastWeeksCashProfits.recruiter = ($lastWeeksCashIncome.recruiter + $lastWeeksCashExpenses.recruiter)>>
- $lastWeeksCashProfits.recruiter
+ <<= cashNumFormat($lastWeeksCashProfits.recruiter)>>
</td>
- </tr>
+ </tr>
<</if>>
<tr><td></td></tr>
<tr>
- <td>Tracked totals</td>
+ <td>Tracked totals</td>
<td>
<<set $lastWeeksCashIncome.Total = hashSum($lastWeeksCashIncome)>>
- $lastWeeksCashIncome.Total
+ <<= cashNumFormat($lastWeeksCashIncome.Total)>>
</td>
-
+
<td>
<<set $lastWeeksCashExpenses.Total = hashSum($lastWeeksCashExpenses)>>
- $lastWeeksCashExpenses.Total
+ <<= cashNumFormat($lastWeeksCashExpenses.Total)>>
</td>
<td>
- <<set $lastWeeksCashProfits.Total = ($lastWeeksCashIncome.Total + $lastWeeksCashExpenses.Total)>>
+ <<set $lastWeeksCashProfits.Total = ($lastWeeksCashIncome.Total + $lastWeeksCashExpenses.Total)>>
/* each "profit" item is calculated on this sheet, and there's two ways to generate a profit total: the difference of the income and expense totals, and adding all the profit items. If they aren't the same, I probably forgot to properly add an item's profit calculation to this sheet.*/
<<if $lastWeeksCashProfits.Total != hashSum($lastWeeksCashProfits) - $lastWeeksCashProfits.Total>>/* Profits includes the total number of profits, so we have to subtract it back out */
<<print (hashSum($lastWeeksCashProfits)-$lastWeeksCashProfits.Total)>><br>
@@.red;Fix profit calc<br>@@
<</if>>
- $lastWeeksCashProfits.Total
+ <<= cashNumFormat($lastWeeksCashProfits.Total)>>
</td>
</tr>
@@ -1046,8 +1046,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<tr>
<td>Expenses budget for week <<print ($week +1)>></td>
<td></td>
- <td>$costs</td>
- <td></td>
+ <td><<= cashNumFormat($costs)>></td>
+ <td></td>
</tr>
@@ -1057,9 +1057,9 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<td>Last week actuals</td>
<td></td>
<td></td>
- <td><<print ($cash-$cashLastWeek)>></td>
+ <td><<print cashNumFormat($cash-$cashLastWeek)>></td>
</tr>
-
+
<<if ($cash-$cashLastWeek) == $lastWeeksCashProfits.Total>>
<tr>
@@.green;The books are balanced, <<= properTitle()>>!@@
@@ -1069,7 +1069,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<td>Transaction tracking off by:</td>
<td></td>
<td>/*<<print ($lastWeeksCashExpenses.Total + $costs)>>*/</td>
- <td><<print (($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)>></td>
+ <td><<print cashNumFormat(($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)>></td>
</tr>
<</if>>
</table>
@@ -1087,8 +1087,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<</if>>
<<if $lastWeeksErrors !== "Errors:">>
- <<link "Reset">>
+ <<link "Reset">>
<<set $lastWeeksErrors = "Errors:">>
<</link>>
@@.red;<<print $lastWeeksErrors>>@@
-<</if>>
\ No newline at end of file
+<</if>>