diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index e85db2a8cf8824642810965be2a9a99b59b5d044..9b5ffd9de4db46ea6afacdb161fe45bab97cb0c4 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -12,15 +12,20 @@
<<set $showAllEntries = {costsBudget: 0, repBudget: 0}>>
<</if>>
-//Here you can view many of the financial details of your arcology, <<= properTitle()>>. The detailed list of slaves and their costs (food, hormones) that you may remember can now be found in the "Slave maintenance" link. Other links will allow you to directly control areas of your arcology to adjust spending to suit your tastes.//
+<div class="scene-intro">
+ Here you can view many of the financial details of your arcology, <<= properTitle()>>. The detailed list of slaves and their costs (food, hormones) that you may remember can now be found in the "Slave maintenance" link. Other links will allow you to directly control areas of your arcology to adjust spending to suit your tastes.
+</div>
<br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>
<<if $difficultySwitch == 1>>
- //The Local Economy score effects some prices in your ecology. The lower the score, the higher the prices. The base score is ''100''.//
- <br>
+ <div class="scene-intro">
+ The Local Economy score effects some prices in your ecology. The lower the score, the higher the prices. The base score is ''100''.
+ </div>
<span id="economy">
- @@.yellowgreen;Global Economy@@
+ <span class="yellowgreen">
+ Global Economy
+ </span>
| <<print $economy>>
</span>
<<if ($cheatMode) && ($cheatModeM)>>
@@ -29,7 +34,9 @@
<<link "Apply">>
<<set $economy = Math.trunc(Number(_Teconomy)) || $economy, $cheater = 1>>
<<replace "#economy">>
- @@.yellowgreen;Global Economy@@
+ <span class="yellowgreen">
+ Global Economy
+ </span>
| <<print $economy>>
<</replace>>
<</link>>
@@ -37,7 +44,9 @@
<br>
<span id="localEcon">
- @@.yellowgreen;Local Economy@@
+ <span class="yellowgreen">
+ Local Economy
+ </span>
| <<print $localEcon>>
</span>
<<if ($cheatMode) && ($cheatModeM)>>
@@ -46,7 +55,9 @@
<<link "Apply">>
<<set $localEcon = Math.trunc(Number(_TlocalEcon)) || $localEcon, $cheater = 1>>
<<replace "#localEcon">>
- @@.yellowgreen;Local Economy@@
+ <span class="yellowgreen">
+ Local Economy
+ </span>
| <<print $localEcon>>
<</replace>>
<</link>>
@@ -55,17 +66,17 @@
<br> The current score is
<<if $localEcon > 100>>
<<set _econPercent = Math.trunc(1000-100000/$localEcon)/10>>
- reducing prices by @@.green;''<<print _econPercent>>%.''@@
+ reducing prices by <span class="cash.inc">''<<print _econPercent>>%.''</span>
<<elseif $localEcon == 100>>
equal to the base score. There are no price modifications.
<<else>>
<<set _econPercent = Math.trunc(100000/$localEcon-1000)/10>>
- increasing prices by @@.red;''<<print _econPercent>>%.''@@
+ increasing prices by <span class="cash.dec">''<<print _econPercent>>%.''</span>
<</if>>
<br style="clear:both"><<if $lineSeparations == 0>><br><br><<else>><hr style="margin:0"><</if>>
<</if>>
-//Your weekly costs are as follows://
+<span class="detail">Your weekly costs are as follows:</span>
<<options $showAllEntries.costsBudget>>
<<option 0 "Normal">>
<<option 1 "Show Empty Entries">>
@@ -183,7 +194,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("weather",
"<<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\"]].
+ Weather is causing <span class=\"red\">expensive damage.</span> Consider a protective [[upgrade|Manage Arcology][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]].
<<else>>
Weather
<</if>>")>>
@@ -318,9 +329,20 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("privateOrphanage", "Private tutelage of $privateOrphanageTotal of your slaves\' children")>>
<<print budgetLine("mercenaries",
- "Security: <<if $barracks>>[[$mercenariesTitle|Barracks][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]
- <<else>>Mercenaries<br>//@@.red;Cost increased by the lack of an armory to house them.@@//<</if>>
- <<if ($PC.skill.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>
+ "Security:
+ <<if $barracks>>
+ [[$mercenariesTitle|Barracks][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]
+ <<else>>
+ Mercenaries
+ <div class=\"red detail\">
+ Cost increased by the lack of an armory to house them.
+ </div>
+ <</if>>
+ <<if ($PC.skill.warfare >= 100) || ($PC.career == \"arcology owner\")>>
+ <div class=\"detail\">
+ Cost reduced by your <span class=\"springgreen\">mercenary contacts.</span>
+ </div>
+ <</if>>
")>>
<<print budgetLine("securityExpansion", "Security expansion")>>
@@ -338,33 +360,23 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<td>Tracked totals</td>
<td>
<<set $lastWeeksCashIncome.Total = hashSum($lastWeeksCashIncome)>>
- <<if $lastWeeksCashIncome.Total > 0>>
- @@.yellowgreen;<<print cashFormat(Math.trunc($lastWeeksCashIncome.Total))>>@@
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashIncome.Total)))>>@@
- <</if>>
+ <<print cashFormatColor(Math.trunc($lastWeeksCashIncome.Total))>>
</td>
<td>
<<set $lastWeeksCashExpenses.Total = hashSum($lastWeeksCashExpenses)>>
- <<if $lastWeeksCashExpenses.Total > 0>>
- @@.yellowgreen;<<print cashFormat(Math.trunc($lastWeeksCashExpenses.Total))>>@@
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.Total)))>>@@
- <</if>>
+ <<print cashFormatColor(Math.trunc($lastWeeksCashExpenses.Total))>>
</td>
<td>
<<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 (cashFormat(Math.trunc(hashSum($lastWeeksCashProfits)-$lastWeeksCashProfits.Total)))>><br>
- @@.red;Fix profit calc<br>@@
- <</if>>
- <<if $lastWeeksCashProfits.Total > 0>>
- @@.yellowgreen;<<print cashFormat(Math.trunc($lastWeeksCashProfits.Total))>>@@
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.Total)))>>@@
+ <<print (cashFormat(Math.trunc(hashSum($lastWeeksCashProfits)-$lastWeeksCashProfits.Total)))>>
+ <div class="red">Fix profit calc</div>
<</if>>
+ <div>
+ <<print cashFormatColor(Math.trunc($lastWeeksCashProfits.Total))>>
+ </div>
</td>
</tr>
@@ -373,11 +385,9 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<tr>
<td>Expenses budget for week <<print ($week+1)>></td>
<td></td>
- <td><<if $costs < 0>>
- @@.yellowgreen;<<print cashFormat($costs)>>@@
- <<else>>
- @@.red;-<<print cashFormat($costs)>>@@
- <</if>></td>
+ <td>
+ <<print cashFormatColor($costs)>>
+ </td>
<td></td>
</tr>
@@ -386,29 +396,23 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<td>Last week actuals</td>
<td></td>
<td></td>
- <td><<if ($cash-$cashLastWeek) > 0>>
- @@.yellowgreen;<<print cashFormat($cash-$cashLastWeek)>>@@
- <<else>>
- @@.red;-<<print cashFormat($cash-$cashLastWeek)>>@@
- <</if>></td>
+ <td>
+ <<print cashFormatColor($cash-$cashLastWeek)>>
+ </td>
</tr>
<<if ($cash-$cashLastWeek) == $lastWeeksCashProfits.Total>>
<tr>
- @@.green;The books are balanced, <<= properTitle()>>!@@
+ <span class="green">The books are balanced, <<= properTitle()>>!</span>
</tr>
<<else>>
<tr>
<td>Transaction tracking off by:</td>
<td></td>
<td>/*<<print ($lastWeeksCashExpenses.Total + $costs)>>*/</td>
- <td><<if (($cash-$cashLastWeek) - $lastWeeksCashProfits.Total) > 0>>
- @@.yellowgreen;<<print cashFormat(($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)>>@@
- <<elseif (($cash-$cashLastWeek) - $lastWeeksCashProfits.Total) == 0>>
- <<print cashFormat((($cash-$cashLastWeek) - $lastWeeksCashProfits.Total))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(($cash-$cashLastWeek) - $lastWeeksCashProfits.Total))>>@@
- <</if>></td>
+ <td>
+ <<print cashFormatColor(($cash-$cashLastWeek) - $lastWeeksCashProfits.Total)>>
+ </td>
</tr>
<</if>>
</table>
@@ -425,5 +429,5 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<link "Reset">>
<<set $lastWeeksCashErrors = "Errors: ">>
<</link>>
- @@.red;-<<print $lastWeeksCashErrors>>@@
+ <<print cashFormatColor($lastWeeksCashErrors)>>
<</if>>