From 3c33366fa0fe1f0694f81b2be0ff73d1f131e5b2 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 26 May 2017 20:33:01 -0400 Subject: [PATCH] Fixes. --- src/uncategorized/brothelReport.tw | 2 +- src/uncategorized/cellblockReport.tw | 2 +- src/uncategorized/clinicReport.tw | 2 +- src/uncategorized/clubReport.tw | 2 +- src/uncategorized/dairyReport.tw | 2 +- src/uncategorized/saChoosesOwnJob.tw | 10 +++++----- src/uncategorized/schoolroomReport.tw | 2 +- src/uncategorized/servantsQuartersReport.tw | 2 +- src/uncategorized/spaReport.tw | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index e589c356130..cfdd3cb8d06 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 28b72648038..11312021b30 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 2a42e65f8e3..bd0492f9a96 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 df5802182ae..bebb5cf2b33 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 aec65fcf265..6f89f0c6011 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 369b6a023d2..bed281b2756 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 bf84877609c..98ab1dac7ba 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 4f49a79004a..6433d37f379 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 3236465981a..d6163853e28 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)>> -- GitLab