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

Pregmod 0.10.0.0a v47

See merge request !138

src/pregmod/generateChild.tw

@@ -53,7 +53,7 @@
 	<<else>>
 		<<for $m = 0; $m < $genePool.length; $m++>>
 			<<if $PC.pregSource == $genePool[$m].ID>>
-				<<set $mergeDad == $genePool[$m]>>
+				<<set $mergeDad = $genePool[$m]>>
 				<<break>>
 			<</if>>
 		<</for>>
@@ -172,7 +172,7 @@
 	<<else>>
 		<<for $m = 0; $m < $genePool.length; $m++>>
 			<<if $PC.pregSource == $genePool[$m].ID>>
-				<<set $mergeDad == $genePool[$m]>>
+				<<set $mergeDad = $genePool[$m]>>
 				<<break>>
 			<</if>>
 		<</for>>

src/uncategorized/saPleaseYou.tw

@@ -400,8 +400,8 @@ serves you this week.
 		<</if>>
 		
 		/*check*/
-		<<if ($PC.preg ==  0) && ($PC.vagina == 1) && ($slaves[$i].ballType == "human")>>
-			<<if random(1,100) > 50-($seed*10)>>
+		<<if ($PC.preg == 0) && ($PC.vagina == 1) && ($slaves[$i].ballType == "human")>>
+			<<if random(1,100) > (50-($seed*10))>>
 				<<set $PC.preg = 1>>
 				<<set $PC.pregSource = $slaves[$i].ID>>
 			<</if>>