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

fPat touch up

See merge request pregmodfan/fc-pregmod!2122

src/pregmod/fPat.tw

@@ -26,7 +26,7 @@ You tell $activeSlave.slaveName to
 /*approach*/
 
 <<if ($activeSlave.fetish == "mindbroken") && ($activeSlave.relationship != -3)>>
-	$He complies robotically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment.
+	$He complies robotically. $He remembers that when <<WrittenMaster>>'s commands are not obeyed, there is punishment.
 <<elseif ($activeSlave.relationship == -2)>>
 	$He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply
 	<<if canSee($activeSlave)>>
@@ -37,7 +37,7 @@ You tell $activeSlave.slaveName to
 	$He blushes furiously.
 <<elseif $activeSlave.relationship == -3>>
 	<<if $activeSlave.fetish == "mindbroken">>
-		$He complies mechanically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty $activeSlave.eyeColor eyes. $He shows no reaction
+		$He complies mechanically. $He remembers that when <<WrittenMaster>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty $activeSlave.eyeColor eyes. $He shows no reaction
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
 		$He complies in a wifely fashion, moving $his body as $he approaches to best enflame your desire, eager to be close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married $him. Once $he's close, you hold $his face in your palms and gaze
 		<<if canSee($activeSlave)>>
@@ -70,7 +70,7 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.devotion > 75)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $his eyes flick downward after a moment.
+		into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<WrittenMaster>> disconcerting, and $his eyes flick downward after a moment.
 	<<else>>
 		upon $his face. $He can feel the intense look from $his beloved <<Master>> and it is disconcerting, causing $him to glance away after only a moment, $his face flushed.
 	<</if>>
@@ -78,21 +78,21 @@ You tell $activeSlave.slaveName to
 <<elseif ($activeSlave.devotion > 50)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $he looks down after a moment, blushing.
+		into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<WrittenMaster>> disconcerting, and $he looks down after a moment, blushing.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<Master>> disconcerting, and it causes him to glance away after only a moment, blushing.
 		<</if>>
 <<elseif ($activeSlave.devotion > 20)>>
 	$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, blushing nervously.
+		into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<WrittenMaster>> worrying, and $he looks down after a moment, blushing nervously.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<Master>> worrying, and $he looks down after a moment, blushing nervously.
 		<</if>>
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > -20)>>
 	$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
 	<<if canSee($activeSlave)>>
-		into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
+		into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<WrittenMaster>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
 	<<else>>
 		upon $his face. $He finds the intense attention from $his <<Master>> worrying, and turns away after a moment, $his lower lip trembling with nervousness.
 	<</if>>
@@ -118,7 +118,7 @@ You walk around $him, drawing closer and slowly resting your hand on $his head.
 <<if ($activeSlave.fetish == "mindbroken")>>
 	Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your poor mentally shattered slave's inability to resist you. $He initially reacts slightly to your physical touch, but soon stops reacting completely.  Nevertheless, you continue to gingerly stroke $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>shaven scalp <<else>>hair <</if>>, as you gently press his body into your chest<<if $activeSlave.amp == 1>> and onto your lap<</if>>. The warmth from your slave's body, and the action of petting $his head, combinded with the sound of $his breathing, allow you to feel more relaxed by the minute.
 <<elseif ($activeSlave.relationship == -3) && $activeSlave.devotion+$activeSlave.trust >= 175>>
-	Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your slave's utterly willing submission. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> and finally onto your lap<</if>>, relaxing as $he feels your caress.  As $he shifts his weight to your chest, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips.  You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content wife.
+	Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your slave's utterly willing submission. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> and finally onto your lap<</if>>, relaxing as $he feels your caress.  As $he shifts his weight to your chest, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips.  You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her <</if>>devoted and content wife.
 <<elseif ($activeSlave.relationship == -2)>>
 	Tenderly and lovingly you brush your fingers along $his head, for a moment, appreciating how easily your slave submits to your desire to pat her head. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> allowing you to move $him onto your lap<</if>>, relaxing as $he feels your caresses.  As $his weight falls onto you, all of the stress from his body melts away, and a small, respectful sigh escapes $his pursed lips.  You smile fondly, allowing all of the troubles of being an arcology owner drift away, in a similar fashion to your slave.  For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content servant.
 <<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.amp != 1)>>