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

Pregmod v1005-30.

See merge request !202

src/js/storyJS.tw

@@ -587,7 +587,7 @@ window.tooBigBalls = function(slave){
 window.tooBigDick = function(slave){
 	if (!slave) {
 		return null;
-	} else if (slave.dick >= 15+(slave.muscles*.1) && slave.physicalAge <= 3) {
+	} else if (slave.dick >= 15+(slave.muscles*.1) && slave.physicalAge <= 3 && slave.dick !== 0) {
 		return true;
 	} else if (slave.dick >= 30+(slave.muscles*.3) && slave.physicalAge <= 12) {
 		return true;

src/npc/fAbuse.tw

@@ -159,18 +159,18 @@
 <</if>> 
 
 <<if ($PC.dick == 1)>>
-	While she strips, your stiffening cock rises,<<if $PC.vagina == 1>> revealing your pussy and<</if>> earning
-<<elseif $PC.vagina == 1>>
+	<<if ($activeSlave.amp isnot 1) && ($activeSlave.clothes !== "no clothing")>>While she strips, your<<else>>Your<</if>>your stiffening cock rises<<if $PC.vagina == 1>>, revealing your pussy and<</if>> earning
+<<else>>
 	<<if ($activeSlave.amp isnot 1) && ($activeSlave.clothes !== "no clothing")>>While she strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
+<</if>>
 <<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
-		a shy look
+	a shy look
 <<elseif ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 95)>>
-		a sultry look
+	a sultry look
 <<else>>
-		a frightened glance
-<</if>>
-	from your victim.
+	a frightened glance
 <</if>>
+from your victim.
 
 <<if ($activeSlave.amp == 1)>>
 	<<if ($activeSlave.clothes !== "no clothing")>>Growing impatient, you rip the clothes off her limbless torso<<else>>You walk up to her<</if>> and spank her brutally; spinning her to present

src/uncategorized/clinicReport.tw

@@ -163,12 +163,14 @@
 			<<set $Nurse.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
 			<</if>>
 			<</if>>
-		<<case "She is remembered for winning best in show as a breeder." && $slaves[$i].preg > 10>>
-			She does her best to aid the pregnant $slaves[_i].slaveName, paying special attention to her swollen belly and the welfare of the life within.
-			<<set $slaves[_i].health += 6>>
 		<<case "She is remembered for winning best in show as a breeder.">>
-			She does her best to aid the breeder $slaves[_i].slaveName, paying special attention to her fertility and reproductive organs.
-			<<set $slaves[_i].health += 4>>
+			<<if $slaves[$i].preg > 10>>
+				She does her best to aid the pregnant $slaves[_i].slaveName, paying special attention to her swollen belly and the welfare of the life within.
+				<<set $slaves[_i].health += 6>>
+			<<else>>
+				She does her best to aid the breeder $slaves[_i].slaveName, paying special attention to her fertility and reproductive organs.
+				<<set $slaves[_i].health += 4>>
+			<</if>>
 		<</switch>>
 		<<if $slaves[_i].bellyImplant > 0 && $clinicInflateBelly == 1>>
 			<br>''@@.pink;$slaves[_i].slaveName@@'' spent a lot of time during the week under IV-like stands with bags of innert filler steadily flowing into her belly implant, slowly pushing her belly further and further out. Careful attention, along with several drug injections, were used to make sure her body was able to safely adjust to the implant's rapid growth.

src/uncategorized/ptWorkaround.tw

@@ -532,35 +532,35 @@
 		$activeSlave.slaveName's innocence and hesitations about sex are unlikely to survive much longer, but you decide to hurry the process along by making her <<if $PC.dick != 0>>eat dick<<else>>eat your pussy<</if>> while masturbating. She's repressed enough that masturbation is still a partial punishment for her, but she usually gets herself off anyway, shaking with release and sobbing with crushed illusions.
 		<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
 	<<case "cum addict">>
-		is utterly addicted to cum. You keep her in your office whenever you can, and subject her to a strict sexual diet of
+		$activeSlave.slaveName is utterly addicted to cum. You keep her in your office whenever you can, and subject her to a strict sexual diet of
 		<<if canDoVaginal($activeSlave)>>sex,<<elseif canDoAnal($activeSlave)>>buttsex,<<else>>breast play,<</if>>
 		no oral allowed, no matter how much she begs to be permitted to <<if $PC.dick == 1>>suck you off<<else>>eat you out<</if>>.
 		<<if canDoVaginal($activeSlave)>><<VaginalVCheck 10>><<elseif canDoAnal($activeSlave)>><<AnalVCheck 10>><</if>>
 	<<case "anal addict">>
-		is utterly addicted to buttsex. You keep her in your office whenever you can, and subject her to a strict sexual diet of
+		$activeSlave.slaveName is utterly addicted to buttsex. You keep her in your office whenever you can, and subject her to a strict sexual diet of
 		<<if canDoVaginal($activeSlave)>>vanilla sex,<<else>>oral and manual intercourse,<</if>>
 		no anal allowed, no matter how much she begs you to stick something, anything, up her ass.
 		<<if ($activeSlave.vagina > -1) && canDoVaginal($activeSlave)>><<VaginalVCheck 10>><<else>><<set $activeSlave.oralCount += 10, $oralTotal += 10>><</if>>
 	<<case "attention whore">>
-		is an obnoxious attention whore. You keep her in your office and make love to her whenever you can, but only whenever you're alone in the office. You even instruct $assistantName not to bother you while the slave is receiving her therapy.
+		$activeSlave.slaveName is an obnoxious attention whore. You keep her in your office and make love to her whenever you can, but only whenever you're alone in the office. You even instruct $assistantName not to bother you while the slave is receiving her therapy.
 		<<if canDoVaginal($activeSlave)>><<VaginalVCheck 10>><<elseif canDoAnal($activeSlave)>><<AnalVCheck 10>>	<</if>>
 	<<case "breast growth">>
-		is completely devoted to her own tits. You keep her in your office whenever you can, <<if canDoVaginal($activeSlave)>>fucking her<<elseif canDoAnal($activeSlave)>>fucking her ass<<else>>fucking her face<</if>>
+		$activeSlave.slaveName is completely devoted to her own tits. You keep her in your office whenever you can, <<if canDoVaginal($activeSlave)>>fucking her<<elseif canDoAnal($activeSlave)>>fucking her ass<<else>>fucking her face<</if>>
 		in positions that offer her boobs no stimulation at all. When you're not broadening her sexual horizons, she's restrained to keep her from touching her own nipples, despite piteous begging.
 		<<if canDoVaginal($activeSlave)>><<VaginalVCheck 10>><<elseif canDoAnal($activeSlave)>><<AnalVCheck 10>><</if>>
 	<<case "abusive" "malicious">>
-		seems to have forgotten that she's your bitch, so you remind her. You keep her in your office whenever she's not otherwise occupied, and hold her down and fuck her whenever you feel like it. It's been a long time since she was on the bottom this regularly.
+		$activeSlave.slaveName seems to have forgotten that she's your bitch, so you remind her. You keep her in your office whenever she's not otherwise occupied, and hold her down and fuck her whenever you feel like it. It's been a long time since she was on the bottom this regularly.
 		<<if canDoVaginal($activeSlave)>><<VaginalVCheck 10>><<elseif canDoAnal($activeSlave)>><<AnalVCheck 10>><</if>>
 	<<case "self hating">>
-		hates herself much more than is normal for a well trained sex slave, to the point where she actively seeks out unhealthy and destructive assignments. You build up her sexual self esteem with a steady diet of
+		$activeSlave.slaveName hates herself much more than is normal for a well trained sex slave, to the point where she actively seeks out unhealthy and destructive assignments. You build up her sexual self esteem with a steady diet of
 		<<if canDoVaginal($activeSlave)>>missionary lovemaking,<<elseif canDoAnal($activeSlave)>>gentle anal loving,<<else>>gentle oral sex,<</if>>
 		and make sure to praise her and keep her spirits up as much as you can.
 		<<if canDoVaginal($activeSlave)>><<VaginalVCheck 10>><<elseif canDoAnal($activeSlave)>><<AnalVCheck 10>><</if>>
 	<<case "neglectful">>
-		has given up on her own sexual pleasure to an extent, focusing only on getting others off. You keep her in your office and play with her regularly, making a game of getting her off as often as possible. You're careful to use other slaves for your own pleasure.
+		$activeSlave.slaveName has given up on her own sexual pleasure to an extent, focusing only on getting others off. You keep her in your office and play with her regularly, making a game of getting her off as often as possible. You're careful to use other slaves for your own pleasure.
 		<<if canDoVaginal($activeSlave)>><<VaginalVCheck 10>><<elseif canDoAnal($activeSlave)>><<AnalVCheck 10>><</if>>
 	<<case "breeder">>
-		has become so sexually obsessed with pregnancy that impregnation holds less interest for her than being pregnant.
+		$activeSlave.slaveName has become so sexually obsessed with pregnancy that impregnation holds less interest for her than being pregnant.
 		<<if $activeSlave.preg > 0>>
 			Since she's pregnant, getting her out of this perversion is more difficult than just fucking her.
 		<<else>>