From 66296b7ba3090bf2ac281af102619cf7aa1f9d3c Mon Sep 17 00:00:00 2001 From: mweggen <361046+mweggen@users.noreply.github.com> Date: Fri, 28 Sep 2018 22:48:58 +0200 Subject: [PATCH] align gt / gte with descriptions --- devNotes/twine JS.txt | 26 +++--- src/SecExp/attackHandler.tw | 2 +- src/js/eventSelectionJS.tw | 24 +++--- src/js/summaryWidgets.tw | 2 +- src/player/actions/fondleButt.tw | 2 +- src/pregmod/beastFucked.tw | 10 +-- src/pregmod/csec.tw | 2 +- src/pregmod/fFeet.tw | 22 ++--- src/pregmod/fPat.tw | 4 +- src/pregmod/fSlaveFeed.tw | 8 +- src/pregmod/fSlaveSelfImpreg.tw | 6 +- src/pregmod/fSlaveSlaveDickConsummate.tw | 2 +- src/pregmod/fillUpButt.tw | 2 +- src/pregmod/fillUpFace.tw | 2 +- src/pregmod/forceFeeding.tw | 34 ++++---- src/pregmod/killSlave.tw | 4 +- src/pregmod/newChildIntro.tw | 2 +- src/pregmod/widgets/bodySwapReaction.tw | 72 ++++++++-------- src/pregmod/widgets/seBirthWidgets.tw | 2 +- src/uncategorized/PESS.tw | 2 +- src/uncategorized/RESS.tw | 60 ++++++------- src/uncategorized/brothelReport.tw | 2 +- src/uncategorized/clubReport.tw | 2 +- src/uncategorized/dairyReport.tw | 2 +- src/uncategorized/longSlaveDescription.tw | 2 +- src/uncategorized/newSlaveIntro.tw | 4 +- src/uncategorized/peLonelyBodyguard.tw | 2 +- src/uncategorized/randomNonindividualEvent.tw | 4 +- src/uncategorized/saDevotion.tw | 12 +-- src/uncategorized/saDiet.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 30 +++---- src/uncategorized/saRelationships.tw | 4 +- src/uncategorized/saRules.tw | 86 +++++++++---------- src/uncategorized/saServeThePublic.tw | 2 +- src/uncategorized/saServeYourOtherSlaves.tw | 2 +- src/uncategorized/saWhore.tw | 2 +- src/uncategorized/seNonlethalPit.tw | 40 ++++----- src/uncategorized/slaveSummary.tw | 2 +- src/uncategorized/surgeryDegradation.tw | 12 +-- src/utility/assayWidgets.tw | 2 +- src/utility/saRulesWidgets.tw | 6 +- 41 files changed, 255 insertions(+), 255 deletions(-) diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 9e544123b38..7b37c42d8f7 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -4526,7 +4526,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.PC.belly < 5000) { if(["be a servant", "work as a servant"].includes(eventSlave.assignment)) { if(eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw == "hates men" || eventSlave.sexualFlaw == "repressed") { - if(eventSlave.devotion > -20) { + if(eventSlave.devotion >= -20) { if(eventSlave.trust > 20) { State.variables.RESSevent.push("frightening dick"); } @@ -4561,7 +4561,7 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.dietCum > 0) { - if(eventSlave.devotion < 20) { + if(eventSlave.devotion <= 20) { if((eventSlave.fetish != "cumslut" && eventSlave.fetish != "masochist" && eventSlave.fetishStrength < 60) || eventSlave.fetishKnown == 0) { State.variables.RESSevent.push("retching cum feeding"); } @@ -4631,7 +4631,7 @@ if(eventSlave.fetish != "mindbroken") { if(eventSlave.physicalAge > 35) { if(eventSlave.speechRules != "restrictive") { if(["whore", "serve the public", "work in the brothel", "serve in the club"].includes(eventSlave.assignment)) { - if(eventSlave.devotion > -20) { + if(eventSlave.devotion >= -20) { if(eventSlave.devotion <= 95) { State.variables.RESSevent.push("ara ara"); } @@ -4663,7 +4663,7 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.trust < -50) { - if(eventSlave.devotion < 50) { + if(eventSlave.devotion <= 50) { State.variables.RESSevent.push("im scared"); } } @@ -4734,7 +4734,7 @@ if(eventSlave.fetish != "mindbroken") { } /* closes mute exempt */ - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) { State.variables.RESSevent.push("gagged slave"); } @@ -4788,7 +4788,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.seeAge == 1) { if(eventSlave.actualAge < 18) { - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(eventSlave.ovaries == 1) { if(eventSlave.pubertyXX == 0) { if(eventSlave.preg == 0) { @@ -4880,7 +4880,7 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.devotion <= 20) { - if(eventSlave.devotion > -50) { + if(eventSlave.devotion >= -50) { if(eventSlave.trust > -20) { if(State.variables.suppository != 0) { if(eventSlave.fetish != "buttslut") { @@ -6092,7 +6092,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.PC.belly < 5000) { if(["be a servant", "work as a servant"].includes(eventSlave.assignment)) { if(eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw == "hates men" || eventSlave.sexualFlaw == "repressed") { - if(eventSlave.devotion > -20) { + if(eventSlave.devotion >= -20) { if(eventSlave.trust > 20) { State.variables.RESSevent.push("frightening dick"); } @@ -6216,7 +6216,7 @@ if(eventSlave.fetish != "mindbroken") { } /* closes mute exempt */ - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) { State.variables.RESSevent.push("gagged slave"); } @@ -6238,7 +6238,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.seeAge == 1) { if(eventSlave.actualAge < 18) { - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(eventSlave.ovaries == 1) { if(eventSlave.pubertyXX == 0) { if(eventSlave.preg == 0) { @@ -6298,8 +6298,8 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.devotion <= 20) { - if(eventSlave.devotion > -50) { - if(eventSlave.trust > -20) { + if(eventSlave.devotion >= -50) { + if(eventSlave.trust >= -20) { if(State.variables.suppository != 0) { if(eventSlave.fetish != "buttslut") { State.variables.RESSevent.push("suppository resistance"); @@ -8927,7 +8927,7 @@ window.SlaveStatClamp = function SlaveStatClamp(slave) { if (slave.trust > 100) { if (slave.devotion < -95) slave.devotion = -100; - else if (slave.devotion < 100 && slave.devotion >= 20) + else if (slave.devotion < 100 && slave.devotion > 20) slave.devotion += Math.trunc(slave.trust-100); else V.rep += 10*(slave.trust-100); diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index b829dae4b38..8cb4e18619c 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -231,7 +231,7 @@ <<elseif $leadingTroops == "bodyguard">> <<if $Bodyguard.devotion < -20>> <<set _slaveMod -= 0.15>> - <<elseif $Bodyguard.devotion >= 50>> + <<elseif $Bodyguard.devotion > 50>> <<set _slaveMod += 0.15>> <</if>> <<if ($rep < 10000 && $authority < 10000) || $Bodyguard.prestige < 1>> diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw index 73daac29af2..8238d650e4e 100644 --- a/src/js/eventSelectionJS.tw +++ b/src/js/eventSelectionJS.tw @@ -604,7 +604,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.PC.belly < 5000) { if(["be a servant", "work as a servant"].includes(eventSlave.assignment)) { if(eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw == "hates men" || eventSlave.sexualFlaw == "repressed") { - if(eventSlave.devotion > -20) { + if(eventSlave.devotion >= -20) { if(eventSlave.trust > 20) { State.variables.RESSevent.push("frightening dick"); } @@ -639,7 +639,7 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.dietCum > 0) { - if(eventSlave.devotion < 20) { + if(eventSlave.devotion <= 20) { if((eventSlave.fetish != "cumslut" && eventSlave.fetish != "masochist" && eventSlave.fetishStrength < 60) || eventSlave.fetishKnown == 0) { State.variables.RESSevent.push("retching cum feeding"); } @@ -709,7 +709,7 @@ if(eventSlave.fetish != "mindbroken") { if(eventSlave.physicalAge > 35) { if(eventSlave.speechRules != "restrictive") { if(["whore", "serve the public", "work in the brothel", "serve in the club"].includes(eventSlave.assignment)) { - if(eventSlave.devotion > -20) { + if(eventSlave.devotion >= -20) { if(eventSlave.devotion <= 95) { State.variables.RESSevent.push("ara ara"); } @@ -741,7 +741,7 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.trust < -50) { - if(eventSlave.devotion < 50) { + if(eventSlave.devotion <= 50) { State.variables.RESSevent.push("im scared"); } } @@ -812,7 +812,7 @@ if(eventSlave.fetish != "mindbroken") { } /* closes mute exempt */ - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) { State.variables.RESSevent.push("gagged slave"); } @@ -866,7 +866,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.seeAge == 1) { if(eventSlave.actualAge < 18) { - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(eventSlave.ovaries == 1) { if(eventSlave.pubertyXX == 0) { if(eventSlave.preg == 0) { @@ -958,7 +958,7 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.devotion <= 20) { - if(eventSlave.devotion > -50) { + if(eventSlave.devotion >= -50) { if(eventSlave.trust > -20) { if(State.variables.suppository != 0) { if(eventSlave.fetish != "buttslut") { @@ -2170,7 +2170,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.PC.belly < 5000) { if(["be a servant", "work as a servant"].includes(eventSlave.assignment)) { if(eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw == "hates men" || eventSlave.sexualFlaw == "repressed") { - if(eventSlave.devotion > -20) { + if(eventSlave.devotion >= -20) { if(eventSlave.trust > 20) { State.variables.RESSevent.push("frightening dick"); } @@ -2294,7 +2294,7 @@ if(eventSlave.fetish != "mindbroken") { } /* closes mute exempt */ - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) { State.variables.RESSevent.push("gagged slave"); } @@ -2316,7 +2316,7 @@ if(eventSlave.fetish != "mindbroken") { if(State.variables.seeAge == 1) { if(eventSlave.actualAge < 18) { - if(eventSlave.devotion >= 20) { + if(eventSlave.devotion > 20) { if(eventSlave.ovaries == 1) { if(eventSlave.pubertyXX == 0) { if(eventSlave.preg == 0) { @@ -2376,8 +2376,8 @@ if(eventSlave.fetish != "mindbroken") { } if(eventSlave.devotion <= 20) { - if(eventSlave.devotion > -50) { - if(eventSlave.trust > -20) { + if(eventSlave.devotion >= -50) { + if(eventSlave.trust >= -20) { if(State.variables.suppository != 0) { if(eventSlave.fetish != "buttslut") { State.variables.RESSevent.push("suppository resistance"); diff --git a/src/js/summaryWidgets.tw b/src/js/summaryWidgets.tw index 369cd3b6932..ac1b19da805 100644 --- a/src/js/summaryWidgets.tw +++ b/src/js/summaryWidgets.tw @@ -17,7 +17,7 @@ window.SlaveStatClamp = function SlaveStatClamp(slave) { if (slave.trust > 100) { if (slave.devotion < -95) slave.devotion = -100; - else if (slave.devotion < 100 && slave.devotion >= 20) + else if (slave.devotion < 100 && slave.devotion > 20) slave.devotion += Math.trunc(slave.trust-100); else V.rep += 10*(slave.trust-100); diff --git a/src/player/actions/fondleButt.tw b/src/player/actions/fondleButt.tw index a54effa8f58..28004ac5dae 100644 --- a/src/player/actions/fondleButt.tw +++ b/src/player/actions/fondleButt.tw @@ -444,7 +444,7 @@ as well as $his virgin <</if>> butthole as you trace it with your fingers and thumb. Eventually, you decide to stop and $he looks up at you quizzically, unsure about what you will do next. -<<elseif ($activeSlave.devotion < 50)>> +<<elseif ($activeSlave.devotion <= 50)>> <<if ($activeSlave.amp != 1)>> You instruct $him to present $his <<if $seeRace == 1>>$activeSlave.race <</if>>anus. $He hesitates but eventually stands in front of you showing $his buttocks before presenting $his <<if ($activeSlave.anus > 3)>> diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw index dc71bf926e1..aaada1b776f 100644 --- a/src/pregmod/beastFucked.tw +++ b/src/pregmod/beastFucked.tw @@ -110,7 +110,7 @@ <</if>> <</if>> - <<if ($activeSlave.devotion > -20) && ($activeSlave.devotion <= 20)>> + <<if ($activeSlave.devotion >= -20) && ($activeSlave.devotion <= 20)>> <<if _sexAct == "vaginal" || _sexAct == "anal">> <<if (_sexAct == "vaginal" && ($activeSlave.vagina > 0)) || ((_sexAct == "anal") && ($activeSlave.anus > 0))>> <<if $activeSlave.fetishKnown == 1>> @@ -155,7 +155,7 @@ <</if>> <<if canWalk($activeSlave)>> - <<if $activeSlave.devotion > -20>> + <<if $activeSlave.devotion >= -20>> <<if ($activeSlave.devotion <= 20)>> and only the threat of worse punishment prevents $him from running out of the room. <</if>> @@ -195,7 +195,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to <</switch>> <<if _sexAct != "oral">> - <<if ($activeSlave.vagina == 0)>>The slave gives a loud <<if ($activeSlave.devotion > 20)>>moan<<else>>groan<</if>> as $his <<if !canDoVaginal($activeSlave)>>@@.lime;anal@@<</if>> @@.lime;virginity is taken from $him@@<<if ($activeSlave.devotion <= -20)>>@@.lime; by force@@<</if>>.<</if>> + <<if ($activeSlave.vagina == 0)>>The slave gives a loud <<if ($activeSlave.devotion > 20)>>moan<<else>>groan<</if>> as $his <<if !canDoVaginal($activeSlave)>>@@.lime;anal@@<</if>> @@.lime;virginity is taken from $him@@<<if ($activeSlave.devotion < -20)>>@@.lime; by force@@<</if>>.<</if>> <</if>> <<case "hooved">> @@ -265,7 +265,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to <<if $activeSlave.devotion > 50>> Since $he is well broken, @@.lime;losing $his virginity@@ in such a manner has @@.hotpink;increased $his submission to you.@@ <<set $activeSlave.devotion += 5>> - <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.devotion < 50)>> + <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.devotion <= 50)>> @@.lime;Losing $his virginity@@ in such a manner has @@.hotpink;increased $his submission to you@@, though $he is @@.gold;fearful@@ that you'll decide to only use $him to sate your animals' lust. <<set $activeSlave.devotion += 5, $activeSlave.trust -= 5>> <<elseif ($activeSlave.devotion >= -50) && ($activeSlave.devotion < -20)>> @@ -288,7 +288,7 @@ before calling in the _animal.species. The _animal.species slowly saunters up to <<if $activeSlave.devotion > 50>> Since $he is well broken, @@.lime;losing $his anal virginity@@ in such a manner has @@.hotpink;increased $his submission to you.@@ <<set $activeSlave.devotion += 5>> - <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.devotion < 50)>> + <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.devotion <= 50)>> @@.lime;Losing $his anal virginity@@ in such a manner has @@.hotpink;increased $his submission to you,@@ though $he is @@.gold;fearful@@ that you'll decide to only use $him to sate your animals' lust. <<set $activeSlave.devotion += 5, $activeSlave.trust -= 5>> <<elseif ($activeSlave.devotion >= -50) && ($activeSlave.devotion < -20)>> diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 849905b9a64..4165692462d 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -263,7 +263,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a <<elseif $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <br><br> <<if $activeSlave.pregSource == -1>> - <<if $activeSlave.devotion < 20 && $activeSlave.weekAcquired > 0>> + <<if $activeSlave.devotion <= 20 && $activeSlave.weekAcquired > 0>> She @@.mediumorchid;despises@@ you for using her body to bear your children. <<set $activeSlave.devotion -= 10>> <<elseif $activeSlave.devotion > 50>> diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw index 645a77d250c..98aaa197aa5 100644 --- a/src/pregmod/fFeet.tw +++ b/src/pregmod/fFeet.tw @@ -235,7 +235,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to $He strongly refuses, and you have to restrain $him to get $him to obey. <<elseif ($activeSlave.devotion < -20)>> $He tries to refuse, but decides it will just be easier to comply than risk punishment. -<<elseif ($activeSlave.devotion < 20)>> +<<elseif ($activeSlave.devotion <= 20)>> $He doesn't seem eager to comply, but fears being punished enough to obey. <<elseif ($activeSlave.devotion < 60)>> $He complies quietly. @@ -294,9 +294,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to $He tries to stay hateful despite the pleasurable stimulation. <<elseif ($activeSlave.devotion < -20)>> $He is mostly quiet, but occasionally stifles a moan. - <<elseif ($activeSlave.devotion >= 20 && $activeSlave.sexualFlaw == "shamefast")>> + <<elseif ($activeSlave.devotion > 20 && $activeSlave.sexualFlaw == "shamefast")>> $He hides $his face in $his hands in shame at $his nudity, but occasionally a moan breaks out. - <<elseif ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.devotion <= 20)>> $He seems a bit surprised by the attention, occasionally letting out a moan. <<else>> <<if ($activeSlave.trust < -50)>> @@ -315,9 +315,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to When $he refuses to serve, you take both $his feet and start thrusting between them. <<elseif ($activeSlave.devotion < -20)>> $He seems a bit reluctant when massaging you with $his feet so you have to do most of the work. - <<elseif ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.devotion <= 20)>> $He tries to make it pleasurable for you, but the combination of the awkward angle and $his nervousness makes $his lose $his pacing often. - <<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>> + <<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>> $He does $his best to please you from $his position on $his side, massaging your cock nicely. <<else>> <<if ($activeSlave.trust < -50)>> @@ -337,9 +337,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to When $he refuses to comply, you take both $his feet and start thrusting between them. <<elseif ($activeSlave.devotion < -20)>> $He seems a bit reluctant when massaging you with $his feet so you have to do most of the work. -<<elseif ($activeSlave.devotion < 20)>> +<<elseif ($activeSlave.devotion <= 20)>> $He tries to make it pleasurable for you, trying to find the right angle and speed, but $he seems a bit tense and ruins $his pacing. -<<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>> +<<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>> $He does $his best to please you, massaging you nicely with $his feet. <<elseif ($activeSlave.attrXY < 16)>> $He tries to make it pleasurable for you, but $his great distaste for men is obvious on $his expression. @@ -428,9 +428,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp. $He is furious that $he is now covered in cum $he can't easily reach to clean. <<elseif ($activeSlave.devotion < -20)>> You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, but you are done using $him for now. $He is left covered in cum $he can't easily reach to clean. - <<elseif ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.devotion <= 20)>> You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief. - <<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>> + <<elseif ($activeSlave.devotion < 60 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>> You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his side with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he rises to an elbow to smile at you. <<else>> <<if ($activeSlave.trust < -50)>> @@ -443,9 +443,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he struggles in your grasp with a look of disgust. <<elseif ($activeSlave.devotion < -20)>> You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>. $He was startled by your orgasm and now wears a conflicted expression, as well as your cum, but you are done using $him for now. -<<elseif ($activeSlave.devotion < 20)>> +<<elseif ($activeSlave.devotion <= 20)>> You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>> as $he sighs in nervous relief. -<<elseif ($activeSlave.devotion < 60 || $activeSlave.attrXY < 16 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion < 20))>> +<<elseif ($activeSlave.devotion < 60 || $activeSlave.attrXY < 16 || ($activeSlave.sexualQuirk == "unflinching" && $activeSlave.devotion <= 20))>> You eventually cum all over $his _skin feet<<if $PC.balls >= 2>> _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he does $his best to catch your semen on $his legs. <<else>> <<if $activeSlave.fetish == "cumslut" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw index 4b771b9e620..3cb76e60ba3 100644 --- a/src/pregmod/fPat.tw +++ b/src/pregmod/fPat.tw @@ -171,9 +171,9 @@ face and lightly touch $his with your fingertips. You move your hand to the side of your slave's head, stroking $his temple gently. <<if $activeSlave.fetish == "mindbroken">> This causes an unconscious shiver to travel down $his spine. -<<elseif $activeSlave.devotion >= 50>> +<<elseif $activeSlave.devotion > 50>> This causes $him to shudder in delight and to move $his hand to your hip, squeezing it gently. -<<elseif $activeSlave.devotion >= 20>> +<<elseif $activeSlave.devotion > 20>> This causes $him to shudder in delight. <<elseif $activeSlave.devotion >= -20>> This causes $him to shiver unconsciously. diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw index efd776df2e0..14eedf920d5 100644 --- a/src/pregmod/fSlaveFeed.tw +++ b/src/pregmod/fSlaveFeed.tw @@ -147,10 +147,10 @@ Next, you see to $activeSlave.slaveName. <<elseif $activeSlave.devotion < -20>> $He tries to refuse, so you strap $his to $milkTap.slaveName's breast, milky $milkTap.nipples nipple wedged in $his mouth. -<<elseif $activeSlave.devotion < 20>> +<<elseif $activeSlave.devotion <= 20>> $He obeys your orders reluctantly, drawing near $milkTap.slaveName's breasts despite $his obvious hesitation to be filled with milk. -<<elseif $activeSlave.devotion < 50>> +<<elseif $activeSlave.devotion <= 50>> $He obeys your orders, drawing near $milkTap.slaveName's breasts despite $his slight hesitation at the idea of being filled with milk. <<else>> @@ -520,10 +520,10 @@ Next, you see to $activeSlave.slaveName. <<elseif $activeSlave.devotion < -20>> $He tries to refuse, so you tie $him up, force a mouth spreader into $him, and position $him for $milkTap.slaveName to thrust into. -<<elseif $activeSlave.devotion < 20>> +<<elseif $activeSlave.devotion <= 20>> $He obeys your orders reluctantly, drawing near $milkTap.slaveName's cock despite $his obvious hesitation to amount of cum that will be gushing into $him. -<<elseif $activeSlave.devotion < 50>> +<<elseif $activeSlave.devotion <= 50>> $He obeys your orders, drawing near $milkTap.slaveName's cock despite $his slight hesitation at the idea of being filled with cum. <<else>> diff --git a/src/pregmod/fSlaveSelfImpreg.tw b/src/pregmod/fSlaveSelfImpreg.tw index 70596cbbeda..bdfcb609c23 100644 --- a/src/pregmod/fSlaveSelfImpreg.tw +++ b/src/pregmod/fSlaveSelfImpreg.tw @@ -9,10 +9,10 @@ <<if ($activeSlave.fetish == "mindbroken")>> <<else>> - <<if ($activeSlave.devotion < 20)>> - <<if ($activeSlave.devotion <= -20)>> + <<if ($activeSlave.devotion <= 20)>> + <<if ($activeSlave.devotion < -20)>> $activeSlave.slaveName despises you, and tends to resent everything you do on principle, - <<elseif ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.devotion <= 20)>> $activeSlave.slaveName dislikes you, <</if>> <<if ($activeSlave.sexualFlaw == "breeder" || (_pfh && $activeSlave.fetishStrength > 90))>> diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw index b2d56e99d6f..21f1def255c 100644 --- a/src/pregmod/fSlaveSlaveDickConsummate.tw +++ b/src/pregmod/fSlaveSlaveDickConsummate.tw @@ -78,7 +78,7 @@ You take a look at the bound cock toy. <<elseif ($activeSlave.fetish == "mindbroken") && ($activeSlave.career == "a breeding bull")>> $activeSlave.slaveName, as a good bull, was already erect while being tied down. It seems they know what's going to happen to them soon. Maybe someone at the Cattle Ranch has been sampling their bulls? <<else>> - <<if $activeSlave.devotion > -20>> + <<if $activeSlave.devotion >= -20>> <<if $activeSlave.energy > 40>> <<if ($activeSlave.fetishKnown == 1)>> <<if ($activeSlave.fetish == "submissive")>> diff --git a/src/pregmod/fillUpButt.tw b/src/pregmod/fillUpButt.tw index 80dd71dbe87..97c10880438 100644 --- a/src/pregmod/fillUpButt.tw +++ b/src/pregmod/fillUpButt.tw @@ -233,7 +233,7 @@ before calling $him over so you can play with $his virgin <</if>> butthole, and setting it on low. <<if $activeSlave.inflation == 2>>$his sloshing belly slowly grows even larger with $activeSlave.inflationType. You rest a hand on $his back as $his swelling belly forces $him to rise off your lap. Once the enema is complete and $he is plugged, you <<if canWalk($activeSlave)>>push $him to $his feet<<else>>help $him onto your desk<</if>> and admire $his taut, $activeSlave.skin stomach. $He looks up at you quizzically, unsure about what you will do next. You order $him to keep $himself filled with two gallons of $activeSlave.inflationType until you say otherwise<<elseif $activeSlave.inflation == 1>>$his bloated belly slowly swells even larger with $activeSlave.inflationType. You slip a hand under $his stomach to feel it grow in your palm. Once the enema is complete and $he is plugged, you <<if canWalk($activeSlave)>>push $him to $his feet<<else>>help $him onto your desk<</if>> and admire $his jiggly, soft, $activeSlave.skin stomach. $He looks up at you quizzically, unsure about what you will do next. You order $him to keep $himself filled with four liters of $activeSlave.inflationType until you say otherwise<<else>>$his belly slowly swells with $activeSlave.inflationType. You slip a hand under $his stomach to feel it grow in your palm. Once the enema is complete and $he is plugged, you <<if canWalk($activeSlave)>>push $him to $his feet<<else>>help $him onto your desk<</if>> and admire $his distended, $activeSlave.skin stomach. $He looks up at you quizzically, unsure about what you will do next. You order $him to keep $himself filled with two liters of $activeSlave.inflationType until you say otherwise<</if>>. -<<elseif $activeSlave.devotion < 50>> +<<elseif $activeSlave.devotion <= 50>> <<if canWalk($activeSlave)>> You instruct $him to present $his <<if $seeRace == 1>>$activeSlave.race <</if>>anus for a $activeSlave.inflationType enema. $He hesitates but eventually stands in front of you showing $his buttocks before presenting $his anus. <<elseif ($activeSlave.amp != 1)>> diff --git a/src/pregmod/fillUpFace.tw b/src/pregmod/fillUpFace.tw index d87ae13647b..4453ddaafb8 100644 --- a/src/pregmod/fillUpFace.tw +++ b/src/pregmod/fillUpFace.tw @@ -139,7 +139,7 @@ You attach a hose to $dairyName tap with the pipes set to pump $activeSlave.infl <</if>> belly. You insert the hose down $his throat, choosing to hold it place instead of strapping it to $him, and turn the flow to low. With everything in place, you place your free hand on $his gurgling stomach.<<if $activeSlave.inflation == 2>>You can feel $his $activeSlave.skin belly growing taut with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the firm orb of $his belly a slap, eliciting a restrained gag from the overfilled slave and no motion at all from $his gut. $He looks up at you quizzically, unsure about what you will do next. You order $him to keep $himself filled with two gallons of $activeSlave.inflationType until you say otherwise, before helping $his hiccuping bulk onto the couch to recover. $His meal attempts to come back up on $his several times, but $he holds it down for fear of punishment should $he vomit. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<elseif $activeSlave.inflation == 1>>You can feel $his $activeSlave.skin belly growing larger with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give the jiggling orb of $his belly a slap, eliciting a strained burp from the full slave and tons of motion from $his gut. $He looks up at you quizzically, unsure about what you will do next. You order $him to keep $himself filled with four liters of $activeSlave.inflationType until you say otherwise, before helping $his hiccuping bulk onto the couch to recover. $His meal attempts to come back up on $his several times, but $he holds it down for fear of punishment should $he vomit. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<<else>>You can feel $his $activeSlave.skin belly swelling with $activeSlave.inflationType as it pushes out against your hand. Once you have given $him $his fill, you give $his bloated belly a slap, eliciting a small shudder from the bloated slave and a little jiggle from $his gut. $He looks up at you quizzically, unsure about what you will do next. You order $him to keep $himself filled with two liters of $activeSlave.inflationType until you say otherwise, before helping $his sloshing bulk onto the couch to recover. $His meal attempts to come back up on $his several times, but $he holds it down for fear of punishment should $he vomit. Only after a few minutes of rest is the groaning $activeSlave.slaveName ready to be moved<</if>>. -<<elseif $activeSlave.devotion < 50>> +<<elseif $activeSlave.devotion <= 50>> <<if canWalk($activeSlave)>> You instruct $him to take a seat on your lap and open $his mouth wide for the hose. $He hesitates but eventually settles $himself onto your lap as you wrap your arms around $his <<elseif ($activeSlave.amp != 1)>> diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw index 55d98093ad0..f35489e2e48 100644 --- a/src/pregmod/forceFeeding.tw +++ b/src/pregmod/forceFeeding.tw @@ -54,7 +54,7 @@ $He is going to eat it all and you're going to enjoy $him as $he does it. $He wastes no time getting into position with $his mouth agape as you wrap your hand <<elseif $activeSlave.devotion <= 20>> $He complies without comment and settles $himself onto your lap, shuddering slightly as you wrap your arm - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> $He hesitates but eventually settles onto your lap as you wrap your arm <<else>> $He eagerly settles $himself onto your lap as you wrap your arm @@ -73,7 +73,7 @@ $He is going to eat it all and you're going to enjoy $him as $he does it. <<elseif $activeSlave.devotion <= 20>> $He's hesitant of being forcefed, but as an amputee can do nothing about it. You heft $him onto your lap, wrapping your arm - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> $He's mildly hesitant of being forcefed, but as an amputee can do nothing about it. You heft $him onto your lap, wrapping your arm <<else>> @@ -94,7 +94,7 @@ $He is going to eat it all and you're going to enjoy $him as $he does it. $He shudders with anticipation as you heft $his onto your lap, wrapping your arm <<elseif $activeSlave.devotion <= 20>> $He complies without comment. You heft $him onto your lap, wrapping an arm - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> $He hesitates for a moment, before demonstrating acceptance. You heft $him onto your lap, wrapping an arm <<else>> @@ -157,7 +157,7 @@ You hold $him tight as you pull $his meal closer, dip in a cup and bring it to $ $He hurriedly gulps down the contents and opens wide for the next, <<elseif $activeSlave.devotion <= 20>> $He wordless drinks the contents, -<<elseif $activeSlave.devotion < 50>> +<<elseif $activeSlave.devotion <= 50>> $He drinks the contents without hesitation, <<else>> $He happily downs the contents, @@ -181,7 +181,7 @@ Once $he has downed two liters, you give $his bloated belly a slap, eliciting a subtle belch from the moaning slave <<elseif $activeSlave.devotion <= 20>> a small shudder from the bloated slave -<<elseif $activeSlave.devotion < 50>> +<<elseif $activeSlave.devotion <= 50>> a small hiccup that the overfilled slave immediately apologizes for, <<else>> a cute burp from the bloated slave, followed by $his tongue running over $his lips @@ -192,7 +192,7 @@ and a little jiggle from $his gut. <<if $activeSlave.pregKnown == 0 && $activeSlave.preg > 3 && _isDone > 0>> As soon as the next helping enters $him you feel something is wrong. $He begins to heave, - <<if $activeSlave.fetish != "mindbroken" && $activeSlave.devotion >= 50>> + <<if $activeSlave.fetish != "mindbroken" && $activeSlave.devotion > 50>> struggling to keep down the slave food, however $he shortly expels the entirety of $his stomach across the floor. <<else>> @@ -208,7 +208,7 @@ and a little jiggle from $his gut. all over $himself and your lap. <<elseif $activeSlave.devotion <= 20>> all over $himself and your lap. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> across the floor. <</if>> It didn't seem to be willful, @@ -222,7 +222,7 @@ and a little jiggle from $his gut. given how $he is in tears over the loss of such a meal, but is completely unacceptable. <<elseif $activeSlave.devotion <= 20>> given how $he is begging you to try again, but is completely unacceptable. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> given how disappointed $he is in failing you, but is completely unacceptable. <<else>> given how disappointed $he is in failing you, but is worrying. Such a good slave shouldn't do such bad things. @@ -244,7 +244,7 @@ and a little jiggle from $his gut. yet, much to $his delight. <<elseif $activeSlave.devotion <= 20>> yet, much to $his dismay. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> yet, not that $he'd risk complaining. <<else>> yet, not that $he'd complain about fulfilling your desires. @@ -260,7 +260,7 @@ and a little jiggle from $his gut. desperately sucks down <<elseif $activeSlave.devotion <= 20>> diligently drinks - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> diligently drinks <<else>> diligently drinks @@ -278,7 +278,7 @@ and a little jiggle from $his gut. a load hiccup, tons of motion under your arm, and a plea for more food. <<elseif $activeSlave.devotion <= 20>> a strained burp from the full slave and tons of motion under your arm. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> a small hiccup, which the bloated slave immediately apologizes for, and tons of motion under your arm. <<else>> a small sigh followed by a request for more, from the bloated slave and tons of motion under your arm. @@ -303,7 +303,7 @@ and a little jiggle from $his gut. <<elseif $activeSlave.devotion <= 20>> $He begins to struggle when $he realizes $he still has another gallon to go. Gulping, $he opens up as another helping approaches $his mouth. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> $He still has another gallon to go and $he knows it, so $he tries $his best to get comfortable and give $his belly room to grow. Gulping, $he diligently opens up for the next serving. @@ -324,7 +324,7 @@ and a little jiggle from $his gut. forces down every sip you give $him and pants heavily when $his mouth isn't full. <<elseif $activeSlave.devotion <= 20>> struggles to down every sip you give $him and pants heavily when ever $he gets the chance. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> obediently downs every gulp you give $him and pants heavily between helpings. <<else>> devotedly downs every gulp you give $him and catches $his breath, while being a tease, between helpings. @@ -343,7 +343,7 @@ and a little jiggle from $his gut. a large belch and a content sigh from the bloated glutton. <<elseif $activeSlave.devotion <= 20>> a restrained gag from the overfilled slave. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> a small hiccup from the overfilled slave, which $he immediately apologizes for. <<else>> a large belch and a playfully stuck out tongue from the stuffed slave. @@ -370,7 +370,7 @@ and a little jiggle from $his gut. hiccuping <<elseif $activeSlave.devotion <= 20>> heaving - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> hefty <<else>> hefty @@ -403,7 +403,7 @@ and a little jiggle from $his gut. $His meal attempts to come back up on $him several times, but $he holds it down for fear of punishment should $he vomit. After a few minutes of rest, - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> $He sighs contently, hoping you'll give $him more attention. $His meal attempts to come back up on $him several times, but $he holds $he dutifully holds it down. After a few minutes of rest, @@ -428,7 +428,7 @@ and a little jiggle from $his gut. massaging $his stuffed belly until you tire of $him and send $him on $his way. <<elseif $activeSlave.devotion <= 20>> tormenting $his gurgling belly until you tire of $his groaning and send $him on $his way. - <<elseif $activeSlave.devotion < 50>> + <<elseif $activeSlave.devotion <= 50>> lavishing attention on $his gurgling belly, much to $his delight, until you tire of $him and send $him on $his way. <<else>> playing with $his belly. $He joins you in the endeavor, happy that you are pleased with the diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw index 99a785c586f..e61f892972e 100644 --- a/src/pregmod/killSlave.tw +++ b/src/pregmod/killSlave.tw @@ -50,9 +50,9 @@ adoration <<elseif ($activeSlave.devotion) > 20 && ($activeSlave.devotion <= 50)>> a calm acceptance - <<elseif ($activeSlave.devotion > -20) && ($activeSlave.devotion <= 20)>> + <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.devotion <= 20)>> apprehension - <<elseif $activeSlave.devotion <= -20>> + <<elseif $activeSlave.devotion < -20>> hatred <</if>> <<else>> diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index 50e23acac81..d211c8fca16 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -527,7 +527,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully <<set $activeSlave.devotion += 1>> <</if>> <<else>> - <<if $activeSlave.devotion < 50>> + <<if $activeSlave.devotion <= 50>> $He sees that most of the slaves $he sees around your penthouse dislike you; in turn @@.mediumorchid;$he dislikes you more too.@@ <<set $activeSlave.devotion -= 2>> <</if>> diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw index abed7826af3..982829ad870 100644 --- a/src/pregmod/widgets/bodySwapReaction.tw +++ b/src/pregmod/widgets/bodySwapReaction.tw @@ -35,7 +35,7 @@ Now you only have to wait for $him to wake up. <<else>> at the hand for moment before looking for $his own. Eventually, $he bumps into $himself and realizes it belongs to $him. From then, $his old body is nothing more than a blur, soon to be forgotten forever. <</if>> - <<elseif $args[0].devotion >= 50>> + <<elseif $args[0].devotion > 50>> After a while, $he begins to stir, $his eyes fluttering. $He lets out a low groan and reaches up to rub at $his eyes. $He stops and stares uncomprehendingly <<if _sight == -2>> into @@.red;the darkness that is $his new world.@@ $He barely manages to keep calm before accepting this is the fate you have chosen for $him. @@ -218,7 +218,7 @@ Now you only have to wait for $him to wake up. <</if>> <<if $args[0].teeth == "removable" && $args[1].teeth != "removable">> /* no teeth */ A look of confusion crosses $his face, $his brow furrowing slightly. You see $him work $his jaw for moment before $he turns $his head and spits out a set of dentures. - <<if $args[0].devotion <= -20 && $args[0].fetish != "mindbroken">> + <<if $args[0].devotion < -20 && $args[0].fetish != "mindbroken">> $He @@.mediumorchid;glowers@@ at them, knowing full well they'll be back in $his mouth shortly. <<set $args[0].devotion -= 2>> <</if>> @@ -953,7 +953,7 @@ Now you only have to wait for $him to wake up. @@.red;heavier $he is.@@ <<if $args[0].fetish == "mindbroken">> With $his broken mind, $he shows no real reaction to this new weight. - <<elseif $args[0].devotion >= 50>> + <<elseif $args[0].devotion > 50>> <<if $args[0].behavioralFlaw == "gluttonous">> $He is @@.hotpink;perfectly fine@@ with this; a bigger body means more food for $his belly and more for you to love. <<set $args[0].devotion += 1>> @@ -1005,7 +1005,7 @@ Now you only have to wait for $him to wake up. @@.green;lighter $he is.@@ <<if $args[0].fetish == "mindbroken">>/*mindbroken*/ $He doesn't show much reaction to $his lost weight. - <<elseif $args[0].devotion >= 50>>/*devoted*/ + <<elseif $args[0].devotion > 50>>/*devoted*/ $He is pleased that you have given $him a more slender and svelte body <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> body and is even happier that $his body is more in line with your society. @@ -1029,7 +1029,7 @@ Now you only have to wait for $him to wake up. <<if $args[0].muscles >= $args[1].muscles + 5>> that $he is @@.lime;significantly more muscular@@ than $he once was. <<if $args[0].fetish != "mindbroken">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He is happy with $his newfound strength and looks forward to putting this power to work for you. <<else>> $He is irritated that you would change something like this about $him @@ -1044,7 +1044,7 @@ Now you only have to wait for $him to wake up. <</if>> <<else>> that $he is @@.orange;significantly less muscular@@ than before. - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He appreciates that you would take the time to make $him more feminine. <<else>> $He is @@.mediumorchid;annoyed@@ that you would alter something about $him like this, and more so because $he will have to @@.gold;work harder@@ now to do the things $he could before. @@ -1079,7 +1079,7 @@ Now you only have to wait for $him to wake up. <</if>> <<if $args[0].fetish != "mindbroken">> <<if $args[0].bellyPreg >= 100 || $args[0].birthsTotal > 0>> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> Even though $he didn't get to experience being made into one, $he is delighted to be a mother<<if $args[0].birthsTotal > 0>> again<</if>>. <<else>> $He is filled with conflicting emotions, @@.mediumorchid;hatred@@ for you for forcing <<if $args[0].pregType > 1>>these lives<<else>>this life<</if>> onto $him, as well as the instinct of a mother's love for $his unborn child. @@ -1088,7 +1088,7 @@ Now you only have to wait for $him to wake up. <</if>> <<elseif $args[0].fetish == "pregnancy">> <<if $args[0].bellyPreg >= 100 || $args[0].birthsTotal > 0>> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> Even though $he didn't get to experience being made into one, $he is overjoyed to have <<if $args[0].birthsTotal > 0>>another<<else>>a<</if>> life growing inside $him. <<else>> $He is filled with conflicting emotions, hate for being forced into this, but also joy from getting to be pregnant. While you didn't do this for $his amusement, $he'll definitely take advantage of it. @@ -1112,7 +1112,7 @@ Now you only have to wait for $him to wake up. <<elseif $args[0].bellyImplant >= 100>> feels a @@.pink;slight swell to $his stomach.@@ <</if>> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He likes how the bulge looks on $him and can't wait to get fucked with it in the way. <<else>> It @@.mediumorchid;bothers $him@@ that you would add such a <<if $args[0].bellyImplant >= 10000>>major<<else>>minor<</if>> inconvenience to $his body. @@ -1120,10 +1120,10 @@ Now you only have to wait for $him to wake up. <</if>> <<if $args[1].pregKnown == 1>> <<if $args[0].fetish == "pregnancy">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He @@.mediumorchid;scowls with momentary wrath@@ before regaining $his composure. $He resents being separated from $his pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>. <<set $args[0].devotion -= 5>> - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in $him<</if>>. <<set $args[0].devotion -= 10>> <<else>> @@ -1131,9 +1131,9 @@ Now you only have to wait for $him to wake up. <<set $args[0].devotion -= 15>> <</if>> <<elseif $args[0].fetish != "mindbroken">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> While $he will miss the chance of meeting $his future child, $he will no longer be weighed down by it as $he gets used to $his new body. - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He accepts this as how things are. <<else>> $He is filled with @@.mediumorchid;hatred for you@@ for snatching $his child away from $him. It didn't matter if $he wanted it or not; @@.gold;it was $hers and you took it.@@ @@ -1146,10 +1146,10 @@ Now you only have to wait for $him to wake up. <br><br> $His hands drift over $his stomach, where $he discovers $he is @@.pink;no longer pregnant.@@ <<if $args[0].fetish == "pregnancy">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He @@.mediumorchid;scowls with momentary wrath@@ before regaining $his composure. $He resents being separated from $his pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>. <<set $args[0].devotion -= 5>> - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in $him<</if>>. <<set $args[0].devotion -= 10>> <<else>> @@ -1157,9 +1157,9 @@ Now you only have to wait for $him to wake up. <<set $args[0].devotion -= 15>> <</if>> <<elseif $args[0].fetish != "mindbroken">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> While $he will miss the chance of meeting $his future child, $he will no longer be weighed down by it as $he gets used to $his new body. - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He accepts this as how things are. <<else>> $He is filled with @@.mediumorchid;hatred for you@@ for snatching $his child away from $him. It didn't matter if $he wanted it or not; @@.gold;it was $hers and you took it.@@ @@ -1185,7 +1185,7 @@ Now you only have to wait for $him to wake up. <<else>> finds @@.pink;no signs of an implant swollen belly.@@ <</if>> - <<if $args[0].devotion >= 20>> + <<if $args[0].devotion > 20>> $He appreciates how much easier it will be with a smaller middle. <<else>> $He can't help but appreciate losing the bulk, but $he still @@.gold;worries@@ over your control of $his body. @@ -2268,7 +2268,7 @@ Now you only have to wait for $him to wake up. <</if>> <<if $args[0].teeth == "removable" && $args[1].teeth != "removable">> /* no teeth */ A look of confusion crosses $his face, $his brow furrowing slightly. You see $him work $his jaw for moment before $he turns $his head and spits out a set of dentures. - <<if $args[0].devotion <= -20 && $args[0].fetish != "mindbroken">> + <<if $args[0].devotion < -20 && $args[0].fetish != "mindbroken">> $He @@.mediumorchid;glowers@@ at them, knowing full well they'll be back in $his mouth shortly. <<set $args[0].devotion -= 2>> <</if>> @@ -2403,7 +2403,7 @@ Now you only have to wait for $him to wake up. @@.red;heavier $he is.@@ <<if $args[0].fetish == "mindbroken">> With $his broken mind, $he shows no real reaction to this new weight. - <<elseif $args[0].devotion >= 50>> + <<elseif $args[0].devotion > 50>> <<if $args[0].behavioralFlaw == "gluttonous">> $He is @@.hotpink;perfectly fine@@ with this; a bigger body means more food for $his belly and more for you to love. <<set $args[0].devotion += 1>> @@ -2455,7 +2455,7 @@ Now you only have to wait for $him to wake up. @@.green;lighter $he is.@@ <<if $args[0].fetish == "mindbroken">>/*mindbroken*/ $He doesn't show much reaction to $his lost weight. - <<elseif $args[0].devotion >= 50>>/*devoted*/ + <<elseif $args[0].devotion > 50>>/*devoted*/ $He is pleased that you have given $him a more slender and svelte body <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> body and is even happier that $his body is more in line with your society. @@ -2479,7 +2479,7 @@ Now you only have to wait for $him to wake up. <<if $args[0].muscles >= $args[1].muscles + 5>> that $he is @@.lime;significantly more muscular@@ than $he once was. <<if $args[0].fetish != "mindbroken">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He is happy with $his newfound strength and looks forward to putting this power to work for you, as limited as it may be. <<else>> $He is irritated that you would change something like this about $him @@ -2494,7 +2494,7 @@ Now you only have to wait for $him to wake up. <</if>> <<else>> that $he is @@.orange;significantly less muscular@@ than before. - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He appreciates that you would take the time to make $him more feminine. <<else>> $He is @@.mediumorchid;annoyed@@ that you would alter something about $him like this, but it's not a big loss given $his state. @@ -2529,7 +2529,7 @@ Now you only have to wait for $him to wake up. <</if>> <<if $args[0].fetish != "mindbroken">> <<if $args[0].bellyPreg >= 100 || $args[0].birthsTotal > 0>> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> Even though $he didn't get to experience being made into one, $he is delighted to be a mother<<if $args[0].birthsTotal > 0>> again<</if>>. <<else>> $He is filled with conflicting emotions, @@.mediumorchid;hatred@@ for you for forcing <<if $args[0].pregType > 1>>these lives<<else>>this life<</if>> onto $him, as well as the instinct of a mother's love for $his unborn child. @@ -2538,7 +2538,7 @@ Now you only have to wait for $him to wake up. <</if>> <<elseif $args[0].fetish == "pregnancy">> <<if $args[0].bellyPreg >= 100 || $args[0].birthsTotal > 0>> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> Even though $he didn't get to experience being made into one, $he is overjoyed to have <<if $args[0].birthsTotal > 0>>another<<else>>a<</if>> life growing inside $him. <<else>> $He is filled with conflicting emotions, hate for being forced into this, but also joy from getting to be pregnant. While you didn't do this for $his amusement, $he'll definitely take advantage of it. @@ -2562,7 +2562,7 @@ Now you only have to wait for $him to wake up. <<elseif $args[0].bellyImplant >= 100>> sees a @@.pink;slight swell to $his stomach.@@ <</if>> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He likes how the bulge looks on $him and can't wait to get fucked with it in the way. <<else>> It @@.mediumorchid;bothers $him@@ that you would add such a <<if $args[0].bellyImplant >= 10000>>major<<else>>minor<</if>> inconvenience to $his body. @@ -2570,10 +2570,10 @@ Now you only have to wait for $him to wake up. <</if>> <<if $args[1].pregKnown == 1>> <<if $args[0].fetish == "pregnancy">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He @@.mediumorchid;scowls with momentary wrath@@ before regaining $his composure. $He resents being separated from $his pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>. <<set $args[0].devotion -= 5>> - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in $him<</if>>. <<set $args[0].devotion -= 10>> <<else>> @@ -2581,9 +2581,9 @@ Now you only have to wait for $him to wake up. <<set $args[0].devotion -= 15>> <</if>> <<elseif $args[0].fetish != "mindbroken">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> While $he will miss the chance of meeting $his future child, $he will no longer be weighed down by it as $he gets used to $his new body. - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He accepts this as how things are. <<else>> $He is filled with @@.mediumorchid;hatred for you@@ for snatching $his child away from $him. It didn't matter if $he wanted it or not; @@.gold;it was $hers and you took it.@@ @@ -2596,10 +2596,10 @@ Now you only have to wait for $him to wake up. <br><br> $He wiggles into a better position to view $his stomach, where $he discovers $he is @@.pink;no longer pregnant.@@ <<if $args[0].fetish == "pregnancy">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He @@.mediumorchid;scowls with momentary wrath@@ before regaining $his composure. $He resents being separated from $his pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>. <<set $args[0].devotion -= 5>> - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in $him<</if>>. <<set $args[0].devotion -= 10>> <<else>> @@ -2607,9 +2607,9 @@ Now you only have to wait for $him to wake up. <<set $args[0].devotion -= 15>> <</if>> <<elseif $args[0].fetish != "mindbroken">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> While $he will miss the chance of meeting $his future child, $he will no longer be weighed down by it as $he gets used to $his new body. - <<elseif $args[0].devotion >= 20>> + <<elseif $args[0].devotion > 20>> $He accepts this as how things are. <<else>> $He is filled with @@.mediumorchid;hatred for you@@ for snatching $his child away from $him. It didn't matter if $he wanted it or not; @@.gold;it was $hers and you took it.@@ @@ -2635,7 +2635,7 @@ Now you only have to wait for $him to wake up. <<else>> discovers $his belly is @@.pink;no longer bulging.@@ <</if>> - <<if $args[0].devotion >= 20>> + <<if $args[0].devotion > 20>> $He appreciates how much easier it will be with a smaller middle. <<else>> $He can't help but appreciate losing the bulk, but $he still @@.gold;worries@@ over your control of $his body. @@ -3165,7 +3165,7 @@ Now you only have to wait for $him to wake up. After a while, $he begins to stir, $his eyes fluttering. <<if _sight == -2>> <<if $args[0].fetish != "mindbroken">> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> $He nearly panics when $he finds @@.red;$he can no longer see.@@ $He barely manages to keep calm before accepting this is the fate you have chosen for $him. <<elseif $args[0].devotion > 20>> $He starts to panic as $he realizes @@.red;$he can no longer see.@@ After a short expurgation of @@.gold;grief and terror,@@ $he takes a deep breath and visibly suppresses $his emotions before returning to $his inspection. diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 53de1439fd6..913eb51e42e 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -723,7 +723,7 @@ All in all, <<set $slaves[$i].devotion -= 10>> <</if>> <<if $slaves[$i].pregSource == -1>> - <<if $slaves[$i].devotion < 20 && $slaves[$i].weekAcquired > 0>> + <<if $slaves[$i].devotion <= 20 && $slaves[$i].weekAcquired > 0>> <br> $He @@.mediumorchid;hates@@ you for using $his body to bear your children. <<set $slaves[$i].devotion -= 10>> diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw index 9c3a8dc65ee..97b96a5c1f9 100644 --- a/src/uncategorized/PESS.tw +++ b/src/uncategorized/PESS.tw @@ -55,7 +55,7 @@ <<set $activeSlave = getSlave($Bodyguard.ID)>> <<case "loving headgirl" "headgirl dickgirl" "worried headgirl" "worshipful impregnatrix">> <<set $activeSlave = getSlave($HeadGirl.ID)>> - <<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirl.ID && s.devotion < 20; })>> + <<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirl.ID && s.devotion <= 20; })>> <</switch>> /* 000-250-006 */ diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 63908e83fe3..6df8d9e994e 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -3933,7 +3933,7 @@ is looking good despite $his diminutive height. When $he raises $his arms above <<case "desperate null">> -You're inspecting <<EventNameLink $activeSlave>>, and $he's an unhappy little null today. <<if $activeSlave.devotion > 50>>$He's devoted to you, so that's not the problem;<<elseif $activeSlave.devotion > 20>>$He accepts her place, so that's not the problem;<<elseif $activeSlave.devotion > -50>>$He's not being especially defiant right now;<<else>>It's not $his hatred of you;<</if>> it's that $he's experiencing extreme sexual frustration. It's not obvious, despite her nakedness. $He has no +You're inspecting <<EventNameLink $activeSlave>>, and $he's an unhappy little null today. <<if $activeSlave.devotion > 50>>$He's devoted to you, so that's not the problem;<<elseif $activeSlave.devotion > 20>>$He accepts her place, so that's not the problem;<<elseif $activeSlave.devotion >= -50>>$He's not being especially defiant right now;<<else>>It's not $his hatred of you;<</if>> it's that $he's experiencing extreme sexual frustration. It's not obvious, despite her nakedness. $He has no <<if $seeDicks != 0>>cock to get hard<</if>> <<if $seeDicks != 100>><<if $seeDicks != 0>>or <</if>>pussy to get wet<</if>> to advertise her uncomfortable state. Most slaves have obvious visual cues like that to do their sexual begging for them, but not $him. All $he's got to show how pent up $he is is the stiffness of her $activeSlave.nipples nipples, goosebumps all over $his areolae despite the warmth of your office, and a tiny bead of clear fluid at the little hole <<if $activeSlave.scrotum > 0>>above her lonely, abandoned ballsack<<elseif $activeSlave.genes == "XX">>where $his pussy used to be<<else>>where the base of $his penis used to be<</if>>. @@ -4685,7 +4685,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You simply clamp a chastity cage onto her limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. <<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Flog $him">> @@ -4693,14 +4693,14 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You bind $his naked body to the wall in preparation for a good beating. Going against one's master is bad, but going against you is even worse. You thoroughly strike $him, showering extra attention to $his crotch, while making sure $he will be in pain for days to come. Such a beating leaves $him @@.red;in agonizing pain@@ and makes a clear example to $him and all your other rebellious slaves that @@.gold;you are not to be trifled with.@@ <<set $activeSlave.trust -= 15>> <<set $activeSlave.health -= 15>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Mute $him">> <<replace "#result2">> As you pull $his limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He tried to rape you, $he must be silenced. Restrained as $he is, the most $he can do is cry and beg. When $he awakens from surgery, $he realizes all you did was stop her from talking; @@.mediumaquamarine;what stops her from making another go at you?@@ Your other rebellious slaves see this a minor loss for a potentially huge gain and, if anything, @@.mediumaquamarine;become more defiant.@@ <<set $activeSlave.trust += 5, $activeSlave.devotion -= 15, $activeSlave.voice = 0>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 10; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 10; } })>> <<set $cash -= $surgeryCost>> <</replace>> <</link>> //Will cost <<print cashFormat($surgeryCost)>>// @@ -4708,7 +4708,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> As you pull $his limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He had the balls to try and rape you, and now $he won't. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new life; @@.mediumorchid;$he'll never get hard again@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ Every other rebellious slave is @@.gold;mortified by the example.@@ <<set $activeSlave.trust -= 20, $activeSlave.devotion -= 10, $activeSlave.health -= 10>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 5; } })>> <<set $cash -= $surgeryCost>> <</replace>> //Will cost <<print cashFormat($surgeryCost)>>// <</link>> @@ -4718,7 +4718,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask her if $he enjoyed the last time $he used her dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into her virgin pussy. You use her until you are satisfied and toss $him to the floor to think about her new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1>> <<= VaginalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -4727,7 +4727,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You ask her if $he enjoyed the last time $he used her dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a surgical null@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.foreskin = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.dickAccessory = "none">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -4737,7 +4737,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask her if $he enjoyed her last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As her arousal grows, $he realizes you not only took her dick, but her prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch her squirm in sexual frustration. This will be her new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0>> <<= AnalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*4)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*4))>>// @@ -4785,7 +4785,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. <<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Flog $him">> @@ -4793,14 +4793,14 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You bind her naked body to the wall in preparation for a good beating. Going against one's master is bad, but going against you is even worse. You thoroughly strike $him, showering extra attention to her crotch, while making sure $he will be in pain for days to come. Such a beating leaves her @@.red;in agonizing pain@@ and makes a clear example to $him and all your other rebellious slaves that @@.gold;you are not to be trifled with.@@ <<set $activeSlave.trust -= 15>> <<set $activeSlave.health -= 15>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Mute $him">> <<replace "#result2">> As you pull her limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He tried to rape you, $he must be silenced. Restrained as $he is, the most $he can do is cry and beg. When $he awakens from surgery, $he realizes all you did was stop her from talking; @@.mediumaquamarine;what stops her from making another go at you?@@ Your other rebellious slaves see this a minor loss for a potentially huge gain and, if anything, @@.mediumaquamarine;become more defiant.@@ <<set $activeSlave.trust += 5, $activeSlave.devotion -= 15, $activeSlave.voice = 0>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 10; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 10; } })>> <<set $cash -= $surgeryCost>> <</replace>> <</link>> //Will cost <<print cashFormat($surgeryCost)>>// @@ -4808,7 +4808,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> As you pull her limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He had the balls to try and rape you, and now $he won't. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new life; @@.mediumorchid;$he'll never get hard again@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ Every other rebellious slave is @@.gold;mortified by the example.@@ <<set $activeSlave.trust -= 20, $activeSlave.devotion -= 10, $activeSlave.health -= 10>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 5; } })>> <<set $cash -= $surgeryCost>> <</replace>> //Will cost <<print cashFormat($surgeryCost)>>// <</link>> @@ -4818,7 +4818,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask her if $he enjoyed the last time $he used her dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into her virgin pussy. You use her until you are satisfied and toss $him to the floor to think about her new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1>> <<= VaginalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -4827,7 +4827,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You ask her if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.foreskin = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.dickAccessory = "none">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -4837,7 +4837,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask her if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took her dick, but $his prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch her squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0>> <<= AnalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*4)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*4))>>// @@ -4880,7 +4880,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. <<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Flog $him">> @@ -4888,14 +4888,14 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You bind her naked body to the wall in preparation for a good beating. Going against one's master is bad, but going against you is even worse. You thoroughly strike $him, showering extra attention to her crotch, while making sure $he will be in pain for days to come. Such a beating leaves her @@.red;in agonizing pain@@ and makes a clear example to $him and all your other rebellious slaves that @@.gold;you are not to be trifled with.@@ <<set $activeSlave.trust -= 15>> <<set $activeSlave.health -= 15>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Mute $him">> <<replace "#result2">> As you pull her limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He tried to rape you, $he must be silenced. Restrained as $he is, the most $he can do is cry and beg. When $he awakens from surgery, $he realizes all you did was stop her from talking; @@.mediumaquamarine;what stops her from making another go at you?@@ Your other rebellious slaves see this a minor loss for a potentially huge gain and, if anything, @@.mediumaquamarine;become more defiant.@@ <<set $activeSlave.trust += 5, $activeSlave.devotion -= 15, $activeSlave.voice = 0>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 10; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 10; } })>> <<set $cash -= $surgeryCost>> <</replace>> <</link>> //Will cost <<print cashFormat($surgeryCost)>>// @@ -4903,7 +4903,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> As you pull her limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He had the balls to try and rape you, and now $he won't. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new life; @@.mediumorchid;$he'll never get hard again@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ Every other rebellious slave is @@.gold;mortified by the example.@@ <<set $activeSlave.trust -= 20, $activeSlave.devotion -= 10, $activeSlave.health -= 10>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 5; } })>> <<set $cash -= $surgeryCost>> <</replace>> //Will cost <<print cashFormat($surgeryCost)>>// <</link>> @@ -4913,7 +4913,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask her if $he enjoyed the last time $he used her dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into her virgin pussy. You use her until you are satisfied and toss $him to the floor to think about her new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1>> <<= VaginalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -4922,7 +4922,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a surgical null@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.foreskin = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.dickAccessory = "none">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -4932,7 +4932,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As her arousal grows, $he realizes you not only took her dick, but her prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch her squirm in sexual frustration. This will be her new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0>> <<= AnalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*4)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*4))>>// @@ -4950,7 +4950,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. <<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Flog $him">> @@ -4958,14 +4958,14 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You bind $his naked body to the wall in preparation for a good beating. Going against one's master is bad, but going against you is even worse. You thoroughly strike $him, showering extra attention to her crotch, while making sure $he will be in pain for days to come. Such a beating leaves her @@.red;in agonizing pain@@ and makes a clear example to $him and all your other rebellious slaves that @@.gold;you are not to be trifled with.@@ <<set $activeSlave.trust -= 15>> <<set $activeSlave.health -= 15>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>> <</replace>> <</link>> <br><<link "Mute $him">> <<replace "#result2">> As you pull her limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He tried to rape you, $he must be silenced. Restrained as $he is, the most $he can do is cry and beg. When $he awakens from surgery, $he realizes all you did was stop her from talking; @@.mediumaquamarine;what stops $him from making another go at you?@@ Your other rebellious slaves see this a minor loss for a potentially huge gain and, if anything, @@.mediumaquamarine;become more defiant.@@ <<set $activeSlave.trust += 5, $activeSlave.devotion -= 15, $activeSlave.voice = 0>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 10; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 10; } })>> <<set $cash -= $surgeryCost>> <</replace>> <</link>> //Will cost <<print cashFormat($surgeryCost)>>// @@ -4973,7 +4973,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> As you pull her limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He had the balls to try and rape you, and now $he won't. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new life; @@.mediumorchid;$he'll never get hard again@@ and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ Every other rebellious slave is @@.gold;mortified by the example.@@ <<set $activeSlave.trust -= 20, $activeSlave.devotion -= 10, $activeSlave.health -= 10>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 5; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 5; } })>> <<set $cash -= $surgeryCost>> <</replace>> //Will cost <<print cashFormat($surgeryCost)>>// <</link>> @@ -4983,7 +4983,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use her until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1>> <<= VaginalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -4992,7 +4992,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<replace "#result2">> You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.foreskin = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.dickAccessory = "none">> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*2)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*2))>>// @@ -5002,7 +5002,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. You ask her if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces her new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As her arousal grows, $he realizes you not only took her dick, but her prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch her squirm in sexual frustration. This will be her new life. Every other rebellious slave is @@.gold;horrified by the example.@@ <<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0>> <<= AnalVCheck()>> - <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust -= 15; } })>> + <<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>> <<set $cash -= ($surgeryCost*4)>> <</replace>> <</link>> //Will cost <<print cashFormat(($surgeryCost*4))>>// @@ -17017,7 +17017,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t You inform your personal assistant that you aren't planning to take any action. If you took notice every time a citizen offered a slave on public duty any insult, you'd never be doing anything else. The only interesting part of the interaction was the possible value of the pretty girls, but enslaving them would likely have been difficult and expensive, given their families' probable wealth and influence. As for $activeSlave.slaveName, $he's not deeply affected. <<if $activeSlave.energy > 95>> $He's so horny that petty insults can't compete for her attention with her constant, oppressive need to get off. - <<elseif $activeSlave.trust > 95 && $activeSlave.devotion > -20>> + <<elseif $activeSlave.trust > 95 && $activeSlave.devotion >= -20>> $He's confident that $he's a good slave, no matter what some visitors from outside the arcology say. <<elseif $activeSlave.trust > 95>> It just gives her more of a reason to work against you. diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index e305a455958..171441e1e32 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -323,7 +323,7 @@ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>> <<elseif ($slaves[$i].devotion < 45)>> <<set $slaves[$i].devotion += 4>> - <<elseif ($slaves[$i].devotion >= 50)>> + <<elseif ($slaves[$i].devotion > 50)>> <<set $slaves[$i].devotion -= 4>> <</if>> <<if ($slaves[$i].trust < 30)>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 9077fb9c932..ce8b969f635 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -207,7 +207,7 @@ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>> <<elseif ($slaves[$i].devotion < 45)>> <<set $slaves[$i].devotion += 4>> - <<elseif ($slaves[$i].devotion >= 50)>> + <<elseif ($slaves[$i].devotion > 50)>> <<set $slaves[$i].devotion -= 4>> <</if>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 2f0b323a628..46491b784c4 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -92,7 +92,7 @@ <<if $dairyRestraintsSetting != 2>> /* how much effort the MM must take to force a slave into a stall */ <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$DairyiIDs[_dI]]>> - <<if $slaves[$i].devotion < 20>> + <<if $slaves[$i].devotion <= 20>> <<set _MMWorkout++>> <</if>> <<if $slaves[$i].trust < 20>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 2fd3b589215..cc014aba83e 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -2050,7 +2050,7 @@ $He is $He is @@.pink;completely silent@@, which is understandable, since $he's mute. <<else>> <<if $activeSlave.lips > 95>> - $He is @@.pink;effectively mute@@, since $his lips are so large that $he can no longer speak intelligibly. $He can still <<if $activeSlave.devotion > 50>>moan<<elseif $activeSlave.devotion >= 20>>whimper<<else>>scream<</if>> through them, though. + $He is @@.pink;effectively mute@@, since $his lips are so large that $he can no longer speak intelligibly. $He can still <<if $activeSlave.devotion > 50>>moan<<elseif $activeSlave.devotion > 20>>whimper<<else>>scream<</if>> through them, though. <</if>> <</if>> diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index 60459e31f42..c4ab552a5d9 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -261,7 +261,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <<set $activeSlave.devotion += 1>> <</if>> <<else>> - <<if $activeSlave.devotion < 50>> + <<if $activeSlave.devotion <= 50>> $He sees that most of the slaves $he sees around your penthouse dislike you, and starts to @@.mediumorchid;dislike you@@ a little more $himself. <<set $activeSlave.devotion -= 2>> <</if>> @@ -1826,7 +1826,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <br> <<link "Give $him all the cum $he can drink">> <<replace "#introResult">> - You securely restrain your new slave; for both $his own safety and so $he can't object to $his meal. You reassure $him and order $him to close $his eyes and open wide for a treat.<<if $activeSlave.eyes == -2>> Blind as $he is,<<else>> Since $his eyes are contentedly closed,<</if>> $he doesn't see you reach for one of the phallus-tipped feeding tubes located throughout your penthouse. Before $he knows what's happening, you've forced the cocktube firmly into $his gaping maw and anchored it to $his head, causing $his entire body to tense up <<if $activeSlave.devotion < 20>>in panic <</if>>once more. + You securely restrain your new slave; for both $his own safety and so $he can't object to $his meal. You reassure $him and order $him to close $his eyes and open wide for a treat.<<if $activeSlave.eyes == -2>> Blind as $he is,<<else>> Since $his eyes are contentedly closed,<</if>> $he doesn't see you reach for one of the phallus-tipped feeding tubes located throughout your penthouse. Before $he knows what's happening, you've forced the cocktube firmly into $his gaping maw and anchored it to $his head, causing $his entire body to tense up <<if $activeSlave.devotion <= 20>>in panic <</if>>once more. <br><br> You pause to examine the tap, making sure it is set to cum, before releasing the valve and unleashing a steady flow. The feeder bucks against $his face as thick, white liquid rushes downward towards the helpless slave. <<if $activeSlave.devotion > 20>> diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw index 7548d45dd75..d66ff6f631a 100644 --- a/src/uncategorized/peLonelyBodyguard.tw +++ b/src/uncategorized/peLonelyBodyguard.tw @@ -4,7 +4,7 @@ <<set $activeSlave = $Bodyguard, _targetSlaveIndex = []>> <<for _i = 0; _i < $slaves.length; _i++>> - <<if $slaves[_i].devotion > -20 && $slaves[_i].relationship == 0 && $slaves[_i].ID != $Bodyguard.ID>> + <<if $slaves[_i].devotion >= -20 && $slaves[_i].relationship == 0 && $slaves[_i].ID != $Bodyguard.ID>> <<set _targetSlaveIndex.push(_i)>> <</if>> <</for>> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 006cbf75940..54f20f8d805 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -369,7 +369,7 @@ <</if>> <</if>> - <<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirl.ID && s.devotion < 20; })>> + <<set $j = $slaves.findIndex(function(s) { return s.ID != $HeadGirl.ID && s.devotion <= 20; })>> <<if canPenetrate($HeadGirl) && ($HeadGirl.balls > 0)>> <<if $j != -1>> @@ -413,7 +413,7 @@ <<if ($Bodyguard.relationship == 0)>> <<if ($Bodyguard.relationshipRules == "permissive")>> <<if ($Bodyguard.fetish != "mindbroken")>> - <<set $j = $slaves.findIndex(function(s) { return s.ID != $Bodyguard.ID && s.relationship == 0 && s.devotion > -20; })>> + <<set $j = $slaves.findIndex(function(s) { return s.ID != $Bodyguard.ID && s.relationship == 0 && s.devotion >= -20; })>> <<if $j != -1>> <<set $events.push("PE lonely bodyguard")>> /* requires valid $slaves[$j] */ <</if>> diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw index 52e3b82baa6..08b2ef347c2 100644 --- a/src/uncategorized/saDevotion.tw +++ b/src/uncategorized/saDevotion.tw @@ -162,10 +162,10 @@ <<set $slaves[$i].trust += 1>> <</if>> <<if ($arcologies[0].FSRestart != "unset")>> - <<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].devotion < 20>> + <<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].devotion <= 20>> Being visibly pregnant in a society that loathes slave breeding fills $him with @@.gold;fear@@ for $himself and $his unborn child. <<set $slaves[$i].trust -= 10>> - <<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].devotion < 20>> + <<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].devotion <= 20>> Being pregnant in a society that loathes slave breeding fills $him with @@.gold;worry@@ that you'll harm $him or $his unborn child. <<set $slaves[$i].trust -= 5>> <</if>> @@ -631,7 +631,7 @@ <</if>> <</if>> <<if $slaves[$i].trust > 95>> - <<if $slaves[$i].devotion <= -20>> + <<if $slaves[$i].devotion < -20>> $slaves[$i].slaveName feels no threat from you, so $he finds it easy to @@.mediumorchid;express $his hatred of you.@@ <<set $slaves[$i].devotion -= 10>> <<elseif $slaves[$i].devotion <= 20>> @@ -642,7 +642,7 @@ <<set $slaves[$i].devotion += 1>> <</if>> <<elseif $slaves[$i].trust > 50>> - <<if $slaves[$i].devotion <= -20>> + <<if $slaves[$i].devotion < -20>> $slaves[$i].slaveName finds you non-threatening, so it's easy for $him to @@.mediumorchid;defy you.@@ <<set $slaves[$i].devotion -= 5>> <<elseif $slaves[$i].devotion <= 20>> @@ -768,9 +768,9 @@ <<set $slaves[$i].devotion = -100>> <</if>> <<if ($slaves[$i].trust > 100)>> - <<if $slaves[$i].devotion < 100 && $slaves[$i].devotion >= 20>> + <<if $slaves[$i].devotion < 100 && $slaves[$i].devotion > 20>> <<set $slaves[$i].devotion += Math.trunc($slaves[$i].trust-100)>> - <<elseif $slaves[$i].devotion <= -50>> + <<elseif $slaves[$i].devotion < -50>> $His blatant disregard for your rule @@.red;damages your reputation.@@ <<set $repGain -= 30*($slaves[$i].trust-100)>> <<elseif $slaves[$i].energy <= 50>> diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw index c0325ca7d8f..a7eb5b44ece 100644 --- a/src/uncategorized/saDiet.tw +++ b/src/uncategorized/saDiet.tw @@ -954,7 +954,7 @@ <<set $slaves[$i].trust++>> <<elseif $slaves[$i].devotion > 20>> but since $he's been broken to slavery, $he does $his best not to think about it. - <<elseif $slaves[$i].devotion > -20>> + <<elseif $slaves[$i].devotion >= -20>> and though $he does $his best not to think about it, it sometimes makes $him @@.gold;cry $himself to sleep.@@ <<set $slaves[$i].trust-->> <<else>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 803acf6961e..03063e861b3 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -196,7 +196,7 @@ <</if>> <</if>> <<case "restrictive latex">> - <<if ($slaves[$i].devotion >= 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>> + <<if ($slaves[$i].devotion > 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>> <<if $slaves[$i].fetishKnown == 0>> The latex $he's wearing limits $his world to your input and control. $He seems to get off on the lack of control; $he's a @@.lightcoral;total submissive.@@ <<set $slaves[$i].fetishKnown = 1>> @@ -212,7 +212,7 @@ <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> <</if>> <<case "shibari ropes">> - <<if ($slaves[$i].devotion >= 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>> + <<if ($slaves[$i].devotion > 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>> <<if $slaves[$i].fetishKnown == 0>> The ropes $he's wearing restrict $him and leave $him completely helpless. $He seems to get off on the lack of control; $he's a @@.lightcoral;natural submissive.@@ <<set $slaves[$i].fetishKnown = 1>> @@ -431,7 +431,7 @@ $His collar's display reveals all sorts of personal information about $his womb, which is completely humiliating, and @@.hotpink;oddly pleasing@@ to $him. $He seems to have a @@.lightcoral;humiliation fetish!@@ <<set $slaves[$i].devotion += 1>> <<set $slaves[$i].fetishKnown = 1>> - <<elseif $slaves[$i].devotion <= -20>> + <<elseif $slaves[$i].devotion < -20>> $His collar's display reveals all sorts of personal information about $his fertility, filling $him @@.mediumorchid;with disgust@@ that you that you consider $his womb little more than property, as well as @@.gold;fear@@ that it will soon be swelling with an unwelcome child. <<set $slaves[$i].devotion -= 2>> <<set $slaves[$i].trust -= 2>> @@ -439,7 +439,7 @@ $His collar's display reveals all sorts of personal information about $his womb, completely @@.hotpink;degrading $him@@ and making $him @@.gold;fear@@ $his new life. <<set $slaves[$i].devotion += 1>> <<set $slaves[$i].trust -= 2>> - <<elseif $slaves[$i].devotion >= 20>> + <<elseif $slaves[$i].devotion > 20>> $His collar's display reveals all sorts of personal information about $his womb, filling $him @@.hotpink;with pride@@ that you think $his womb is worth attention. <<set $slaves[$i].devotion += 1>> <</if>> @@ -4483,7 +4483,7 @@ <<set $slaves[$i].pregSource = _tempRival.ID>> <<elseif (random(1,100) > 60) && canImpreg($slaves[$i], $PC)>> /* still 40% chance of impregnation by PC */ <<set $slaves[$i].pregSource = -1>> - <<elseif (random(1,100) > 95) && ($slaves[$i].eggType == "human") && $slaves[$i].devotion < 20>> /* 5% chance of impregnation by random citizen - TODO: make this optional for players who want random fathers from among their own slaves only */ + <<elseif (random(1,100) > 95) && ($slaves[$i].eggType == "human") && $slaves[$i].devotion <= 20>> /* 5% chance of impregnation by random citizen - TODO: make this optional for players who want random fathers from among their own slaves only */ <<set $slaves[$i].pregSource = -2>> <<else>> /* pick a random starting point in the slave array and iterate (wrapping around) until finding eligible father or coming back to starting point */ @@ -4491,7 +4491,7 @@ <<if canImpreg($slaves[$i], $slaves[$i]) && _conceptionSeed > 95 && ($slaves[$i].releaseRules == "permissive" || $slaves[$i].releaseRules == "masturbation")>> <<set $slaves[$i].pregSource = $slaves[$i].ID>> <</if>> - <<elseif $slaves[$i].releaseRules == "permissive" || ($slaves[$i].devotion < 20 && $slaves[$i].trust > 50) || $universalRulesConsent == 0>> + <<elseif $slaves[$i].releaseRules == "permissive" || ($slaves[$i].devotion <= 20 && $slaves[$i].trust > 50) || $universalRulesConsent == 0>> <<set _sourceSeed = random(0,$slaves.length-1)>><<set _tried = 0>> <<for _m = _sourceSeed + 1; _m != _sourceSeed; _m++>> <<if _m == $slaves.length>><<set _m = 0, _tried = 1>><</if>> /* wrap around */ @@ -4914,7 +4914,7 @@ <</if>> <<if ($slaves[$i].breedingMark == 1 && $propOutcome == 1) && ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>> - <<if ($slaves[$i].devotion <= -20)>> + <<if ($slaves[$i].devotion < -20)>> $He views the mark of the Societal Elite @@.mediumorchid;with disgust@@ as it brands $him as nothing more than your breeding bitch. <<set $slaves[$i].devotion -= 10>> <<elseif ($slaves[$i].devotion <= 50)>> @@ -5428,7 +5428,7 @@ <<if $slaves[$i].fetish == "mindbroken">> Society is mixed over your marriage to the mindbroken girl; on one hand $he had no consent, but on the other, you @@.green;surely must love $him@@ to marry $him. <<FSChangePorn "Paternalist" 1>> - <<elseif ($slaves[$i].devotion < 20)>> + <<elseif ($slaves[$i].devotion <= 20)>> Society is @@.red;thoroughly disgusted@@ that you took $his hand in marriage by force. <<FSChangePorn "Paternalist" -3>> <</if>> @@ -5805,7 +5805,7 @@ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>> $He may be blind and deaf, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you. <<set $slaves[$i].trust += 2>> - <<elseif $slaves[$i].devotion > -20>> + <<elseif $slaves[$i].devotion >= -20>> $His blindness and deafness forces $him to @@.hotpink;entirely rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he has only the smell of arousal to warn of an impending threat. <<set $slaves[$i].devotion += 10, $slaves[$i].trust -= 30>> <<else>> @@ -5822,7 +5822,7 @@ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>> $He may be blind and hard of hearing, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you. <<set $slaves[$i].trust += 2>> - <<elseif $slaves[$i].devotion > -20>> + <<elseif $slaves[$i].devotion >= -20>> $His blindness and trouble hearing forces $him to @@.hotpink;rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he strains to hear anything potential threats to $him. <<set $slaves[$i].devotion += 7, $slaves[$i].trust -= 20>> <<else>> @@ -5839,7 +5839,7 @@ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>> $He may be blind, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you. <<set $slaves[$i].trust += 2>> - <<elseif $slaves[$i].devotion > -20>> + <<elseif $slaves[$i].devotion >= -20>> $His blindness forces $him to @@.hotpink;rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he has severely limited capabilities to defend $himself. <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 10>> <<else>> @@ -5892,7 +5892,7 @@ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>> Since $he is also deaf, $he views you as $his @@.mediumaquamarine;blurry guardian.@@ <<set $slaves[$i].trust += 5>> - <<elseif $slaves[$i].devotion > -20>> + <<elseif $slaves[$i].devotion >= -20>> Since $he is also deaf, $he @@.gold;descends into paranoia@@ as every blurry shape could be out to get $him. <<set $slaves[$i].trust -= 20>> <<else>> @@ -5941,7 +5941,7 @@ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>> $He may be deaf, but no one can sneak up on $him while $he is with you, @@.mediumaquamarine;developing the trust@@ that you have $his back. <<set $slaves[$i].trust += 2>> - <<elseif $slaves[$i].devotion > -20>> + <<elseif $slaves[$i].devotion >= -20>> $His deafness forces $him to @@.gold;distrust everyone@@ as everything out of sight is a potential threat to $him. <<set $slaves[$i].trust -= 10>> <<else>> @@ -5992,7 +5992,7 @@ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>> $He may be physically frail and vulnerable, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you. <<set $slaves[$i].trust += 2>> - <<elseif $slaves[$i].devotion > -20>> + <<elseif $slaves[$i].devotion >= -20>> $His frailty forces $him to @@.hotpink;rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he has no chance of defending $himself. <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 10>> <<else>> @@ -7818,7 +7818,7 @@ $His inhumanly wide hips make walking difficult. $He can barely move without swinging them side to side seductively, and $he keeps bumping things with them. <<if ($slaves[$i].devotion > 50)>> Since $he's devoted to you, $he embraces $his wide body and does everything $he can to show it off for you. - <<elseif ($slaves[$i].devotion > -20)>> + <<elseif ($slaves[$i].devotion >= -20)>> This gait makes $him feel like a huge whore, @@.hotpink;increasing $his submissiveness.@@ <<set $slaves[$i].devotion += 2>> <<else>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 28704893b91..5f9ac891a81 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1120,9 +1120,9 @@ <<if _SlaveI.devotion != _SlaveJ.devotion>> _SlaveI.slaveName absorbs <<if _SlaveI.relationship == 1>>a touch of her friend<<elseif _SlaveI.relationship == 2>>a little of her best friend<<elseif _SlaveI.relationship == 3>>some of her close friend<<elseif _SlaveI.relationship == 4>>a lot of her lover<<else>>much of her wife<</if>>'s <<if _SlaveI.devotion > _SlaveJ.devotion>> - @@.mediumorchid;<<if _SlaveJ.devotion > 50>>remaining doubts about you<<elseif _SlaveJ.devotion > 20>>remaining hesitations about sexual slavery<<elseif _SlaveJ.devotion > -20>>unhappiness about being a sex slave<<else>>anger at being a slave<</if>>.@@ + @@.mediumorchid;<<if _SlaveJ.devotion > 50>>remaining doubts about you<<elseif _SlaveJ.devotion > 20>>remaining hesitations about sexual slavery<<elseif _SlaveJ.devotion >= -20>>unhappiness about being a sex slave<<else>>anger at being a slave<</if>>.@@ <<else>> - @@.hotpink;<<if _SlaveJ.devotion > 50>>love for you<<elseif _SlaveJ.devotion > 20>>acceptance of sexual slavery<<elseif _SlaveJ.devotion > -20>>submission to the reality of being a sex slave<<else>>unwillingness to immediately rebel<</if>>.@@ + @@.hotpink;<<if _SlaveJ.devotion > 50>>love for you<<elseif _SlaveJ.devotion > 20>>acceptance of sexual slavery<<elseif _SlaveJ.devotion >= -20>>submission to the reality of being a sex slave<<else>>unwillingness to immediately rebel<</if>>.@@ <</if>> <<set _SlaveI.devotion -= Math.trunc((_SlaveI.devotion - _SlaveJ.devotion) * (0.1 * _SlaveI.relationship))>> <</if>> diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index 642b522e905..c7defb724ba 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -202,19 +202,19 @@ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> refuses to come up to the penthouse for sexual release, and is @@.gold;severely punished@@ for illicit masturbation. <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> <<if $slaves[$i].devotion <= 20>> occasionally comes to the penthouse to beg for sexual release. <<else>> doesn't mind having to come to the penthouse to beg for sexual release. <</if>> <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ + <<else>> /* $slaves[$i].devotion > 50 */ willingly comes up to the penthouse and begs you to <<saRulesPlayerFetishPlay>> every break $he gets. <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ + <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> <<elseif ($slaves[$i].releaseRules == "masturbation")>> @@ -227,7 +227,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than trading sex with other slaves, though being forced to do it in front of an aroused client @@.gold;terrifies $him;@@ you can never know when they'll want more. <<set $slaves[$i].trust -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<elseif ($slaves[$i].devotion < 80)>> @@ -261,7 +261,7 @@ is forced by the urges induced by the food to either demand sex from other slaves or attempt to attract additional clients. $He @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts the need@@ to <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesRapeFetish>> @@ -289,7 +289,7 @@ is forced by the urges induced by the food to either swap sex with other slaves or attempt to attract additional clients. $He @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts having to ask@@ other slaves for sex, <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesConsentFetish>> @@ -677,19 +677,19 @@ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> refuses to come up to the penthouse for sexual release, and is @@.gold;severely punished@@ for illicit masturbation. <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> <<if $slaves[$i].devotion <= 20>> occasionally comes to the penthouse to beg for sexual release. <<else>> doesn't mind having to come to the penthouse to beg for sexual release. <</if>> <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ + <<else>> /* $slaves[$i].devotion > 50 */ willingly comes up to the penthouse and begs you to <<saRulesPlayerFetishPlay>> every break $he gets. <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ + <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> <<elseif ($slaves[$i].releaseRules == "masturbation")>> @@ -702,7 +702,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than trading sex with other slaves, though being forced to do it in on a table surrounded by citizens@@.gold;terrifies $him;@@ you can never know when they'll want more. <<set $slaves[$i].trust -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<elseif ($slaves[$i].devotion < 80)>> @@ -736,7 +736,7 @@ is forced by the urges induced by the food to either demand sex from other slaves or offering $himself to patrons. $He @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts the need@@ to <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesRapeFetish>> @@ -764,7 +764,7 @@ is forced by the urges induced by the food to either swap sex with other slaves or attempt to seduce amorous citizens. $He @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts having to ask@@ other slaves for sex, <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesConsentFetish>> @@ -1136,7 +1136,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than having to seek other means of release, @@.mediumaquamarine;slightly reducing $his fear@@ of you but @@.mediumorchid;allowing $him to remain in control of $him sexuality.@@ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<else>> @@ -1742,19 +1742,19 @@ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> refuses to come up to the penthouse for sexual release, or to beg to share a bath with you, and is @@.gold;severely punished@@ for illicit masturbation. <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> <<if $slaves[$i].devotion <= 20>> occasionally comes to the penthouse to beg for sexual release or for you to join $him in $spaName. <<else>> doesn't mind having to come to the penthouse to beg for sexual release or for you to join $him in $spaName. <</if>> <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ + <<else>> /* $slaves[$i].devotion > 50 */ willingly comes up to the penthouse and begs you to <<saRulesPlayerFetishPlay>> whenever the urge strikes. <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ + <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> <<elseif ($slaves[$i].releaseRules == "masturbation")>> @@ -1764,7 +1764,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing $his fear@@ of you but @@.mediumorchid;allowing $him to remain in control of $him sexuality.@@ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<elseif ($slaves[$i].devotion < 80)>> @@ -1798,7 +1798,7 @@ is forced by the urges induced by the food to demand sex from other slaves, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts the need@@ to <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesRapeFetish>> @@ -1826,7 +1826,7 @@ is forced by the urges induced by the food to swap sex with other slaves, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts having to ask@@ other slaves for sex, <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesConsentFetish>> @@ -2269,19 +2269,19 @@ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> refuses to come to you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation. <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> <<if $slaves[$i].devotion <= 20>> occasionally comes to you to beg for sexual release. <<else>> doesn't mind having to come to you to beg for sexual release. <</if>> <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ + <<else>> /* $slaves[$i].devotion > 50 */ willingly begs you to <<saRulesPlayerFetishPlay>> every chance $he gets. <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ + <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> <<elseif ($slaves[$i].releaseRules == "masturbation")>> @@ -2291,7 +2291,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing $his fear@@ of you but @@.mediumorchid;allowing $him to remain in control of $him sexuality.@@ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<elseif ($slaves[$i].devotion < 80)>> @@ -2325,7 +2325,7 @@ is forced to demand sex from other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts the need@@ to <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesRapeFetish>> @@ -2353,7 +2353,7 @@ is forced to swap sex with other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts having to ask@@ other slaves for sex, <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesConsentFetish>> @@ -2708,19 +2708,19 @@ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> refuses to offer $himself to you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation. <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> <<if $slaves[$i].devotion <= 20>> occasionally stops by your office to offer $himself to you. <<else>> doesn't mind stopping by your office to beg for sexual release. <</if>> <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ + <<else>> /* $slaves[$i].devotion > 50 */ willingly stops by your office and begs you to <<saRulesPlayerFetishPlay>> every break $he gets. <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ + <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> <<elseif ($slaves[$i].releaseRules == "masturbation")>> @@ -2730,7 +2730,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing $his fear@@ of you but @@.mediumorchid;allowing $him to remain in control of $him sexuality.@@ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<elseif ($slaves[$i].devotion < 80)>> @@ -2764,7 +2764,7 @@ is forced to demand sex from other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts the need@@ to <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesRapeFetish>> @@ -2792,7 +2792,7 @@ is forced to swap sex with other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts having to ask@@ other slaves for sex, <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesConsentFetish>> @@ -3197,19 +3197,19 @@ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> refuses to come to you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation. <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> <<if $slaves[$i].devotion <= 20>> occasionally comes to you to beg for sexual release. <<else>> doesn't mind having to come to you to beg for sexual release. <</if>> <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ + <<else>> /* $slaves[$i].devotion > 50 */ willingly begs you to <<saRulesPlayerFetishPlay>> every chance $he gets. <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ + <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> <<elseif ($slaves[$i].releaseRules == "masturbation")>> @@ -3219,7 +3219,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing $his fear@@ of you but @@.mediumorchid;allowing $him to remain in control of $him sexuality.@@ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<elseif ($slaves[$i].devotion < 80)>> @@ -3253,7 +3253,7 @@ is forced to demand sex from other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts the need@@ to <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesRapeFetish>> @@ -3281,7 +3281,7 @@ is forced to swap sex with other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts having to ask@@ other slaves for sex, <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesConsentFetish>> @@ -3940,19 +3940,19 @@ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>> refuses to come to you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation. <<set $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> <<if $slaves[$i].devotion <= 20>> occasionally comes to you to beg for sexual release. <<else>> doesn't mind having to come to you to beg for sexual release. <</if>> <<saRulesPlayerEnergy>> - <<else>> /* $slaves[$i].devotion >= 50 */ + <<else>> /* $slaves[$i].devotion > 50 */ willingly begs you to <<saRulesPlayerFetishPlay>> every chance $he gets. <<saRulesPlayerEnergy>> - <</if>> /* closes $slaves[$i].devotion >= 50 */ + <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> <<elseif ($slaves[$i].releaseRules == "masturbation")>> @@ -3962,7 +3962,7 @@ <<elseif ($slaves[$i].devotion <= 20)>> enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing $his fear@@ of you but @@.mediumorchid;allowing $him to remain in control of $him sexuality.@@ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> accepts having to relieve $himself solely through masturbation. <<set $slaves[$i].need = 0>> <<elseif ($slaves[$i].devotion < 80)>> @@ -3996,7 +3996,7 @@ is forced to demand sex from other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts the need@@ to <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesRapeFetish>> @@ -4024,7 +4024,7 @@ is forced to swap sex with other slaves by the urges induced by the food, and @@.hotpink;hates $himself@@ for it. <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>> <</if>> - <<elseif ($slaves[$i].devotion < 50)>> + <<elseif ($slaves[$i].devotion <= 50)>> @@.hotpink;accepts having to ask@@ other slaves for sex, <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>> <<saRulesConsentFetish>> diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index 0d22aa27947..80949b81d6c 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -467,7 +467,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea <</if>> <</if>> -<<if $slaves[$i].assignment == "serve in the club" && $slaves[$i].devotion >= 50>> +<<if $slaves[$i].assignment == "serve in the club" && $slaves[$i].devotion > 50>> Being so far from your presence @@.mediumorchid;weakens $his intense devotion to you.@@ <</if>> diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw index 9ca4355e0a4..d4571a22fe6 100644 --- a/src/uncategorized/saServeYourOtherSlaves.tw +++ b/src/uncategorized/saServeYourOtherSlaves.tw @@ -187,7 +187,7 @@ is serving ''$slaves[_dom].slaveName'' this week. Since $slaves[_dom].slaveName loves _his2 rear played with, $slaves[$i].slaveName lavishes attention on _his2 butt. $He spends the week fondling $slaves[_dom].slaveName's _domRace ass with $his _subRace <<if $slaves[$i].amp>>face<<else>>hands<</if>>. @@.hotpink;$slaves[_dom].slaveName enjoys having a playmate so fond of _his2 booty.@@ <</if>> <</if>> -<<elseif ($slaves[$i].devotion > -20) && ($slaves[_dom].fetish == "submissive") && ($slaves[_dom].fetishKnown == 1) && ($slaves[_dom].fetishStrength > 60)>> +<<elseif ($slaves[$i].devotion >= -20) && ($slaves[_dom].fetish == "submissive") && ($slaves[_dom].fetishKnown == 1) && ($slaves[_dom].fetishStrength > 60)>> $slaves[_dom].slaveName loves to submit, and tells $slaves[$i].slaveName to fuck _him2; when $slaves[$i].slaveName asks how, $slaves[_dom].slaveName tells $him to take charge. <<if canPenetrate($slaves[$i])>> <<set _penetrativeUse = random(9,12)>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index 5c8edad5748..9e6375a8db5 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -482,7 +482,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d <</if>> <</if>> -<<if $slaves[$i].assignment == "work in the brothel" && $slaves[$i].devotion >= 50>> +<<if $slaves[$i].assignment == "work in the brothel" && $slaves[$i].devotion > 50>> Being so far from your presence @@.mediumorchid;weakens $his intense devotion to you.@@ <</if>> diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw index 68769afa37a..1e4efc0282f 100644 --- a/src/uncategorized/seNonlethalPit.tw +++ b/src/uncategorized/seNonlethalPit.tw @@ -795,27 +795,27 @@ You throw the victor's strap-on down to _winner.slaveName. <<if (_winner.rivalry > 0) && (_loser.ID == _winner.rivalryTarget)>> She @@.hotpink;relishes@@ the chance to abuse _loser.slaveName, whom she dislikes. <<set _winner.devotion += 5>> -<<elseif (_winner.relationship >= 0) && (_loser.ID == _winner.relationshipTarget) && (_winner.devotion >= 20)>> +<<elseif (_winner.relationship >= 0) && (_loser.ID == _winner.relationshipTarget) && (_winner.devotion > 20)>> She accepts having to abuse _loser.slaveName, and plans to make it up to her later. <<elseif (_winner.relationship >= 0) && (_loser.ID == _winner.relationshipTarget)>> She @@.mediumorchid;hates@@ having to abuse _loser.slaveName. <<set _winner.devotion -= 10>> <<elseif _winner.mother == _loser.ID>> - <<if _winner.devotion >= 20>> + <<if _winner.devotion > 20>> She accepts having to abuse her mother, _loser.slaveName, and plans to make it up to her later. <<else>> She @@.mediumorchid;hates@@ having to abuse her mother, _loser.slaveName. <<set _winner.devotion -= 10>> <</if>> <<elseif _winner.father == _loser.ID>> - <<if _winner.devotion >= 20>> + <<if _winner.devotion > 20>> She accepts having to abuse her father, _loser.slaveName, and plans to make it up to her later. <<else>> She @@.mediumorchid;hates@@ having to abuse her father, _loser.slaveName. <<set _winner.devotion -= 10>> <</if>> <<elseif _loser.mother == _winner.ID || _loser.father == _winner.ID>> - <<if _winner.devotion >= 20>> + <<if _winner.devotion > 20>> She accepts having to abuse her daughter, _loser.slaveName, and plans to make it up to her later. <<else>> She @@.mediumorchid;hates@@ having to abuse her daughter, _loser.slaveName. @@ -824,43 +824,43 @@ You throw the victor's strap-on down to _winner.slaveName. <<elseif _winner.sisters > 0>> <<switch areSisters(_winner, _loser)>> <<case 1>> - <<if _winner.devotion >= 20>> + <<if _winner.devotion > 20>> She accepts having to abuse her twin sister, _loser.slaveName, and plans to make it up to her later. <<else>> She @@.mediumorchid;hates@@ having to abuse her twin sister, _loser.slaveName. <<set _winner.devotion -= 10>> <</if>> <<case 2>> - <<if _winner.devotion >= 20>> + <<if _winner.devotion > 20>> She accepts having to abuse her sister, _loser.slaveName, and plans to make it up to her later. <<else>> She @@.mediumorchid;hates@@ having to abuse her sister, _loser.slaveName. <<set _winner.devotion -= 10>> <</if>> <<case 3>> - <<if _winner.devotion >= 20>> + <<if _winner.devotion > 20>> She accepts having to abuse her half-sister, _loser.slaveName, and plans to make it up to her later. <<else>> She @@.mediumorchid;hates@@ having to abuse her half-sister, _loser.slaveName. <<set _winner.devotion -= 10>> <</if>> <</switch>> -<<elseif (_winner.relation != 0) && (_loser.ID == _winner.relationTarget) && (_winner.devotion >= 20)>> +<<elseif (_winner.relation != 0) && (_loser.ID == _winner.relationTarget) && (_winner.devotion > 20)>> She accepts having to abuse _loser.slaveName, and plans to make it up to her later. <<elseif (_winner.relation != 0) && (_loser.ID == _winner.relationTarget)>> She @@.mediumorchid;hates@@ having to abuse _loser.slaveName. <<set _winner.devotion -= 10>> <</if>> -<<if _winner.fetish == "sadist" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "malicious" && _winner.devotion >= 20>> +<<if _winner.fetish == "sadist" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "malicious" && _winner.devotion > 20>> She noticed something while she was raping _loser.slaveName; watching the way she writhed in pain was strangely satisfying, as she was making her suffer. _winner.slaveName cums powerfully at the mere thought; she has become @@.yellow;sexually addicted to inflicting pain and anguish.@@ <<set _winner.sexualFlaw = "malicious">> -<<elseif _winner.fetish == "masochist" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "self hating" && _winner.devotion < 20>> +<<elseif _winner.fetish == "masochist" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "self hating" && _winner.devotion <= 20>> She feels horrible after forcing herself on _loser.slaveName; she is the one that should suffer, not her. _winner.slaveName has @@.yellow;descended into true self hatred.@@ <<set _winner.sexualFlaw = "self hating">> -<<elseif _winner.fetish == "dom" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "abusive" && _winner.devotion >= 20>> +<<elseif _winner.fetish == "dom" && _winner.fetishStrength > 90 && _winner.sexualFlaw != "abusive" && _winner.devotion > 20>> She noticed something while she was raping _loser.slaveName; watching the way she cowered before her raised palm was strangely satisfying, as were the painful moans that accompanied every forceful thrust. _winner.slaveName cums powerfully at the mere thought; she has become @@.yellow;sexually abusive, getting off on the thrill of forcing herself on other slaves.@@ <<set _winner.sexualFlaw = "abusive">> -<<elseif _winner.behavioralFlaw == "none" && random(1,100) <= 5 && _winner.devotion < 20>> +<<elseif _winner.behavioralFlaw == "none" && random(1,100) <= 5 && _winner.devotion <= 20>> She begins to act @@.red;oddly@@ after the fight; having to beat down and rape another slave may have affected her mentally. <<set _winner.behavioralFlaw = "odd">> <</if>> @@ -890,7 +890,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<set _loser.trust -= 10>> <<set _loser.devotion -= 10>> <<elseif _loser.mother == _winner.ID>> - <<if _loser.devotion >= 20>> + <<if _loser.devotion > 20>> She accepts her mother, _winner.slaveName, having to rape her, but she @@.gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> <<else>> @@ -899,7 +899,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<set _loser.trust -= 10>> <</if>> <<elseif _loser.father == _winner.ID>> - <<if _loser.devotion >= 20>> + <<if _loser.devotion > 20>> She accepts her father, _winner.slaveName, having to rape her, but she @@.gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> <<else>> @@ -908,7 +908,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<set _loser.trust -= 10>> <</if>> <<elseif _winner.mother == _loser.ID || _winner.father == _loser.ID>> - <<if _loser.devotion >= 20>> + <<if _loser.devotion > 20>> She accepts her daughter, _winner.slaveName, having to rape her, but she @@.gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> <<else>> @@ -919,7 +919,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<elseif _loser.sisters > 0>> <<switch areSisters(_winner, _loser)>> <<case 1>> - <<if _loser.devotion >= 20>> + <<if _loser.devotion > 20>> She accepts her twin sister, _winner.slaveName, having to rape her, but she @@.gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> <<else>> @@ -928,7 +928,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<set _loser.trust -= 10>> <</if>> <<case 2>> - <<if _loser.devotion >= 20>> + <<if _loser.devotion > 20>> She accepts her sister, _winner.slaveName, having to rape her, but she @@.gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> <<else>> @@ -937,7 +937,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<set _loser.trust -= 10>> <</if>> <<case 3>> - <<if _loser.devotion >= 20>> + <<if _loser.devotion > 20>> She accepts her half-sister, _winner.slaveName, having to rape her, but she @@.gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> <<else>> @@ -946,7 +946,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<set _loser.trust -= 10>> <</if>> <</switch>> -<<elseif (_loser.relation != 0) && (_winner.ID == _loser.relationTarget) && (_loser.devotion >= 20)>> +<<elseif (_loser.relation != 0) && (_winner.ID == _loser.relationTarget) && (_loser.devotion > 20)>> She accepts _winner.slaveName having to rape her, but she @@.gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> <<elseif (_loser.relation != 0) && (_winner.ID == _loser.relationTarget)>> @@ -957,7 +957,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<if _loser.fetish == "masochist" && _loser.fetishStrength > 90 && _loser.behavioralFlaw != "self hating">> She feels strangely content after being abused and violated; she is the one that should suffer, after all. _loser.slaveName has @@.yellow;descended into true self hatred.@@ <<set _loser.behavioralFlaw = "self hating">> -<<elseif _loser.behavioralFlaw == "none" && random(1,100) <= 5 && _loser.devotion < 20>> +<<elseif _loser.behavioralFlaw == "none" && random(1,100) <= 5 && _loser.devotion <= 20>> She begins to act @@.red;oddly@@ after the fight; losing and getting raped may have affected her mentally. <<set _loser.behavioralFlaw = "odd">> <</if>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index bf5cae18ef0..9a8c18e14bf 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -3,7 +3,7 @@ <<set setup.passagePreFilters = setup.passagePreFilters || { "Main": s => (s.assignmentVisible == 1), "Personal Attention Select": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0), - "Agent Select": s => (s.fuckdoll == 0 && s.devotion >= 20 && s.intelligence > 0 && s.intelligenceImplant > 0 && canWalk(s) && canSee(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark != 1 || $propOutcome == 0)), + "Agent Select": s => (s.fuckdoll == 0 && s.devotion > 20 && s.intelligence > 0 && s.intelligenceImplant > 0 && canWalk(s) && canSee(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark != 1 || $propOutcome == 0)), "BG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "guard you" && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)), "Recruiter Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)), "HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canSee(s) && canTalk(s)), diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index 6d31c0be5f7..1a2c45f485d 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -54,7 +54,7 @@ <<set $activeSlave.fetish = "mindbroken">> <<set $activeSlave.fetishStrength = 10>> <<set $activeSlave.sexualQuirk = "none", $activeSlave.behavioralQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.sexualFlaw = "none">> - <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion <= 20)>> <<if canSee($activeSlave)>>$He can hardly believe what $he is seeing. $His once magnificent, immense bust has been all but stripped from $him. $His face fills with resentment as $his flatness dawns on $him<<else>>$He immediately notices the lack of an immense weight hanging off $his chest. $His face fills with resentment as $his flatness dawns on $him<</if>>. <<if $activeSlave.amp != 1>>$He's still sore, so $he doesn't touch them, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<<else>>$He's still sore, so $he keeps $his torso still, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<</if>> $He loved $his enormous breasts, and they were apparently swiped from off $his chest by the person $he was just beginning to entrust $himself to. @@.mediumorchid;$He sees this as a betrayal by you@@. As with all invasive surgery @@.red;$his health has been affected.@@ $He is now @@.gold;terribly afraid@@ that you may chose to steal something else $he loves, even though it was your intent to preserve them. <<set $activeSlave.trust -= 40, $activeSlave.devotion -= 20>> <<elseif ($activeSlave.devotion > 50)>> @@ -87,7 +87,7 @@ <<set $activeSlave.fetish = "mindbroken">> <<set $activeSlave.fetishStrength = 10>> <<set $activeSlave.sexualQuirk = "none", $activeSlave.behavioralQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.sexualFlaw = "none">> - <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion <= 20)>> <<if canSee($activeSlave)>>$He can hardly believe what $he is seeing. $His once magnificent bust has been all but stripped from $him. $His face fills with resentment as $his flatness dawns on $him<<else>>$He immediately notices the lack of an immense weight hanging off $his chest. $His face fills with resentment as $his flatness dawns on $him<</if>>. <<if $activeSlave.amp != 1>>$He's still sore, so $he doesn't touch them, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<<else>>$He's still sore, so $he keeps $his torso still, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<</if>> $He loved $his huge breasts, and they were apparently swiped from off $his chest by the person $he was just beginning to entrust $himself to. @@.mediumorchid;$He sees this as a betrayal by you@@. As with all invasive surgery @@.red;$his health has been affected.@@ $He is now @@.gold;terribly afraid@@ that you may chose to steal something else $he loves, even though it was your intent to preserve them. <<set $activeSlave.trust -= 40, $activeSlave.devotion -= 20>> <<elseif ($activeSlave.devotion > 50)>> @@ -657,7 +657,7 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.fetish = "mindbroken">> <<set $activeSlave.fetishStrength = 10>> <<set $activeSlave.sexualQuirk = "none", $activeSlave.behavioralQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.sexualFlaw = "none">> - <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion <= 20)>> <<if canSee($activeSlave)>>$He can hardly believe what $he is seeing. $His once magnificent, immense bust has been all but stripped from $him. $His face fills with resentment as $his flatness dawns on $him<<else>>$He immediately notices the lack of an immense weight hanging off $his chest. $His face fills with resentment as $his flatness dawns on $him<</if>>. <<if $activeSlave.amp != 1>>$He's still sore, so $he doesn't touch them, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<<else>>$He's still sore, so $he keeps $his torso still, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<</if>> $He loved $his enormous breasts, and they were swiped from off $his chest by the person $he was just beginning to entrust $himself to. @@.mediumorchid;$He sees this as a betrayal by you@@. As with all invasive surgery @@.red;$his health has been affected.@@ $He is now @@.gold;terribly afraid@@ that you may chose to steal something else $he loves. <<set $activeSlave.trust -= 40, $activeSlave.devotion -= 20>> <<elseif ($activeSlave.devotion > 50)>> @@ -695,7 +695,7 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.fetish = "mindbroken">> <<set $activeSlave.fetishStrength = 10>> <<set $activeSlave.sexualQuirk = "none", $activeSlave.behavioralQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.sexualFlaw = "none">> - <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion < 20)>> + <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.devotion <= 20)>> <<if canSee($activeSlave)>>$He can hardly believe what $he is seeing. $His once magnificent bust has been all but stripped from $him. $His face fills with resentment as $his flatness dawns on $him<<else>>$He immediately notices the lack of an immense weight hanging off $his chest. $His face fills with resentment as $his flatness dawns on $him<</if>>. <<if $activeSlave.amp != 1>>$He's still sore, so $he doesn't touch them, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<<else>>$He's still sore, so $he keeps $his torso still, but <<if canSee($activeSlave)>>$he glares daggers<<else>>$his face contorts with distaste<</if>>.<</if>> $He loved $his huge breasts, and they were swiped from off $his chest by the person $he was just beginning to entrust $himself to. @@.mediumorchid;$He sees this as a betrayal by you@@. As with all invasive surgery @@.red;$his health has been affected.@@ $He is now @@.gold;terribly afraid@@ that you may chose to steal something else $he loves. <<set $activeSlave.trust -= 40, $activeSlave.devotion -= 20>> <<elseif ($activeSlave.devotion > 50)>> @@ -2352,7 +2352,7 @@ As the remote surgery's long recovery cycle completes, <<set _voiceReaction = "It comes out far higher than it was before, " + $he + " feels this new voice does not belong to " + $him + ".">> <<if ($activeSlave.devotion > 20)>> <<set _voiceReaction = $He + " laughs at " + $his + " new voice happily as " + $he + " gets used to it.">> - <<elseif ($activeSlave.devotion > -20)>> + <<elseif ($activeSlave.devotion >= -20)>> <<set _voiceReaction = $He + " laughs grimly at " + $him + "self as " + $he + " gets used to it.">> <</if>> <<set _statusChanges.push($He + ' hears ' + $his + ' voice coming out as @@.orange;higher@@ and more ' + _voiceLevel + ' than it was before. ' + _voiceReaction), $activeSlave.voice += 1>> @@ -2364,7 +2364,7 @@ As the remote surgery's long recovery cycle completes, <<if (_numberChanges <= 0)>> Despite the long and arduous treatment, $he has no idea what all of it was for. $He stands before you <<if ($activeSlave.devotion > 20)>>eager to learn what it's all about. - <<elseif ($activeSlave.devotion > -20)>>worried to discover what's happened to $him. + <<elseif ($activeSlave.devotion >= -20)>>worried to discover what's happened to $him. <<else>>anxious about what you did to $him, dreading the news. <</if>> <<else>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 42c6ce4a841..6d5333b14d4 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1371,7 +1371,7 @@ <</if>> <<if $specialSlavesPriceOverride == 1>> - <<if $args[0].devotion >= 50>> + <<if $args[0].devotion > 50>> <<set _slaveMultiplier += $args[0].devotion/200>> <</if>> <<if $args[0].trust >= 50>> diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw index afd50c99a6d..7eb87e0cbb5 100644 --- a/src/utility/saRulesWidgets.tw +++ b/src/utility/saRulesWidgets.tw @@ -369,7 +369,7 @@ and <<set $slaves[$i].vagina++>> <</if>> <<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 2>> - <<elseif ($slaves[$i].devotion > -20)>> + <<elseif ($slaves[$i].devotion >= -20)>> leaving $him @@.mediumorchid;completely unfulfilled@@ since @@.gold;you won't <<if $PC.dick == 1>>give $him<<else>>let $him find<</if>> the dick $he needs.@@ <<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 2>> <<else>> @@ -421,7 +421,7 @@ and <<set _j = $slaveIndices[$RapeableIDs[_dI]]>> <<if !$slaves[_j].rivalry>> <<if $slaves[_j].assignmentVisible || $slaves[_j].assignment == $slaves[$i].assignment>> - <<if $slaves[_j].devotion < 20>> + <<if $slaves[_j].devotion <= 20>> <<if $slaves[_j].trust < -20>> Craving a rush, $he repeatedly forces a reluctant <<= SlaveFullName($slaves[_j])>> to have sex with $him in public. $slaves[_j].slaveName resents this, and $slaves[$i].slaveName's ongoing sexual abuse @@.lightsalmon;starts a rivalry@@ between them. <<set $slaves[$i].rivalry = 1, $slaves[_j].rivalry = 1, $slaves[$i].rivalryTarget = $slaves[_j].ID, $slaves[_j].rivalryTarget = $slaves[$i].ID>> @@ -534,7 +534,7 @@ and <<set _j = $slaveIndices[$RapeableIDs[_dI]]>> <<if !$slaves[_j].rivalry>> <<if $slaves[_j].assignmentVisible || $slaves[_j].assignment == $slaves[$i].assignment>> - <<if $slaves[_j].devotion < 20>> + <<if $slaves[_j].devotion <= 20>> <<if $slaves[_j].trust < -20>> $He repeatedly rapes a reluctant <<= SlaveFullName($slaves[_j])>>; $he can't seem to keep $his hands off the poor slave, who can't avoid $him. Not surprisingly, $slaves[_j].slaveName resents this, and $slaves[$i].slaveName's ongoing sexual abuse @@.lightsalmon;starts a rivalry@@ between them. <<set $slaves[$i].rivalry = 1, $slaves[_j].rivalry = 1, $slaves[$i].rivalryTarget = $slaves[_j].ID, $slaves[_j].rivalryTarget = $slaves[$i].ID>> -- GitLab