diff --git a/Makefile b/Makefile
index 11881035812f9bf0a68667b960b0e89518ddd4b8..97a22d5ceae5b1b7133febb23f78d152bfee1de4 100644
--- a/Makefile
+++ b/Makefile
@@ -36,12 +36,12 @@ bin/%.html: bin/tmp
bin/fc.js: bin/
devTools/concatFiles.sh js/ '*.js' $@
-bin/tmp: bin/fc.js src/gui/mainMenu/AlphaDisclaimer.tw
+bin/tmp: bin/fc.js injectGitCommitHash
$(TWEEGO) --module=bin/fc.js --head devTools/head.html src/ > $@
rm -f bin/fc.js
-src/gui/mainMenu/AlphaDisclaimer.tw:
- sed -Ei "s/build: .releaseID/\0 commit $(COMMIT)/" $@
+injectGitCommitHash:
+ sed -Ei "s/build: .releaseID/\0, commit $(COMMIT)/" src/gui/mainMenu/AlphaDisclaimer.tw
bin/:
mkdir -p $@
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index f8a874ca32a346d390341dc6c2119047d06965b0..fb1d09ee397096724d42d10f1a1fc13d952da78d 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -597,6 +597,7 @@ App.Data.resetOnNGPlus = {
REButtholeCheckinIDs: [],
REFutaSisterCheckinIDs: [],
REReductionCheckinIDs: [],
+ /** @type {FC.SlaveStateOrZero} */
activeSlave: 0,
activeChild: 0,
reminders: [],
@@ -1299,8 +1300,7 @@ App.Data.resetOnNGPlus = {
CoursingAssociation: 0,
LurcherID: 0,
coursed: 0,
- /** @type {FC.SlaveStateOrZero} */
- Stud: 0,
+ StudID: 0,
StudCum: 0,
RaidingMercenaries: 0,
raided: 0,
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index e7b0ab807a1398299258db7ade0a2c0953e03c62..14d2598f56a6f06fd48a83baece67d834e92a287 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1159,7 +1159,7 @@ App.Update.globalVariables = function(node) {
// Stud stuff
{
- V.Stud = V.Stud || 0;
+ V.StudID = V.StudID || 0;
V.StudCum = Math.max(+V.StudCum, 0) || 0;
}
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 4eef584acb282eb4dfc97d2b0c3e74b246e86426..817f7e16407de81e1412077dbf7b237684621e80 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1968,6 +1968,13 @@ globalThis.FacilityDatatypeCleanup = (function() {
return FacilityDatatypeCleanup;
+ function replaceSlaveStateWithId(stateVar, idVar) {
+ idVar = idVar || `${stateVar}ID`;
+ if (V[stateVar] !== undefined) {
+ V[idVar] = V[stateVar] === 0 ? 0 : V[stateVar].ID;
+ }
+ }
+
function FacilityDatatypeCleanup() {
/* common variables */
FacilityIDArrayCleanup();
@@ -1990,12 +1997,9 @@ globalThis.FacilityDatatypeCleanup = (function() {
V.Recruiter = V.slaves.find(s => s.assignment === "recruit girls") || 0;
V.Bodyguard = V.slaves.find(s => s.assignment === "guard you") || 0;
- if (V.Lurcher) {
- V.LurcherID = V.Lurcher === 0 ? 0 : V.Lurcher.ID;
- }
- if (V.Stud) {
- V.Stud = V.slaves[V.slaveIndices[V.Stud.ID]];
- }
+
+ replaceSlaveStateWithId("Lurcher");
+ replaceSlaveStateWithId("Stud");
}
function FacilityIDArrayCleanup() {
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index b83b57856a8d267b55968890fd21d99b9a0d9777..d562c80f5f89d3b3f52555b60daa5b58e38949c2 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -306,7 +306,7 @@ globalThis.endWeek = (function() {
V.Matron = 0;
V.Nurse = 0;
V.Bodyguard = 0;
- V.Stud = 0;
+ V.StudID = 0;
V.StudCum = 0;
V.fuckSlaves = 0;
V.freeSexualEnergy = 0;
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index c501780ce63300ae6237c0395ec88d2f2512b71b..880731c7c7a043d16de199423c94a3ba96903ff7 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -164,6 +164,10 @@ App.UI.SlaveInteract.fucktoyPref = function(slave) {
return jQuery('#fucktoypref').empty().append(el);
};
+/**
+ * @param {string} blockId
+ * @param {App.Entity.SlaveState} slave
+ */
App.UI.SlaveInteract.assignmentBlock = function(blockId, slave) {
let el = document.createElement('div');
let title = document.createElement('div');
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 9894041c917ceb523206c8b9622f0e46042ae1d1..03762812ba6282bd41786c3234df9b74d3d38d5a 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -291,7 +291,7 @@ globalThis.getSlave = function(ID) {
*/
globalThis.slaveStateById = function(ID) {
const index = State.variables.slaveIndices[ID];
- return index === undefined ? undefined : State.variables.slaves[index];
+ return index === undefined ? null : State.variables.slaves[index];
};
globalThis.getChild = function(ID) {
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index fc8438acfe04c6151657441f4493a1d697a9d825..8fae2294b2329aae50147fc0d88f322c446f0d8c 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -496,8 +496,8 @@ globalThis.removeJob = function(slave, assignment, saveRecord) {
V.Concubine = 0;
} else if (V.Collectrix !== 0 && slave.ID === V.Collectrix.ID) {
V.Collectrix = 0;
- } else if (V.Stud !== 0 && slave.ID === V.Stud.ID) {
- V.Stud = 0;
+ } else if (slave.ID === V.StudID) {
+ V.StudID = 0;
}
/* use .toLowerCase() to get rid of a few dupe conditions. */
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 4c9e438447c02007f01f987cb9602d1f32822b8e..5cc3b0f9f5916e160dcec5dd038278440f63cf46 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -11,6 +11,7 @@
<<if $slaves[$i].aphrodisiacs === -1>><<set _oldEnergy = $slaves[$i].energy, _maxEnergyGain = Math.round((75 - _oldEnergy)/9.3)>><</if>>
<<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 2 : 0>>
<<set _gigantomastiaMod = $slaves[$i].geneticQuirks.gigantomastia == 2 ? ($slaves[$i].geneticQuirks.macromastia == 2 ? 3 : 2) : 1>>
+<<set _Stud = slaveStateById($StudID)>> /% may be null %/
<<if $slaves[$i].fuckdoll > 0>>
<<if $slaves[$i].fuckdoll >= 100>>
@@ -4262,7 +4263,7 @@
<<if canGetPregnant($slaves[$i]) && (($slaves[$i].assignment == "work in the dairy" && $dairyPregSetting == 0) || $slaves[$i].assignment != "work in the dairy")>>
<<set _conceptionSeed = random(1,100)>>
- <<set _studIgnoresRules = ($Stud != 0 && $universalRulesImpregnation == "Stud" && $Stud.career == "a breeding bull" && $Stud.fetish == "mindbroken" && canWalk($Stud)) ? 1 : 0>>
+ <<set _studIgnoresRules = (_Stud && $universalRulesImpregnation == "Stud" && _Stud.career == "a breeding bull" && _Stud.fetish == "mindbroken" && canWalk(_Stud)) ? 1 : 0>>
<<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.
@@ -4398,112 +4399,112 @@
<<set $slaves[_saLTE] = $HeadGirl>>
<</if>>
<</if>> /* closes HG impregnation */
- <<elseif ($Stud != 0) && ($slaves[$i].ID != $Stud.ID) && ($universalRulesImpregnation == "Stud")>>
- <<setLocalPronouns $Stud 2>>
- <<if ($slaves[$i].StudExclude == 1 || $slaves[$i].breedingMark == 1) && ($Stud.career != "a breeding bull" || $Stud.fetish != "mindbroken" || !canWalk($Stud))>>
- It's $Stud.slaveName's role to provide sperm for fertile slaves, but $slaves[$i].slaveName is not included on the list.
+ <<elseif ($slaves[$i].ID != $StudID) && ($universalRulesImpregnation == "Stud")>>
+ <<setLocalPronouns _Stud 2>>
+ <<if ($slaves[$i].StudExclude == 1 || $slaves[$i].breedingMark == 1) && (_Stud.career != "a breeding bull" || _Stud.fetish != "mindbroken" || !canWalk(_Stud))>>
+ It's _Stud.slaveName's role to provide sperm for fertile slaves, but $slaves[$i].slaveName is not included on the list.
<<elseif $universalHGImpregnateMasterSuiteToggle == 1 && ["serve in the master suite", "be your Concubine"].includes($slaves[$i].assignment)>>
- It's $Stud.slaveName's role to provide sperm for fertile slaves, but $slaves[$i].slaveName is off-limits.
+ It's _Stud.slaveName's role to provide sperm for fertile slaves, but $slaves[$i].slaveName is off-limits.
<<elseif $StudCum == 0>>
- It's $Stud.slaveName's role to provide sperm for fertile slaves, but your Stud can only cum enough to ensure impregnation in a limited number of slaves each week.
- <<elseif !canBreed($slaves[$i], $Stud)>>
- It's $Stud.slaveName's role to provide sperm for fertile slaves, but _his2 sperm is unable to fertilize $slaves[$i].slaveName's ova, so there is no point in forcing the union.
+ It's _Stud.slaveName's role to provide sperm for fertile slaves, but your Stud can only cum enough to ensure impregnation in a limited number of slaves each week.
+ <<elseif !canBreed($slaves[$i], _Stud)>>
+ It's _Stud.slaveName's role to provide sperm for fertile slaves, but _his2 sperm is unable to fertilize $slaves[$i].slaveName's ova, so there is no point in forcing the union.
<<else>>
<<set _studRandiness = 0>> /* used to control the slave reaction. 1 - fucks slave, -1 - slave fucks stud, 0 - inert */
- It's $Stud.slaveName's role to
+ It's _Stud.slaveName's role to
/* stud's reaction to the role */
- <<if $Stud.fuckdoll > 0>>
+ <<if _Stud.fuckdoll > 0>>
provide sperm for $him; all $he needs to do is signal the suit to stimulate an ejaculation.
- <<elseif $Stud.fetish == "mindbroken">>
- <<if $Stud.career == "a breeding bull" && canWalk($Stud)>>
+ <<elseif _Stud.fetish == "mindbroken">>
+ <<if _Stud.career == "a breeding bull" && canWalk(_Stud)>>
impregnate fertile slaves, a task the amorous Stud performs with gusto and little regard for rules.
<<set _studRandiness = 1>>
<<else>>
provide sperm for $him, a task that usually involves $him doing all the work.
<<set _studRandiness = -1>>
<</if>>
- <<elseif $Stud.career == "a breeding bull">>
- <<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif _Stud.career == "a breeding bull">>
+ <<if (_Stud.fetish == "pregnancy") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
impregnate $him, a task your pregnancy fetishist Stud believes @@.hotpink;is nothing short of destiny.@@
- <<set $Stud.devotion += 3>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 3>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
- <<set $Stud.fetishStrength += 4>>
+ <<set _Stud.fetishStrength += 4>>
<</if>>
- <<elseif ($Stud.fetish == "dom") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "dom") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
fill $him with child, a task your dominant Stud @@.hotpink;carries out with gusto.@@
- <<set $Stud.devotion += 2>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 2>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 dominant tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 4>>
+ <<set _Stud.fetishStrength += 4>>
<</if>>
<<else>>
impregnate $him, a task your Stud feels @@.hotpink;_he2 was meant for.@@
- <<set $Stud.devotion += 1>>
+ <<set _Stud.devotion += 1>>
<</if>>
<<set _studRandiness = 1>>
- <<elseif $Stud.devotion < -20>>
- <<if $Stud.trust > 20>>
- <<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif _Stud.devotion < -20>>
+ <<if _Stud.trust > 20>>
+ <<if (-Stud.fetish == "pregnancy") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
impregnate $him, a task your pregnancy fetishist Stud @@.mediumaquamarine;takes full advantage of@@ to deeply ingraine _himself2 in your penthouse.
- <<if ($Stud.fetishStrength <= 95)>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
- <<set $Stud.fetishStrength += 4>>
+ <<set _Stud.fetishStrength += 4>>
<</if>>
- <<elseif ($Stud.fetish == "dom") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "dom") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
fill $him with child, a task your dominant Stud @@.mediumaquamarine;carries out with glee@@ as _he2 steadily dominates your slaves.
- <<if ($Stud.fetishStrength <= 95)>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 dominant tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 4>>
+ <<set _Stud.fetishStrength += 4>>
<</if>>
<<else>>
impregnate $him, a task your Stud @@.mediumaquamarine;takes pride in@@ with each and every womb _he2 takes from you.
<</if>>
- <<set $Stud.trust += 3>>
+ <<set _Stud.trust += 3>>
<<set _studRandiness = 1>>
- <<elseif $Stud.trust >= -20>>
- <<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif _Stud.trust >= -20>>
+ <<if (_Stud.fetish == "pregnancy") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
fill $him with child, a task your pregnancy fetishist Stud @@.mediumaquamarine;takes unwarranted pride@@ in.
- <<set $Stud.trust += 3>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.trust += 3>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
- <<set $Stud.fetishStrength += 2>>
+ <<set _Stud.fetishStrength += 2>>
<</if>>
- <<elseif ($Stud.fetish == "dom") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "dom") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
fill $him with child, a task your dominant Stud @@.mediumaquamarine;takes unwarranted pride@@ in.
- <<set $Stud.trust += 3>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.trust += 3>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 dominant tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 2>>
+ <<set _Stud.fetishStrength += 2>>
<</if>>
<<else>>
impregnate $him, a task your Stud @@.mediumaquamarine;takes unwarranted liberties@@ in.
- <<set $Stud.trust += 2>>
+ <<set _Stud.trust += 2>>
<</if>>
<<set _studRandiness = 1>>
<<else>>
- <<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<if (_Stud.fetish == "pregnancy") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
impregnate $him, a task your pregnancy fetishist Stud @@.mediumaquamarine;warms up to@@ in spite of _his2 fear of you.
- <<set $Stud.trust += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.trust += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
- <<set $Stud.fetishStrength += 1>>
+ <<set _Stud.fetishStrength += 1>>
<</if>>
<<set _studRandiness = 1>>
- <<elseif ($Stud.fetish == "masochist") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "masochist") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
provide sperm for $him, a task your masochist Stud @@.mediumaquamarine;takes advantage of,@@ despite _his2 fear of you.
- <<set $Stud.trust += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.trust += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 masochistic tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 1>>
+ <<set _Stud.fetishStrength += 1>>
<</if>>
<<set _studRandiness = -1>>
- <<elseif ($Stud.fetish == "submissive") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "submissive") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
provide sperm for $him, a task your submissive Stud @@.mediumaquamarine;warms up to@@ in spite of _his2 fear of you.
- <<set $Stud.trust += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.trust += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 1>>
+ <<set _Stud.fetishStrength += 1>>
<</if>>
<<set _studRandiness = -1>>
<<else>>
@@ -4511,22 +4512,22 @@
<<set _studRandiness = -1>>
<</if>>
<</if>>
- <<elseif $Stud.devotion <= 20>>
- <<if $Stud.trust >= -20>>
- <<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif _Stud.devotion <= 20>>
+ <<if _Stud.trust >= -20>>
+ <<if (_Stud.fetish == "pregnancy") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
impregnate $him, a task your pregnancy fetishist Stud takes @@.hotpink;hesitant pleasure@@ in.
- <<set $Stud.devotion += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
- <<set $Stud.fetishStrength += 2>>
+ <<set _Stud.fetishStrength += 2>>
<</if>>
<<set _studRandiness = 1>>
- <<elseif ($Stud.fetish == "submissive") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "submissive") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
provide sperm for $him, a task your submissive Stud @@.hotpink;enjoys@@ more than _he2 lets on.
- <<set $Stud.devotion += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 2>>
+ <<set _Stud.fetishStrength += 2>>
<</if>>
<<set _studRandiness = -1>>
<<else>>
@@ -4534,26 +4535,26 @@
<<set _studRandiness = 1>>
<</if>>
<<else>>
- <<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<if (_Stud.fetish == "pregnancy") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
impregnate $him, a task your pregnancy fetishist Stud takes some @@.hotpink;pleasure@@ in, despite _his2 fears of you.
- <<set $Stud.devotion += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 1>>
+ <<set _Stud.fetishStrength += 1>>
<</if>>
- <<elseif ($Stud.fetish == "masochist") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "masochist") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
provide sperm for $him, a task your masochist Stud is @@.hotpink;surprisingly willing@@ to complicate, despite _his2 fear of you, in order to provoke $him.
- <<set $Stud.devotion += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 masochistic tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 1>>
+ <<set _Stud.fetishStrength += 1>>
<</if>>
- <<elseif ($Stud.fetish == "submissive") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "submissive") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
provide sperm for $him, a task your submissive Stud @@.hotpink;is more than happy@@ to allow $him to take responsibility of.
- <<set $Stud.devotion += 1>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 1>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 1>>
+ <<set _Stud.fetishStrength += 1>>
<</if>>
<<else>>
impregnate $him, a task your Stud takes seriously in fear of what will become of $him should $he fail.
@@ -4561,19 +4562,19 @@
<<set _studRandiness = 1>>
<</if>>
<<else>>
- <<if ($Stud.fetish == "pregnancy") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<if (_Stud.fetish == "pregnancy") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
impregnate $him, a task your pregnancy fetishist Stud is @@.hotpink;extremely pleased@@ to take on.
- <<set $Stud.devotion += 2>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 2>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 pregnancy fetish@@ by indulgence.
- <<set $Stud.fetishStrength += 4>>
+ <<set _Stud.fetishStrength += 4>>
<</if>>
- <<elseif ($Stud.fetish == "dom") && ($Stud.fetishKnown == 1) && ($Stud.fetishStrength > 60)>>
+ <<elseif (_Stud.fetish == "dom") && (_Stud.fetishKnown == 1) && (_Stud.fetishStrength > 60)>>
fill $him with child, a task your dominant Stud @@.hotpink;enjoys the perks of.@@
- <<set $Stud.devotion += 2>>
- <<if ($Stud.fetishStrength <= 95)>>
+ <<set _Stud.devotion += 2>>
+ <<if (_Stud.fetishStrength <= 95)>>
The opportunity @@.lightcoral;strengthens _his2 tendencies@@ by indulgence.
- <<set $Stud.fetishStrength += 4>>
+ <<set _Stud.fetishStrength += 4>>
<</if>>
<<else>>
impregnate $him, a task your Stud approaches dutifully.
@@ -4582,16 +4583,16 @@
<</if>>
/* slave's response to the deed */
<<if ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
- <<if $Stud.fuckdoll > 0>>
+ <<if _Stud.fuckdoll > 0>>
<<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
$slaves[$i].slaveName @@.mediumorchid;is not amused@@ that $he is expected to use a syringe to @@.lime;inseminate $himself.@@
<<set $slaves[$i].devotion -= 2>>
<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
- $slaves[$i].slaveName @@.gold;is horrified@@ by the state of $Stud.slaveName and @@.mediumorchid;quite upset@@ that $he is being forced not only to carry _his2 child, but to milk _him2 and inject _his2 cum into $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy until $he @@.lime;conceives.@@
+ $slaves[$i].slaveName @@.gold;is horrified@@ by the state of _Stud.slaveName and @@.mediumorchid;quite upset@@ that $he is being forced not only to carry _his2 child, but to milk _him2 and inject _his2 cum into $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy until $he @@.lime;conceives.@@
<<set $slaves[$i].trust -= 4>>
<<set $slaves[$i].devotion -= 4>>
<<elseif ($slaves[$i].devotion <= 20)>>
- $slaves[$i].slaveName @@.gold;is utterly horrified@@ by the state of $Stud.slaveName and @@.mediumorchid;has to be forced@@ @@.lime;conceive _his2 child.@@
+ $slaves[$i].slaveName @@.gold;is utterly horrified@@ by the state of _Stud.slaveName and @@.mediumorchid;has to be forced@@ @@.lime;conceive _his2 child.@@
<<set $slaves[$i].trust -= 10>>
<<set $slaves[$i].devotion -= 10>>
<<elseif ($slaves[$i].devotion <= 75)>>
@@ -4614,7 +4615,7 @@
<<set $slaves[$i].devotion += 1>>
<</if>>
<</if>>
- <<elseif $Stud.dick == 0>>
+ <<elseif _Stud.dick == 0>>
<<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
$slaves[$i].slaveName feels a need to be bred by your Stud,
<<if _studRandiness == 1>>
@@ -4627,24 +4628,24 @@
<<set $slaves[$i].devotion -= 1>>
<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if _studRandiness == 1>>
- $slaves[$i].slaveName tries to resist _him2, so $Stud.slaveName teaches _him2 that _he2 doesn't need a dick @@.mediumorchid;to rape the poor $girl@@ pregnant. _He2 regularly ejaculating inside $him until @@.lime;conception@@ is confirmed, @@.gold;much to $his terror.@@
+ $slaves[$i].slaveName tries to resist _him2, so _Stud.slaveName teaches _him2 that _he2 doesn't need a dick @@.mediumorchid;to rape the poor $girl@@ pregnant. _He2 regularly ejaculating inside $him until @@.lime;conception@@ is confirmed, @@.gold;much to $his terror.@@
<<set $slaves[$i].devotion -= 4>>
<<set $slaves[$i].trust -= 4>>
<<set _studVaginal = 1>>
<<else>>
- $slaves[$i].slaveName finds $Stud.slaveName is in a similar situation as $he is, so the two of them try to make it as @@.mediumaquamarine;mutuably enjoyable as possible,@@ despite the awkwardness involved, while trying their best to overlook that $Stud.slaveName is being forced to @@.lime;impregnate $him.@@
+ $slaves[$i].slaveName finds _Stud.slaveName is in a similar situation as $he is, so the two of them try to make it as @@.mediumaquamarine;mutuably enjoyable as possible,@@ despite the awkwardness involved, while trying their best to overlook that _Stud.slaveName is being forced to @@.lime;impregnate $him.@@
<<set $slaves[$i].trust += 4>>
- <<set $Stud.trust += 4>>
+ <<set _Stud.trust += 4>>
<<set $slaves[$i].need = 0>>
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
<<if _studRandiness == 1>>
- $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, so $Stud.slaveName is forced to @@.mediumorchid;rape the poor $girl@@ pregnant, regularly squirting cum into $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy until @@.lime;conception@@ is confirmed.
+ $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, so _Stud.slaveName is forced to @@.mediumorchid;rape the poor $girl@@ pregnant, regularly squirting cum into $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy until @@.lime;conception@@ is confirmed.
<<set $slaves[$i].devotion -= 4>>
<<else>>
- $Stud.slaveName doesn't want to do this and shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;reinforcing their dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
+ _Stud.slaveName doesn't want to do this and shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;reinforcing their dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
<<set $slaves[$i].devotion -= 4>>
- <<set $Stud.devotion -= 4>>
+ <<set _Stud.devotion -= 4>>
<</if>>
<<elseif ($slaves[$i].devotion <= 75)>>
<<if ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -4697,7 +4698,7 @@
<<set $slaves[$i].devotion += 1>>
<</if>>
<</if>>
- <<elseif canAchieveErection($Stud) && $Stud.dick <= 7>> /* chastity is temporaily removed, so the only diff between this and canPenetrate() is if the dick actually fits */
+ <<elseif canAchieveErection(_Stud) && _Stud.dick <= 7>> /* chastity is temporaily removed, so the only diff between this and canPenetrate() is if the dick actually fits */
<<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
$slaves[$i].slaveName feels a need to be bred by your Stud,
<<if _studRandiness == 1>>
@@ -4709,24 +4710,24 @@
<<set $slaves[$i].need -= 50>>
<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if _studRandiness == 1>>
- $slaves[$i].slaveName tries to resist _him2, so $Stud.slaveName just @@.mediumorchid;rapes the poor $girl@@ pregnant, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
+ $slaves[$i].slaveName tries to resist _him2, so _Stud.slaveName just @@.mediumorchid;rapes the poor $girl@@ pregnant, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
<<set $slaves[$i].devotion -= 4>>
<<set _rapeAddsFlaw = 1>>
<<else>>
- $slaves[$i].slaveName finds $Stud.slaveName is in a similar situation as $he is, so the two of them try to make it as @@.mediumaquamarine;mutuably enjoyable as possible@@ while trying their best to overlook that $Stud.slaveName is being forced to @@.lime;impregnate $him.@@
+ $slaves[$i].slaveName finds _Stud.slaveName is in a similar situation as $he is, so the two of them try to make it as @@.mediumaquamarine;mutuably enjoyable as possible@@ while trying their best to overlook that _Stud.slaveName is being forced to @@.lime;impregnate $him.@@
<<set $slaves[$i].trust += 4>>
- <<set $Stud.trust += 4>>
+ <<set _Stud.trust += 4>>
<<set $slaves[$i].need = 0>>
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
<<if _studRandiness == 1>>
- $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, but $Stud.slaveName @@.mediumorchid;rapes the poor $girl@@ pregnant anyway, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
+ $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, but _Stud.slaveName @@.mediumorchid;rapes the poor $girl@@ pregnant anyway, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
<<set $slaves[$i].devotion -= 4>>
<<set _rapeAddsFlaw = 1>>
<<else>>
- $Stud.slaveName doesn't want to do this and shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;reinforcing their dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
+ _Stud.slaveName doesn't want to do this and shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;reinforcing their dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
<<set $slaves[$i].devotion -= 4>>
- <<set $Stud.devotion -= 4>>
+ <<set _Stud.devotion -= 4>>
<</if>>
<<elseif ($slaves[$i].devotion <= 75)>>
<<if ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -4784,7 +4785,7 @@
<</if>>
<<set _studPenetrative = 1>>
<<set _studTakesV = 1>>
- <<elseif canAchieveErection($Stud)>>
+ <<elseif canAchieveErection(_Stud)>>
<<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
$slaves[$i].slaveName feels a need to be bred by your Stud, but try as $he might, just can't fit _his2 massive dick inside $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy. Having to take just the tip until $he @@.lime;conceives@@ @@.mediumorchid;isn't satisfying@@ to the ex-dairy cow.
<<set $slaves[$i].devotion -= 1>>
@@ -4792,26 +4793,26 @@
<<set _studTakesV = 1>>
<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<if _studRandiness == 1>>
- $slaves[$i].slaveName tries to resist _him2, so $Stud.slaveName just @@.mediumorchid;rapes the poor $girl@@ pregnant, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
+ $slaves[$i].slaveName tries to resist _him2, so _Stud.slaveName just @@.mediumorchid;rapes the poor $girl@@ pregnant, regularly ejaculating inside $him until @@.lime;conception@@ is confirmed.
<<set $slaves[$i].devotion -= 4>>
<<set _rapeAddsFlaw = 1>>
<<set _studPenetrative = 1>>
<<set _studTakesV = 1>>
<<else>>
- $slaves[$i].slaveName finds $Stud.slaveName is in a similar situation as $he is, so the two of them try to make it as @@.mediumaquamarine;mutuably enjoyable as possible@@ while trying their best to overlook that $Stud.slaveName is being forced to @@.lime;impregnate $him.@@
+ $slaves[$i].slaveName finds _Stud.slaveName is in a similar situation as $he is, so the two of them try to make it as @@.mediumaquamarine;mutuably enjoyable as possible@@ while trying their best to overlook that _Stud.slaveName is being forced to @@.lime;impregnate $him.@@
<<set $slaves[$i].trust += 4>>
- <<set $Stud.trust += 4>>
+ <<set _Stud.trust += 4>>
<<set $slaves[$i].need = 0>>
<<set _studPenetrative = 1>>
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
<<if _studRandiness == 1>>
- $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, so $Stud.slaveName is forced to @@.mediumorchid;rape the poor $girl@@ pregnant, regularly squirting cum into $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy until @@.lime;conception@@ is confirmed.
+ $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred, so _Stud.slaveName is forced to @@.mediumorchid;rape the poor $girl@@ pregnant, regularly squirting cum into $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy until @@.lime;conception@@ is confirmed.
<<set $slaves[$i].devotion -= 4>>
<<else>>
- $Stud.slaveName doesn't want to do this and shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;reinforcing their dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
+ _Stud.slaveName doesn't want to do this and shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;reinforcing their dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
<<set $slaves[$i].devotion -= 4>>
- <<set $Stud.devotion -= 4>>
+ <<set _Stud.devotion -= 4>>
<</if>>
<<elseif ($slaves[$i].devotion <= 75)>>
<<if ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -4881,13 +4882,13 @@
$slaves[$i].slaveName feels a need to be bred by your Stud, but try as $he might, just can't get _him2 hard. Being forced to milk _him2 and inject _his2 seed into $himself until $he @@.lime;conceives@@ @@.mediumorchid;disappoints@@ the ex-dairy cow.
<<set $slaves[$i].devotion -= 1>>
<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
- $slaves[$i].slaveName finds $Stud.slaveName is in a similar situation as $he is, so the two of them work together to make the process @@.mediumaquamarine;as painless as possible,@@ given that $he is @@.lime;coming out of this pregnant,@@ one way or the other.
+ $slaves[$i].slaveName finds _Stud.slaveName is in a similar situation as $he is, so the two of them work together to make the process @@.mediumaquamarine;as painless as possible,@@ given that $he is @@.lime;coming out of this pregnant,@@ one way or the other.
<<set $slaves[$i].trust += 4>>
- <<set $Stud.trust += 4>>
+ <<set _Stud.trust += 4>>
<<elseif ($slaves[$i].devotion <= 20)>>
- $Stud.slaveName shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;building upon their mutual dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
+ _Stud.slaveName shows mercy to the pitiable $slaves[$i].slaveName, @@.mediumorchid;building upon their mutual dislike of you.@@ _He2 still has to @@.lime;force $him to bear _his2 child,@@ however.
<<set $slaves[$i].devotion -= 4>>
- <<set $Stud.devotion -= 4>>
+ <<set _Stud.devotion -= 4>>
<<elseif ($slaves[$i].devotion <= 75)>>
<<if ($slaves[$i].fetish == "pregnancy") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
$slaves[$i].slaveName, a pregnancy fetishist, is @@.hotpink;very willing@@ to milk _him2 and inject $his harvest deep into $his <<if $slaves[$i].mpreg == 1>>ass<</if>>pussy until $he @@.lime;conceives.@@
@@ -4926,12 +4927,12 @@
<</if>>
<</if>>
<</if>>
- <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Stud.ID, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1, $StudCum -= 1>>
+ <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $StudID, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1, $StudCum -= 1>>
<<set $slaves[$i].pregType = setPregType($slaves[$i])>>
- <<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $Stud.ID, 1)>>
+ <<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $StudID, 1)>>
<<if _studPenetrative>>
<<if _studTakesV>> /* Stud may not actually take virginity */
- <<set $Stud.counter.penetrative += 10>>
+ <<set _Stud.counter.penetrative += 10>>
<<set $penetrativeTotal += 10>>
<<set $activeSlave = $slaves[$i]>>
<<if $slaves[$i].mpreg == 1>>
@@ -4949,8 +4950,8 @@
<</if>>
<</if>>
<<if _studVaginal>>
- <<if $Stud.vagina >= 0>>
- <<run seX($Stud, "vaginal", 10)>>
+ <<if _Stud.vagina >= 0>>
+ <<run seX(_Stud, "vaginal", 10)>>
<</if>>
<<if $slaves[$i].mpreg == 1>>
<<run seX($slaves[$i], "anal", 10)>>
@@ -4958,10 +4959,6 @@
<<run seX($slaves[$i], "vaginal", 10)>>
<</if>>
<</if>>
- <<set _saLTE = $slaveIndices[$Stud.ID]>>
- <<if def _saLTE>>
- <<set $slaves[_saLTE] = $Stud>>
- <</if>>
<</if>> /* closes stud impregnation */
<<elseif _conceptionSeed > (50-($reproductionFormula*10))>>
<<switch $slaves[$i].assignment>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 3e5a980cf846817d38657c45612b274245b38fa6..5e698ada3312be015f4e3dbd47787c37993515bf 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -801,32 +801,33 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
<<set $fuckSlaves++>>
<<case "be a subordinate slave">>
<<if $slaves[$i].subTarget == -1>>
- <<set $Stud = $slaves[$i]>>
- <<if $slaves[$i].balls == 0>>
- <span class='slave-name'>$Stud.slaveName</span> no longer has sperm @@.yellow;and cannot serve as a Stud any more.@@<br>
- <<set $Stud = 0>>
- <<elseif $slaves[$i].ballType == "sterile">>
- <span class='slave-name'>$Stud.slaveName</span> no longer produces potent sperm @@.yellow;and cannot serve as a Stud any more.@@<br>
- <<set $Stud = 0>>
- <<elseif $slaves[$i].pubertyXY != 1>>
- <span class='slave-name'>$Stud.slaveName</span> no longer produces mature sperm @@.yellow;and cannot serve as a Stud any more.@@<br>
- <<set $Stud = 0>>
- <<elseif $slaves[$i].vasectomy == 1>>
- <span class='slave-name'>$Stud.slaveName</span> shoots blanks due to a vasectomy @@.yellow;and cannot serve as a Stud any more.@@<br>
- <<set $Stud = 0>>
+ <<set $StudID = $slaves[$i].ID>>
+ <<set _Stud = slaveStateById($StudID)>>
+ <<if _Stud.balls == 0>>
+ <span class='slave-name'>_Stud.slaveName</span> no longer has sperm @@.yellow;and cannot serve as a Stud any more.@@<br>
+ <<set $StudID = 0>>
+ <<elseif _Stud.ballType == "sterile">>
+ <span class='slave-name'>_Stud.slaveName</span> no longer produces potent sperm @@.yellow;and cannot serve as a Stud any more.@@<br>
+ <<set $StudID = 0>>
+ <<elseif _Stud.pubertyXY != 1>>
+ <span class='slave-name'>_Stud.slaveName</span> no longer produces mature sperm @@.yellow;and cannot serve as a Stud any more.@@<br>
+ <<set $StudID = 0>>
+ <<elseif _Stud.vasectomy == 1>>
+ <span class='slave-name'>_Stud.slaveName</span> shoots blanks due to a vasectomy @@.yellow;and cannot serve as a Stud any more.@@<br>
+ <<set $StudID = 0>>
<<elseif $universalRulesImpregnation != "Stud">>
- <span class='slave-name'>$Stud.slaveName</span> is @@.yellow;no longer needed as a Stud.@@
+ <span class='slave-name'>_Stud.slaveName</span> is @@.yellow;no longer needed as a Stud.@@
<</if>>
- <<if $Stud == 0>>
+ <<if $StudID == 0>>
<<set $slaves[$i].subTarget = 0>>
<<else>>
- <<set $StudCum = 2+Math.trunc(($Stud.balls/5)+($Stud.energy/95)+($Stud.health.condition/95)+($Stud.devotion/95)+($reproductionFormula*5)-($Stud.health.tired/25))>>
- <<if $Stud.drugs == "hyper testicle enhancement">>
+ <<set $StudCum = 2+Math.trunc((_Stud.balls/5)+(_Stud.energy/95)+(_Stud.health.condition/95)+(_Stud.devotion/95)+($reproductionFormula*5)-(_Stud.health.tired/25))>>
+ <<if _Stud.drugs == "hyper testicle enhancement">>
<<set $StudCum += 3>>
- <<elseif $Stud.drugs == "testicle enhancement">>
+ <<elseif _Stud.drugs == "testicle enhancement">>
<<set $StudCum += 1>>
<</if>>
- <<if $Stud.diet == "cum production">>
+ <<if _Stud.diet == "cum production">>
<<set $StudCum += 1>>
<</if>>
<</if>>
@@ -934,17 +935,16 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
<<set $slaves[$i].needCap = $slaves[$i].need>>
<</if>>
/* Stud gets off based on impregnations, so we need to check and see if they actually do anyone */
- <<if $Stud>>
- <<set _studIndex = $slaves.findIndex(function(s) { return s.ID === $Stud.ID; })>>
+ <<if $StudID>>
<<set _studCumLimit = $StudCum>>
<<for _sar = 0; _sar < _SL; _sar++>>
- <<if _studCumLimit == 0 || $slaves[_studIndex].need <= 0>>
+ <<if _studCumLimit == 0 || _Stud.need <= 0>>
<<break>>
<</if>>
- <<if canGetPregnant($slaves[$i]) && canBreed($Stud, $slaves[$i]) && $slaves[$i].ID != $Stud.ID>>
- <<set $slaves[_studIndex].need -= 20>>
- <<if $Stud.fetish == "pregnancy">>
- <<set $slaves[_studIndex].need -= 30>>
+ <<if canGetPregnant($slaves[$i]) && canBreed(_Stud, $slaves[$i]) && $slaves[$i].ID != $StudID>>
+ <<set _Stud.need -= 20>>
+ <<if _Stud.fetish == "pregnancy">>
+ <<set _Stud.need -= 30>>
<</if>>
<</if>>
<</for>>
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index 5dbcd93de647e36676763d17737587670e50a16f..ccd8f8edf27d26aaddde165af2d8c57162960bdb 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -7,7 +7,7 @@
<<if $activeSlave.subTarget == $activeSlave.ID>>
<<set $activeSlave.subTarget = 0>>
<<elseif $activeSlave.subTarget == -1>>
- <<if $universalRulesImpregnation != "Stud" || $activeSlave.ID != $Stud.ID>>
+ <<if $universalRulesImpregnation != "Stud" || $activeSlave.ID != $StudID>>
<<set $activeSlave.subTarget = 0>>
<</if>>
<</if>>
@@ -25,7 +25,7 @@
<</if>>
<<if $activeSlave.subTarget == -1>>
- <br><br><<link "Reign $him in" "Subordinate Targeting">><<set $activeSlave.subTarget = 0, $Stud = 0>><</link>>
+ <br><br><<link "Reign $him in" "Subordinate Targeting">><<set $activeSlave.subTarget = 0, $StudID = 0>><</link>>
<<else>>
<br><br>__Select a slave for $him to submit to, sexually:__
<<= App.UI.SlaveList.slaveSelectionList(
@@ -33,8 +33,8 @@
(!isAmputee(State.variables.activeSlave) || !isAmputee(s)),
(s, i) => App.UI.DOM.passageLink(SlaveFullName(s), 'Subordinate Targeting', () => { V.activeSlave.subTarget = s.ID; }),
)>>
- <<if $universalRulesImpregnation == "Stud" && $Stud == 0>>
- <br><br>[[Stud|Subordinate Targeting][$activeSlave.subTarget = -1, $Stud = $activeSlave]]
+ <<if $universalRulesImpregnation == "Stud" && $StudID == 0>>
+ <br><br>[[Stud|Subordinate Targeting][$activeSlave.subTarget = -1, $StudID = $activeSlave.ID]]
<</if>>
<br><br>[[None|Subordinate Targeting][$activeSlave.subTarget = 0]]
<</if>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index eb8a56ad430f1dc62f97146cece4afbc93657c81..33f1b51af3998e977623da9999ed4d1d5d57f0a3 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -530,10 +530,10 @@ Slave nicknames are
Your Head Girl, if able, ''is'' inseminating slaves in the Master Suite. [["Forbid "+$him+" from inseminating Master Suite slaves"|Universal Rules][$universalHGImpregnateMasterSuiteToggle = 1]]
<</if>>
<<elseif $universalRulesImpregnation == "Stud">>
- <<if $Stud == 0>>
+ <<if $StudID == 0>>
Fertile slaves will be ''systematically impregnated by a Stud,'' once you designate a subordinate slave to act as such.
<<else>>
- <<setLocalPronouns $Stud>>
+ <<setLocalPronouns getSlaveStateById($StudID)>>
Fertile slaves will be ''systematically impregnated by your Stud,'' if $he is able to do so.
<</if>>
[[Cancel insemination regime|Universal Rules][($universalRulesImpregnation = "none"),($universalHGImpregnateMasterSuiteToggle = 0)]]