From 7388a0cd1cd945758c86ce4a3da167e778b96056 Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Thu, 17 Jan 2019 23:17:17 -0500 Subject: [PATCH] Brothel ads fix, lore fix --- src/uncategorized/brothel.tw | 16 +++++++++------- src/uncategorized/brothelAdvertisement.tw | 4 ++-- src/uncategorized/costsBudget.tw | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw index 69416478613..1113197761c 100644 --- a/src/uncategorized/brothel.tw +++ b/src/uncategorized/brothel.tw @@ -187,15 +187,17 @@ $brothelNameCaps <br>$brothelNameCaps <<if $brothelAdsSpending > 0>> - is the subject of an active ad campaign, + is the subject of an active ad campaign. <<else>> - advertises by word of mouth, + advertises by word of mouth. +<</if>> +Last week's ads +<<set $lastWeeksCashProfits.brothelAds = $lastWeeksCashIncome.brothelAds + $lastWeeksCashExpenses.brothelAds>> +<<if $lastWeeksCashProfits.brothelAds > 0>> + made you an extra @@.green;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>@@. +<<elseif $lastWeeksCashProfits.brothelAds < 0>> + lost you @@.red;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>@@. <</if>> -<<if $lastWeeksCashIncome.brothelAds > $brothelAdsSpending>> - making you an extra @@.green;<<print cashFormat($lastWeeksCashIncome.brothelAds - $brothelAdsSpending)>>@@. - <<elseif $lastWeeksCashIncome.brothelAds < $brothelAdsSpending>> - losing you @@.red;<<print cashFormat($lastWeeksCashIncome.brothelAds - $brothelAdsSpending)>>@@. - <</if>> <<link "Manage brothel advertisements" "Brothel Advertisement">><<set $nextLink = passage(), $nextButton = "Back">><</link>> <!-- Statistics output --> diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw index 7b2bdfb5046..61a3ce9771e 100644 --- a/src/uncategorized/brothelAdvertisement.tw +++ b/src/uncategorized/brothelAdvertisement.tw @@ -119,9 +119,9 @@ <br><br> -You are spending <<print cashFormat($brothelAdsSpending)>> each week to advertise the brothel. +You are spending @@.red;<<print cashFormat($brothelAdsSpending)>>@@ each week to advertise the brothel. <<if $lastWeeksCashIncome.brothelAds > 0>> - Last week's ads increased profits by <<print cashFormat($lastWeeksCashIncome.brothelAds)>>. + Last week's ads increased profits by @@.green;<<print cashFormat($lastWeeksCashIncome.brothelAds)>>@@, and cost @@.red;<<print cashFormat($lastWeeksCashExpenses.brothelAds)>>@@. <</if>> <<if $brothelAdsSpending > 900>> diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw index b4ea3c11688..68faac481ee 100644 --- a/src/uncategorized/costsBudget.tw +++ b/src/uncategorized/costsBudget.tw @@ -10,7 +10,7 @@ <br> -//Here you can view many of the financial details of your arcology. A list of details about slaves and their costs (food, hormones) can be found in the "Slave maintenance" link. Other links will take you to relevant areas of your arcology where costs may be able to be adjusted. "Actuals" are visible back at the main screen (as "since last week") and listed at the very bottom of this page; they very accurately record the total cash change since the previous week. The other numbers may have small inaccuracies, and some transactions may not be tracked yet at all, but they should help you keep a finger on the financial pulse of your arcology. +//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.// <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>> <br> -- GitLab