diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw index 65f9c25a44d473338b8576efc0293e11af825c64..b3aa5220a55be8bb3504e7d86b72648d35e29124 100644 --- a/src/uncategorized/costsBudget.tw +++ b/src/uncategorized/costsBudget.tw @@ -207,9 +207,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ <<print budgetLine("porn", "Porn")>> - <<if $Recruiter != 0>> - <<print budgetLine("recruiter", "Recruiter")>> - <</if>> + <<print budgetLine("recruiter", "Recruiter")>> <<print budgetLine("menialRetirement", "Menials retiring")>> @@ -234,9 +232,7 @@ 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>>")>> - <<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>> - <<if ["trading", "warfare", "slaving", "engineering", "medicine", "hacking"].includes($personalAttention)>> - <<print budgetLine("PCtraining", " + <<print budgetLine("PCtraining", " <<if ($personalAttention == \"trading\")>> [[Trading trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees <<elseif ($personalAttention == \"warfare\")>> @@ -251,8 +247,6 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ [[Hacking trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees <</if>> ")>> - <</if>> - <</if>> <<print budgetLine("PCmedical", "Your medical expenses")>> @@ -265,11 +259,9 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ <</if>> ")>> - <<if $corpIncorporated > 0>> - <<print budgetLine("stocks", "Stock dividends on ($personalShares/<<print ($publicShares + $personalShares)>> shares).")>> + <<print budgetLine("stocks", "Stock dividends on ($personalShares/<<print ($publicShares + $personalShares)>> shares).")>> - <<print budgetLine("stocksTraded", "Stock trading")>> - <</if>> + <<print budgetLine("stocksTraded", "Stock trading")>> <<print budgetLine("fines", "Fines")>> @@ -282,10 +274,13 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ <<print budgetLine("cheating", "CHEATING")>> <tr> - <h2>Policies</h2> + <h2>Policies <<if $secExp > 0>> and editics<</if>> </h2> </tr> - <<print budgetLine("policies", "[[Policies|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] and [[Edicts|edicts][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]")>> + <<print budgetLine("policies", "[[Policies|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]")>> + <<if $secExp > 0>> + <<print budgetLine("[[Edicts|edicts][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]")>> + <</if>> <<print budgetLine("futureSocieties", "[[Society shaping|Future Society][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]")>> @@ -311,33 +306,21 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ <</if>> ")>> - <<if $citizenOrphanageTotal > 0>> - <<print budgetLine("citizenOrphanage", "Education of $citizenOrphanageTotal of your slaves\' children in citizen schools")>> - <</if>> + <<print budgetLine("citizenOrphanage", "Education of $citizenOrphanageTotal of your slaves\' children in citizen schools")>> - <<if $privateOrphanageTotal > 0>> - <<print budgetLine("privateOrphanage", "Private tutelage of $privateOrphanageTotal of your slaves\' children")>> - <</if>> + <<print budgetLine("privateOrphanage", "Private tutelage of $privateOrphanageTotal of your slaves\' children")>> - <<if $mercenaries > 0>> - <<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.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>> - ")>> - <</if>> + <<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.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>> + ")>> - <<if $secExp > 0>> - <<print budgetLine("securityExpansion", "Security expansion")>> - <</if>> + <<print budgetLine("securityExpansion", "Security expansion")>> - <<if $SF.Toggle && $SF.Active >= 1>> - <<print budgetLine("specialForces", "Special forces")>> - <</if>> + <<print budgetLine("specialForces", "Special forces")>> - <<if $peacekeepers.undermining > 0>> - <<print budgetLine("undermining", "Undermine political support for the nearby old world peacekeeping mission.")>> - <</if>> + <<print budgetLine("undermining", "Undermine political support for the nearby old world peacekeeping mission.")>> <tr><td></td></tr> diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw index 9bb91fc36d2cb0e34ee7153137247a3406543fcd..cfb41e6cdd3d3275b078c971780ab51008f8c24e 100644 --- a/src/uncategorized/repBudget.tw +++ b/src/uncategorized/repBudget.tw @@ -55,59 +55,39 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){ <<print budgetLine("gloryhole", "Free glory holes")>> - <<if $Concubine != 0>> - <<print budgetLine("concubine", "Concubine")>> - <</if>> + <<print budgetLine("concubine", "Concubine")>> - <<if $HeadGirl != 0>> - <<print budgetLine("headGirl", "Head girl")>> - <</if>> + <<print budgetLine("headGirl", "Head girl")>> - <<if $Bodyguard != 0>> - <<print budgetLine("bodyguard", "Bodyguard")>> - <</if>> + <<print budgetLine("bodyguard", "Bodyguard")>> - <<if $Recruiter != 0>> - <<print budgetLine("recruiter", "Recruiter")>> - <</if>> + <<print budgetLine("recruiter", "Recruiter")>> <tr> <h2>Structures</h2> /* TODO: using h2s doesn't fit in with the rest of the game */ </tr> - <<if $arcade > 0>> - <<print budgetLine("arcade", "[[$arcadeNameCaps|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($arcadeSlaves slaves)")>> + <<print budgetLine("arcade", "[[$arcadeNameCaps|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($arcadeSlaves slaves)")>> - <<print budgetLine("gloryholeArcade", "Free arcade")>> - <</if>> + <<print budgetLine("gloryholeArcade", "Free arcade")>> - <<if $brothel > 0>> - <<print budgetLine("brothel", "[[$brothelNameCaps|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($brothelSlaves slaves)")>> - <</if>> + <<print budgetLine("brothel", "[[$brothelNameCaps|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($brothelSlaves slaves)")>> - <<if $club > 0>> - <<print budgetLine("club", "[[$clubNameCaps|Club][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($clubSlaves slaves)")>> + <<print budgetLine("club", "[[$clubNameCaps|Club][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($clubSlaves slaves)")>> - <<print budgetLine("publicServantClub", "Club servants")>> + <<print budgetLine("publicServantClub", "Club servants")>> - <<if $clubAdsSpending > 0>> - <<print budgetLine("clubAds", "[[Club ads|Club Advertisement][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]")>> - <</if>> + <<print budgetLine("clubAds", "[[Club ads|Club Advertisement][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]")>> + <<if $club > 0>> <br> <</if>> - <<if $pit > 0>> - <<print budgetLine("pit", "[[$pitNameCaps|Pit][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($fighterIDs.length slaves)")>> - <</if>> + <<print budgetLine("pit", "[[$pitNameCaps|Pit][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($fighterIDs.length slaves)")>> - <<if $servantsQuarters > 0>> - <<print budgetLine("servantsQuarters", "[[Servants' Quarters][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($servantsQuartersSlaves slaves)")>> - <</if>> + <<print budgetLine("servantsQuarters", "[[Servants' Quarters][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($servantsQuartersSlaves slaves)")>> - <<if $spa > 0>> - <<print budgetLine("spa", "[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($spaSlaves slaves)")>> - <</if>> + <<print budgetLine("spa", "[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] ($spaSlaves slaves)")>> <<print budgetLine("architecture", "[[Architecture|Manage Arcology][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]")>> @@ -151,9 +131,7 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){ <h2>Forces</h2> </tr> - <<if $SF.Toggle && $SF.Active >= 1>> - <<print budgetLine("specialForces", "Special forces")>> - <</if>> + <<print budgetLine("specialForces", "Special forces")>> <<print budgetLine("peacekeepers", "Peacekeepers")>>