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

fRival gate tweaks

See merge request !5193

src/npc/fRival.tw

@@ -12,7 +12,7 @@ You call $activeSlave.slaveName to your office and let $him know you'll be abusi
 	$He looks overjoyed at the prospect of getting to hurt someone.
 <</if>>
 
-$slaves[$partner].slaveName sees $activeSlave.slaveName as _he2 enters and looks worried.
+$slaves[$partner].slaveName <<if canSee($slaves[$partner])>>sees<<else>>senses<</if>> $activeSlave.slaveName as _he2 enters and looks worried.
 
 <<if ($slaves[$partner].anus == 0) && ($slaves[$partner].vagina < 0)>>
 	Since _he2's a sissy bitch and an anal virgin, you tell _him2 to bend over and <<if ($PC.dick == 0)>>give you head<<else>>suck your dick<</if>>. _He2 does, and once _he2's working away, you tell $activeSlave.slaveName to come over and start spanking. $slaves[$partner].slaveName begins to lift _his2 head as though to protest, so you shove _him2 back down onto your <<if ($PC.dick == 0)>>pussy<<else>>cock<</if>>, gagging and struggling. $activeSlave.slaveName administers a series of cruel slaps to the quivering <<if $seeRace == 1>>$slaves[$partner].race <</if>>buttocks in front of $him, making your victim yell delightfully into your <<if ($PC.dick == 0)>>womanhood<<else>>member<</if>>. After a short time $activeSlave.slaveName decides to be even crueler, and begins to 'miss' frequently, hitting $slaves[$partner].slaveName's limp dick instead of _his2 ass.

src/uncategorized/slaveInteract.tw

@@ -354,8 +354,11 @@
 			<</if>>
 		<</if>>
 	<</if>>
-	<<if ($activeSlave.rivalryTarget != 0) && canWalk($activeSlave)>>
-		| <<link "Abuse $his rival with $him">><<replace "#miniscene">><<include "FRival">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><</link>>
+	<<if $activeSlave.rivalryTarget != 0 && $activeSlave.amp != 1>>
+		<<set _rsi = $slaveIndices[$activeSlave.rivalryTarget]>>
+		<<if isSlaveAvailable($slaves[_rsi]) && hasAnyLegs($slaves[_rsi])>>
+			| <<link "Abuse $his rival with $him">><<replace "#miniscene">><<include "FRival">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><</link>>
+		<</if>>
 	<</if>>
 	<<if ($activeSlave.fetish != "mindbroken") && (canTalk($activeSlave) || hasAnyArms($activeSlave))>>
 		| <<link "Ask $him about $his feelings">><<replace "#miniscene">><<include "FFeelings">><br>&nbsp;&nbsp;&nbsp;&nbsp;<</replace>><</link>>