Merge branch 'fixes' into 'pregmod-master'

Fix `costsReport.tw` to check for ad spending instead of facility presence and fix indentation

See merge request pregmodfan/fc-pregmod!6339

src/uncategorized/costsReport.tw

@@ -118,19 +118,18 @@ your personal living expenses are @@.yellowgreen;<<print cashFormat(Math.trunc(_
 <<if $brothel > 0 || $club > 0 || $arcade > 0 || $dairy > 0 || $farmyard > 0>>
 	<br><br>__Arcology Building Maintenance__:
 	<<if $brothel > 0>>
-	<<set _advertising = 0>>
-	<<if $brothel > 0>>
-		<<set _advertising = $brothelAdsSpending>>
+		<<set _advertising = 0>>
+		<<if $brothelAdsSpending > 0>>
+			<<set _advertising = $brothelAdsSpending>>
+		<</if>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;
+		Brothel: @@.yellowgreen;<<print cashFormat(($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising)>>@@
+		<<set _arcologyCosts += ($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising>>
 	<</if>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	Brothel: @@.yellowgreen;<<print cashFormat(($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising)>>@@
-	<<set _arcologyCosts += ($brothel*$facilityCost)+(0.1*$brothelUpgradeDrugs*$brothel*$facilityCost)+_advertising>>
-<</if>>
 	<<if $club > 0>>
 		<<set _advertising= 0>>
-		<<if $club > 0>>
+		<<if $clubAdsSpending > 0>>
 			<<set _advertising = $clubAdsSpending>>
-			<<set _arcologyCosts += $clubAdsSpending>>
 		<</if>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
 		Club: @@.yellowgreen;<<print cashFormat(($club*$facilityCost)+(0.2*$clubUpgradePDAs*$club*$facilityCost)+_advertising)>>@@