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

Fixed newSlaveIntro.tw postpartum issue and expanded body mod reactions

See merge request !3836

src/uncategorized/bodyModificationReaction.tw

@@ -10,34 +10,55 @@ As you cast off $his bindings<<if canSee($activeSlave)>> and <<if ($activeSlave.
 	<<set $activeSlave.health -= 10>>
 <</if>>
 <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
-<<if ($degradation > 10) && ($activeSlave.devotion <= 50) && ($activeSlave.trust < -50)>>
-	$He is appalled by the whorish spectacle you have made of $him. $He @@.gold;fears@@ you all the more for this but is so terrified of you it does not affect $his submission.
-	<<set $activeSlave.trust -= 10>>
-<<elseif ($degradation > 10) && ($activeSlave.devotion <= 50)>>
-	$He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;hates@@ and @@.gold;fears@@ you for this.
-	<<set $activeSlave.devotion -= 10>>
-	<<set $activeSlave.trust -= 10>>
-<<elseif ($degradation > 10)>>
-	$He is shocked by the whorish spectacle you have made of $him. However, $he is so submissive to your will that $he @@.hotpink;accepts@@ that the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is who $he is now.
-	<<set $activeSlave.devotion += 4>>
-<<elseif ($degradation > 4) && ($activeSlave.devotion <= 20) && ($activeSlave.trust < -20)>>
-	$He is so afraid of you that $he suppresses any reaction to the slutty modifications you have made to $his body and @@.gold;fears@@ your power to do whatever you like to $him.
-	<<set $activeSlave.trust -= 5>>
-<<elseif ($degradation > 4)>>
-	$He is surprised with the slutty modifications you have made to $his body. However, $he is so obedient that $he @@.hotpink;accepts@@ your changes.
-	<<set $activeSlave.devotion += 4>>
-<<elseif ($degradation > 1) && ($activeSlave.devotion < -20) && ($activeSlave.trust < 20)>>
-	$He is @@.gold;afraid@@ that $he has been permanently altered against $his will, but is also scared of your reaction to any objection and suppresses $his disgust.
-	<<set $activeSlave.trust -= 5>>
-<<elseif ($degradation > 1) && ($activeSlave.devotion < -20)>>
-	$He is @@.mediumorchid;angry@@ and @@.gold;afraid@@ that $he has been permanently altered against $his will.
-	<<set $activeSlave.devotion -= 5>>
-	<<set $activeSlave.trust -= 5>>
-<<elseif ($degradation > 1)>>
-	$He is saddened to have been altered against $his will. However, $he realizes that $he is a slave, so $he @@.hotpink;accepts@@ your work.
-	<<set $activeSlave.devotion += 4>>
-<<else>>
-	$He shows no real reaction to your modifications.
-<</if>>
+	<<if $degradation > 10>>
+		<<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+			$He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;lothes@@ you all the more for this, but $his resolve is @@.gold;whittled down@@ by your power over $him.
+			<<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
+		<<elseif $activeSlave.devotion <= 50 && $activeSlave.trust < -50>>
+			$He is appalled by the whorish spectacle you have made of $him. $He @@.gold;fears@@ you all the more for this but is so terrified of you it does not affect $his submission.
+			<<set $activeSlave.trust -= 10>>
+		<<elseif $activeSlave.devotion <= 50>>
+			$He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;hates@@ and @@.gold;fears@@ you for this.
+			<<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
+		<<elseif $activeSlave.devotion <= 90>>
+			$He is shocked by the whorish spectacle you have made of $him. However, $he is @@.hotpink;so submissive to your will@@ that $he accepts that the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is who $he is now.
+			<<set $activeSlave.devotion += 3>>
+		<<else>>
+			$He fully understands that $his body belongs to you and that it is yours to modify as you see fit, the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is still somewhat shocking to $him. Like a good slave<<= $girl>> though, $he can't wait to show off your changes.
+		<</if>>
+	<<elseif $degradation > 4>>
+		<<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+			$He is disgusted by the slutty modifications you have made to $his body. $He @@.mediumorchid;hates@@ for it, but begins to @@.gold;fear@@ the power you hold over $him.
+			<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
+		<<elseif $activeSlave.devotion <= 20 && $activeSlave.trust < -20>>
+			$He is so afraid of you that $he suppresses any reaction to the slutty modifications you have made to $his body and @@.gold;fears@@ your power to do whatever you like to $him.
+			<<set $activeSlave.trust -= 5>>
+		<<elseif $activeSlave.devotion < 50>>
+			$He is surprised with the slutty modifications you have made to $his body. However, $he is so obedient that $he @@.hotpink;accepts your changes.@@
+			<<set $activeSlave.devotion += 2>>
+		<<else>>
+			$He is surprised with the slutty modifications you have made to $his body but thrilled that you'd put so much into a slave like $him.
+		<</if>>
+	<<elseif $degradation > 1>>
+		<<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+			While $he hates being permanently altered by you, $he @@.orangered;refuses to give you any reaction.@@
+			<<set $activeSlave.trust += 1>>
+		<<elseif $activeSlave.devotion < -20 && $activeSlave.trust < 20>>
+			$He is @@.gold;afraid@@ that $he has been permanently altered against $his will, but is also scared of your reaction to any objection and suppresses $his disgust.
+			<<set $activeSlave.trust -= 5>>
+		<<elseif $activeSlave.devotion < -20>>
+			$He is @@.mediumorchid;angry@@ and @@.gold;afraid@@ that $he has been permanently altered against $his will.
+			<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
+		<<elseif $activeSlave.devotion < 0>>
+			$He is saddened to have been altered against $his will, but @@.hotpink;begins to understand@@ that it is not $his decision.
+			<<set $activeSlave.devotion += 1>>
+		<<elseif $activeSlave.devotion < 20>>
+			$He is saddened to have been altered against $his will. However, $he realizes that $he is a slave, so $he accepts your work.
+		<<else>>
+			$He fully understands that $his body belongs to you and that it is yours to modify as you see fit.
+		<</if>>
+	<<else>>
+		$He shows no real <<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>interest in<<else>>reaction to<</if>> your modifications.
+	<</if>>
 <</if>>
 <<set $degradation = 0>>

src/uncategorized/newSlaveIntro.tw

@@ -626,7 +626,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 	<<set $activeSlave.pregType = 0>>
 	<<set $activeSlave.pregSource = 0>>
 	<<set $activeSlave.pregKnown = 0>>
-	<<set $activeSlave.pregWeek = 0>>
+	<<set $activeSlave.pregWeek = -4>>
 	<<run SetBellySize($activeSlave)>>
 	<</link>>
  <br>
@@ -1104,7 +1104,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 		<</replace>>
 		<<set $activeSlave.preg = -3>>
 		<<set $activeSlave.pregType = 0>>
-		<<set $activeSlave.pregWeek = 0>>
+		<<set $activeSlave.pregWeek = -4>>
 		<<set $activeSlave.pregKnown = 0>>
 		<<run SetBellySize($activeSlave)>>
 		<<set $activeSlave.ovaries = 0>>
@@ -1154,7 +1154,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
 				<<= FSChange("Eugenics", 3)>>
 			<</if>>
 		<</replace>>
-		<<set $activeSlave.chastityVagina = 0,$activeSlave.dick = 0,$activeSlave.foreskin = 0,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregKnown = 0,$activeSlave.pregSource = 0,$activeSlave.pregType = 0,$activeSlave.pregWeek = 0,$activeSlave.vagina = -1,$activeSlave.vaginalSkill = 0>>
+		<<set $activeSlave.chastityVagina = 0,$activeSlave.dick = 0,$activeSlave.foreskin = 0,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregKnown = 0,$activeSlave.pregSource = 0,$activeSlave.pregType = 0,$activeSlave.pregWeek = -4,$activeSlave.vagina = -1,$activeSlave.vaginalSkill = 0>>
 		<<run SetBellySize($activeSlave)>>
 		<<set $activeSlave.health -= 10, $activeSlave.trust = Math.clamp($activeSlave.trust-100, -100, 100)>>
 	<</link>>