diff --git a/src/init/dummy.tw b/src/init/dummy.tw index bf152e7a1078d7d7a6fa5d4da2a1a44c720f34a2..a01448611a332a41c7c94ebc70d5be2433ad26e1 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -16,7 +16,7 @@ $personalAttentionChanged $veryYoungCareers, $recruiterCareers $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence -$hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed +$LurcherSpeed $$i $activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory $drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index f5956989833072c5600dcac56c59e0f754675d62..c6dc4bce4d893a9b12e9257f6609197a38b28fd4 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -38,15 +38,10 @@ <br><br>@@.red;ERROR: Main slaves array contains a null entry! Please report this.@@ <<link "Repair">><<set $slaves.delete(null)>><</link>><<goto "Main">><br><br> <</if>> <span id="NaNArray"> -<<if ndef $NaNArray>> - <<set $NaNArray = findNaN()>> -<</if>> <<if $NaNArray.length > 0>> - <br><br>@@.red;ERROR: The following variables are NaN! Please report this.@@<br> - <<set _main = 0>> - <<for _main < $NaNArray.length>> /* Don't change how this loop is setup. It's important for unknown reasons. */ + <br><br>@@.red; ERROR: The following variables are NaN! Please report this.@@<br> + <<for _main = 0; _main < $NaNArray.length; _main++>> $NaNArray[_main] <br> - <<set _main++>> <</for>><br> <<link "Hide NaN variables until next week">><<replace #NaNArray>><<set $NaNArray = []>><</replace>><</link>> <</if>> diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index c692b8b8a9f5767554e2a0267e8d6fba7bcb00ba..a31751143797eccc2fc9393b41175c8d85b8ad93 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -332,5 +332,5 @@ <<if $SF.Toggle && $SF.Active >= 1 && $SFTradeShow.CanAttend > -1 && $SFTradeShow.CanAttend > -2>> <<set $SFTradeShow.CanAttend = -1>> <</if>> -<<unset $NaNArray>> +<<set $NaNArray = findNaN()>> <<goto "Main">> diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw index 3f422199f392988f96fc88b3ac175b0da0bf3a6d..81e3e555d3aa970cffbafafc4946f446dfa18068 100644 --- a/src/uncategorized/seCoursing.tw +++ b/src/uncategorized/seCoursing.tw @@ -35,6 +35,7 @@ The rules have been explained to the hares: they're to be freed if they can reac The third and final hare <</if>> +<<set $hareSpeed = 10>> <<set $origin = _possibleOrigins.pluck()>> /* select random origin and remove from list to avoid using same origin multiple times */ <<if $origin == "virgin">> <<set $activeSlaveOneTimeMaxAge = 20>> @@ -300,21 +301,23 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har <span id="result"> <<link "The first">> <<replace "#result">> - <<set $activeSlave = $hare1, $origin = $origin1, $hareSpeed = $hareSpeed1>> + <<set $activeSlave = clone($hare1), $origin = $origin1, $hareSpeed = $hareSpeed1>> <<include "SE coursing race">> <</replace>> <</link>> <br><<link "The second">> <<replace "#result">> - <<set $activeSlave = $hare2, $origin = $origin2, $hareSpeed = $hareSpeed2>> + <<set $activeSlave = clone($hare2), $origin = $origin2, $hareSpeed = $hareSpeed2>> + <<set $hare2 = clone($hare1), $origin2 = $origin1, $hareSpeed2 = $hareSpeed1>> <<include "SE coursing race">> <</replace>> <</link>> <br><<link "The third">> <<replace "#result">> - <<set $activeSlave = $hare3, $origin = $origin3, $hareSpeed = $hareSpeed3>> + <<set $activeSlave = clone($hare3), $origin = $origin3, $hareSpeed = $hareSpeed3>> + <<set $hare3 = clone($hare1), $origin3 = $origin1, $hareSpeed3 = $hareSpeed1>> <<include "SE coursing race">> <</replace>> <</link>> diff --git a/src/uncategorized/seCoursingRace.tw b/src/uncategorized/seCoursingRace.tw index cdbeb59c11288ed04cde788e429a211022f7c95f..7ee5f0fff00cb65abd21ec33af066fb3b27dcbc4 100644 --- a/src/uncategorized/seCoursingRace.tw +++ b/src/uncategorized/seCoursingRace.tw @@ -336,4 +336,4 @@ You place your hand on the leash's quick release and whisper your direction into 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 her 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 her capture. <</if>> <<set $slaves[$slaveIndices[$Lurcher.ID]] = $Lurcher>> -<<unset $origin, $origin1, $origin2, $origin3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $hare1, $hare2, $hare3>> \ No newline at end of file +<<unset $origin, $origin1, $origin2, $origin3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $hare1, $hare2, $hare3>> diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw index db08477acf734a46ae617597a53c11456b66ea47..9a11a3c8cb51b84ab3eadeb149de285e2795c6d7 100644 --- a/src/uncategorized/seRaiding.tw +++ b/src/uncategorized/seRaiding.tw @@ -64,6 +64,7 @@ The <</if>> target +<<set $targetEscape = 0>> <<set $origin = _origins.pluck()>> <<switch $origin>> <<case "housewife">>