diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index df6f8441de14e822ca7fbcb30f1f26355c47af39..12f9afae8df81cd76ee44bd4a61b84e76bae6c95 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -6422,6 +6422,13 @@ window.isPure = function(slave) {
return ((slave.boobsImplant == 0) && (slave.buttImplant == 0) && (slave.waist >= -95) && (slave.lipsImplant == 0) && (slave.faceImplant < 30) && (slave.bellyImplant == -1) && (Math.abs(slave.shouldersImplant) < 2) && (Math.abs(slave.hipsImplant) < 2));
};
+window.modScore = function modScore(slave) {
+ const V = State.variables;
+ V.piercingScore = PiercingScore(slave);
+ V.tatScore = TatScore(slave);
+ V.modScore = V.tatScore + V.piercingScore;
+}
+
window.PiercingScore = function(slave) {
var piercingScore = 0;
@@ -6752,6 +6759,23 @@ window.Enunciate = function Enunciate(slave) {
}
};
+window.fetishChangeChance = function fetishChangeChance(slave) {
+ const V = State.variables;
+ var chance = 0, sex = 0;
+
+ if (slave.clitSetting !== slave.fetish) {
+ if (slave.balls) {
+ sex = V.potencyAge - slave.actualAge;
+ }
+ else if (slave.ovaries || slave.mpreg) {
+ sex = V.fertilityAge - slave.actualAge;
+ }
+ chance = Math.trunc(Math.clamp((slave.devotion/4)-(slave.fetishStrength/4)-(Math.max(sex,0)*10), 0, 100));
+ }
+
+ return chance;
+}
+
/*:: Summary Widgets JS [script]*/
window.SlaveStatClamp = function SlaveStatClamp(slave) {
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index 11c85931e88626db4e0d40fbccbae1ee30cdb89c..e241f3d9d9193471298d906ea6c4738ca1df55d9 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -62,6 +62,13 @@ window.isPure = function(slave) {
return ((slave.boobsImplant == 0) && (slave.buttImplant == 0) && (slave.waist >= -95) && (slave.lipsImplant == 0) && (slave.faceImplant < 30) && (slave.bellyImplant == -1) && (Math.abs(slave.shouldersImplant) < 2) && (Math.abs(slave.hipsImplant) < 2));
};
+window.modScore = function modScore(slave) {
+ const V = State.variables;
+ V.piercingScore = PiercingScore(slave);
+ V.tatScore = TatScore(slave);
+ V.modScore = V.tatScore + V.piercingScore;
+}
+
window.PiercingScore = function(slave) {
var piercingScore = 0;
@@ -391,3 +398,20 @@ window.Enunciate = function Enunciate(slave) {
V.xEnunciate = "x";
}
};
+
+window.fetishChangeChance = function fetishChangeChance(slave) {
+ const V = State.variables;
+ var chance = 0, sex = 0;
+
+ if (slave.clitSetting !== slave.fetish) {
+ if (slave.balls) {
+ sex = V.potencyAge - slave.actualAge;
+ }
+ else if (slave.ovaries || slave.mpreg) {
+ sex = V.fertilityAge - slave.actualAge;
+ }
+ chance = Math.trunc(Math.clamp((slave.devotion/4)-(slave.fetishStrength/4)-(Math.max(sex,0)*10), 0, 100));
+ }
+
+ return chance;
+}
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index 31e3c5b15e7732f6d21dc818f98c1847cacbf36e..d00d96928af8e8121d89e4d07498142159a8516d 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -1505,7 +1505,7 @@ Release rules: _Slave.releaseRules.
<<elseif _Slave.lactation == 2>>
Lact++
<</if>>
-<<modScore _Slave>>
+<<run modScore(_Slave)>>
<<if _Slave.corsetPiercing == 0 && $piercingScore < 3 && $tatScore < 2>>
<<elseif $modScore > 15 || ($piercingScore > 8 && $tatScore > 5)>>
Mods++
@@ -1754,7 +1754,7 @@ _Slave.faceShape face.
<<elseif _Slave.lactation == 2>>
Heavy lactation.
<</if>>
-<<modScore _Slave>>
+<<run modScore(_Slave)>>
<<if _Slave.corsetPiercing == 0 && $piercingScore < 3 && $tatScore < 2>>
<<elseif $modScore > 15 || ($piercingScore > 8 && $tatScore > 5)>>
Extensive body mods.
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index 4ae38215578412bf54286dc0e9e2d39e1a940c24..d3567c3d5a1ddbf63d273376b7e7b1f4e1129de7 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -254,8 +254,7 @@
<<if ($activeSlave.devotion > 50)>>
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
- <<fetishChangeChance $activeSlave>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($activeSlave) > random(0,100)>>
<<set $activeSlave.fetishStrength = 10, $activeSlave.fetishKnown = 1, $activeSlave.fetish = "masochist">>
<<set $activeSlave.devotion += 4, $activeSlave.trust += 4>>
Her successful penance made her @@.gold;trust@@ and @@.hotpink;love@@ you more as she has proved both to you and the goddess how good of a slave she is.
@@ -281,8 +280,7 @@
<<elseif ($activeSlave.devotion > 20) || (($activeSlave.devotion >= -20) && ($activeSlave.trust < -20) && ($activeSlave.trust >= -50))>>
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
- <<fetishChangeChance $activeSlave>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($activeSlave) > random(0,100)>>
<<set $activeSlave.fetishKnown = 1, $activeSlave.fetish = "masochist">>
<</if>>
@@ -334,8 +332,7 @@
<<elseif ($activeSlave.trust < -20)>>
<<if ($activeSlave.fetish != "none")>>
- <<fetishChangeChance $activeSlave>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($activeSlave) > random(0,100)>>
<<set $activeSlave.fetishStrength = 10, $activeSlave.fetishKnown = 1, $activeSlave.fetish = "masochist">>
<</if>>
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index c1fbc6bc6518d4a382c2009aad87dd17df52d7e7..0e4c1e000fbb7f1a9e876f2a850ab5f070cc21cb 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -181,6 +181,9 @@
<<if def $adopted>>
<<unset $adopted>>
<</if>>
+<<if def $fetishChangeChance>>
+ <<unset $fetishChangeChance>>
+<</if>>
/* pregmod stuff */
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index fc4ca009cec0cb6febcd3ab05cd3281f33bcbd79..7708cf21acad89cea611ddb8173a400a5a3fdc4e 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -34,8 +34,7 @@
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "dom">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 590412f6e0e21aadff6997d56d824fc4d7e5595d..0ef5e349db6daeed6a886792e0859d07dcd63b1f 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -33,8 +33,7 @@
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "sadist">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "sadist">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index fecb4e7f7acdbcdefd5d7378d8255a29b8e4d4ff..a1254fd9b78e43277e786d84864a0e1b31bb50d7 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -29,8 +29,7 @@
<<set $slaves[_FLs].devotion += _devBonus>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "dom">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 59c18b07611d78371265872efe1fa1dbd2aab29b..4446037881488de447bfafeb2c015023b86ced67 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -31,8 +31,7 @@
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "humiliation">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "humiliation">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 2658c9cd11f76abe3b9b1242e2381346be9bc4db..8d5a90c394ee5b43fa7d317832dbe3643fb7ad65 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -39,8 +39,7 @@
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "boobs">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 0f7d494ea90310c600dd5831344c5534f425e1cd..28517020d4999c50a8c4dde05ff41c416c91b5de 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -226,8 +226,8 @@
<<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">>
- <<fetishChangeChance $slaves[$i]>>
- <<if (_masterSuiteAverageMilk > 2000) && ($fetishChangeChance > random(0,50))>>
+ <<set _fetishChangeChance = fetishChangeChance($slaves[$i])>>
+ <<if (_masterSuiteAverageMilk > 2000) && (_fetishChangeChance > random(0,50))>>
<<if $slaves[$i].fetish == "boobs">>
<<if $verboseDescriptions == 1>>Her<<else>>$slaves[$i].slaveName's<</if>> @@.lightcoral;boob fetish is strengthened@@ by the constant availability of milky nipples for her to play with.
<<set $slaves[$i].fetishStrength += 4>>
@@ -235,7 +235,7 @@
She @@.lightcoral;acquires a boob fetish@@ after spending a lot of time in the fuckpit drinking from her fellow fucktoys' tits.
<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishStrength = 65>>
<</if>>
- <<elseif (_masterSuiteAverageDick > 3) && ($slaves[$i].anus > 0) && ($fetishChangeChance > random(0,50))>>
+ <<elseif (_masterSuiteAverageDick > 3) && ($slaves[$i].anus > 0) && (_fetishChangeChance > random(0,50))>>
She
<<if $slaves[$i].fetish == "buttslut">>
@@.lightcoral;sinks farther into anal pleasure,@@ since she spends her time in the fuckpit with at least one of the many available cocks up her butt.
@@ -244,7 +244,7 @@
@@.lightcoral;acquires an anal fetish@@ after helplessly orgasming at the mercy of your many fucktoys eager to shove their big stiff penises up her ass.
<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishStrength = 65>>
<</if>>
- <<elseif (_masterSuiteAverageCum > 3) && ($fetishChangeChance > random(0,50))>>
+ <<elseif (_masterSuiteAverageCum > 3) && (_fetishChangeChance > random(0,50))>>
She
<<if $slaves[$i].fetish == "cumslut">>
@@.lightcoral;sinks farther into cum addiction,@@ since she spends her time in the fuckpit eagerly sucking down ejaculate, straight from the many sources.
@@ -253,7 +253,7 @@
@@.lightcoral;acquires an oral fixation@@ after orally servicing your many fucktoys eager to blow their loads down her throat.
<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishStrength = 65>>
<</if>>
- <<elseif (_masterSuiteAveragePreg > 10) && ($fetishChangeChance > random(0,50))>>
+ <<elseif (_masterSuiteAveragePreg > 10) && (_fetishChangeChance > random(0,50))>>
She
<<if $slaves[$i].fetish == "pregnancy">>
@@.lightcoral;sinks farther into pregnancy obsession,@@ since she never wants for a pregnant girl to make love to.
@@ -262,7 +262,7 @@
@@.lightcoral;acquires a pregnancy fetish,@@ since many of her sexual partners in the fuckpit are heavily pregnant.
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishStrength = 65>>
<</if>>
- <<elseif (_masterSuiteAverageDom < 50) && ($fetishChangeChance > random(0,50))>>
+ <<elseif (_masterSuiteAverageDom < 50) && (_fetishChangeChance > random(0,50))>>
She
<<if $slaves[$i].fetish == "dom">>
@@.lightcoral;becomes more dominant,@@ since there are so many subs in the fuckpit who beg her to fuck them hard.
@@ -271,7 +271,7 @@
@@.lightcoral;becomes sexually dominant@@ after having fun satisfying the many submissive fucktoys in the fuckpit who beg her to top them.
<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishStrength = 65>>
<</if>>
- <<elseif (_masterSuiteAverageDom > 50) && ($fetishChangeChance > random(0,50))>>
+ <<elseif (_masterSuiteAverageDom > 50) && (_fetishChangeChance > random(0,50))>>
She
<<if $slaves[$i].fetish == "submissive">>
@@.lightcoral;becomes even more submissive,@@ since there are so many doms in the fuckpit that she's often used by more than one at once.
@@ -280,7 +280,7 @@
@@.lightcoral;becomes sexually submissive@@ after the many dominant slaves in the fuckpit hold her down and use her for their pleasure.
<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishStrength = 65>>
<</if>>
- <<elseif (_masterSuiteAverageSadism < 50) && ($fetishChangeChance > random(0,50))>>
+ <<elseif (_masterSuiteAverageSadism < 50) && (_fetishChangeChance > random(0,50))>>
She
<<if $slaves[$i].fetish == "sadist">>
@@.lightcoral;becomes more sadistic,@@ since there are so many girls in the fuckpit who will do anything for her if she'll only spank them.
@@ -289,7 +289,7 @@
@@.lightcoral;becomes a bit of a sadist@@ after she notices that so many of her fellow fucktoys cum harder if she gives them a good slap.
<<set $slaves[$i].fetish = "sadist", $slaves[$i].fetishStrength = 65>>
<</if>>
- <<elseif (_masterSuiteAverageSadism > 50) && ($fetishChangeChance > random(0,50))>>
+ <<elseif (_masterSuiteAverageSadism > 50) && (_fetishChangeChance > random(0,50))>>
<<if $slaves[$i].fetish == "masochist">>
<<if $verboseDescriptions == 1>>Her<<else>>$slaves[$i].slaveName's<</if>> @@.lightcoral;pain addiction deepens,@@ since the fuckpit is full of ladies happy to fuck her while she screams.
<<set $slaves[$i].fetishStrength += 4>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index f0d57b7b59395a489be0054e2b67212724c8b990..8b8974e315cc550c7b437ee7d6f4ed472a5e6902 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -494,7 +494,7 @@
<</if>>
<<if ($slaves[$i].fetishStrength <= 65)>>
<<if ($slaves[$i].fetish != "pregnancy")>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[$i]) > random(0,100)>>
She begins to find the thought of filling a fertile womb with sperm @@.lightcoral;irresistible.@@
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1>>
<</if>>
@@ -833,7 +833,7 @@
<</if>>
<<if ($slaves[$i].fetishStrength <= 95)>>
<<if ($slaves[$i].fetish != "cumslut")>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[$i]) > random(0,100)>>
After sucking down cum for sustenance, she has started to think of the stuff as a @@.lightcoral;normal part@@ of life.
<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -925,7 +925,7 @@
<<if ($slaves[$i].devotion < -20)>>
Being forced to get her sustenance only by working the phallic food dispensers in the kitchen @@.mediumorchid;disgusts her.@@
<<set $slaves[$i].devotion -= 2>>
- <<elseif $fetishChangeChance > random(0,100)>>
+ <<elseif fetishChangeChance($slaves[$i]) > random(0,100)>>
Getting her sustenance only after working the phallic food dispensers in the kitchen makes sucking cock to completion such an integral part of her life that she starts to @@.lightcoral;fetishize ejaculate.@@
<<set $slaves[$i].fetish = "cumslut">>
<<set $slaves[$i].fetishKnown = 1>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 43e343e2967f40a1a4c128b7d3897c27d340bf48..8bc905d351618d67ad5db6efce07c7ebd6224f8c 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -21,7 +21,7 @@
They @@.orange;negatively impact $possessive intelligence,@@ as well.
<<set $slaves[$i].intelligence -= 1>>
<</if>>
- <<if $slaves[$i].fuckdoll == 0 && $slaves[$i].intelligence < 0 && $slaves[$i].fetishStrength <= 60 && $slaves[$i].fetish != "submissive" && $fetishChangeChance > random(0,100)>>
+ <<if $slaves[$i].fuckdoll == 0 && $slaves[$i].intelligence < 0 && $slaves[$i].fetishStrength <= 60 && $slaves[$i].fetish != "submissive" && fetishChangeChance($slaves[$i]) > random(0,100)>>
The willingness to @@.lightcoral;submit@@ created by the drugs invades $possessive sexuality, too.
<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -1256,7 +1256,7 @@
<<if ($slaves[$i].devotion < -20)>>
Getting buttfucked morning and night by reciprocating dildos that ejaculate $possessive drug regime @@.mediumorchid;disgusts $object.@@
<<set $slaves[$i].devotion -= 2>>
- <<elseif $fetishChangeChance > random(0,100)>>
+ <<elseif fetishChangeChance($slaves[$i]) > random(0,100)>>
$pronounCap starts to look forward to getting buttfucked morning and night by reciprocating dildos that ejaculate $possessive drug regime; $pronoun's @@.lightcoral;become anally fixated.@@
<<set $slaves[$i].fetish = "buttslut">>
<<set $slaves[$i].fetishKnown = 1>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index c8f8365db21781ec209611770a738c095b4d62d4..719d156e32d49e4b88f23a0789db3b64a2c48478 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1,6 +1,6 @@
:: SA long term effects [nobr]
-<<fetishChangeChance $slaves[$i]>>
+<<set _fetishChangeChance = fetishChangeChance($slaves[$i])>>
<<set $bellyAccessory = $slaves[$i].bellyAccessory>>
<<set _para = 0>>
<<if $slaves[$i].aphrodisiacs === -1>><<set _oldEnergy = $slaves[$i].energy, _maxEnergyGain = Math.round((75 - _oldEnergy)/9.3)>><</if>>
@@ -136,7 +136,7 @@
Her chafed skin makes sex an agonizing prospect. She seems to get off on the pain; she's a @@.lightcoral;natural masochist.@@
<<set $slaves[$i].fetishKnown = 1>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Her chafed skin makes sex an agonizing prospect. She learns to come in spite of, and then @@.lightcoral;because of the pain.@@
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -152,7 +152,7 @@
The straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
<<set $slaves[$i].fetishKnown = 1>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
The straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -162,7 +162,7 @@
Her straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
<<set $slaves[$i].fetishKnown = 1>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Her straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -179,7 +179,7 @@
Her chains pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
<<set $slaves[$i].fetishKnown = 1>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -189,7 +189,7 @@
Her chains pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
<<set $slaves[$i].fetishKnown = 1>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -588,7 +588,7 @@
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
During sex, every breath in and out is agonizing. She learns to come in spite of, and then @@.lightcoral;because of the pain.@@
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -1055,7 +1055,7 @@
She shows a surprising lack of resistance to the routine of having a tail inserted in her ass each morning; she seems to @@.lightcoral;naturally enjoy the humiliation.@@
<<set $slaves[$i].fetishKnown = 1>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Slowly, her shame at having a tail inserted in her ass each morning turns to secret enjoyment and finally to @@.lightcoral;open arousal at the humiliating accessory.@@
<<set $slaves[$i].fetish = "humiliation", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -1065,7 +1065,7 @@
She shows a surprising lack of resistance to the routine of getting the plug up her butt in the morning; she seems to @@.lightcoral;naturally enjoy anal stimulation.@@
<<set $slaves[$i].fetishKnown = 1>>
<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Slowly, her anguish at getting the plug up her butt in the morning turns to secret enjoyment and finally to @@.lightcoral;open arousal at having her anus filled.@@
<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -1429,7 +1429,7 @@
<</if>>
<</switch>>
<<if ($slaves[$i].clitPiercing != 3)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
<<switch $slaves[$i].behavioralQuirk>>
<<case "confident">>
<<if ($slaves[$i].fetish != "dom")>>
@@ -1570,7 +1570,7 @@
<</if>>
<</switch>>
<<if ($slaves[$i].clitPiercing != 3)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
<<switch $slaves[$i].sexualQuirk>>
<<case "gagfuck queen">>
<<if $slaves[$i].fetish != "cumslut">>
@@ -2323,7 +2323,7 @@
<<if ($slaves[$i].lactation > 0)>>
<<if ($slaves[$i].fetishStrength <= 95)>>
<<if ($slaves[$i].fetish != "boobs")>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Since she has had her lactating nipples constantly caressed by the milkers, @@.lightcoral;she begins to appreciate nipple stimulation in a new way.@@
<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2337,7 +2337,7 @@
<<if $slaves[$i].prostate != 0>>
<<if $slaves[$i].fetishStrength <= 95>>
<<if $slaves[$i].fetish != "buttslut">>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
Since she has had her prostate constantly stimulated to encourage her to give cum, @@.lightcoral;she begins to look forward to anal penetration.@@
<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2373,7 +2373,7 @@
<<if $slaves[$i].career == "a dairy cow" || $slaves[$i].career == "a breeding bull">>
Since she sees herself as an animal, she is perfectly content walking on all fours.
<<else>>
-<<if $fetishChangeChance > random(0,100)>>
+<<if _fetishChangeChance > random(0,100)>>
Living as a sex slave on all fours @@.lightcoral;turns her into a sexual submissive.@@
<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 65>>
<</if>>
@@ -2561,7 +2561,7 @@
<</if>>
<</if>>
<<case "vanilla">>
- <<if ($slaves[$i].fetish != "none") && ($fetishChangeChance > random(0,100)-20*$assistant)>>
+ <<if ($slaves[$i].fetish != "none") && (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms during straightforward sex, @@.coral;her sexuality returns to normal.@@
<<set $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2570,7 +2570,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when she's using her mouth.
<<set $slaves[$i].fetishStrength -= 20>>
- <<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+ <<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms as she performs oral sex, @@.lightcoral;she develops a fetish for cum.@@
<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2583,7 +2583,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when her rear hole is being fucked.
<<set $slaves[$i].fetishStrength -= 20>>
-<<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms when her ass is being stimulated, @@.lightcoral;she develops a fetish for being an anal bottom.@@
<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2596,7 +2596,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when her tits are being touched.
<<set $slaves[$i].fetishStrength -= 20>>
-<<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms when her nipples are being stimulated, @@.lightcoral;she develops a fetish for her tits.@@
<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2609,7 +2609,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when she's being held down and used.
<<set $slaves[$i].fetishStrength -= 20>>
-<<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms when she is restrained, @@.lightcoral;she develops a fetish for submission.@@
<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2622,7 +2622,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when she's got an audience.
<<set $slaves[$i].fetishStrength -= 20>>
-<<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms when she is being humiliated, @@.lightcoral;she develops a fetish for humiliation.@@
<<set $slaves[$i].fetish = "humiliation", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2635,7 +2635,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when she feels like she's being bred.
<<set $slaves[$i].fetishStrength -= 20>>
-<<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms during <<if $PC.dick == 1>>unprotected sex<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>loving contact with the female anatomy<</if>>, @@.lightcoral;she begins to fantasize about pregnancy.@@
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2648,7 +2648,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when another slave is servicing her.
<<set $slaves[$i].fetishStrength -= 20>>
-<<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms while she's taking an active, dominant sexual role, @@.lightcoral;she begins to enjoy dominance.@@
<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2661,7 +2661,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when she's being hurt.
<<set $slaves[$i].fetishStrength -= 20>>
-<<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms while she's being beaten, @@.lightcoral;she begins to enjoy pain.@@
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2674,7 +2674,7 @@
<<if $slaves[$i].fetishStrength >= 10>>
Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> acts to @@.coral;suppress her current fetish,@@ encouraging her to orgasm when she witnesses or even takes part in another slave's pain.
<<set $slaves[$i].fetishStrength -= 20>>
- <<elseif ($fetishChangeChance > random(0,100)-20*$assistant)>>
+ <<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing encourages many orgasms while she's involved in the abuse of other slaves, @@.lightcoral;she begins to develop a sadistic streak.@@
<<set $slaves[$i].fetish = "sadist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
@@ -2695,7 +2695,7 @@
<<if canDoAnal($slaves[$i])>>
<<if $slaves[$i].vagina > -1 && !canDoVaginal($slaves[$i])>>
<<if ($slaves[$i].fetishStrength <= 95)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
<<if ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club")>>
<<if $slaves[$i].fetish != "buttslut">>
With so much sexual attention focused on her anus, @@.lightcoral;she comes to view buttsex as the centerpiece of her sexuality.@@
@@ -2718,7 +2718,7 @@
<<elseif $slaves[$i].vagina == -1>>
<<if $slaves[$i].prostate != 0>>
<<if $slaves[$i].fetishStrength <= 95>>
- <<if $fetishChangeChance > random(0,90)>>
+ <<if _fetishChangeChance > random(0,90)>>
<<if ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club")>>
<<if $slaves[$i].fetish != "buttslut">>
Since most of her orgasms are caused by prostate stimulation from anal sex with citizens, @@.lightcoral;she comes to view her asshole as her primary sexual organ.@@
@@ -2746,7 +2746,7 @@
<<if ($slaves[$i].balls > 0)>>
<<if $slaves[$i].drugs == "testicle enhancement" || $slaves[$i].drugs == "intensive testicle enhancement" || ($slaves[$i].drugs == "hyper testicle enhancement")>>
<<if ($slaves[$i].fetishStrength <= 95)>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if _fetishChangeChance > random(0,100)>>
<<if $slaves[$i].fetish != "cumslut">>
While masturbating, she's at first surprised but then aroused by her drug-enhanced ejaculation. After repeatedly covering herself in the stuff, @@.lightcoral;she's become a cum fetishist.@@
<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
@@ -4130,7 +4130,7 @@
<</switch>>
<</if>>
<</if>>
- <<if ($slaves[$i].fetishStrength <= 95) && ($fetishChangeChance > random(0,100)) && ($slaves[$i].oralCount+$slaves[$i].vaginalCount+$slaves[$i].analCount > 200) && ($slaves[$i].fetish != "pregnancy")>>
+ <<if ($slaves[$i].fetishStrength <= 95) && (_fetishChangeChance > random(0,100)) && ($slaves[$i].oralCount+$slaves[$i].vaginalCount+$slaves[$i].analCount > 200) && ($slaves[$i].fetish != "pregnancy")>>
The combination of pregnancy and constant sex has @@.lightcoral;sexualized pregnancy for her.@@
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 65>>
<</if>>
@@ -4570,7 +4570,7 @@
Being so distended with fluids is @@.mediumorchid;very uncomfortable@@ to $possessive.
<<set $slaves[$i].devotion -= 3>>
<</if>>
- <<if ($slaves[$i].fetish == "none") && ($fetishChangeChance > random(0,100))>>
+ <<if ($slaves[$i].fetish == "none") && (_fetishChangeChance > random(0,100))>>
Having such a round, heavy belly leads $object to @@.lightcoral;begin fantasizing about being pregnant.@@
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishStrength = 10, $slaves[$i].fetishKnown = 1>>
<</if>>
@@ -4605,7 +4605,7 @@
<</switch>>
is @@.mediumorchid;completely humiliating.@@
<<set $slaves[$i].devotion -= 2>>
- <<if (($slaves[$i].fetish == "none") || ($slaves[$i].fetishStrength <= 10)) && ($fetishChangeChance > random(0,100))>>
+ <<if (($slaves[$i].fetish == "none") || ($slaves[$i].fetishStrength <= 10)) && (_fetishChangeChance > random(0,100))>>
However, all the eyes on $object and $possessive jiggling middle @@.lightcoral;makes $object begin to crave humiliation.@@
<<set $slaves[$i].fetish = "humiliation", $slaves[$i].fetishStrength = 10, $slaves[$i].fetishKnown = 1>>
<</if>>
@@ -5120,7 +5120,7 @@
<</if>>
<<if $arcologies[0].FSPaternalist != "unset" || $arcologies[0].FSDegradationist != "unset" || $arcologies[0].FSBodyPurist != "unset">>
- <<modScore $slaves[$i]>>
+ <<run modScore($slaves[$i])>>
<</if>>
<<if $arcologies[0].FSSupremacist != "unset">>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index d0c1289426766524724e18dd96b5faf966192ada..66cbf8b5ebae899968ade05eac066b2fc211a3f3 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -5,7 +5,7 @@ serves you this week.
<<set _trainingEfficiency = 5+Math.trunc($slaves[$i].devotion/30)+$slaves[$i].intelligence>>
<<set $skillIncrease = _trainingEfficiency>>
<<set _oralUse = 0, _analUse = 0, _vaginalUse = 0, _mammaryUse = 0, _penetrativeUse = 0>>
-<<fetishChangeChance $slaves[$i]>>
+<<set _fetishChangeChance = fetishChangeChance($slaves[$i])>>
<<if ($slaves[$i].toyHole != "all her holes")>>
<<if $slaves[$i].toyHole == "pussy">>
@@ -121,7 +121,7 @@ serves you this week.
$pronoun @@.hotpink;seems to enjoy@@ being your fucktoy.
<</if>>
<<set $slaves[$i].devotion += 2>>
- <<elseif $fetishChangeChance > random(0,100)>>
+ <<elseif _fetishChangeChance > random(0,100)>>
<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
$pronounCap frequently climaxes with your <<if $PC.title == 1>>strong<<else>>soft<</if>> hands holding $object and your cock spreading heat through $possessive core, teaching $object that @@.lightcoral;a girl's role is to please a man.@@
<</if>>
@@ -262,7 +262,7 @@ serves you this week.
$pronounCap @@.hotpink;seems to enjoy@@ anal sex more than the usual slave.
<</if>>
<<set $slaves[$i].devotion += 2>>
- <<elseif $fetishChangeChance > random(0,100)>>
+ <<elseif _fetishChangeChance > random(0,100)>>
<<set $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10, $slaves[$i].fetish = "buttslut">>
After repeated anal orgasms, @@.lightcoral;$pronoun begins to crave $possessive next buttfuck.@@
<</if>>
@@ -407,7 +407,7 @@ serves you this week.
$pronounCap @@.hotpink;seems to enjoy@@ $possessive role as a cum receptacle more than you'd expect.
<</if>>
<<set $slaves[$i].devotion += 2>>
- <<elseif $fetishChangeChance > random(0,100)>>
+ <<elseif _fetishChangeChance > random(0,100)>>
<<set $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10, $slaves[$i].fetish = "cumslut">>
$pronounCap frequently climaxes with <<if $PC.dick == 1>>your dick in $possessive mouth<<else>>$possessive mouth on your cunt<</if>>, learning that giving @@.lightcoral;blowjobs is a lot of fun.@@
<</if>>
@@ -566,7 +566,7 @@ serves you this week.
$pronounCap @@.hotpink;seems to enjoy@@ having $possessive <<if $slaves[$i].boobs >= 300>>breasts<<else>>chest<</if>> fondled more than the average girl.
<</if>>
<<set $slaves[$i].devotion += 2>>
- <<elseif $fetishChangeChance > random(0,100)>>
+ <<elseif _fetishChangeChance > random(0,100)>>
<<set $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10, $slaves[$i].fetish = "boobs">>
$pronounCap climaxes to nipple stimulation alone, and starts acting as though
<<if $slaves[$i].clit > 0 && $slaves[$i].nipples != "fuckable">>
@@ -1270,7 +1270,7 @@ Keeping $object as nothing but your personal
Being tasked with servicing a lusty pregnant woman @@.lightcoral;strengthens her pregnancy fetish.@@
<<set $slaves[$i].fetishStrength += 4>>
<</if>>
- <<elseif $fetishChangeChance > random(0,100) && ($PC.preg >= 20 || ($PC.preg >= 16 && $PC.career == "escort"))>>
+ <<elseif _fetishChangeChance > random(0,100) && ($PC.preg >= 20 || ($PC.preg >= 16 && $PC.career == "escort"))>>
At first she found the prospect of being used by her increasingly pregnant <<WrittenMaster $slaves[$i]>> a turn off, but being so close to your gravid form serves to be more erotic than she anticipated. Soon she finds herself aroused less from the prospect of sex and more @@.lightcoral;the chance to be near your child laden belly.@@
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 3ad269544d2be615d4f8d27bd4144442e8aa626a..aef02b90e13fc2fae8ebaf21042494fe5571276a 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -475,7 +475,7 @@
<<set _seed += 1>>
<</if>>
<<elseif $arcologies[0].FSDegradationist != "unset">>
- <<modScore $slaves[$i]>>
+ <<run modScore($slaves[$i])>>
<<if $slaves[$i].intelligence > 1>>
<<set _seed += 1, _FSdefend++, $arcologies[0].FSDegradationist += 0.01*$FSSingleSlaveRep*($slaves[$i].intelligence-1)>>
<</if>>
@@ -484,7 +484,7 @@
<</if>>
<</if>>
<<if $arcologies[0].FSBodyPurist != "unset">>
- <<modScore $slaves[$i]>>
+ <<run modScore($slaves[$i])>>
<<if $slaves[$i].corsetPiercing == 0 && $piercingScore < 3 && $tatScore < 2>>
<<if $slaves[$i].boobsImplant == 0>>
<<set _seed += 1>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index f1738206395518a4315e36773e9ccd2c831b28e1..28704893b915d9b65d5deee8f8ba40ff46f2ff69 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -1379,7 +1379,7 @@
<<set _SlaveI.attrXY += 2>>
<</if>>
<</if>>
- <<if ((_SlaveJ.fetish != "none") && (_SlaveJ.fetish != "mindbroken")) && (_SlaveI.fetishStrength <= 95) && (_SlaveJ.fetish != _SlaveI.fetish) && ($fetishChangeChance > (random(0, 100) - (_SlaveI.relationship * 5)))>>
+ <<if ((_SlaveJ.fetish != "none") && (_SlaveJ.fetish != "mindbroken")) && (_SlaveI.fetishStrength <= 95) && (_SlaveJ.fetish != _SlaveI.fetish) && (fetishChangeChance(_SlaveI) > (random(0, 100) - (_SlaveI.relationship * 5)))>>
<<switch _SlaveJ.fetish>>
<<case "boobs">>
After experiencing _SlaveJ.slaveName's love of breasts, her own and _SlaveI.slaveName's, _SlaveI.slaveName happily joins her as a @@.lightcoral;boob fanatic.@@
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index b392c67e7a5e79200108f5c19517d063b7c2ef88..c4323975fd61179621bb308d19e0b581ac1f51ae 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -33,8 +33,7 @@
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "dom">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 23a558ee7c8beddb4c87b754b857d0476ca9198e..a2586f1664b220b5f81e27c499c552721d8c36e6 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -30,8 +30,7 @@
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "dom">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 49a0b2b08149cd1fd1944c5419820bf540725d2c..8985097f2b65bf0811a035583c885052b75a7180 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -27,8 +27,7 @@
<<set _FLsFetish = 0>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "submissive">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
+ <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "submissive">>
<</if>>
<<elseif $slaves[_FLs].fetishKnown == 0>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 905bd3996b0238bcc51c4c409591d8a8493ea8a6..9fc4969469af64b5ef760d7b42b21bdb23b84b61 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -2,7 +2,7 @@
<<widget "Beauty">>
-<<modScore $args[0]>>
+<<run modScore($args[0])>>
<<set $beauty = 0>>
@@ -1573,72 +1573,6 @@
<</widget>>
-/* Use is <<modScore $someSlave>> where $someSlave is any variable that points to a valid slave */
-
-<<widget "modScore">>
-<<set $piercingScore = 0>>
-<<set $tatScore = 0>>
-<<if $args[0].earPiercing > 0>><<set $piercingScore += $args[0].earPiercing*0.75-0.5>><</if>>
-<<if $args[0].nosePiercing > 0>><<set $piercingScore += $args[0].nosePiercing*0.75-0.5>><</if>>
-<<if $args[0].eyebrowPiercing > 0>><<set $piercingScore += $args[0].eyebrowPiercing*0.75-0.5>><</if>>
-<<if $args[0].navelPiercing > 0>><<set $piercingScore += $args[0].navelPiercing*0.75-0.5>><</if>>
-<<if $args[0].corsetPiercing > 0>><<set $piercingScore += $args[0].corsetPiercing*0.75+0.5>><</if>>
-<<if $args[0].nipplesPiercing > 0>><<set $piercingScore += $args[0].nipplesPiercing*0.75-0.25>><</if>>
-<<if $args[0].areolaePiercing > 0>><<set $piercingScore += $args[0].areolaePiercing*0.75+0.5>><</if>>
-<<if $args[0].lipsPiercing > 0>><<set $piercingScore += $args[0].lipsPiercing*0.75-0.25>><</if>>
-<<if $args[0].tonguePiercing > 0 >><<set $piercingScore += $args[0].tonguePiercing*0.75-0.25>><</if>>
-<<if $args[0].clitPiercing == 3>><<set $piercingScore += 1.25>> /* smart piercing */
- <<elseif $args[0].clitPiercing > 0>><<set $piercingScore += $args[0].clitPiercing*0.75-0.25>><</if>>
-<<if $args[0].vaginaPiercing > 0>><<set $piercingScore += $args[0].vaginaPiercing*0.75-0.25>><</if>>
-<<if $args[0].dickPiercing > 0>><<set $piercingScore += $args[0].dickPiercing*0.75-0.25>><</if>>
-<<if $args[0].anusPiercing > 0>><<set $piercingScore += $args[0].anusPiercing*0.75-0.25>><</if>>
-<<if $args[0].boobsTat != 0>><<set $tatScore += 1.25>><</if>>
-<<if $args[0].buttTat != 0>><<set $tatScore += 1.25>><</if>>
-<<if $args[0].lipsTat != 0>><<set $tatScore += 1.25>><</if>>
-<<if $args[0].shouldersTat != 0>><<set $tatScore += 1>><</if>>
-<<if $args[0].backTat != 0>><<set $tatScore += 1.25>><</if>>
-<<if $args[0].armsTat != 0>><<set $tatScore += 1>><</if>>
-<<if $args[0].legsTat != 0>><<set $tatScore += 1>><</if>>
-<<if $args[0].stampTat != 0>><<set $tatScore += 1>><</if>>
-<<if $args[0].vaginaTat != 0>><<set $tatScore += 1>><</if>>
-<<if $args[0].dickTat != 0>><<set $tatScore += 1>><</if>>
-<<if $args[0].bellyTat != 0>>
-<<if ($args[0].belly >= 300000)>>
- <<set $tatScore += 0.75>>
-<<elseif ($args[0].belly >= 150000)>>
- <<set $tatScore += 1>>
-<<elseif ($args[0].belly >= 10000)>>
- <<set $tatScore += 1>>
-<<elseif ($args[0].belly >= 5000)>>
- <<set $tatScore += 0.5>>
-<<elseif ($args[0].belly >= 1500)>>
- <<set $tatScore += 0.25>>
-<<else>>
- <<set $tatScore += 0.1>>
-<</if>>
-<</if>>
-<<if $args[0].anusTat == "bleached">><<set $tatScore += 0.5>>
- <<elseif $args[0].anusTat != 0>><<set $tatScore += 1.25>><</if>>
-<<set $modScore = $piercingScore+$tatScore>> /* note: always overwrites previous $modScore */
-<</widget>>
-
-<<widget "fetishChangeChance">>
-
-<<if $args[0].clitSetting != $args[0].fetish>>
- <<if $args[0].balls>>
- <<set _sex = $potencyAge-$args[0].actualAge>>
- <<elseif $args[0].ovaries || $args[0].mpreg>>
- <<set _sex = $fertilityAge-$args[0].actualAge>>
- <<else>>
- <<set _sex = 0>>
- <</if>>
- <<set $fetishChangeChance = Math.trunc(Math.clamp(($args[0].devotion/4)-($args[0].fetishStrength/4)-(Math.max(_sex,0)*10), 0, 100))>>
-<<else>>
- <<set $fetishChangeChance = 0>>
-<</if>>
-
-<</widget>>
-
<<widget "slaveCost">>
<<Beauty $args[0]>>