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

Fixes

Closes #2358

See merge request !7965

src/uncategorized/RESS.tw

@@ -5103,7 +5103,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
 				$He cocks $his hips and so that your cock is pressing against $his soaked cunt. In response to $his wordless question, you nibble $his ear and tell $him that it's $his choice. $He turns $his upper torso to <<if canSee($activeSlave)>>stare at you in surprise<<else>>so that you may see $his surprise<</if>> for a moment, and then smiles and gives you a peck on the cheek.
 				<<if ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishKnown == 1) && isFertile($activeSlave)>>
 					$He pushes against you until you are fully inserted into $his pussy. $He's ripe for impregnation and needs your baby in $him. You make love
-				<<elseif ($activeSlave.anus > 2)>>
+				<<elseif ($activeSlave.vagina > 2)>>
 					$He easily slides your cock into $his loose pussy. You make love
 				<<else>>
 					$He hikes $himself up a bit, and then gently slides your cock into $his tight pussy. You make love

src/uncategorized/scheduledEvent.tw

@@ -131,15 +131,14 @@
 	<<goto "SE coursing">>
 <<elseif $policies.raidingMercenaries == 1 && ($week > ($raided + 6))>>
 	<<goto "SE raiding">>
-<<elseif $pit && !$pit.fought>>
-	<<if ($pit.fighterIDs.length > 1 && !$pit.bodyguardFights)
+<<elseif $pit && !$pit.fought &&
+		(($pit.fighterIDs.length > 1 && !$pit.bodyguardFights)
 		|| ($pit.fighterIDs.length > 0 && ($BodyguardID !== 0 && $pit.bodyguardFights) || $pit.animal)
-		|| $pit.slaveFightingBodyguard>>
-		<<if $pit.lethal>>
-			<<goto "SE lethal pit">>
-		<<else>>
-			<<goto "SE nonlethal pit">>
-		<</if>>
+		|| $pit.slaveFightingBodyguard)>>
+	<<if $pit.lethal>>
+		<<goto "SE lethal pit">>
+	<<else>>
+		<<goto "SE nonlethal pit">>
 	<</if>>
 <<elseif ($bioreactorPerfectedID != 0) && ($bioreactorsAnnounced != 1)>>
 	<<goto "P bioreactor perfected">>