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

Pregmod v1019-52

See merge request !711

src/art/artWidgets.tw

@@ -50,19 +50,21 @@ $args[2]: icon UI Display for vector art, 1 for on.
 %/
 <<widget "SlaveArt">>
 
-<<if $args[0].customImage>>
-
-<<set _fileName = "'resources/" + $args[0].customImage + ".png' ">>
-
-<<if $args[1] == 3>>
-	<<print "<img src=" + _fileName + "style='float:right; border:3px hidden'/>">>
-<<elseif $args[1] == 2>>
-	<<print "<img src=" + _fileName + "style='float:right; border:3px hidden' width='300' height='300'/>">>
-<<elseif $args[1] == 1>>
-	<<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'/>">>
-<<else>>
-	<<print "<img src=" + _fileName + "style='float:left; border:3px hidden' width='120' height='120'/>">>
-<</if>>
+<<if ndef $args[0].customImage>><<set $args[0].customImage = 0>><</if>>
+<<if $args[0].customImage != 0>>
+	<<set _fileFormat = ($args[0].customImageFormat || "png"),
+		_fileName = "'resources/" + $args[0].customImage + "." + _fileFormat + "' ",
+		_fileTypeStart = (_fileFormat === "webm" ? "video loop autoplay" : "img"),
+		_fileTypeEnd = (_fileFormat === "webm" ? "</video>" : "")>>
+	<<if $args[1] == 3>>
+		<<print "<" + _fileTypeStart + " src=" + _fileName + "style='float:right; border:3px hidden'>" + _fileTypeEnd>>
+	<<elseif $args[1] == 2>>
+		<<print "<" + _fileTypeStart + " src=" + _fileName + "style='float:right; border:3px hidden' width='300' height='300'>" + _fileTypeEnd>>
+	<<elseif $args[1] == 1>>
+		<<print "<" + _fileTypeStart + " src=" + _fileName + "style='float:left; border:3px hidden' width='150' height='150'>" + _fileTypeEnd>>
+	<<else>>
+		<<print "<" + _fileTypeStart + " src=" + _fileName + "style='float:left; border:3px hidden' width='120' height='120'>" + _fileTypeEnd>>
+	<</if>>
 
 <<elseif $imageChoice == 1>> /* VECTOR ART BY NOX*/
 

src/uncategorized/RESS.tw

@@ -1117,7 +1117,7 @@ You decide to stop by to see her method at work. By the time you arrive, she's a
 <<case "forbidden masturbation">>
 <<if $assistant > 0>>
-	There is an alert from $assistantName, in her deliciously feminine voice: "$activeSlave.slaveName is masturbating, <<Master>>. Ooh, she's breaking the rules, <<Master>>!" Her avatar
+	There is an alert from $assistantName, in her deliciously feminine voice: "$activeSlave.slaveName is masturbating, <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>. Ooh, she's breaking the rules, <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>!" Her avatar
 	<<switch $assistantAppearance>>
 	<<case "monstergirl">>
 		strokes its dicks suggestively.
@@ -1155,11 +1155,11 @@ You decide to stop by to see her method at work. By the time you arrive, she's a
 		spins accusingly.
 	<</switch>>
 <<else>>
-	There is a gentle alert from $assistantName: "$activeSlave.slaveName is masturbating in violation of the rules, <<Master>>."
+	There is a gentle alert from $assistantName: "$activeSlave.slaveName is masturbating in violation of the rules, <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>."
 <</if>>
-A video feed appears. <<if $activeSlave.vaginalAccessory == "chastity belt">>In her chastity belt, all she can manage is furious nipple-rubbing and some furtive fingering of her asshole.<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormones > 0)>>Since she's impotent from hormone treatment, all she can manage is rubbing her soft dick and some furtive fingering of her asshole.<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>Since she's impotent due to her lack of balls, all she can manage is rubbing her soft dick and some furtive fingering of her asshole.<<elseif ($activeSlave.vagina == -1) && ($activeSlave.dick == 0)>>She's rubbing her perineum desperately with one hand, and her anus with the other, since she lacks external genitalia.<<elseif $activeSlave.vagina == -1>>She's furiously jacking off.<<else>>She's furiously polishing her pearl.<</if>> She's chosen to do it in a dark corner and looks like she's hurrying; she clearly knows this is forbidden.
+A video feed appears. <<if $activeSlave.vaginalAccessory == "chastity belt" || $activeSlave.vaginalAccessory == "combined chastity">>In her chastity belt, all she can manage is furious nipple-rubbing and some furtive fingering of her asshole.<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormones > 0)>>Since she's impotent from hormone treatment, all she can manage is rubbing her soft dick and some furtive fingering of her asshole.<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>Since she's impotent due to her lack of balls, all she can manage is rubbing her soft dick and some furtive fingering of her asshole.<<elseif ($activeSlave.vagina == -1) && ($activeSlave.dick == 0)>>She's rubbing her perineum desperately with one hand, and her anus with the other, since she lacks external genitalia.<<elseif $activeSlave.vagina == -1>>She's furiously jacking off.<<else>>She's furiously polishing her pearl.<</if>> She's chosen to do it in a dark corner and looks like she's hurrying; she clearly knows this is forbidden.
 <br><br>
-<<EventNameLink $activeSlave>> does not hear your approach until you're very close. She starts and tries to look normal. <<if canTalk($activeSlave) == false>>She nervously gestures that she wasn't doing anything.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"<<Master>>, I wathn't doing anything," she lies.<<else>>"I wasn't doing anything, <<Master>>!" she lies.<</if>>
+<<EventNameLink $activeSlave>> does not hear your approach until you're very close. She starts and tries to look normal. <<if !canTalk($activeSlave)>>She nervously gestures that she wasn't doing anything.<<else>>"I wa<<s>>n't doing anything, <<if $activeSlave.rudeTitle == 1>><<PoliteRudeTitle $activeSlave>><<else>><<Master>><</if>>!" she lies.<</if>>
 <<case "hates oral">>