Merge branch 'pregmod-master' into 'pregmod-master'

Manual 1220

See merge request pregmodfan/fc-pregmod!1222

src/pregmod/SecForceEX/securityForceTradeShow.tw

@@ -72,7 +72,7 @@ The (bi-yearly) security trade show has finally come around and even though you'
 		<<set _TradingPower = 16>>
 	<</if>>
 
-	<<set _SuccesfulPersuationAttempt == 0>>
+	<<set _SuccesfulPersuationAttempt = 0>>
 	<<if ($SFNO || $SFO) < 10 && random(0,100)+_TradingPower > 90>>
 		<<set _SuccesfulPersuationAttempt = 1>>
 		<<set _PersuationBonus = 1.05>>

src/uncategorized/brothel.tw

@@ -146,7 +146,7 @@ $brothelNameCaps
 <</if>>
 
 <<set _Tmult0 = Math.trunc($brothel*1000*$upgradeMultiplierArcology)>>
-<br>It can support $brothel whores.
+<br>It can support $brothel whores. Currently $brothelSlaves whore at $brothelNameCaps.
 [[Expand the brothel|Brothel][$cash -= _Tmult0, $brothel += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
 
 <br>

src/uncategorized/buySlaves.tw

@@ -262,7 +262,7 @@ The parts of your arcology you own can house a total of $PopCap menial slaves.
 
 <br>
 <<if $helots > 1>>
-	You own <<print commaNum($helots)>> menial slaves.
+	You own <<print commaNum(Math.trunc($helots))>> menial slaves.
 <<elseif $helots > 0>>
 	You own one menial slave.
 <<else>>
@@ -325,7 +325,7 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
 <</if>>
 
 <<if $fuckdolls > 1>>
-	<br>You own $fuckdolls standard Fuckdolls.
+	<br>You own <<print commaNum(Math.trunc($fuckdolls))>> standard Fuckdolls.
 <<elseif $fuckdolls > 0>>
 	<br>You own one standard Fuckdoll.
 <<elseif $arcologies[0].FSPaternalist == "unset">>
@@ -363,7 +363,7 @@ The market price of standard fuckdolls is <<print cashFormat(_menialPrice*2)>>.
 <</if>>
 
 <<if $menialBioreactors > 1>>
-	<br>You own $menialBioreactors standard bioreactors.
+	<br>You own <<print commaNum(Math.trunc($menialBioreactors))>> standard bioreactors.
 <<elseif $menialBioreactors > 0>>
 	<br>You own one standard bioreactor.
 <<elseif $arcologies[0].FSPaternalist == "unset">>

src/uncategorized/club.tw

@@ -201,7 +201,7 @@ $clubNameCaps
 <</if>>
 
 <<set _Tmult0 = Math.trunc($club*1000*$upgradeMultiplierArcology)>>
-<br>There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves.
+<br>There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves. Currently $clubSlaves are serving in $clubName.
 [[Expand the club|Club][$cash -= _Tmult0, $club += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
 
 <br>

src/uncategorized/saServeYourOtherSlaves.tw

@@ -34,6 +34,9 @@
 			<<set $slaves[$i].devotion += 1>>
 		<</if>>
 	<</if>>
+	<<set _fuckCount = (($dormitoryPopulation+$roomsPopulation)+random((($dormitoryPopulation+$roomsPopulation)*1),($dormitoryPopulation+$roomsPopulation)*7))>>
+	<<SimpleSlaveFucking $slaves[$i] _fuckCount>>
+	<<set $slaves[$i].need -= 2*_fuckCount>>
 <<else>>
 	obediently serves your other slaves' sexual needs. Being used as a sexual outlet for everyone @@.hotpink;keeps her in a good frame of mind.@@
 	<<set $slaves[$i].trust += 2>>