Skip to content
Snippets Groups Projects
Commit b1f997bf authored by lowercasedonkey's avatar lowercasedonkey
Browse files

CostX and budget bugfixes for ThreadAnon

parent 507bfec1
No related branches found
No related tags found
1 merge request!3386Cost budget and economy js fixes mostly for house servants
...@@ -1102,6 +1102,7 @@ This week, rents from $arcologies[0].name came to @@.yellowgreen;<<print cashFor ...@@ -1102,6 +1102,7 @@ This week, rents from $arcologies[0].name came to @@.yellowgreen;<<print cashFor
<<if $menials+$menialBioreactors+$fuckdolls > 0>> <<if $menials+$menialBioreactors+$fuckdolls > 0>>
You own You own
<<if $menials > 0>> <<if $menials > 0>>
<<set _menialEarnings = 0>>
<<if $menials > Math.trunc(_LSCD / _slaveProductivity - _SCD)>> <<if $menials > Math.trunc(_LSCD / _slaveProductivity - _SCD)>>
<<set _menialEarnings += Math.trunc(_LSCD / _slaveProductivity - _SCD) * 10>> <<set _menialEarnings += Math.trunc(_LSCD / _slaveProductivity - _SCD) * 10>>
<br>@@.red;more menial slaves than there was work,@@ consider selling some. You own <br>@@.red;more menial slaves than there was work,@@ consider selling some. You own
...@@ -1121,6 +1122,7 @@ You own ...@@ -1121,6 +1122,7 @@ You own
<</if>> <</if>>
<<if $menialBioreactors > 0>> <<if $menialBioreactors > 0>>
<<set _bioreactorEarnings = 0>>
<<set _bioreactorEarnings = $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>> <<set _bioreactorEarnings = $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>>
<<if $dairy && $dairyUpgradeMenials>><<set _bioreactorEarnings += $menialBioreactors*5>><</if>> <<if $dairy && $dairyUpgradeMenials>><<set _bioreactorEarnings += $menialBioreactors*5>><</if>>
<<if $menialBioreactors > 1>> <<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>> <<if $menialBioreactors > 1>> <<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>>
...@@ -1130,6 +1132,7 @@ You own ...@@ -1130,6 +1132,7 @@ You own
<<if $fuckdolls > 0>> <<if $fuckdolls > 0>>
<<set _fuckdollsEarnings = 0>>
<<set _fuckdollsEarnings = $fuckdolls*(15+(10*$arcologies[0].FSDegradationistLaw))>> <<set _fuckdollsEarnings = $fuckdolls*(15+(10*$arcologies[0].FSDegradationistLaw))>>
<<if $arcade && $arcadeUpgradeMenials>><<set _fuckdollsEarnings += $fuckdolls*5>><</if>> <<if $arcade && $arcadeUpgradeMenials>><<set _fuckdollsEarnings += $fuckdolls*5>><</if>>
<<if $fuckdolls > 1>> <<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>> <<if $fuckdolls > 1>> <<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>>
......
...@@ -739,24 +739,22 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ ...@@ -739,24 +739,22 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</td> </td>
</tr> </tr>
//
<<if $researchLab.hired != 0>> <<if $researchLab.hired != 0>>
<tr> <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></td>
<td>@@.yellowgreen;+<<print cashFormat(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> <td>//@@.red;-<<print cashFormat(Math.abs(Math.trunc(300*$researchLab.hired)))>>@@//</td>
</tr> </tr>
<</if>> <</if>>
<<if $researchLab.menials != 0>> <<if $researchLab.menials != 0>>
<tr> <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></td>
<td>@@.yellowgreen;+<<print cashFormat(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> <td>//@@.red;-<<print cashFormat(Math.abs(Math.trunc(100*$researchLab.)menials))>>@@//</td>
</tr> </tr>
<</if>> <</if>>
//
<</if>> <</if>>
...@@ -2457,7 +2455,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ ...@@ -2457,7 +2455,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<elseif Math.trunc((($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)) == 0>> <<elseif Math.trunc((($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)) == 0>>
<<print cashFormat(Math.trunc((($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)))>> <<print cashFormat(Math.trunc((($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)))>>
<<else>> <<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> <</if>></td>
</tr> </tr>
<</if>> <</if>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment