From c0f4fb253239098ccf2e2b72f2490c9b3bdb8734 Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Fri, 29 Jun 2018 16:39:56 -0400 Subject: [PATCH] Remove dependence on uncategorized/saChoosesOwnClothes.tw --- src/init/dummy.tw | 1 + src/uncategorized/brothelReport.tw | 8 ++++---- src/uncategorized/cellblockReport.tw | 4 ++-- src/uncategorized/clinicReport.tw | 8 ++++---- src/uncategorized/clubReport.tw | 8 ++++---- src/uncategorized/dairyReport.tw | 4 ++-- src/uncategorized/fullReport.tw | 4 ++-- src/uncategorized/masterSuiteReport.tw | 4 ++-- src/uncategorized/saLiveWithHG.tw | 4 ++-- src/uncategorized/schoolroomReport.tw | 8 ++++---- src/uncategorized/servantsQuartersReport.tw | 8 ++++---- src/uncategorized/spaReport.tw | 8 ++++---- 12 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/init/dummy.tw b/src/init/dummy.tw index aba903ccb03..0eeaf95a49e 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 2b665ec4c22..bdec3240e97 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">> + <<= 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">> + <<= 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 8aec90cd1e8..1cbe68d627c 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">> + <<= 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 27fa4a83ea8..a39db89089b 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">> + <<= 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">> + <<= 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 a6e1d0fd685..81407c74bcd 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">> + <<= 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">> + <<= 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 88e5f99a414..1351317189b 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">> + <<= 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 a94cdf59bdc..3235fb52a88 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">> + <<= 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 894ebbde4a1..5a3cac62f4e 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">> + <<= 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 fec187c047e..aed9f2ac0c2 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -966,7 +966,7 @@ <<if $showEWD == 0>> <<silently>> - <<include "SA chooses own clothes">> + <<= 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 379d25789d9..46ef9138721 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">> + <<= 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">> + <<= 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 35bfb07d8b1..e96f8b7ef54 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">> + <<= 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">> + <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> <<include "SA long term effects">> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index cdf0fdcc142..5a060902e4a 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">> + <<= 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">> + <<= saChoosesOwnClothes($slaves[$i])>> <<set _dump = saRest($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> -- GitLab