diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index e589c35613068e9af0cbf6c641e50e69ff927651..cfdd3cb8d062810a6197c0f0aa59a681ffed79f8 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -57,7 +57,7 @@ <<run getSlaveStatisticData($Madam, $facility.brothel)>> <<set $Madam = $slaves[_FLs]>> $Madam.slaveName is serving as the Madam. - <<if $Madam.relationship == -3 && $activeSlave.devotion > 50>> + <<if $Madam.relationship == -3 && $Madam.devotion > 50>> As your loving wife, she does her best to attract attention to your brothel. <<set $madamCashBonus += 0.25>> <</if>> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 28b7264803868ed4f21ebf4d5a5e60bd76e9cdee..11312021b300a4f011713a414e0fb4ce0744e6e9 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -57,7 +57,7 @@ <<set _devBonus++, _trustMalus++, _idleBonus++>> <</if>> $Wardeness.slaveName is serving as the Wardeness. - <<if $Wardeness.relationship == -3 && $activeSlave.devotion > 50>> + <<if $Wardeness.relationship == -3 && $Wardeness.devotion > 50>> <<set _devBonus++, _trustMalus++, _idleBonus++>> As your wife, she tries her best to break the disobedient slaves to your will. <</if>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 2a42e65f8e34b281737575a5de2f4cebf3021ed0..bd0492f9a96715993e70598eba00c1a823eb72a4 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -48,7 +48,7 @@ <</if>> <<set $Nurse = $slaves[_FLs]>> $Nurse.slaveName is serving as the clinical nurse. - <<if $Nurse.relationship == -3 && $activeSlave.devotion > 50>> + <<if $Nurse.relationship == -3 && $Nurse.devotion > 50>> She does her best to be a caring and nurturing wife. <<set _healthBonus += 2>> <</if>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index df5802182aedf8ffc917b1fcf06218c99b6ef0f3..bebb5cf2b33258d21085604e5e3c3245be7468f8 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -48,7 +48,7 @@ <</if>> <<set $DJ = $slaves[_FLs]>> $DJ.slaveName is performing as the DJ. - <<if $DJ.relationship == -3 && $activeSlave.devotion > 50>> + <<if $DJ.relationship == -3 && $DJ.devotion > 50>> She tries her best to be your energetic, cheerful wife. <<set $DJRepBonus += 0.1>> <</if>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index aec65fcf265220d600868df568bc069212f13ca8..6f89f0c6011ef0e83389c0c150999d662629400c 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -54,7 +54,7 @@ <</if>> <<set $Milkmaid = $slaves[_FLs], $i = _FLs>> $Milkmaid.slaveName is serving as your Milkmaid. - <<if $Milkmaid.relationship == -3 && $activeSlave.devotion > 50>> + <<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>> <<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>> She tries her best to be your perfect farmwife. <</if>> diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw index 369b6a023d2311fa9fb8f2b5a99258a7cdefca27..bed281b2756d19a7c006ec0bb0a44189d4d1cb40 100644 --- a/src/uncategorized/saChoosesOwnJob.tw +++ b/src/uncategorized/saChoosesOwnJob.tw @@ -125,11 +125,11 @@ <</if>> <<elseif ($slaves[$i].relationship == -3)>> - <<if $activeSlave.devotion+$activeSlave.trust >= 175>> + <<if $slaves[$i].devotion+$slaves[$i].trust >= 175>> <<set $slaves[$i].choosesOwnAssignmentText += " is happily married to you,">> - <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>> + <<elseif $slaves[$i].devotion < -20 && $slaves[$i].trust > 20>> <<set $slaves[$i].choosesOwnAssignmentText += " is reluctantly married to you,">> - <<elseif $activeSlave.devotion < -20>> + <<elseif $slaves[$i].devotion < -20>> <<set $slaves[$i].choosesOwnAssignmentText += " is forcibly married to you,">> <<else>> <<set $slaves[$i].choosesOwnAssignmentText += " is married to you,">> @@ -164,7 +164,7 @@ <<assignJob $slaves[$i] "please you">> <</if>> <</if>> - <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>> + <<elseif $slaves[$i].devotion < -20 && $slaves[$i].trust > 20>> <<set $slaves[$i].choosesOwnAssignmentText += " and $pronoun thinks of all the ways $pronoun can take advantage of this,">> <<if ($universalRulesAssignsSelfFacility == 1) && ($spa > $spaSlaves)>> <<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun heads straight to $spaName to relax.">> @@ -173,7 +173,7 @@ <<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun cheerfully desides to lounge about the penthouse.">> <<assignJob $slaves[$i] "rest">> <</if>> - <<elseif $activeSlave.devotion < -20>> + <<elseif $slaves[$i].devotion < -20>> <<set $slaves[$i].choosesOwnAssignmentText += " and $pronoun is scared of you, so $pronoun chooses to work as a servant so that $pronoun may serve you without "serving" you.">> <<assignJob $slaves[$i] "be a servant">> <<else>> diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index bf84877609cc709f5c65926a6b199ae938c05855..98ab1dac7bacf7c674b4fa3657dfa2fe73b2b595 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -53,7 +53,7 @@ <</if>> <</if>> <<set $Schoolteacher = $slaves[_FLs]>> - $Schoolteacher.slaveName is serving as your Schoolteacher.<<if $Schoolteacher.relationship == -3 && $activeSlave.devotion > 50>> As your loving wife, she tries her best to teach her pupils how to please you.<</if>> + $Schoolteacher.slaveName is serving as your Schoolteacher.<<if $Schoolteacher.relationship == -3 && $Schoolteacher.devotion > 50>> As your loving wife, she tries her best to teach her pupils how to please you.<</if>> <<if (_FLsFetish == 1)>> She's allowed and even expected to use her students for her own sexual gratification, and in their own way her students are complicit, offering sexual favors for an easier time in the classroom. Before long, she's running a hungry eye over the tits and asses of new trainees; she is now @@.lightcoral;more dominant.@@ <<elseif (_FLsFetish == 2)>> diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw index 4f49a79004ae6798ca53a0719761f1c5aef831cd..6433d37f379a50439e6c8ab7ca87db7451456495 100644 --- a/src/uncategorized/servantsQuartersReport.tw +++ b/src/uncategorized/servantsQuartersReport.tw @@ -53,7 +53,7 @@ <</if>> <</if>> <<set $Stewardess = $slaves[_FLs]>> - $Stewardess.slaveName is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $activeSlave.devotion > 50>> She does her best to be your perfect lovely housewife.<</if>> + $Stewardess.slaveName is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $Stewardess.devotion > 50>> She does her best to be your perfect lovely housewife.<</if>> <<if ($stewardessImpregnates == 1) && (_DL > 0) && (canPenetrate($Stewardess)) && $Stewardess.pubertyXY == 1>> <<set _stewardessImpregnated = 0>> <<for _dI = 0; _dI < _DL; _dI++>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 3236465981a4487660b7a1530423cd911b034aed..d6163853e282e9f7020e0cbd9eba7ac83b1f3e7e 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -50,7 +50,7 @@ <<set _devBonus++>> <</if>> <<set $slaves[_FLs].devotion += _devBonus, $Attendant = $slaves[_FLs]>> - $Attendant.slaveName is serving as the spa attendant.<<if $Attendant.relationship == -3 && $activeSlave.devotion > 50>> She tries her best to be your perfect attentive, caring and loving wife.<</if>> + $Attendant.slaveName is serving as the spa attendant.<<if $Attendant.relationship == -3 && $Attendant.devotion > 50>> She tries her best to be your perfect attentive, caring and loving wife.<</if>> <<if (_FLsFetish == 1)>> When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a submissive.@@ <<elseif (_FLsFetish == 2)>>