Merge branch 'Coursing' into 'pregmod-master'

Improve vector art for coursing

Closes #707

See merge request pregmodfan/fc-pregmod!4434

src/uncategorized/seCoursing.tw

@@ -235,75 +235,99 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
 /* 000-250-006 */
 <<if _sec == 0>>
 	<<link "The first hare">>
+		<<replace "#result">>
+			<<set $activeSlave = clone($hare1), $origin = $origin1, $hareSpeed = $hareSpeed1>>
+			<<include "SE coursing race">>
+		<</replace>>
 		<<replace "#artFrame">>
 			<<set _clothesTemp = $Lurcher.clothes, $Lurcher.clothes = "no clothing">>
+			<<if $activeSlave != 0>>
+				<<set _clothesTemp2 = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
+			<</if>>
 			/* 000-250-006 */
 			<<if $seeImages == 1>>
 				<div class="imageColumn">
 					<div class="imageRef medImg">
 						<<SlaveArt $Lurcher 2 0>>
 					</div>
-					<div class="imageRef medImg">
-						<<SlaveArt $hare1 2 0>>
-					</div>
+					<<if $activeSlave != 0>>
+						<div class="imageRef medImg">
+							<<SlaveArt $activeSlave 2 0>>
+						</div>
+					<</if>>
 				</div>
 			<</if>>
 			/* 000-250-006 */
 			<<set $Lurcher.clothes = _clothesTemp>>
-		<</replace>>
-		<<replace "#result">>
-			<<set $activeSlave = clone($hare1), $origin = $origin1, $hareSpeed = $hareSpeed1>>
-			<<include "SE coursing race">>
+			<<if $activeSlave != 0>>
+				<<set $activeSlave.clothes = _clothesTemp2>>
+			<</if>>
 		<</replace>>
 	<</link>>
 <<elseif _sec == 1>>
 	<<link "The second hare">>
+		<<replace "#result">>
+			<<set $activeSlave = clone($hare2), $origin = $origin2, $hareSpeed = $hareSpeed2>>
+			<<set $hare2 = clone($hare1), $origin2 = $origin1, $hareSpeed2 = $hareSpeed1>>
+			<<include "SE coursing race">>
+		<</replace>>
 		<<replace "#artFrame">>
 			<<set _clothesTemp = $Lurcher.clothes, $Lurcher.clothes = "no clothing">>
+			<<if $activeSlave != 0>>
+				<<set _clothesTemp2 = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
+			<</if>>
 			/* 000-250-006 */
 			<<if $seeImages == 1>>
 				<div class="imageColumn">
 					<div class="imageRef medImg">
 						<<SlaveArt $Lurcher 2 0>>
 					</div>
-					<div class="imageRef medImg">
-						<<SlaveArt $hare2 2 0>>
-					</div>
+					<<if $activeSlave != 0>>
+						<div class="imageRef medImg">
+							<<SlaveArt $activeSlave 2 0>>
+						</div>
+					<</if>>
 				</div>
 			<</if>>
 			/* 000-250-006 */
 			<<set $Lurcher.clothes = _clothesTemp>>
-		<</replace>>
-		<<replace "#result">>
-			<<set $activeSlave = clone($hare2), $origin = $origin2, $hareSpeed = $hareSpeed2>>
-			<<set $hare2 = clone($hare1), $origin2 = $origin1, $hareSpeed2 = $hareSpeed1>>
-			<<include "SE coursing race">>
+			<<if $activeSlave != 0>>
+				<<set $activeSlave.clothes = _clothesTemp2>>
+			<</if>>
 		<</replace>>
 	<</link>>
 <<else>>
 	<<link "The third and final hare">>
+		<<replace "#result">>
+			<<set $activeSlave = clone($hare3), $origin = $origin3, $hareSpeed = $hareSpeed3>>
+			<<set $hare3 = clone($hare1), $origin3 = $origin1, $hareSpeed3 = $hareSpeed1>>
+			<<include "SE coursing race">>
+		<</replace>>
 		<<replace "#artFrame">>
 			<<set _clothesTemp = $Lurcher.clothes, $Lurcher.clothes = "no clothing">>
+			<<if $activeSlave != 0>>
+				<<set _clothesTemp2 = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
+			<</if>>
 			/* 000-250-006 */
 			<<if $seeImages == 1>>
 				<div class="imageColumn">
 					<div class="imageRef medImg">
 						<<SlaveArt $Lurcher 2 0>>
 					</div>
-					<div class="imageRef medImg">
-						<<SlaveArt $hare3 2 0>>
-					</div>
+					<<if $activeSlave != 0>>
+						<div class="imageRef medImg">
+							<<SlaveArt $activeSlave 2 0>>
+						</div>
+					<</if>>
 				</div>
 			<</if>>
 			/* 000-250-006 */
 			<<set $Lurcher.clothes = _clothesTemp>>
+			<<if $activeSlave != 0>>
+				<<set $activeSlave.clothes = _clothesTemp2>>
+			<</if>>
 		<</replace>>
-		<<replace "#result">>
-			<<set $activeSlave = clone($hare3), $origin = $origin3, $hareSpeed = $hareSpeed3>>
-			<<set $hare3 = clone($hare1), $origin3 = $origin1, $hareSpeed3 = $hareSpeed1>>
-			<<include "SE coursing race">>
-		<</replace>>
-<</link>>
+	<</link>>
 <</if>>
 <<if $origin == "virgin">>
 	is an appealingly young $activeSlave.race _girl2, and has V symbols drawn over _his2 cunt and on _his2 lower back, in the interests of fairness. _He2's a @@.pink;double virgin.@@<<if !canSee($Lurcher)>> To accommodate your blind lurcher, a bell is fastened around _his2 neck.<</if>>

src/uncategorized/seCoursingRace.tw

@@ -188,6 +188,7 @@ You place your hand on the leash's quick release and <<if canHear($Lurcher)>>whi
 		$His quarry is unwilling to be tackled, probably out of fear for _his2 baby, and flings _himself2 down as soon as $Lurcher.slaveName gets near.<<if !canSee($Lurcher)>> _He2 screams as _he2 sees $Lurcher.slaveName preparing to dive on _him2, alerting the blind lurcher that $his prey has already surrendered.<</if>>
 	<<elseif !canSee($Lurcher) && random(1,3) == 1>>
 		$His prey takes advantage of $his lack of eyesight, baiting $Lurcher.slaveName to dive in the wrong direction. As $he rises to $his feet, the slave is too far gone to make another lunge. $Lurcher.slaveName's course is over.
+		<<set _seed = 0>>
 	<<elseif $Lurcher.skill.combat == 1>>
 		$His tackle is expert: $he wraps $his quarry up and pulls _him2 down, falling on top of the struggling body.
 	<<elseif $Lurcher.muscles > 30>>
@@ -341,6 +342,7 @@ You place your hand on the leash's quick release and <<if canHear($Lurcher)>>whi
 	<</if>>
 	<<setNonlocalPronouns $seeDicks>>
 	On the other side of the plaza, there is a scream of triumph followed by tears of joy as one of the hares successfully wins _hisU freedom. This cheerful noise mixes strangely with screams of a very different sort and the slap of flesh on flesh as a more successful lurcher rapes _hisU capture.
+	<<set $activeSlave = 0>>
 <</if>>
 <<set $slaves[$slaveIndices[$Lurcher.ID]] = $Lurcher>>
 <<unset $origin, $origin1, $origin2, $origin3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $hare1, $hare2, $hare3>>