From 9c6772c6022b84b7cf77f896628b64c62da5f85c Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Wed, 30 Jan 2019 18:54:42 -0500
Subject: [PATCH] costsBudget: add/remove categories and copied listings
---
src/js/economyJS.js | 2 +-
src/uncategorized/costsBudget.tw | 441 ++++++++++----------------
src/uncategorized/costsWidgets.tw | 6 +-
src/uncategorized/saGetMilked.tw | 33 +-
src/uncategorized/saWhore.tw | 17 +-
src/uncategorized/saWorkAGloryHole.tw | 8 +-
6 files changed, 221 insertions(+), 286 deletions(-)
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index e02c059bb27..b9339bb6389 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -86,7 +86,7 @@ window.getCost = function(array) {
cashX(forceNeg(getRecruiterCosts()), "recruiter");
cashX(forceNeg(getSchoolCosts()), "schoolBacking");
cashX(forceNeg(getPolicyCosts()), "policies");
- cashX(forceNeg(getCyberModCosts()), "cyberMod");
+ cashX(forceNeg(getCyberModCosts()), "lab");
cashX(forceNeg(getPCTrainingCosts()), "PCtraining");
cashX(forceNeg(getPCCosts()), "PCmedical");
getTotalSlaveCosts(array2);
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index b1df4ff92ca..236021b03bc 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -42,7 +42,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<table class="finances" border="1">
<tr>
- <th><h2>Jobs</h2></th>
+ <th><h2>Penthouse</h2></th>
<th>Income</th>
<th>Expense</th>
<th>Totals</th>
@@ -138,39 +138,9 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
- <<if $lastWeeksCashIncome.subordinateSlave || $lastWeeksCashExpenses.subordinateSlave>>
- <tr>
- <td>subordinateSlaves</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.subordinateSlave) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.subordinateSlave))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.subordinateSlave))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.subordinateSlave) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.subordinateSlave)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.subordinateSlave))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.subordinateSlave = ($lastWeeksCashIncome.subordinateSlave + $lastWeeksCashExpenses.subordinateSlave)>>
- <<if $lastWeeksCashProfits.subordinateSlave > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.subordinateSlave))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.subordinateSlave) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.subordinateSlave))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.subordinateSlave)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
<<if $lastWeeksCashIncome.houseServant || $lastWeeksCashExpenses.houseServant>>
<tr>
- <td>HouseServants</td>
+ <td>House servants</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.houseServant) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.houseServant))>>@@
@@ -352,9 +322,6 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<tr>
<h2>Structures</h2> /* TODO: using h2s doesn't fit in with the rest of the game */
</tr>
- <tr>
- //Slaves working in these buildings have their profits reported in "jobs".//
- </tr>
<<if $lastWeeksCashIncome.brothel || $lastWeeksCashExpenses.brothel>>
<tr>
@@ -386,9 +353,39 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
+ <<if $lastWeeksCashIncome.whoreBrothel || $lastWeeksCashExpenses.whoreBrothel>> /* If it's not 0, it will return true. */
+ <tr>
+ <td>Brothel whores</td>
+ <td>
+ <<if Math.trunc($lastWeeksCashIncome.whoreBrothel) > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.whoreBrothel))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashIncome.whoreBrothel))>>
+ <</if>>
+ </td>
+ <td>
+ <<if Math.trunc($lastWeeksCashExpenses.whoreBrothel) < 0>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.whoreBrothel)))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashExpenses.whoreBrothel))>>
+ <</if>>
+ </td>
+ <td>
+ <<set $lastWeeksCashProfits.whoreBrothel = ($lastWeeksCashIncome.whoreBrothel + $lastWeeksCashExpenses.whoreBrothel)>>
+ <<if $lastWeeksCashProfits.whoreBrothel > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.whoreBrothel))>>@@
+ <<elseif Math.trunc($lastWeeksCashProfits.whoreBrothel) == 0>>
+ <<print cashFormat(Math.trunc($lastWeeksCashProfits.whoreBrothel))>>
+ <<else>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.whoreBrothel)))>>@@
+ <</if>>
+ </td>
+ </tr>
+ <</if>>
+
<<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> /* TODO: this is also weird */
+ <td>[[Brothel ads|Brothel Advertisement][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] also increase the income of whoring slaves in "jobs."</td> /* TODO: this is also weird */
<td>
<<if Math.trunc($lastWeeksCashIncome.brothelAds) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.brothelAds))>>@@
@@ -416,6 +413,10 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
+ <<if $brothel > 0>>
+ <br>
+ <</if>>
+
<<if $lastWeeksCashIncome.club || $lastWeeksCashExpenses.club>>
<tr>
<td>[[$clubNameCaps|Club][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($clubSlaves slaves)</td>
@@ -448,7 +449,7 @@ 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>[[Club ads|Club Advertisement][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.clubAds) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.clubAds))>>@@
@@ -476,6 +477,10 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
+ <<if $club > 0>>
+ <br>
+ <</if>>
+
<<if $lastWeeksCashIncome.arcade || $lastWeeksCashExpenses.arcade>>
<tr>
<td>[[$arcadeNameCaps|Arcade][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($arcadeSlaves slaves)</td>
@@ -504,6 +509,41 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
+ <<if $lastWeeksCashIncome.gloryholeArcade || $lastWeeksCashExpenses.gloryholeArcade>>
+ <tr>
+ <td>Arcade slaves</td>
+ <td>
+ <<if Math.trunc($lastWeeksCashIncome.gloryholeArcade) > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.gloryholeArcade))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashIncome.gloryholeArcade))>>
+ <</if>>
+ </td>
+ <td>
+ <<if Math.trunc($lastWeeksCashExpenses.gloryholeArcade) < 0>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.gloryholeArcade)))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashExpenses.gloryholeArcade))>>
+ <</if>>
+ </td>
+ <td>
+ <<set $lastWeeksCashProfits.gloryholeArcade = ($lastWeeksCashIncome.gloryholeArcade + $lastWeeksCashExpenses.gloryholeArcade)>>
+ <<if $lastWeeksCashProfits.gloryholeArcade > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.gloryholeArcade))>>@@
+ <<elseif Math.trunc($lastWeeksCashProfits.gloryholeArcade) == 0>>
+ <<print cashFormat(Math.trunc($lastWeeksCashProfits.gloryholeArcade))>>
+ <<else>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.gloryholeArcade)))>>@@
+ <</if>>
+ </td>
+ </tr>
+ <</if>>
+
+ <<if $arcade > 0>>
+ <br>
+ <</if>>
+
+
<<if $lastWeeksCashIncome.dairy || $lastWeeksCashExpenses.dairy>>
<tr>
<td>[[$dairyNameCaps|Dairy][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($dairySlaves slaves)</td>
@@ -534,6 +574,40 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
+ <<if $lastWeeksCashIncome.milkedDairy || $lastWeeksCashExpenses.milkedDairy>>
+ <tr>
+ <td>Dairy cows</td>
+ <td>
+ <<if Math.trunc($lastWeeksCashIncome.milkedDairy) > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.milkedDairy))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashIncome.milkedDairy))>>
+ <</if>>
+ </td>
+ <td>
+ <<if Math.trunc($lastWeeksCashExpenses.milkedDairy) < 0>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.milkedDairy)))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashExpenses.milkedDairy))>>
+ <</if>>
+ </td>
+ <td>
+ <<set $lastWeeksCashProfits.milkedDairy = ($lastWeeksCashIncome.milkedDairy + $lastWeeksCashExpenses.milkedDairy)>>
+ <<if $lastWeeksCashProfits.milkedDairy > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.milkedDairy))>>@@
+ <<elseif Math.trunc($lastWeeksCashProfits.milkedDairy) == 0>>
+ <<print cashFormat(Math.trunc($lastWeeksCashProfits.milkedDairy))>>
+ <<else>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.milkedDairy)))>>@@
+ <</if>>
+ </td>
+ </tr>
+ <</if>>
+
+ <<if $dairy > 0>>
+ <br>
+ <</if>>
+
<<if $lastWeeksCashIncome.servantsQuarters || $lastWeeksCashExpenses.servantsQuarters>>
<tr>
<td>[[Servants' Quarters][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($servantsQuartersSlaves slaves)</td>
@@ -756,39 +830,6 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
<</if>>
-
-
-
-
- <<if $lastWeeksCashIncome.cyberMod || $lastWeeksCashExpenses.cyberMod>>
- <tr>
- <td>CyberMod</td> /* TODO: this doesn't fit in*/
- <td>
- <<if Math.trunc($lastWeeksCashIncome.cyberMod) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.cyberMod))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.cyberMod))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.cyberMod) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.cyberMod)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.cyberMod))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.cyberMod = ($lastWeeksCashIncome.cyberMod + $lastWeeksCashExpenses.cyberMod)>>
- <<if $lastWeeksCashProfits.cyberMod > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.cyberMod))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.cyberMod) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.cyberMod))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.cyberMod)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
<<if $lastWeeksCashIncome.incubator || $lastWeeksCashExpenses.incubator>>
<tr>
@@ -910,36 +951,6 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
- <<if $lastWeeksCashIncome.arcologyImprovement || $lastWeeksCashExpenses.arcologyImprovement>>
- <tr>
- <td>Arcology construction and repair</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.arcologyImprovement) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.arcologyImprovement))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.arcologyImprovement))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.arcologyImprovement) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.arcologyImprovement)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.arcologyImprovement))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.arcologyImprovement = ($lastWeeksCashIncome.arcologyImprovement + $lastWeeksCashExpenses.arcologyImprovement)>>
- <<if $lastWeeksCashProfits.arcologyImprovement > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.arcologyImprovement))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.arcologyImprovement) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.arcologyImprovement))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.arcologyImprovement)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
<<if $lastWeeksCashIncome.environment || $lastWeeksCashExpenses.environment>>
<tr>
<td>Environment</td>
@@ -973,7 +984,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.weather || $lastWeeksCashExpenses.weather>> /* TODO: this doesn't fit in */
<tr>
<td>
- <<if $lastWeeksCashExpenses.weather > 0>>
+ <<if $lastWeeksCashExpenses.weather < 0 && $weatherCladding == 0>>
Weather is causing @@.red;expensive damage.@@ Consider a protective [[upgrade|Manage Arcology][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]].
<<else>>
Weather
@@ -1039,7 +1050,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.extraMilk || $lastWeeksCashExpenses.extraMilk>>
<tr>
- <td>Extra Milk</td>
+ <td>Extra milk</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.extraMilk) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.extraMilk))>>@@
@@ -1067,6 +1078,36 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
+ <<if $lastWeeksCashIncome.slaveTransfer || $lastWeeksCashExpenses.slaveTransfer>>
+ <tr>
+ <td>Selling/buying major slaves</td>
+ <td>
+ <<if Math.trunc($lastWeeksCashIncome.slaveTransfer) > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.slaveTransfer))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashIncome.slaveTransfer))>>
+ <</if>>
+ </td>
+ <td>
+ <<if Math.trunc($lastWeeksCashExpenses.slaveTransfer) < 0>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.slaveTransfer)))>>@@
+ <<else>>
+ <<print cashFormat(Math.trunc($lastWeeksCashExpenses.slaveTransfer))>>
+ <</if>>
+ </td>
+ <td>
+ <<set $lastWeeksCashProfits.slaveTransfer = ($lastWeeksCashIncome.slaveTransfer + $lastWeeksCashExpenses.slaveTransfer)>>
+ <<if $lastWeeksCashProfits.slaveTransfer > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.slaveTransfer))>>@@
+ <<elseif Math.trunc($lastWeeksCashProfits.slaveTransfer) == 0>>
+ <<print cashFormat(Math.trunc($lastWeeksCashProfits.slaveTransfer))>>
+ <<else>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.slaveTransfer)))>>@@
+ <</if>>
+ </td>
+ </tr>
+ <</if>>
+
<<if $lastWeeksCashIncome.menialTransfer || $lastWeeksCashExpenses.menialTransfer>>
<tr>
<td>Menials: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td>
@@ -1157,61 +1198,31 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
- <<if $lastWeeksCashIncome.fuckdollsTransfer || $lastWeeksCashExpenses.fuckdollsTransfer>>
- <tr>
- <td>Fuckdolls: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.fuckdollsTransfer) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckdollsTransfer))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckdollsTransfer))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.fuckdollsTransfer = ($lastWeeksCashIncome.fuckdollsTransfer + $lastWeeksCashExpenses.fuckdollsTransfer)>>
- <<if $lastWeeksCashProfits.fuckdollsTransfer > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.fuckdollsTransfer) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
- <<if $lastWeeksCashIncome.menialBioreactorsTransfer || $lastWeeksCashExpenses.menialBioreactorsTransfer>>
+ <<if $lastWeeksCashIncome.babyTransfer || $lastWeeksCashExpenses.babyTransfer>>
<tr>
- <td>Bioreactors: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td>
+ <td>Selling/buying babies</td>
<td>
- <<if Math.trunc($lastWeeksCashIncome.menialBioreactorsTransfer) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.menialBioreactorsTransfer))>>@@
+ <<if Math.trunc($lastWeeksCashIncome.babyTransfer) > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.babyTransfer))>>@@
<<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.menialBioreactorsTransfer))>>
+ <<print cashFormat(Math.trunc($lastWeeksCashIncome.babyTransfer))>>
<</if>>
</td>
<td>
- <<if Math.trunc($lastWeeksCashExpenses.menialBioreactorsTransfer) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.menialBioreactorsTransfer)))>>@@
+ <<if Math.trunc($lastWeeksCashExpenses.babyTransfer) < 0>>
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.babyTransfer)))>>@@
<<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.menialBioreactorsTransfer))>>
+ <<print cashFormat(Math.trunc($lastWeeksCashExpenses.babyTransfer))>>
<</if>>
</td>
<td>
- <<set $lastWeeksCashProfits.menialBioreactorsTransfer = ($lastWeeksCashIncome.menialBioreactorsTransfer + $lastWeeksCashExpenses.menialBioreactorsTransfer)>>
- <<if $lastWeeksCashProfits.menialBioreactorsTransfer > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer))>>
+ <<set $lastWeeksCashProfits.babyTransfer = ($lastWeeksCashIncome.babyTransfer + $lastWeeksCashExpenses.babyTransfer)>>
+ <<if $lastWeeksCashProfits.babyTransfer > 0>>
+ @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.babyTransfer))>>@@
+ <<elseif Math.trunc($lastWeeksCashProfits.babyTransfer) == 0>>
+ <<print cashFormat(Math.trunc($lastWeeksCashProfits.babyTransfer))>>
<<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.menialBioreactorsTransfer)))>>@@
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.babyTransfer)))>>@@
<</if>>
</td>
</tr>
@@ -1307,36 +1318,6 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
- <<if ($lastWeeksCashIncome.fuckDollBioFactory) || ($lastWeeksCashExpenses.fuckDollBioFactory)>>
- <tr>
- <td>Menials: labor</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.fuckDollBioFactory) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckDollBioFactory))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckDollBioFactory))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.fuckDollBioFactory) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.fuckDollBioFactory)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.fuckDollBioFactory))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.fuckDollBioFactory = ($lastWeeksCashIncome.fuckDollBioFactory + $lastWeeksCashExpenses.fuckDollBioFactory)>>
- <<if $lastWeeksCashProfits.fuckDollBioFactory > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckDollBioFactory))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.fuckDollBioFactory) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckDollBioFactory))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.fuckDollBioFactory)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
<<if $lastWeeksCashIncome.porn || $lastWeeksCashExpenses.porn>>
<tr>
<td>Porn</td>
@@ -1397,96 +1378,6 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
- <<if $lastWeeksCashIncome.slaveTransfer || $lastWeeksCashExpenses.slaveTransfer>>
- <tr>
- <td>Buying/Selling Major Slaves</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.slaveTransfer) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.slaveTransfer))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.slaveTransfer))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.slaveTransfer) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.slaveTransfer)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.slaveTransfer))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.slaveTransfer = ($lastWeeksCashIncome.slaveTransfer + $lastWeeksCashExpenses.slaveTransfer)>>
- <<if $lastWeeksCashProfits.slaveTransfer > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.slaveTransfer))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.slaveTransfer) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.slaveTransfer))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.slaveTransfer)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
- <<if $lastWeeksCashIncome.fuckdollsTransfer || $lastWeeksCashExpenses.fuckdollsTransfer>>
- <tr>
- <td>Buying/Selling Fuckdolls</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.fuckdollsTransfer) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckdollsTransfer))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.fuckdollsTransfer))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.fuckdollsTransfer))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.fuckdollsTransfer = ($lastWeeksCashIncome.fuckdollsTransfer + $lastWeeksCashExpenses.fuckdollsTransfer)>>
- <<if $lastWeeksCashProfits.fuckdollsTransfer > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.fuckdollsTransfer) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.fuckdollsTransfer)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
- <<if $lastWeeksCashIncome.babyTransfer || $lastWeeksCashExpenses.babyTransfer>>
- <tr>
- <td>Buying/Selling Babies</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.babyTransfer) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.babyTransfer))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.babyTransfer))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.babyTransfer) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.babyTransfer)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.babyTransfer))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.babyTransfer = ($lastWeeksCashIncome.babyTransfer + $lastWeeksCashExpenses.babyTransfer)>>
- <<if $lastWeeksCashProfits.babyTransfer > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.babyTransfer))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.babyTransfer) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.babyTransfer))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.babyTransfer)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
<<if $lastWeeksCashIncome.menialRetirement || $lastWeeksCashExpenses.menialRetirement>>
<tr>
<td>Menials retiring</td>
@@ -1519,7 +1410,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.slaveMod || $lastWeeksCashExpenses.slaveMod>>
<tr>
- <td>Slave Modification</td>
+ <td>Slave modification</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.slaveMod) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.slaveMod))>>@@
@@ -1549,7 +1440,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.slaveSurgery || $lastWeeksCashExpenses.slaveSurgery>>
<tr>
- <td>Slave Surgery</td>
+ <td>Slave surgery</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.slaveSurgery) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.slaveSurgery))>>@@
@@ -1579,7 +1470,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.birth || $lastWeeksCashExpenses.birth>>
<tr>
- <td>Slave Surgery</td>
+ <td>Slave surgery</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.birth) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.birth))>>@@
@@ -1614,7 +1505,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.personalBusiness || $lastWeeksCashExpenses.personalBusiness>>
<tr>
- <td>Personal Business</td>
+ <td>Personal business</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.personalBusiness) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.personalBusiness))>>@@
@@ -1993,7 +1884,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.capEx || $lastWeeksCashExpenses.capEx>>
<tr>
- <td>Capital Expenses</td>
+ <td>Capital expenses</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.capEx) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.capEx))>>@@
@@ -2057,7 +1948,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.policies || $lastWeeksCashExpenses.policies>>
<tr>
- <td>[[Policies|Policies][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
+ <td>[[Policies|Policies][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] and [[Edicts|edicts][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.policies) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.policies))>>@@
@@ -2087,7 +1978,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $FSSpending != 0>>
<tr>
- <td>[[Society Shaping|Future Society][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
+ <td>[[Society shaping|Future Society][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.futureSocieties) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.futureSocieties))>>@@
@@ -2258,7 +2149,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.securityExpansion || $lastWeeksCashExpenses.securityExpansion>>
<tr>
- <td>Security Expansion</td>
+ <td>Security expansion</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.securityExpansion) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.securityExpansion))>>@@
@@ -2288,7 +2179,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashIncome.specialForces || $lastWeeksCashExpenses.specialForces>>
<tr>
- <td>Special Forces</td>
+ <td>Special forces</td>
<td>
<<if Math.trunc($lastWeeksCashIncome.specialForces) > 0>>
@@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.specialForces))>>@@
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index 24888e8d065..24879dbd81a 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -457,16 +457,18 @@
<<set $lastWeeksCashIncome = {
/*Slave Jobs*/
whore: 0,
+whoreBrothel: 0,
rest: 0,
fucktoy: 0,
-subordinateSlave: 0,
houseServant: 0,
confined: 0,
publicServant: 0,
classes: 0,
milked: 0,
+milkedDairy: 0,
extraMilk: 0, /*milk from slaves doing other things*/
gloryhole: 0,
+gloryholeArcade: 0,
porn: 0,
recruiter: 0,
@@ -508,7 +510,6 @@ nursery: 0,
farmyard: 0,
pit: 0,
-arcologyImprovement:0,
environment: 0,
weather: 0,
@@ -516,7 +517,6 @@ mercenaries:0,
peacekeepers: 0,
specialForces: 0,
securityExpansion: 0,
-cyberMod: 0,
citizenOrphanage:0,
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index 0248e26f424..c93325c9894 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -168,7 +168,14 @@ gets milked this week.
<<set $milkSale = $milk*6>>
$His milk is sold for @@.yellowgreen;<<print cashFormat($milkSale)>>.@@
<</if>>
- <<run cashX($milkSale, "milked", $slaves[$i])>>
+ <<if $slaves[$i].assignment == "work in the dairy">>
+ <<run cashX($milkSale, "milkedDairy", $slaves[$i])>>
+ <<elseif $slaves[$i].assignment == "get milked">>
+ <<run cashX($milkSale, "milked", $slaves[$i])>>
+ <<else>>
+ <<run cashX($milkSale, "extraMilk", $slaves[$i])>>
+ <</if>>
+
<<set _incomeStats.income += $milkSale>>
<<if $slaves[$i].fetishKnown>>
@@ -393,7 +400,13 @@ gets milked this week.
<<if $slaves[$i].vasectomy == 1 || $slaves[$i].ballType == "sterile">><<set _cumSale *= 0.2>><<elseif $slaves[$i].prostate == 3>><<set _cumSale *= 0.5>><</if>>
$He produces <<print $cum>> deciliters of cum over the week; the fresh ejaculate, which is in high demand given the new cultural preference for slave products, is sold for @@.yellowgreen;<<print cashFormat(_cumSale)>>.@@
<</if>>
- <<run cashX(_cumSale, "milked", $slaves[$i])>>
+ <<if $slaves[$i].assignment == "work in the dairy">>
+ <<run cashX(_cumSale, "milkedDairy", $slaves[$i])>>
+ <<elseif $slaves[$i].assignment == "get milked">>
+ <<run cashX(_cumSale, "milked", $slaves[$i])>>
+ <<else>>
+ <<run cashX(_cumSale, "extraMilk", $slaves[$i])>>
+ <</if>>
<<set _incomeStats.income += _cumSale>>
<<if ($slaves[$i].energy > 95)>>
@@ -465,7 +478,13 @@ gets milked this week.
Because of your arcology's cultural preferences, it comes with extra value.
<</if>>
It is sold for @@.yellowgreen;<<print cashFormat($fluidSale)>>.@@
- <<run cashX( $fluidSale, "milked", $slaves[$i])>>
+ <<if $slaves[$i].assignment == "work in the dairy">>
+ <<run cashX($fluidSale, "milkedDairy", $slaves[$i])>>
+ <<elseif $slaves[$i].assignment == "get milked">>
+ <<run cashX($fluidSale, "milked", $slaves[$i])>>
+ <<else>>
+ <<run cashX($fluidSale, "extraMilk", $slaves[$i])>>
+ <</if>>
<<set _incomeStats.income += $fluidSale>>
<</if>> /* CLOSES FEMALE PROSTATE FLUID GATHERING */
@@ -486,7 +505,13 @@ gets milked this week.
<<else>>
an incident without lasting effect.
<</if>>
- <<run cashX(Math.trunc($FResult*_vignette.effect), "milked", $slaves[$i])>>
+ <<if $slaves[$i].assignment == "work in the dairy">>
+ <<run cashX(Math.trunc($FResult*_vignette.effect), "milkedDairy", $slaves[$i])>>
+ <<elseif $slaves[$i].assignment == "get milked">>
+ <<run cashX(Math.trunc($FResult*_vignette.effect), "milked", $slaves[$i])>>
+ <<else>>
+ <<run cashX(Math.trunc($FResult*_vignette.effect), "extraMilk", $slaves[$i])>>
+ <</if>>
<<set _incomeStats.income += Math.trunc($FResult*_vignette.effect)>>
<<elseif (_vignette.type == "devotion")>>
<<if (_vignette.effect > 0)>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 7bac453ed0d..d92d4287665 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -1063,9 +1063,16 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FResult))>>@@ for the use of $slaves[$i].slaveName's body this week.
<<set _cashX = Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].whoreSkill)))>>
-<<run cashX(_cashX, "whore", $slaves[$i])>>
<<set _incomeStats.income += Math.trunc(($beauty*$FResult)*(1+(0.002*$slaves[$i].whoreSkill)))>>
+<<if $slaves[$i].assignment == "work in the brothel">>
+ <<run cashX(_cashX, "whoreBrothel", $slaves[$i])>>
+<<elseif $slaves[$i].assignment == "whore">>
+ <<run cashX(_cashX, "whore", $slaves[$i])>>
+<<else>>
+ <<run cashX(_cashX, "whoring in an unregistered building", $slaves[$i])>>
+<</if>>
+
/* FACILITY DECORATION IMPACTS */
<<if $slaves[$i].assignment == "work in the brothel">>
@@ -1230,7 +1237,13 @@ In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FR
an incident without lasting effect.
<</if>>
<<set _cashX = Math.trunc($FResult*_vignette.effect)>>
- <<run cashX(_cashX, "whore", $slaves[$i])>>
+ <<if $slaves[$i].assignment == "work in the brothel">>
+ <<run cashX(_cashX, "whoreBrothel", $slaves[$i])>>
+ <<elseif $slaves[$i].assignment == "whore">>
+ <<run cashX(_cashX, "whore", $slaves[$i])>>
+ <<else>>
+ <<run cashX(_cashX, "whoring in an unregistered building", $slaves[$i])>>
+ <</if>>
<<set _incomeStats.income += Math.trunc($FResult*_vignette.effect)>>
<<elseif (_vignette.type == "devotion")>>
<<if (_vignette.effect > 0)>>
diff --git a/src/uncategorized/saWorkAGloryHole.tw b/src/uncategorized/saWorkAGloryHole.tw
index 687e5b0dd49..67899edc14e 100644
--- a/src/uncategorized/saWorkAGloryHole.tw
+++ b/src/uncategorized/saWorkAGloryHole.tw
@@ -265,6 +265,12 @@ $His feelings, skills, and appearance do not matter. $He is condemned to a world
<<set $slaves[$i].bellyImplant += _cervixPump>>
<</if>>
-<<run cashX(($beauty*$FResult), "gloryhole", $slaves[$i])>>
+<<if $slaves[$i].assignment == "work a glory hole"">>
+ <<run cashX(($beauty*$FResult), "gloryhole", $slaves[$i])>>
+<<elseif $slaves[$i].assignment == "be confined in the arcade">>
+ <<run cashX(($beauty*$FResult), "gloryholeArcade", $slaves[$i])>>
+<<else>>
+ <<run cashX(($beauty*$FResult), "working a gloryhole in an unregistered building", $slaves[$i])>>
+<</if>>
<<set _profits += ($beauty*$FResult)>>
<<set _incomeStats.income += ($beauty*$FResult)>>
--
GitLab