From b1f997bf95f15be91287d4774ca5979c20183f78 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Sun, 20 Jan 2019 09:58:02 -0500
Subject: [PATCH] CostX and budget bugfixes for ThreadAnon
---
src/uncategorized/arcmgmt.tw | 3 +++
src/uncategorized/costsBudget.tw | 16 +++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 170da8bb72e..46c990df662 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1102,6 +1102,7 @@ This week, rents from $arcologies[0].name came to @@.yellowgreen;<<print cashFor
<<if $menials+$menialBioreactors+$fuckdolls > 0>>
You own
<<if $menials > 0>>
+ <<set _menialEarnings = 0>>
<<if $menials > Math.trunc(_LSCD / _slaveProductivity - _SCD)>>
<<set _menialEarnings += Math.trunc(_LSCD / _slaveProductivity - _SCD) * 10>>
<br>@@.red;more menial slaves than there was work,@@ consider selling some. You own
@@ -1121,6 +1122,7 @@ You own
<</if>>
<<if $menialBioreactors > 0>>
+ <<set _bioreactorEarnings = 0>>
<<set _bioreactorEarnings = $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>>
<<if $dairy && $dairyUpgradeMenials>><<set _bioreactorEarnings += $menialBioreactors*5>><</if>>
<<if $menialBioreactors > 1>> <<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
@@ -1130,6 +1132,7 @@ You own
<<if $fuckdolls > 0>>
+ <<set _fuckdollsEarnings = 0>>
<<set _fuckdollsEarnings = $fuckdolls*(15+(10*$arcologies[0].FSDegradationistLaw))>>
<<if $arcade && $arcadeUpgradeMenials>><<set _fuckdollsEarnings += $fuckdolls*5>><</if>>
<<if $fuckdolls > 1>> <<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 7728dd35561..8893e0a45b4 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -739,24 +739,22 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</td>
</tr>
- //
<<if $researchLab.hired != 0>>
<tr>
- <td>[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($researchLab.hired scientists)</td>
+ <td>//[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($researchLab.hired scientists)//</td>
<td></td>
- <td>@@.yellowgreen;+<<print cashFormat(Math.trunc(300*$researchLab.hired))>>@@</td>
- <td>@@.red;-<<print cashFormat(Math.abs(Math.trunc(300*$researchLab.)hired))>>@@</td>
+ <td>//@@.red;-<<print cashFormat(Math.trunc(300*$researchLab.hired))>>@@//</td>
+ <td>//@@.red;-<<print cashFormat(Math.abs(Math.trunc(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>//[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($researchLab.menials menial Slaves)//</td>
<td></td>
- <td>@@.yellowgreen;+<<print cashFormat(Math.trunc(100*$researchLab.menials))>>@@</td>
- <td>@@.red;-<<print cashFormat(Math.abs(Math.trunc(100*$researchLab.)menials))>>@@</td>
+ <td>//@@.red;-+<<print cashFormat(Math.trunc(100*$researchLab.menials))>>@@//</td>
+ <td>//@@.red;-<<print cashFormat(Math.abs(Math.trunc(100*$researchLab.)menials))>>@@//</td>
</tr>
<</if>>
- //
<</if>>
@@ -2457,7 +2455,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<elseif Math.trunc((($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)) == 0>>
<<print cashFormat(Math.trunc((($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)))>>
<<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc((($cash-$c)ashLastWeek) - $lastWeeksCashProfits.Total)))>>@@
+ @@.red;-<<print cashFormat(Math.abs(Math.trunc(($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)))>>@@
<</if>></td>
</tr>
<</if>>
--
GitLab