From 6c2775416f9a78f937fb3efcf048d04817c4f95d Mon Sep 17 00:00:00 2001
From: mweggen <361046+mweggen@users.noreply.github.com>
Date: Fri, 28 Sep 2018 22:51:18 +0200
Subject: [PATCH] align gt / gte with descriptions for trust
---
devNotes/twine JS.txt | 46 +++++------
src/endWeek/saRest.tw | 2 +-
src/endWeek/saServant.tw | 2 +-
src/js/eventSelectionJS.tw | 40 +++++-----
src/js/summaryWidgets.tw | 2 +-
src/npc/fKiss.tw | 2 +-
src/player/actions/fCaress.tw | 2 +-
src/player/actions/fEmbrace.tw | 2 +-
src/pregmod/fPat.tw | 2 +-
src/uncategorized/brothelReport.tw | 2 +-
src/uncategorized/cellblockReport.tw | 2 +-
src/uncategorized/clubReport.tw | 2 +-
src/uncategorized/dairyReport.tw | 6 +-
.../industrialDairyAssignmentScene.tw | 2 +-
src/uncategorized/masterSuiteReport.tw | 4 +-
src/uncategorized/newSlaveIntro.tw | 2 +-
src/uncategorized/personalAttentionSelect.tw | 6 +-
src/uncategorized/ptWorkaround.tw | 16 ++--
src/uncategorized/saDevotion.tw | 4 +-
src/uncategorized/saGetMilked.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 24 +++---
src/uncategorized/saRules.tw | 80 +++++++++----------
src/uncategorized/saServeThePublic.tw | 2 +-
src/uncategorized/saWhore.tw | 2 +-
src/uncategorized/servantsQuartersReport.tw | 2 +-
src/uncategorized/slaveAssignmentsReport.tw | 2 +-
src/utility/assayWidgets.tw | 2 +-
src/utility/ptWidgets.tw | 2 +-
28 files changed, 132 insertions(+), 132 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 7b37c42d8f7..ae9c0694d72 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -4225,7 +4225,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.relationship >= 2) {
if(eventSlave.relationship < 5) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
State.variables.events.push("RE relationship advice");
}
}
@@ -4373,7 +4373,7 @@ if(eventSlave.fetish != "mindbroken") {
}
if(eventSlave.devotion < -50) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.speechRules == "restrictive") {
State.variables.RESSevent.push("vocal disobedience");
}
@@ -4430,7 +4430,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
State.variables.RESSevent.push("not my name");
}
@@ -4573,7 +4573,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.week-eventSlave.weekAcquired > 1) {
if(State.variables.week-eventSlave.weekAcquired < 10) {
if(eventSlave.devotion < -20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.health > -20) {
if(eventSlave.race == eventSlave.origRace) {
if(eventSlave.indentureRestrictions < 1) {
@@ -4591,7 +4591,7 @@ if(eventSlave.fetish != "mindbroken") {
if(canTalk(eventSlave)) {
if(eventSlave.dietCum > 0) {
if(eventSlave.diet == "fattening") {
- if(eventSlave.trust > -50) {
+ if(eventSlave.trust >= -50) {
if(eventSlave.fetish != "cumslut") {
if(eventSlave.weight < -30) {
if(eventSlave.health > -80) {
@@ -4671,7 +4671,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.fetish == "sadist") {
if(eventSlave.fetishStrength > 20) {
if(State.variables.arcadeSlaves > 0) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.devotion > 50) {
if(eventSlave.belly < 300000) {
State.variables.RESSevent.push("arcade sadist");
@@ -4716,7 +4716,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.PC.vagina == 1) {
if(eventSlave.devotion <= 20) {
- if((eventSlave.trust > -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
+ if((eventSlave.trust >= -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
if(eventSlave.muscles > 30) {
if(eventSlave.health > 20) {
if(eventSlave.energy > 50) {
@@ -4881,7 +4881,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.devotion <= 20) {
if(eventSlave.devotion >= -50) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(State.variables.suppository != 0) {
if(eventSlave.fetish != "buttslut") {
State.variables.RESSevent.push("suppository resistance");
@@ -5140,7 +5140,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.waist < -95) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.belly < 30000) {
if(eventSlave.weight <= 95) {
State.variables.RESSevent.push("devoted waist");
@@ -5270,7 +5270,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.assignment == "please you") {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if(!["chastity", "combined chastity"].includes(eventSlave.dickAccessory) || eventSlave.dick == 0) {
if(State.variables.corpIncorporated != 0) {
@@ -5299,7 +5299,7 @@ if(eventSlave.fetish != "mindbroken") {
}
} else if(["serve in the master suite", "be your Concubine"].includes(eventSlave.assignment)) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if((!["chastity", "combined chastity"].includes(eventSlave.dickAccessory)) || (eventSlave.dick == 0)) {
if(State.variables.corpIncorporated != 0) {
@@ -5561,7 +5561,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.assignment == "whore") {
if(canDoAnal(eventSlave) && (eventSlave.vagina < 0 || canDoVaginal(eventSlave))) {
- if(eventSlave.devotion < -20 && eventSlave.trust > -20) {
+ if(eventSlave.devotion < -20 && eventSlave.trust >= -20) {
State.variables.RESSevent.push("whore rebellious");
}
}
@@ -5582,7 +5582,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.butt < 3) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if(eventSlave.devotion <= 50) {
- if(eventSlave.devotion > 20 && eventSlave.trust > -20) {
+ if(eventSlave.devotion > 20 && eventSlave.trust >= -20) {
if(eventSlave.weight <= 10) {
if(eventSlave.muscles <= 30) {
State.variables.RESSevent.push("obedient girlish");
@@ -5996,7 +5996,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
State.variables.RESSevent.push("not my name");
}
@@ -6131,7 +6131,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.week-eventSlave.weekAcquired > 1) {
if(State.variables.week-eventSlave.weekAcquired < 10) {
if(eventSlave.devotion < -20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.health > -20) {
if(eventSlave.race == eventSlave.origRace) {
if(eventSlave.indentureRestrictions < 1) {
@@ -6149,7 +6149,7 @@ if(eventSlave.fetish != "mindbroken") {
if(canTalk(eventSlave)) {
if(eventSlave.dietCum > 0) {
if(eventSlave.diet == "fattening") {
- if(eventSlave.trust > -50) {
+ if(eventSlave.trust >= -50) {
if(eventSlave.fetish != "cumslut") {
if(eventSlave.weight < -30) {
if(eventSlave.health > -80) {
@@ -6185,7 +6185,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.fetish == "sadist") {
if(eventSlave.fetishStrength > 20) {
if(State.variables.arcadeSlaves > 0) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.devotion > 50) {
if(eventSlave.belly < 300000) {
State.variables.RESSevent.push("arcade sadist");
@@ -6198,7 +6198,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.PC.vagina == 1) {
if(eventSlave.devotion <= 20) {
- if((eventSlave.trust > -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
+ if((eventSlave.trust >= -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
if(eventSlave.muscles > 30) {
if(eventSlave.health > 20) {
if(eventSlave.energy > 50) {
@@ -6524,7 +6524,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.waist < -95) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.belly < 30000) {
if(eventSlave.weight <= 95) {
State.variables.RESSevent.push("devoted waist");
@@ -6763,7 +6763,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.butt < 3) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if(eventSlave.devotion <= 50) {
- if(eventSlave.devotion > 20 && eventSlave.trust > -20) {
+ if(eventSlave.devotion > 20 && eventSlave.trust >= -20) {
if(eventSlave.weight <= 10) {
if(eventSlave.muscles <= 30) {
State.variables.RESSevent.push("obedient girlish");
@@ -8917,7 +8917,7 @@ window.SlaveStatClamp = function SlaveStatClamp(slave) {
if (slave.devotion > 100) {
if (slave.trust < -95)
slave.trust = -100;
- else if ((slave.trust < 100) && (slave.trust >= 20))
+ else if ((slave.trust < 100) && (slave.trust > 20))
slave.trust += (Math.trunc((slave.devotion-100)*5)/10);
else
V.rep += 10*(slave.devotion-100);
@@ -11056,7 +11056,7 @@ window.saRest = function saRest(slave) {
} else if (_vignette.effect < 0) {
if (slave.trust > 20) {
t += `<span class='gold'>reducing ${his} trust in you.</span>`;
- } else if (slave.trust > -20) {
+ } else if (slave.trust >= -20) {
t += `<span class='gold'>increasing ${his} fear of you.</span>`;
} else {
t += `<span class='gold'>increasing ${his} terror of you.</span>`;
@@ -11238,7 +11238,7 @@ window.saServant = function saServant(slave) {
} else if (_vignette.effect < 0) {
if (slave.trust > 20) {
t += `<span class='gold'>reducing ${his} trust in you.</span>`;
- } else if (slave.trust > -20) {
+ } else if (slave.trust >= -20) {
t += `<span class='gold'>increasing ${his} fear of you.</span>`;
} else {
t += `<span class='gold'>increasing ${his} terror of you.</span>`;
diff --git a/src/endWeek/saRest.tw b/src/endWeek/saRest.tw
index 0af696c93b6..dab12e8b5aa 100644
--- a/src/endWeek/saRest.tw
+++ b/src/endWeek/saRest.tw
@@ -102,7 +102,7 @@ window.saRest = function saRest(slave) {
} else if (_vignette.effect < 0) {
if (slave.trust > 20) {
t += `<span class='gold'>reducing ${his} trust in you.</span>`;
- } else if (slave.trust > -20) {
+ } else if (slave.trust >= -20) {
t += `<span class='gold'>increasing ${his} fear of you.</span>`;
} else {
t += `<span class='gold'>increasing ${his} terror of you.</span>`;
diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw
index 5f0b9b509a6..0c649703c9e 100644
--- a/src/endWeek/saServant.tw
+++ b/src/endWeek/saServant.tw
@@ -147,7 +147,7 @@ window.saServant = function saServant(slave) {
} else if (_vignette.effect < 0) {
if (slave.trust > 20) {
t += `<span class='gold'>reducing ${his} trust in you.</span>`;
- } else if (slave.trust > -20) {
+ } else if (slave.trust >= -20) {
t += `<span class='gold'>increasing ${his} fear of you.</span>`;
} else {
t += `<span class='gold'>increasing ${his} terror of you.</span>`;
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index 8238d650e4e..37895f85372 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -303,7 +303,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.relationship >= 2) {
if(eventSlave.relationship < 5) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
State.variables.events.push("RE relationship advice");
}
}
@@ -451,7 +451,7 @@ if(eventSlave.fetish != "mindbroken") {
}
if(eventSlave.devotion < -50) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.speechRules == "restrictive") {
State.variables.RESSevent.push("vocal disobedience");
}
@@ -508,7 +508,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
State.variables.RESSevent.push("not my name");
}
@@ -651,7 +651,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.week-eventSlave.weekAcquired > 1) {
if(State.variables.week-eventSlave.weekAcquired < 10) {
if(eventSlave.devotion < -20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.health > -20) {
if(eventSlave.race == eventSlave.origRace) {
if(eventSlave.indentureRestrictions < 1) {
@@ -669,7 +669,7 @@ if(eventSlave.fetish != "mindbroken") {
if(canTalk(eventSlave)) {
if(eventSlave.dietCum > 0) {
if(eventSlave.diet == "fattening") {
- if(eventSlave.trust > -50) {
+ if(eventSlave.trust >= -50) {
if(eventSlave.fetish != "cumslut") {
if(eventSlave.weight < -30) {
if(eventSlave.health > -80) {
@@ -749,7 +749,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.fetish == "sadist") {
if(eventSlave.fetishStrength > 20) {
if(State.variables.arcadeSlaves > 0) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.devotion > 50) {
if(eventSlave.belly < 300000) {
State.variables.RESSevent.push("arcade sadist");
@@ -794,7 +794,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.PC.vagina == 1) {
if(eventSlave.devotion <= 20) {
- if((eventSlave.trust > -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
+ if((eventSlave.trust >= -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
if(eventSlave.muscles > 30) {
if(eventSlave.health > 20) {
if(eventSlave.energy > 50) {
@@ -959,7 +959,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.devotion <= 20) {
if(eventSlave.devotion >= -50) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(State.variables.suppository != 0) {
if(eventSlave.fetish != "buttslut") {
State.variables.RESSevent.push("suppository resistance");
@@ -1218,7 +1218,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.waist < -95) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.belly < 30000) {
if(eventSlave.weight <= 95) {
State.variables.RESSevent.push("devoted waist");
@@ -1348,7 +1348,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.assignment == "please you") {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if(!["chastity", "combined chastity"].includes(eventSlave.dickAccessory) || eventSlave.dick == 0) {
if(State.variables.corpIncorporated != 0) {
@@ -1377,7 +1377,7 @@ if(eventSlave.fetish != "mindbroken") {
}
} else if(["serve in the master suite", "be your Concubine"].includes(eventSlave.assignment)) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if((!["chastity", "combined chastity"].includes(eventSlave.dickAccessory)) || (eventSlave.dick == 0)) {
if(State.variables.corpIncorporated != 0) {
@@ -1639,7 +1639,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.assignment == "whore") {
if(canDoAnal(eventSlave) && (eventSlave.vagina < 0 || canDoVaginal(eventSlave))) {
- if(eventSlave.devotion < -20 && eventSlave.trust > -20) {
+ if(eventSlave.devotion < -20 && eventSlave.trust >= -20) {
State.variables.RESSevent.push("whore rebellious");
}
}
@@ -1660,7 +1660,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.butt < 3) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if(eventSlave.devotion <= 50) {
- if(eventSlave.devotion > 20 && eventSlave.trust > -20) {
+ if(eventSlave.devotion > 20 && eventSlave.trust >= -20) {
if(eventSlave.weight <= 10) {
if(eventSlave.muscles <= 30) {
State.variables.RESSevent.push("obedient girlish");
@@ -2074,7 +2074,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.slaveName != eventSlave.birthName && eventSlave.birthName !== "") {
if(eventSlave.devotion <= 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.anus > 0 && canDoAnal(eventSlave)) {
State.variables.RESSevent.push("not my name");
}
@@ -2209,7 +2209,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.week-eventSlave.weekAcquired > 1) {
if(State.variables.week-eventSlave.weekAcquired < 10) {
if(eventSlave.devotion < -20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.health > -20) {
if(eventSlave.race == eventSlave.origRace) {
if(eventSlave.indentureRestrictions < 1) {
@@ -2227,7 +2227,7 @@ if(eventSlave.fetish != "mindbroken") {
if(canTalk(eventSlave)) {
if(eventSlave.dietCum > 0) {
if(eventSlave.diet == "fattening") {
- if(eventSlave.trust > -50) {
+ if(eventSlave.trust >= -50) {
if(eventSlave.fetish != "cumslut") {
if(eventSlave.weight < -30) {
if(eventSlave.health > -80) {
@@ -2263,7 +2263,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.fetish == "sadist") {
if(eventSlave.fetishStrength > 20) {
if(State.variables.arcadeSlaves > 0) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.devotion > 50) {
if(eventSlave.belly < 300000) {
State.variables.RESSevent.push("arcade sadist");
@@ -2276,7 +2276,7 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.PC.vagina == 1) {
if(eventSlave.devotion <= 20) {
- if((eventSlave.trust > -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
+ if((eventSlave.trust >= -20 && eventSlave.behavioralFlaw == "arrogant") || (eventSlave.trust > 20)) {
if(eventSlave.muscles > 30) {
if(eventSlave.health > 20) {
if(eventSlave.energy > 50) {
@@ -2602,7 +2602,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.waist < -95) {
if(eventSlave.devotion > 20) {
- if(eventSlave.trust > -20) {
+ if(eventSlave.trust >= -20) {
if(eventSlave.belly < 30000) {
if(eventSlave.weight <= 95) {
State.variables.RESSevent.push("devoted waist");
@@ -2841,7 +2841,7 @@ if(eventSlave.fetish != "mindbroken") {
if(eventSlave.butt < 3) {
if(canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
if(eventSlave.devotion <= 50) {
- if(eventSlave.devotion > 20 && eventSlave.trust > -20) {
+ if(eventSlave.devotion > 20 && eventSlave.trust >= -20) {
if(eventSlave.weight <= 10) {
if(eventSlave.muscles <= 30) {
State.variables.RESSevent.push("obedient girlish");
diff --git a/src/js/summaryWidgets.tw b/src/js/summaryWidgets.tw
index ac1b19da805..b9cc28479bc 100644
--- a/src/js/summaryWidgets.tw
+++ b/src/js/summaryWidgets.tw
@@ -7,7 +7,7 @@ window.SlaveStatClamp = function SlaveStatClamp(slave) {
if (slave.devotion > 100) {
if (slave.trust < -95)
slave.trust = -100;
- else if ((slave.trust < 100) && (slave.trust >= 20))
+ else if ((slave.trust < 100) && (slave.trust > 20))
slave.trust += (Math.trunc((slave.devotion-100)*5)/10);
else
V.rep += 10*(slave.devotion-100);
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index b753305d025..3ae51e1d741 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -97,7 +97,7 @@ You tell $activeSlave.slaveName to
<<else>>
upon $his face. $He finds the intense attention from $his <<Master>> worrying, and $he looks down after a moment, blushing nervously.
<</if>>
-<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > -20)>>
+<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<Master>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index aca479e47e3..67ced9184cc 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -41,7 +41,7 @@ You tell $activeSlave.slaveName to
$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $he looks down after a moment, blushing.
<<elseif ($activeSlave.devotion > 20)>>
$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, blushing nervously.
-<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > -20)>>
+<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<elseif ($activeSlave.trust < -20)>>
The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and look into $his $activeSlave.eyeColor eyes. $He looks down fearfully, and begins to shake with terror, tears leaking silently down $his cheeks.
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index c803b58e4f3..c83c7e3f9c5 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -29,7 +29,7 @@ You tell $activeSlave.slaveName to
$He dotingly complies, being near you filling $his with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $he looks down after a moment, blushing.
<<elseif ($activeSlave.devotion > 20)>>
$He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, blushing nervously.
-<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > -20)>>
+<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<elseif ($activeSlave.trust < -20)>>
The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you take $his trembling head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes for a moment. $He looks down fearfully, and begins to shake with terror, tears streaking down $his cheeks.
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index 3cb76e60ba3..2a242742478 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -89,7 +89,7 @@ You tell $activeSlave.slaveName to
<<else>>
upon $his face. $He finds the intense attention from $his <<Master>> worrying, and $he looks down after a moment, blushing nervously.
<</if>>
-<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > -20)>>
+<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>>
$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<= WrittenMaster()>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 171441e1e32..14a140b1174 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -319,7 +319,7 @@
<<elseif $slaves[$i].health < 90>>
<<set $slaves[$i].health += 7>>
<</if>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
<<elseif ($slaves[$i].devotion < 45)>>
<<set $slaves[$i].devotion += 4>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index e2f44a10981..051f8cb82b4 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -179,7 +179,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$CellBiIDs[_dI]]>>
<<if ($slaves[$i].devotion <= 20)>>
- <<if ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].trust >= -20)>>
<<if (($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs") ||($slaves[$i].hears == -2))>>
<<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 2>>
<<else>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index ce8b969f635..5129457bf75 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -203,7 +203,7 @@
<<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].broodmother == 0) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>>
<<set $legendaryWombID = $slaves[$i].ID>>
<</if>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
<<elseif ($slaves[$i].devotion < 45)>>
<<set $slaves[$i].devotion += 4>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 46491b784c4..8d20fa6015d 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -389,7 +389,7 @@
<<set _milkWeek += $milk, _cumWeek += $cum>>
/* Facility Specific End of Week effects */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
<</if>>
<<if ($slaves[$i].health < -80)>>
@@ -708,7 +708,7 @@
<<set $slaves[$i].intelligence--, _intelligenceLost++>>
<<elseif ($slaves[$i].devotion >= -20)>>
<<set $slaves[$i].devotion -= 10>>
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].trust -= 10>>
<<elseif ($slaves[$i].whoreSkill > 0)>>
<<set $slaves[$i].whoreSkill -= 10, _skillsLost++>>
@@ -753,7 +753,7 @@
<<set $slaves[$i].intelligence--, $intelligenceLost++>>
<<elseif ($slaves[$i].devotion >= -20)>>
<<set $slaves[$i].devotion -= 8>>
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].trust -= 8>>
<<elseif ($slaves[$i].whoreSkill >= 20)>>
<<set $slaves[$i].whoreSkill -= 10, _skillsLost++>>
diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw
index 6604749f436..5b96036d1b6 100644
--- a/src/uncategorized/industrialDairyAssignmentScene.tw
+++ b/src/uncategorized/industrialDairyAssignmentScene.tw
@@ -168,7 +168,7 @@ I'll d-do anything!"
<<else>>
She starts to weep as soon as she realizes her fate.
-<<if $activeSlave.trust > -20>>
+<<if $activeSlave.trust >= -20>>
She is afraid of you, but not afraid enough that she will not resist this.
<</if>>
<<if ($activeSlave.amp == 1)>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 10b20b7c1ce..0585e35f996 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -208,7 +208,7 @@
<</if>>
<<else>>
<<set $slaves[$i].livingRules = "spare">>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 5>>
<<elseif ($slaves[$i].devotion <= 60)>>
<<set $slaves[$i].devotion += 2>>
@@ -232,7 +232,7 @@
<<set _fuckCount = (random(1,3)*_energy)>>
<<set $slaves[$i].mammaryCount += _fuckCount, $mammaryTotal += _fuckCount>>
<</if>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion > -10) && ($slaves[$i].fetishStrength <= 95) && $slaves[$i].fetish != "mindbroken">>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion > -10) && ($slaves[$i].fetishStrength <= 95) && $slaves[$i].fetish != "mindbroken">>
<<set _fetishChangeChance = fetishChangeChance($slaves[$i])>>
<<if (_masterSuiteAverageMilk > 2000) && (_fetishChangeChance > random(0,50))>>
<<if $slaves[$i].fetish == "boobs">>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index c4ab552a5d9..c84f3d42156 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -288,7 +288,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<elseif ($activeSlave.trust > -10)>>
$He seems to have picked up rumors about your ruthlessness, and is @@.gold;terrified into obedience.@@
<<set $activeSlave.trust -= 20>>
- <<elseif ($activeSlave.trust > -20)>>
+ <<elseif ($activeSlave.trust >= -20)>>
$He seems to have picked up rumors about your ruthlessness, and is @@.gold;frightened into obedience.@@
<<set $activeSlave.trust -= 15>>
<</if>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 236cfb5d11d..a1a4bea776a 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -185,7 +185,7 @@
<</if>>
<<elseif ($activeSlave.fetishKnown != 1)>>
<<set $personalAttention[_i].trainingRegimen = "explore her sexuality">>
- <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
<<set $personalAttention[_i].trainingRegimen = "break her will">>
<<else>>
<<set $personalAttention[_i].trainingRegimen = "build her devotion">>
@@ -202,7 +202,7 @@
<br>Change training objective:
<br>
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
<<link "Break her will">><<set $personalAttention[_i].trainingRegimen = "break her will">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
| <<link "Use enhanced breaking techniques">><<set $personalAttention[_i].trainingRegimen = "harshly break her will">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
<<else>>
@@ -249,7 +249,7 @@
//She knows all the skills you can teach a shemale slave//
<<elseif ($activeSlave.analSkill >= 100) && ($activeSlave.oralSkill >= 100) && ($activeSlave.whoreSkill > 0) && ($activeSlave.entertainSkill > 0) && ($activeSlave.vaginalAccessory == "chastity belt")>>
//She knows all the skills you can teach while she's wearing a chastity belt//
- <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
//She's too disobedient to learn sex skills//
<<else>>
<<link "Teach her">><<set $personalAttention[_i].trainingRegimen = "learn skills">><<replace `"#training"+_i`>><strong>$personalAttention[_i].trainingRegimen</strong><</replace>><</link>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 7b94ad7b5da..14c08604686 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -109,7 +109,7 @@
$activeSlave.slaveName got over her behavioral flaw without you,
@@.yellow;her training assignment has defaulted to
<<if ["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder", "none"].includes($activeSlave.sexualFlaw)>>
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
breaking her will.
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
<<else>>
@@ -178,7 +178,7 @@
With her behavioral flaw softened,
@@.yellow;her training assignment has defaulted to
<<if ($activeSlave.sexualFlaw == "none")>>
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
breaking her will.
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
<<else>>
@@ -198,7 +198,7 @@
$activeSlave.slaveName got over her sexual flaw without you,
@@.yellow;her training assignment has defaulted to
<<if ($activeSlave.behavioralFlaw == "none")>>
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
breaking her will.
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
<<else>>
@@ -265,7 +265,7 @@
has a paraphilia. Typical methods will have no effect on this kind of flaw.
<<set $activeSlave.training = 0>>
@@.yellow;Her training assignment has defaulted to
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
breaking her will.
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
<<else>>
@@ -302,7 +302,7 @@
With her sexual flaw softened,
@@.yellow;her training assignment has defaulted to
<<if ($activeSlave.behavioralFlaw == "none")>>
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
breaking her will.
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
<<else>>
@@ -566,7 +566,7 @@
<<if ($activeSlave.behavioralFlaw == "none")>>
With her behavioral flaw trained out,
<<if ($activeSlave.sexualFlaw == "none")>>
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
@@.yellow;her training assignment has defaulted to breaking her will.@@
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
<<else>>
@@ -698,7 +698,7 @@
With her sexual flaw trained out,
@@.yellow;her training assignment has defaulted to
<<if ($activeSlave.behavioralFlaw == "none")>>
- <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
breaking her will.
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
<<else>>
@@ -715,7 +715,7 @@
<<case "explore her sexuality">>
<<set $activeSlave.attrKnown = 1>>
You set about investigating her sexuality.
- <<if ($activeSlave.devotion < -20) && ($activeSlave.trust > -20)>>
+ <<if ($activeSlave.devotion < -20) && ($activeSlave.trust >= -20)>>
She's so resistant that you have to fill her with psychoactive drugs and restrain her painfully in order to learn anything. This abuse @@.mediumorchid;increases her hatred.@@
<<set $activeSlave.devotion -= 5>>
<<elseif $activeSlave.devotion <= 20>>
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index 08b2ef347c2..d25c1f8502c 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -721,7 +721,7 @@
/* CAPS ON TRUST GAIN */
-<<if $slaves[$i].trust > -20>>
+<<if $slaves[$i].trust >= -20>>
<<if $slaves[$i].trust >= ($slaves[$i].oldTrust+5)>>
<<if $slaves[$i].tankBaby == 1>>
Any natural doubts $he has are overcome by $his conditioning in the incubation facility; $he cannot resist trusting $his owner.
@@ -753,7 +753,7 @@
<<set $slaves[$i].trust = 100>>
<<else>>
<<if ($slaves[$i].devotion > 100)>>
- <<if ($slaves[$i].trust < 100) && ($slaves[$i].trust >= 20)>>
+ <<if ($slaves[$i].trust < 100) && ($slaves[$i].trust > 20)>>
<<set $slaves[$i].trust += Math.trunc(($slaves[$i].devotion-100)*5)/10>>
<<elseif $slaves[$i].energy <= 50>>
<<set $energyPlus += Math.trunc($slaves[$i].devotion-100)>>
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index f918042ff27..f4d4b21184d 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -517,7 +517,7 @@ gets milked this week.
<<elseif (_vignette.effect < 0)>>
<<if $slaves[$i].trust > 20>>
@@.gold;reducing $his trust in you.@@
- <<elseif $slaves[$i].trust > -20>>
+ <<elseif $slaves[$i].trust >= -20>>
@@.gold;increasing $his fear of you.@@
<<else>>
@@.gold;increasing $his terror of you.@@
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 03063e861b3..e4972bbf3fe 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2468,7 +2468,7 @@
$He remembers how hard $his life was before $he was a slave, and
<<if $slaves[$i].trust > 50>>
@@.mediumaquamarine;trusts you a bit more@@ for improving it.
- <<elseif $slaves[$i].trust > -20>>
+ <<elseif $slaves[$i].trust >= -20>>
@@.mediumaquamarine;trusts you a bit more@@ because of it.
<<else>>
@@.mediumaquamarine;fears you a little less@@ because of it.
@@ -2481,7 +2481,7 @@
$He took orders a lot before $he was a slave, and is subconsciously
<<if $slaves[$i].trust > 50>>
@@.hotpink;a little more eager to obey.@@
- <<elseif $slaves[$i].trust > -20>>
+ <<elseif $slaves[$i].trust >= -20>>
@@.hotpink;a little quicker to obey.@@
<<else>>
@@.hotpink;a bit less resistant@@ to commands.
@@ -4270,7 +4270,7 @@
<<if ($universalRulesImpregnation == "PC") && canImpreg($slaves[$i], $PC)>>
$slaves[$i].slaveName is ripe for breeding, so you ejaculate inside $him often. When you bore of $his fertile <<if $slaves[$i].mpreg == 1>>ass<<else>>cunt<</if>>, you keep $him around as you fuck other slaves so you can pull out of them, shove your cock into $him, and fill $him with your seed anyway.
<<if ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
$He attempts to resist this treatment, and spends most of $his days bound securely, with your cum dripping out of $his <<if $slaves[$i].mpreg == 1>>ass<<else>>pussy<</if>>. This regimen fills $him with @@.mediumorchid;hatred,@@ @@.gold;fear,@@ and @@.lime;a pregnancy.@@
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
<<if ($slaves[$i].sexualFlaw == "none")>>
@@ -4331,7 +4331,7 @@
<<if ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
<<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
$slaves[$i].slaveName feels a need to be bred by the Head Girl, and submits $himself to $his superior's virile cock until @@.lime;conception@@ is verified.
- <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if (($HeadGirl.fetish == "sadist") || ($HeadGirl.fetish == "dom")) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
Her interest is piqued, however, when $slaves[$i].slaveName shows signs of resistance. $HeadGirl.slaveName @@.hotpink;enthusiastically@@ @@.mediumorchid;rapes the poor girl@@ pregnant, ejaculating inside her victim more often than is really necessary for @@.lime;conception.@@
<<set $HeadGirl.devotion += 2, $slaves[$i].devotion -= 5>>
@@ -5236,7 +5236,7 @@
<<elseif ($slaves[$i].dick > 0) && ($slaves[$i].balls == 0)>>
Society @@.green;approves@@ of your keeping a gelded slave; this advances public interest in girls with soft dickclits.
<<FSChangePorn "GenderRadicalist" 1>>
- <<elseif ($slaves[$i].dick > 0) && ($slaves[$i].anus > 0) && ($slaves[$i].devotion > 20) && ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].dick > 0) && ($slaves[$i].anus > 0) && ($slaves[$i].devotion > 20) && ($slaves[$i].trust >= -20)>>
Society @@.green;approves@@ of your keeping a contented dickgirl bottom; this advances public interest in girls who get hard when assfucked.
<<FSChangePorn "GenderRadicalist" 1>>
<</if>>
@@ -6710,7 +6710,7 @@
<<set $slaves[$i].devotion -= 2>>
<</if>>
<<if $slaves[$i].devotion < 10>>
- <<if $slaves[$i].trust > -20>>
+ <<if $slaves[$i].trust >= -20>>
$He's @@.gold;aware of $his total vulnerability@@ to punishment.
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -7405,7 +7405,7 @@
Every little inconvenience just feeds $his breast growth obsession, so $he's more bothered that they aren't an even bigger problem for $his daily life.
<<elseif ($slaves[$i].devotion > 50)>>
Since $he's devoted to you, $he just does $his best.
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
This torment makes $him @@.gold;less trusting@@ of your willingness to look after $him.
<<set $slaves[$i].trust -= 2>>
<<else>>
@@ -7692,7 +7692,7 @@
But all this justs feeds $his obsession with being a breeder.
<<elseif ($slaves[$i].devotion > 50)>>
Since $he's devoted to you, $he just does $his best.
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
This torment makes $him @@.gold;less trusting@@ of your willingness to look after $him.
<<set $slaves[$i].trust -= 2>>
<<else>>
@@ -7711,7 +7711,7 @@
$His giant belly makes life a struggle: <<if $buttAccessibility == 1 || $boobAccessibility == 1 || $ballsAccessibility == 1>>$he has trouble using appliances and furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>$he barely fits through doors, has trouble using appliances and furniture, and constantly bumps into things<</if>>.
<<if ($slaves[$i].devotion > 40)>>
Since $he's devoted to you, $he just does $his best.
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
This torment makes $him @@.gold;less trusting@@ of your willingness to look after $him.
<<set $slaves[$i].trust -= 2>>
<<else>>
@@ -7758,7 +7758,7 @@
$His giant penis make life a struggle: $he has to drag it along as $he moves, has trouble fitting into beds and sitting in chairs, and constantly has to make sure to not get $his dick caught in doors.
<<if ($slaves[$i].devotion > 50)>>
Since $he's devoted to you, $he just does $his best.
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
This torment makes $him @@.gold;less trusting@@ of your willingness to look after $him.
<<set $slaves[$i].trust -= 2>>
<<else>>
@@ -7804,7 +7804,7 @@
$His giant balls make life a struggle: <<if $buttAccessibility == 1 || $pregAccessibility == 1 || $boobAccessibility == 1>>$he has trouble using appliances and furniture, and has to be constantly mindful of things striking $his oversensitive testicles, but at least the doors have already been widened for your other slaves<<else>>$he barely fits through doors, has trouble using appliances and furniture, and has to be constantly mindful of things striking $his oversensitive testicles<</if>>.
<<if ($slaves[$i].devotion > 50)>>
Since $he's devoted to you, $he just does $his best.
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
This torment makes $him @@.gold;less trusting@@ of your willingness to look after $him.
<<set $slaves[$i].trust -= 2>>
<<else>>
@@ -7857,7 +7857,7 @@
$His giant butt make life a struggle: <<if $buttAccessibility == 1 || $pregAccessibility == 1 || $boobAccessibility == 1>>$he has trouble using furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>$he barely fits through doors, has trouble using furniture, and constantly bumps into things<</if>>.
<<if ($slaves[$i].devotion > 50)>>
Since $he's devoted to you, $he just does $his best.
- <<elseif ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].trust >= -20)>>
This torment makes $him @@.gold;less trusting@@ of your willingness to look after $him.
<<set $slaves[$i].trust -= 1>>
<<else>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index c7defb724ba..b05da581b39 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -17,7 +17,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off at work despite $his reluctance, @@.hotpink;habituating $him to being a fuckhole.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -185,7 +185,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -199,7 +199,7 @@
<</if>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<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)>>
@@ -221,7 +221,7 @@
<<if $slaves[$i].sexualFlaw == "attention whore">>
@@.hotpink;enjoys being allowed to masturbate,@@ especially since it's often to the pleasure of an aroused client.
<<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
- <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, though being forced to do it in front of an aroused client prevents $him from getting complacent; you can never know when they'll want more.
<<set $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -245,7 +245,7 @@
<<saRulesMasturbationDrugEffects>>
<<else>> /* releaseRules not restrictive */
<<if ($universalRulesConsent == 0)>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
masturbates whenever $he can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -273,7 +273,7 @@
<<saRulesRapeDiscoversFetish>>
<</if>>
<<else>> /* universalRulesConsent is not zero */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
prefers to masturbate rather than asking other slaves for sex or giving free samples, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -660,7 +660,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -674,7 +674,7 @@
<</if>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<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)>>
@@ -696,7 +696,7 @@
<<if $slaves[$i].sexualFlaw == "attention whore">>
@@.hotpink;enjoys being allowed to masturbate,@@ especially since its often on stage for $clubName's amusement.
<<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
- <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, though being forced to do it on a table surrounded by citizens prevents $him from getting complacent; you can never know when they'll want more.
<<set $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -720,7 +720,7 @@
<<saRulesMasturbationDrugEffects>>
<<else>> /* releaseRules not restrictive */
<<if ($universalRulesConsent == 0)>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
masturbates whenever $he can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -748,7 +748,7 @@
<<saRulesRapeDiscoversFetish>>
<</if>>
<<else>> /* universalRulesConsent is not zero */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
prefers to masturbate rather than asking other slaves for sex or offering $himself to patrons, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -1130,7 +1130,7 @@
<</if>>
<<set $slaves[$i].need -= 60>>
<<elseif ($slaves[$i].releaseRules == "masturbation") || ($slaves[$i].releaseRules == "permissive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to seek other means of release, @@.mediumaquamarine;reducing $his fear@@ of you.
<<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -1482,7 +1482,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -1739,7 +1739,7 @@
<<set $slaves[$i].need -= 60>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<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)>>
@@ -1758,7 +1758,7 @@
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
<<elseif ($slaves[$i].releaseRules == "masturbation")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing $his fear@@ of you.
<<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -1782,7 +1782,7 @@
<<saRulesMasturbationDrugEffects>>
<<else>> /* releaseRules not restrictive */
<<if ($universalRulesConsent == 0)>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
masturbates whenever $he can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -1810,7 +1810,7 @@
<<saRulesRapeDiscoversFetish>>
<</if>>
<<else>> /* universalRulesConsent is not zero */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
prefers to masturbate rather than asking other slaves for sex or giving free samples, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -2252,7 +2252,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off during class despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -2266,7 +2266,7 @@
<</if>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<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)>>
@@ -2285,7 +2285,7 @@
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
<<elseif ($slaves[$i].releaseRules == "masturbation")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing $his fear@@ of you.
<<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -2309,7 +2309,7 @@
<<saRulesMasturbationDrugEffects>>
<<else>> /* releaseRules not restrictive */
<<if ($universalRulesConsent == 0)>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
masturbates whenever $he can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -2337,7 +2337,7 @@
<<saRulesRapeDiscoversFetish>>
<</if>>
<<else>> /* universalRulesConsent is not zero */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
prefers to masturbate rather than asking other slaves for sex, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -2691,7 +2691,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -2705,7 +2705,7 @@
<</if>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<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)>>
@@ -2724,7 +2724,7 @@
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
<<elseif ($slaves[$i].releaseRules == "masturbation")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing $his fear@@ of you.
<<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -2748,7 +2748,7 @@
<<saRulesMasturbationDrugEffects>>
<<else>> /* releaseRules not restrictive */
<<if ($universalRulesConsent == 0)>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
masturbates whenever $he can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -2776,7 +2776,7 @@
<<saRulesRapeDiscoversFetish>>
<</if>>
<<else>> /* universalRulesConsent is not zero */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
prefers to masturbate rather than asking other slaves for sex, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -3180,7 +3180,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off from being milked despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -3194,7 +3194,7 @@
<</if>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<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)>>
@@ -3213,7 +3213,7 @@
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
<<elseif ($slaves[$i].releaseRules == "masturbation")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing $his fear@@ of you.
<<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -3237,7 +3237,7 @@
<<saRulesMasturbationDrugEffects>>
<<else>> /* releaseRules not restrictive */
<<if ($universalRulesConsent == 0)>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
masturbates whenever $he can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -3265,7 +3265,7 @@
<<saRulesRapeDiscoversFetish>>
<</if>>
<<else>> /* universalRulesConsent is not zero */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
prefers to masturbate rather than asking other slaves for sex, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -3622,7 +3622,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off regularly despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -3638,7 +3638,7 @@
<<if ($slaves[$i].devotion <= 20)>>
sometimes needs a little extra attention from you, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing to your touch, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -3774,7 +3774,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off with $HeadGirl.slaveName despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -3923,7 +3923,7 @@
<<if ($slaves[$i].devotion <= 20)>>
gets off at work despite $his reluctance, @@.hotpink;habituating $him to sexual slavery.@@
<<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
$He hates $himself for climaxing, and knows the mild aphrodisiacs in the food are forcing $his arousal, @@.gold;frightening $him.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
@@ -3937,7 +3937,7 @@
<</if>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<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)>>
@@ -3956,7 +3956,7 @@
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
<<elseif ($slaves[$i].releaseRules == "masturbation")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing $his fear@@ of you.
<<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -3980,7 +3980,7 @@
<<saRulesMasturbationDrugEffects>>
<<else>> /* releaseRules not restrictive */
<<if ($universalRulesConsent == 0)>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
masturbates whenever $he can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
@@ -4008,7 +4008,7 @@
<<saRulesRapeDiscoversFetish>>
<</if>>
<<else>> /* universalRulesConsent is not zero */
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
prefers to masturbate rather than asking other slaves for sex, @@.mediumaquamarine;slightly reducing $his fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 80949b81d6c..3152d87497b 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -1254,7 +1254,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
<<elseif (_vignette.effect < 0)>>
<<if $slaves[$i].trust > 20>>
@@.gold;reducing $his trust in you.@@
- <<elseif $slaves[$i].trust > -20>>
+ <<elseif $slaves[$i].trust >= -20>>
@@.gold;increasing $his fear of you.@@
<<else>>
@@.gold;increasing $his terror of you.@@
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 9e6375a8db5..c99a34b583d 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -1258,7 +1258,7 @@ In total, you were paid @@.yellowgreen;<<print cashFormat(Math.trunc($beauty*$FR
<<elseif (_vignette.effect < 0)>>
<<if $slaves[$i].trust > 20>>
@@.gold;reducing $his trust in you.@@
- <<elseif $slaves[$i].trust > -20>>
+ <<elseif $slaves[$i].trust >= -20>>
@@.gold;increasing $his fear of you.@@
<<else>>
@@.gold;increasing $his terror of you.@@
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index a5dd8b40aba..0861bd3cecc 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -237,7 +237,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$ServQiIDs[_dI]], $slaves[$i].devotion += _devBonus>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
<<elseif ($slaves[$i].devotion < 2)>>
<<set $slaves[$i].devotion += 2>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index e22cd84fcd1..5f21df53fef 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -497,7 +497,7 @@
<</if>>
<</if>>
- <<if ($headGirlTrainsObedience && _Slave.devotion <= 20 && _Slave.trust > -20)>>
+ <<if ($headGirlTrainsObedience && _Slave.devotion <= 20 && _Slave.trust >= -20)>>
<<set _HGPossibleSlaves[4].push({ID: _Slave.ID, training: "obedience"})>>
<<continue>>
<</if>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 6d5333b14d4..8d04dbe85e7 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1374,7 +1374,7 @@
<<if $args[0].devotion > 50>>
<<set _slaveMultiplier += $args[0].devotion/200>>
<</if>>
- <<if $args[0].trust >= 50>>
+ <<if $args[0].trust > 50>>
<<set _slaveMultiplier += $args[0].trust/200>>
<</if>>
<<else>>
diff --git a/src/utility/ptWidgets.tw b/src/utility/ptWidgets.tw
index 2f301869c5e..3683b9af6d2 100644
--- a/src/utility/ptWidgets.tw
+++ b/src/utility/ptWidgets.tw
@@ -38,7 +38,7 @@
<<elseif ($activeSlave.devotion > 20) && !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder", "none"].includes($activeSlave.sexualFlaw)>>
Since she's obedient and already has a sexual quirk, @@.yellow;her training assignment has defaulted to removing her sexual flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "fix her sexual flaw">>
- <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>>
+ <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
@@.yellow;Her training assignment has defaulted to breaking her will.@@
<<set $personalAttention[_pti].trainingRegimen = "break her will">>
<<else>>
--
GitLab