diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index 68df806cc730e0a32dc9d7c659a84b068da91c01..077f600863e731f84413520bbb09fef8c5697227 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -270,7 +270,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <<set $slaves[$i].health -= 7>> <<set $injury = 1>> <<elseif ($slaves[$i].vagina < 0)>> - <<SlaveTitle $slaves[$i]>> + <<set $desc = SlaveTitle($slaves[$i])>> <<if (($slaves[$i].analSkill + $slaves[$i].oralSkill) >= 200)>> $He's such an expert public servant that $he copes with the stress of being a $desc slut. <<elseif random(1,100) > 40+(10*($slaves[$i].analSkill + $slaves[$i].oralSkill))>> @@ -533,7 +533,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <<elseif $slaves[$j].relationship > 4>> slave wife <</if>> - $slaves[$j].slaveName is also serving the public and they work well toget$him. + $slaves[$j].slaveName is also serving the public and they work well together. <</if>> <<elseif $slaves[$i].relationship == -1>> $He relies on citizens' desire to fuck $him for emotional support, making $him an excellent, if occasionally disturbing, slut. @@ -1206,23 +1206,23 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <<elseif (_vignette.type == "devotion")>> <<if (_vignette.effect > 0)>> <<if $slaves[$i].devotion > 50>> - @@.hotpink;increasing her devotion to you.@@ + @@.hotpink;increasing $his devotion to you.@@ <<elseif $slaves[$i].devotion >= -20>> - @@.hotpink;increasing her acceptance of you.@@ + @@.hotpink;increasing $his acceptance of you.@@ <<elseif $slaves[$i].devotion >= -50>> - @@.hotpink;reducing her dislike of you.@@ + @@.hotpink;reducing $his dislike of you.@@ <<else>> - @@.hotpink;reducing her hatred of you.@@ + @@.hotpink;reducing $his hatred of you.@@ <</if>> <<elseif (_vignette.effect < 0)>> <<if $slaves[$i].devotion > 50>> - @@.mediumorchid;reducing her devotion to you.@@ + @@.mediumorchid;reducing $his devotion to you.@@ <<elseif $slaves[$i].devotion >= -20>> - @@.mediumorchid;reducing her acceptance of you.@@ + @@.mediumorchid;reducing $his acceptance of you.@@ <<elseif $slaves[$i].devotion >= -50>> - @@.mediumorchid;increasing her dislike of you.@@ + @@.mediumorchid;increasing $his dislike of you.@@ <<else>> - @@.mediumorchid;increasing her hatred of you.@@ + @@.mediumorchid;increasing $his hatred of you.@@ <</if>> <<else>> an incident without lasting effect. @@ -1231,19 +1231,19 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <<elseif (_vignette.type == "trust")>> <<if (_vignette.effect > 0)>> <<if $slaves[$i].trust > 20>> - @@.mediumaquamarine;increasing her trust in you.@@ + @@.mediumaquamarine;increasing $his trust in you.@@ <<elseif $slaves[$i].trust >= -50>> - @@.mediumaquamarine;reducing her fear of you.@@ + @@.mediumaquamarine;reducing $his fear of you.@@ <<else>> - @@.mediumaquamarine;reducing her terror of you.@@ + @@.mediumaquamarine;reducing $his terror of you.@@ <</if>> <<elseif (_vignette.effect < 0)>> <<if $slaves[$i].trust > 20>> - @@.gold;reducing her trust in you.@@ + @@.gold;reducing $his trust in you.@@ <<elseif $slaves[$i].trust > -20>> - @@.gold;increasing her fear of you.@@ + @@.gold;increasing $his fear of you.@@ <<else>> - @@.gold;increasing her terror of you.@@ + @@.gold;increasing $his terror of you.@@ <</if>> <<else>> an incident without lasting effect. @@ -1251,9 +1251,9 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <<set $slaves[$i].trust += 1*_vignette.effect>> <<elseif (_vignette.type == "health")>> <<if (_vignette.effect > 0)>> - @@.green;improving her health.@@ + @@.green;improving $his health.@@ <<elseif (_vignette.effect < 0)>> - @@.red;affecting her health.@@ + @@.red;affecting $his health.@@ <<else>> an incident without lasting effect. <</if>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index c4f5cd8b32d18796f42515d3dae733c2b63a4725..927a52e273a425a96fb8b380354fa21ded629b03 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -254,7 +254,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d <<set $slaves[$i].health -= 7>> <<set $injury = 1>> <<elseif ($slaves[$i].vagina < 0)>> - <<SlaveTitle $slaves[$i]>> + <<set $desc = SlaveTitle($slaves[$i])>> <<if (($slaves[$i].analSkill + $slaves[$i].oralSkill) >= 200)>> $He's such an expert whore that $he copes with the stress of being a $desc prostitute. <<elseif random(1,100) > 40+(10*($slaves[$i].analSkill + $slaves[$i].oralSkill))>> @@ -1200,27 +1200,27 @@ In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FR an incident without lasting effect. <</if>> <<set $cash += Math.trunc($FResult*_vignette.effect)>> - <<set _incomeStats.rep += Math.trunc($FResult*_vignette.effect)>> + <<set _incomeStats.income += Math.trunc($FResult*_vignette.effect)>> <<elseif (_vignette.type == "devotion")>> <<if (_vignette.effect > 0)>> <<if $slaves[$i].devotion > 50>> - @@.hotpink;increasing her devotion to you.@@ + @@.hotpink;increasing $his devotion to you.@@ <<elseif $slaves[$i].devotion >= -20>> - @@.hotpink;increasing her acceptance of you.@@ - <<elseif $slaves[$i].devotion >= -50>> - @@.hotpink;reducing her dislike of you.@@ + @@.hotpink;increasing $his acceptance of you.@@ + <<elseif $slaves[$i].devotion > -10>> + @@.hotpink;reducing $his dislike of you.@@ <<else>> - @@.hotpink;reducing her hatred of you.@@ + @@.hotpink;reducing $his hatred of you.@@ <</if>> <<elseif (_vignette.effect < 0)>> <<if $slaves[$i].devotion > 50>> - @@.mediumorchid;reducing her devotion to you.@@ + @@.mediumorchid;reducing $his devotion to you.@@ <<elseif $slaves[$i].devotion >= -20>> - @@.mediumorchid;reducing her acceptance of you.@@ - <<elseif $slaves[$i].devotion >= -50>> - @@.mediumorchid;increasing her dislike of you.@@ + @@.mediumorchid;reducing $his acceptance of you.@@ + <<elseif $slaves[$i].devotion > -10>> + @@.mediumorchid;increasing $his dislike of you.@@ <<else>> - @@.mediumorchid;increasing her hatred of you.@@ + @@.mediumorchid;increasing $his hatred of you.@@ <</if>> <<else>> an incident without lasting effect. @@ -1229,19 +1229,19 @@ In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FR <<elseif (_vignette.type == "trust")>> <<if (_vignette.effect > 0)>> <<if $slaves[$i].trust > 20>> - @@.mediumaquamarine;increasing her trust in you.@@ - <<elseif $slaves[$i].trust >= -50>> - @@.mediumaquamarine;reducing her fear of you.@@ + @@.mediumaquamarine;increasing $his trust in you.@@ + <<elseif $slaves[$i].trust > -10>> + @@.mediumaquamarine;reducing $his fear of you.@@ <<else>> - @@.mediumaquamarine;reducing her terror of you.@@ + @@.mediumaquamarine;reducing $his terror of you.@@ <</if>> <<elseif (_vignette.effect < 0)>> <<if $slaves[$i].trust > 20>> - @@.gold;reducing her trust in you.@@ + @@.gold;reducing $his trust in you.@@ <<elseif $slaves[$i].trust > -20>> - @@.gold;increasing her fear of you.@@ + @@.gold;increasing $his fear of you.@@ <<else>> - @@.gold;increasing her terror of you.@@ + @@.gold;increasing $his terror of you.@@ <</if>> <<else>> an incident without lasting effect. @@ -1249,9 +1249,9 @@ In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FR <<set $slaves[$i].trust += 1*_vignette.effect>> <<elseif (_vignette.type == "health")>> <<if (_vignette.effect > 0)>> - @@.green;improving her health.@@ + @@.green;improving $his health.@@ <<elseif (_vignette.effect < 0)>> - @@.red;affecting her health.@@ + @@.red;affecting $his health.@@ <<else>> an incident without lasting effect. <</if>> @@ -1265,8 +1265,9 @@ In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FR an incident without lasting effect. <</if>> <<set $rep += Math.trunc($FResult*_vignette.effect*0.1)>> - <<set _incomeStats.income += Math.trunc($FResult*_vignette.effect*0.1)>> + <<set _incomeStats.rep += Math.trunc($FResult*_vignette.effect*0.1)>> <</if>> + <</if>> <<if $slaves[$i].energy > 40 && $slaves[$i].energy < 95>>