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

fix master suite report when verboseDescriptions is disabled

See merge request !289

src/uncategorized/masterSuiteReport.tw

@@ -160,13 +160,11 @@
 				<<set $slaves[$i].devotion++>>
 			<</if>>
 		<<else>> /* not Concubine */
-			<<if $verboseDescriptions == 1>>
-				''__@@.pink;$slaves[$i].slaveName@@__''
-				<<if $slaves[$i].choosesOwnAssignment == 2>>
-					<<include "SA chooses own job">>
-				<<else>>
-					sees to your pleasure in $masterSuiteName.
-				<</if>>
+			''__@@.pink;$slaves[$i].slaveName@@__''
+			<<if $slaves[$i].choosesOwnAssignment == 2>>
+				<<include "SA chooses own job">>
+			<<else>>
+				sees to your pleasure in $masterSuiteName.
 			<</if>>
 			/* Perform facility based rule changes */
 			<<if ($masterSuiteUpgradeLuxury == 1)>>
@@ -214,22 +212,17 @@
 		/% Both Concubine and other slaves %/
 		<<if $masterSuiteUpgradeLuxury == 2 && $masterSuiteAverageEnergy > random(50,90)>>
 			<<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion > -10) && ($slaves[$i].fetishStrength <= 95)>>
-				<<if $verboseDescriptions == 1>>
-					<<set _Verb = "She">>
-				<<else>>
-					<<set _Verb = $slaves[$i].slaveName>>
-				<</if>>
 				<<fetishChangeChance $slaves[$i]>>
 				<<if (_masterSuiteAverageMilk > 2000) && ($fetishChangeChance > random(0,50))>>
 					<<if $slaves[$i].fetish == "boobs">>
 						<<if $verboseDescriptions == 1>>Her<<else>>$slaves[$i].slaveName's<</if>> @@.lightcoral;boob fetish is strengthened@@ by the constant availability of milky nipples for her to play with.
 						<<set $slaves[$i].fetishStrength += 4>>
 					<<else>>
-						_Verb @@.lightcoral;acquires a boob fetish@@ after spending a lot of time in the fuckpit drinking from her fellow fucktoys' tits.
+						She @@.lightcoral;acquires a boob fetish@@ after spending a lot of time in the fuckpit drinking from her fellow fucktoys' tits.
 						<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishStrength = 65>>
 					<</if>>
 				<<elseif (_masterSuiteAverageDick > 3) && ($slaves[$i].anus > 0) && ($fetishChangeChance > random(0,50))>>
-					_Verb
+					She
 					<<if $slaves[$i].fetish == "buttslut">>
 						@@.lightcoral;sinks farther into anal pleasure,@@ since she spends her time in the fuckpit with at least one of the many available cocks up her butt.
 						<<set $slaves[$i].fetishStrength += 4>>
@@ -238,7 +231,7 @@
 						<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishStrength = 65>>
 					<</if>>
 				<<elseif (_masterSuiteAverageCum > 3) && ($fetishChangeChance > random(0,50))>>
-					_Verb
+					She
 					<<if $slaves[$i].fetish == "cumslut">>
 						@@.lightcoral;sinks farther into cum addiction,@@ since she spends her time in the fuckpit eagerly sucking down ejaculate, straight from the many sources.
 						<<set $slaves[$i].fetishStrength += 4>>
@@ -247,7 +240,7 @@
 						<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishStrength = 65>>
 					<</if>>
 				<<elseif (_masterSuiteAveragePreg > 10) && ($fetishChangeChance > random(0,50))>>
-					_Verb
+					She
 					<<if $slaves[$i].fetish == "pregnancy">>
 						@@.lightcoral;sinks farther into pregnancy obsession,@@ since she never wants for a pregnant girl to make love to.
 						<<set $slaves[$i].fetishStrength += 4>>
@@ -256,7 +249,7 @@
 						<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishStrength = 65>>
 					<</if>>
 				<<elseif (_masterSuiteAverageDom < 50) && ($fetishChangeChance > random(0,50))>>
-					_Verb
+					She
 					<<if $slaves[$i].fetish == "dom">>
 						@@.lightcoral;becomes more dominant,@@ since there are so many subs in the fuckpit who beg her to fuck them hard.
 						<<set $slaves[$i].fetishStrength += 4>>
@@ -265,7 +258,7 @@
 						<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishStrength = 65>>
 					<</if>>
 				<<elseif (_masterSuiteAverageDom > 50) && ($fetishChangeChance > random(0,50))>>
-					_Verb
+					She
 					<<if $slaves[$i].fetish == "submissive">>
 						@@.lightcoral;becomes even more submissive,@@ since there are so many doms in the fuckpit that she's often used by more than one at once.
 						<<set $slaves[$i].fetishStrength += 4>>
@@ -274,7 +267,7 @@
 						<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishStrength = 65>>
 					<</if>>
 				<<elseif (_masterSuiteAverageSadism < 50) && ($fetishChangeChance > random(0,50))>>
-					_Verb
+					She
 					<<if $slaves[$i].fetish == "sadist">>
 						@@.lightcoral;becomes more sadistic,@@ since there are so many girls in the fuckpit who will do anything for her if she'll only spank them.
 						<<set $slaves[$i].fetishStrength += 4>>