diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index bdec3240e97617a082378d644d853a3d160b051b..7af33a2cf1384eb803eaf5982f5727dced8a9e9a 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -232,7 +232,7 @@ /* 000-250-006 */ ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the Madam. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -242,7 +242,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -351,7 +351,7 @@ <</if>> <br> She <<include "SA whore">> <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -363,7 +363,7 @@ <<silently>> <<include "SA chooses own job">> <<include "SA whore">> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 1cbe68d627c3de79d52efe4b6efc1d5764208e62..d9cc4191fd562e56ef8408eb67a5aa7fd673bd49 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -154,7 +154,7 @@ /* 000-250-006 */ ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__'' is serving as the Wardeness in $cellblockName. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -164,7 +164,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index a39db89089bd6aabbbe9e30696a27eb3733dd95f..419db37d4c17b7e8cda73d505e2cbeed2a25fc31 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -216,7 +216,7 @@ /* 000-250-006 */ ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the clinical nurse. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -226,7 +226,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -298,7 +298,7 @@ <</if>> <br> She <<= saRest($slaves[$i])>> <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -310,7 +310,7 @@ <<silently>> <<include "SA chooses own job">> <<set _dump = saRest($slaves[$i])>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 81407c74bcd8a385be3df57658154dcb87909fd5..1d413c92173738240a2d7278d79f55cef1806e9f 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -141,7 +141,7 @@ /* 000-250-006 */ ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is performing as the DJ in $clubName. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -151,7 +151,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -247,7 +247,7 @@ <</if>> <br> She <<include "SA serve the public">> <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -259,7 +259,7 @@ <<silently>> <<include "SA chooses own job">> <<include "SA serve the public">> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 1351317189b57803da2f3ec4bfcfbdc5abbc67d9..129926444c167679ccda1941991f2da745923eac 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -261,7 +261,7 @@ /* 000-250-006 */ ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as your Milkmaid. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -271,7 +271,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw index 3235fb52a8804bfafdb51acbc36629798fcd48e9..5c485272d44f9089ac1b4ced121253394cda42b8 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -65,7 +65,7 @@ <<if $showEWD == 0>> <<silently>> <<include "SA rules">> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA diet">> <<include "SA long term effects">> <<include "SA drugs">> @@ -74,7 +74,7 @@ <</silently>> <<else>> <<include "SA rules">> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA diet">> <<include "SA long term effects">> <<include "SA drugs">> diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index 5a3cac62f4e65dcc66af72c8b451057f1108d013..24bdb344e3ee0ff1197036a39774fea9937ba8de 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -353,7 +353,7 @@ <<if $verboseDescriptions == 1>> <br> She <<include "SA please you">> <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -365,7 +365,7 @@ <<silently>> <<include "SA chooses own job">> <<include "SA please you">> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index aed9f2ac0c224681b91e7fadbaad491ca87521cd..a7505831aaad0f6c846331f09159b1c84f62c469 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -966,7 +966,7 @@ <<if $showEWD == 0>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -976,7 +976,7 @@ <<include "SA devotion">> <</silently>> <<else>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index 46ef91387213cd9892b3ecbb87cd05b1c36d0f19..5f87fcc5587c6f73f3be42eddbb7bbfdd513bd85 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -139,7 +139,7 @@ /* 000-250-006 */ ''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your Schoolteacher. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -149,7 +149,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -220,7 +220,7 @@ <</if>> <br> She <<include "SA take classes">> <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -232,7 +232,7 @@ <<silently>> <<include "SA chooses own job">> <<include "SA take classes">> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index e96f8b7ef54593310ed55f2ad5da77958ab80b78..86bb775556d4c664705330070542da36d54cc59f 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -211,7 +211,7 @@ /* 000-250-006 */ ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as your Stewardess. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -221,7 +221,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -286,7 +286,7 @@ <<set _SQMilk += $milk, _SQMilkSale += $milkSale>> <</if>> <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -302,7 +302,7 @@ <<include "SA get milked">> <<set _SQMilk += $milk, _SQMilkSale += $milkSale>> <</if>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index e0a3c313e861cad7260225dc55582326e0fa231d..817a32724c23f8d31d9f645c02ca456f6df0f313 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -195,7 +195,7 @@ <<if (_Slave.choosesOwnClothes == 1) && (_Slave.clothes == "choosing her own clothes")>> <<set _oldDevotion = _Slave.devotion>> - <<run saChoosesOwnClothes(_Slave) >> + <<set _chosenClothes = saChoosesOwnClothes(_Slave)>> <<set $slaves[_ssi].devotion = _oldDevotion, _Slave = $slaves[_ssi]>> /* restore devotion value so repeatedly changing clothes isn't an exploit */ <</if>> <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 5a060902e4af334b67e77d56f95f4ccbc1772233..2597dd4bb7c816a86f7593ba4420cd309dc44c5c 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -238,7 +238,7 @@ /* 000-250-006 */ ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__'' is serving as the Attendant in $spaName. <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -248,7 +248,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -305,7 +305,7 @@ <</if>> <br> She <<= saRest($slaves[$i])>> <br> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -316,7 +316,7 @@ <<else>> <<silently>> <<include "SA chooses own job">> - <<= saChoosesOwnClothes($slaves[$i])>> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<set _dump = saRest($slaves[$i])>> <<include "SA rules">> <<include "SA diet">>