From b309b7e5670598fab61e87f8dbcf1dcaa40f700b Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Mon, 18 Dec 2017 06:34:38 +1300
Subject: [PATCH] Bug fix and additional conversions.

---
 src/uncategorized/manageArcology.tw | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 33f7e199993..498f7c5f4b5 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -90,13 +90,12 @@ __Construction__
 
 <br>
 
-<<if $FormattedWithCommas == 0>>
-	<<set $GenericProsperityImporvementCost = Math.trunc($cash*.10)>> <<else>> <<set $GenericProsperityImporvementCost = cashFormat(Math.trunc($cash*.10))>> 
-<</if>>
+<<set $GenericProsperityImporvementCost = Math.trunc($cash*.10)>>
 <<link "Increase the maxium prosperity of $arcologies[0].name">>
-	<<set $AProsperityCap += 5, $cash -= $GenericProsperityImporvementCost>>
+	<<set $AProsperityCap += 5>>
+	 <<set $cash -= $GenericProsperityImporvementCost>>
 	<<goto "Manage Arcology">>
-<</link>> <br>// This will cost 10% of your current cash which is <<print $GenericProsperityImporvementCost>>.
+<</link>> <br>// This will cost 10% of your current cash which is <<if $FormattedWithCommas == 0>> <<print $GenericProsperityImporvementCost>> <<else>> <<print cashFormat($GenericProsperityImporvementCost)>> <</if>>.
 <<if $secExp == 1>>
 	<br>
 	<br>
@@ -183,17 +182,17 @@ She also has charge of all smart piercings in the arcology, and is using her ada
 
 <br><br>
 
-Your slaves have participated in approximately <<print $oralTotal+$vaginalTotal+$analTotal>> sexual encounters: $oralTotal primarily oral, $vaginalTotal vanilla, $mammaryTotal mammary, $analTotal anal, and $penetrativeTotal with the slave penetrating another. They have produced about $milkTotal liters of marketable milk, <<if $seeDicks != 0>>about $cumTotal deciliters of marketable cum, <</if>>and have given birth $birthsTotal times.
+Your slaves have participated in approximately <<if $FormattedWithCommas == 0>> <<print $oralTotal+$vaginalTotal+$analTotal>> <<else>> <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> <</if>> sexual encounters: <<if $FormattedWithCommas == 0>> $oralTotal <<else>>  <<print commaNum($oralTotal)>> <</if>> primarily oral, <<if $FormattedWithCommas == 0>> $vaginalTotal <<else>> <<print commaNum($vaginalTotal)>> <</if>>  vanilla, <<if $FormattedWithCommas == 0>> $mammaryTotal <<else>> <<print commaNum($mammaryTotal)>> <</if>> mammary, <<if $FormattedWithCommas == 0>> $analTotal <<else>> <<print commaNum($analTotal)>> <</if>> anal, and <<if $FormattedWithCommas == 0>> $penetrativeTotal <<else>> <<print commaNum($penetrativeTotal)>> <</if>> with the slave penetrating another. They have produced about <<if $FormattedWithCommas == 0>> $milkTotal <<else>> <<print commaNum($milkTotal)>> <</if>> liters of marketable milk, <<if $seeDicks != 0>>about <<if $FormattedWithCommas == 0>> $cumTotal <<else>> <<print commaNum($cumTotal)>> <</if>>  deciliters of marketable cum, <</if>>and have given birth <<if $FormattedWithCommas == 0>> $birthsTotal <<else>> <<print commaNum($birthsTotal)>> <</if>> times.
 
-<<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>>
-<<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
+<<if $pitKillsTotal > 0>> <<if $FormattedWithCommas == 0>> $pitKillsTotal <<else>> <<print commaNum($pitKillsTotal)>> <</if>> slaves have died in your fighting pit.<</if>>
+<<if $fuckdollsSold > 0>> <<if $FormattedWithCommas == 0>> $fuckdollsSold <<else>> <<print commaNum($fuckdollsSold)>> <</if>> mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
 
 <<if $secExp == 1 && $battlesEnabled == 1>>
 <br><br>
 <<if $securityForceCreate == 0>>
-	Your army counts <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower>> total soldiers.
+	Your army counts <<if $FormattedWithCommas == 0>> <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower>> <<else>> <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> <</if>>total soldiers.
 <<else>>
-	Your army counts <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel>> total soldiers of which $securityForcePersonnel under the security force command and the rest under your direct control.
+	Your army counts <<if $FormattedWithCommas == 0>> <<print $militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel>> <<else>> <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel)>> <</if>> total soldiers of which <<if $FormattedWithCommas == 0>> $securityForcePersonnel <<else>> <<print commaNum($securityForcePersonnel)>> <</if>> fall under the security force command with the rest under your direct control.
 <</if>>
 <<if $hasFoughtOnce == 1>>
 	Your troops were involved in <<print $battlesCount>> battles of which <<print $majorBattlesCount>> major engagements. You won <<print $PCvictories>> of them, while the enemy managed to gain the upper hand in the other <<print $PClosses>>.
-- 
GitLab