From 180d3670e1b74509a235f44acf630df89cb97662 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Sun, 10 Mar 2019 20:00:11 -0400
Subject: [PATCH] fix costsBudget
---
src/uncategorized/costsBudget.tw | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 15d5f6621ab..b308c24ef80 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -184,7 +184,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
Since you are used to a fairly normal life, your personal living expenses are:
<</if>>")>>
- <<print budgetLine("PCtraining", "<<if ($personalAttention == \"trading\")>>
+ <<print budgetLine("PCtraining", "
+ <<if ($personalAttention == \"trading\")>>
[[Trading trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
<<elseif ($personalAttention == \"warfare\")>>
[[Warfare trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
@@ -194,16 +195,19 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
[[Engineering trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
<<elseif ($personalAttention == \"medicine\")>>
[[Medicine trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
- <</if>>")>>
+ <</if>>
+ ")>>
<<print budgetLine("PCmedical", "Your medical expenses")>>
<<print budgetLine("PCskills", "Your skills")>>
- <<print budgetLine("rents", "Your rents
+ <<print budgetLine("rents",
+ "Your rents
<<if $lastWeeksCashExpenses.rents < 0>>
and bribes
- <</if>>")>>
+ <</if>>
+ ")>>
<<print budgetLine("stocks", ">Stock dividends on ($personalShares/<<print ($publicShares + $personalShares)>> shares).")>>
@@ -244,15 +248,18 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<elseif $TCR.schoolPresent == 1>>[[The Cattle Ranch|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] branch campus upkeep
<<elseif $HA.schoolPresent == 1>>[[Hippolyta Academy|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] branch campus upkeep
<<else>> Unknown school expense
- <</if>>")>>
+ <</if>>
+ ")>>
<<print budgetLine("citizenOrphanage", "Education of $citizenOrphanageTotal of your slaves\' children in citizen schools")>>
<<print budgetLine("privateOrphanage", "Private tutelage of $privateOrphanageTotal of your slaves\' children")>>
- <<print budgetLine("mercenaries", "Security: [[$mercenariesTitle|Barracks][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]
+ <<print budgetLine("mercenaries",
+ "Security: [[$mercenariesTitle|Barracks][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]
<<if $barracks>><<else>><br>//@@.red;Cost increased by the lack of an armory to house them.@@//<</if>>
- <<if ($PC.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>")>>
+ <<if ($PC.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>
+ ")>>
<<print budgetLine("securityExpansion", "Security expansion")>>
--
GitLab