diff --git a/src/init/dummy.tw b/src/init/dummy.tw index aba903ccb03ff4bc0e4593dac0ec93b242bc7a23..0eeaf95a49e777a6a8a445e72db1f175e29a7c88 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -23,4 +23,5 @@ $PC.origRace, $PC.origSkin $SFIDs, $SupportFacilityDecoration, $SupportFacilityEfficiency $isReady, $fatherID, $servantsQuartersSpots +$sEnunciate, $SEnunciate, $ssEnunciate, $cEnunciate, $ccEnunciate, $zEnunciate, $shEnunciate, $ShEnunciate, $xEnunciate */ diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 2b665ec4c2228ef58b9f63f5fab7030cc0afee96..fc4ca009cec0cb6febcd3ab05cd3281f33bcbd79 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -242,7 +242,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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> - <<include "SA chooses own clothes">> + <<= 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">> - <<include "SA chooses own clothes">> + <<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 8aec90cd1e84dde16510fc3e4d31103021dadeb2..590412f6e0e21aadff6997d56d824fc4d7e5595d 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -164,7 +164,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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 27fa4a83ea888510493c5cc74e302b0b2406a18b..fecb4e7f7acdbcdefd5d7378d8255a29b8e4d4ff 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -226,7 +226,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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> - <<include "SA chooses own clothes">> + <<= 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])>> - <<include "SA chooses own clothes">> + <<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 a6e1d0fd685b351473669d9f9e7cd96643f7a7d7..59c18b07611d78371265872efe1fa1dbd2aab29b 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -151,7 +151,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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> - <<include "SA chooses own clothes">> + <<= 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">> - <<include "SA chooses own clothes">> + <<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 88e5f99a4144d751281ea6e8cdc38937444f79bb..2658c9cd11f76abe3b9b1242e2381346be9bc4db 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -271,7 +271,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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 a94cdf59bdc72bc9d6ac296bdcac644af7be2434..b8468bbfb19ee324e2f6ad4e1af9ce2282cee7e9 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -65,7 +65,7 @@ <<if $showEWD == 0>> <<silently>> <<include "SA rules">> - <<include "SA chooses own clothes">> + <<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">> - <<include "SA chooses own clothes">> + <<= 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 894ebbde4a19f7b4ab7595d6282bb5a6f51b4d83..fbaea844c7af8ddedfcc28aa9d66076e10a097ee 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> - <<include "SA chooses own clothes">> + <<= 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">> - <<include "SA chooses own clothes">> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/saChoosesOwnClothes.tw b/src/uncategorized/saChoosesOwnClothes.tw deleted file mode 100644 index 60382b60d4d422a825d92871ec17e56eabd1ebbf..0000000000000000000000000000000000000000 --- a/src/uncategorized/saChoosesOwnClothes.tw +++ /dev/null @@ -1,3 +0,0 @@ -:: SA chooses own clothes [nobr] - -<<= saChoosesOwnClothes($slaves[$i]) >> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index fec187c047e74eabc686ec814b2ff6afa5f79cd3..e59a1a7d3ff83b018ebc4401f63da235e3496867 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -966,7 +966,7 @@ <<if $showEWD == 0>> <<silently>> - <<include "SA chooses own clothes">> + <<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>> - <<include "SA chooses own clothes">> + <<= 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 379d25789d9e19f61fb5b6fa971601b1289e1051..b392c67e7a5e79200108f5c19517d063b7c2ef88 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -149,7 +149,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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> - <<include "SA chooses own clothes">> + <<= 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">> - <<include "SA chooses own clothes">> + <<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 35bfb07d8b138cc1a7c70b3c41f01eeaeda93fce..23a558ee7c8beddb4c87b754b857d0476ca9198e 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -221,7 +221,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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> - <<include "SA chooses own clothes">> + <<= 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>> - <<include "SA chooses own clothes">> + <<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 cdf0fdcc142ae99ebe6d21dad692f02b210e4079..49a0b2b08149cd1fd1944c5419820bf540725d2c 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> - <<include "SA chooses own clothes">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> @@ -248,7 +248,7 @@ <br><<include "SA devotion">> <<else>> <<silently>> - <<include "SA chooses own clothes">> + <<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> - <<include "SA chooses own clothes">> + <<= 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">> - <<include "SA chooses own clothes">> + <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<set _dump = saRest($slaves[$i])>> <<include "SA rules">> <<include "SA diet">>