From a2e581c6960f742480681c663eddc389ad441d44 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Thu, 22 Oct 2020 17:12:11 -0700
Subject: [PATCH] quickCorrections [Ready to merge]
---
.../incubator/incubatorRetrievalWorkaround.tw | 17 ++++++------
src/npc/databases/cheatmodeDatabase.tw | 14 +++++-----
src/pregmod/reMaleCitizenHookup.tw | 2 +-
src/pregmod/widgets/bodySwapReaction.tw | 4 +--
src/uncategorized/arcadeReport.tw | 20 +++++++-------
src/uncategorized/nonRandomEvent.tw | 3 +--
src/uncategorized/pRaidResult.tw | 26 +++++++++----------
src/uncategorized/randomNonindividualEvent.tw | 2 +-
src/uncategorized/reBusyMasterSuite.tw | 12 ++++-----
src/uncategorized/seExpiration.tw | 2 +-
10 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/facilities/incubator/incubatorRetrievalWorkaround.tw b/src/facilities/incubator/incubatorRetrievalWorkaround.tw
index f89e5c35906..a7810f8c3c5 100644
--- a/src/facilities/incubator/incubatorRetrievalWorkaround.tw
+++ b/src/facilities/incubator/incubatorRetrievalWorkaround.tw
@@ -10,13 +10,12 @@
<br><br>
- <<set $activeSlave = $readySlave>>
- <<includeDOM App.Desc.longSlave(V.activeSlave)>>
+ <<includeDOM App.Desc.longSlave($readySlave)>>
<<if $readySlave.tankBaby != 3>>
<<if $incubatorOrgans.length > 0>>
<<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>>
<<if $incubatorOrgans[_irw].ID == $readySlave.ID>>
- <<set _newOrgan = {type: $incubatorOrgans[_irw].type, weeksToCompletion: $incubatorOrgans[_irw].weeksToCompletion, ID: $activeSlave.ID}>>
+ <<set _newOrgan = {type: $incubatorOrgans[_irw].type, weeksToCompletion: $incubatorOrgans[_irw].weeksToCompletion, ID: $readySlave.ID}>>
<<if _newOrgan.weeksToCompletion <= 0>>
<<set $completedOrgans.push($incubatorOrgans[_irw])>>
<<else>>
@@ -26,19 +25,21 @@
<</if>>
<</for>>
<</if>>
- <<includeDOM App.UI.newChildIntro($activeSlave)>>
+ <<includeDOM App.UI.newChildIntro($readySlave)>>
<<else>>
+ <<set $activeSlave = $readySlave>> /* $activeSlave is used by husk Slave Swap Workaround */
A husk is ready to be used.
<br>
//As expected, $he is a complete vegetable, but that is what you wanted after all. You lack the facilities to care for $him in this state, so you should do what you are planning quickly. Or you could sell $him to the Flesh Heap.//
+ <<set _price = Math.trunc(slaveCost($readySlave)/3)>>
<span id="result">
<<if $cash >= $surgeryCost>>
<br>[[Contact the bodyswap surgeon.|husk Slave Swap Workaround]] //Will significantly increase the selected slave's upkeep.//
- <br>[[Sell the husk to Flesh Heap.|Main][cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")]]
- //This body can be bought by the Flesh Heap for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>//.
+ <br>[[Sell the husk to Flesh Heap.|Main][cashX(_price, "slaveTransfer")]]
+ //This body can be bought by the Flesh Heap for <<print cashFormat(_price)>>//.
<<else>>
- <<run cashX(Math.trunc(slaveCost($activeSlave)/3), "slaveTransfer")>>
- //You can't sustain $him and thus must sell $him for <<print cashFormat(Math.trunc(slaveCost($activeSlave)/3))>>.//
+ <<run cashX(_price, "slaveTransfer")>>
+ //You can't sustain $him and thus must sell $him for <<print cashFormat(_price)>>.//
<</if>>
</span>
<</if>>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index 479591222ef..5149a727ca4 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -1,7 +1,7 @@
:: Cheatmode Database [nobr]
-<<set $activeSlave = BaseSlave()>>
-<<set _HS = clone($activeSlave)>>
+<<set _slave = BaseSlave()>>
+<<set _HS = clone(_slave)>>
<<set
_HS.slaveName = "Miss Anne",
_HS.birthName = "Lindy Anne",
@@ -61,7 +61,7 @@
<<set $HeadGirlID = _HS.ID>>
//There are quite a few left; their names are _HS.slaveName,//
-<<set _HS = clone($activeSlave)>>
+<<set _HS = clone(_slave)>>
<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, setHealth(_HS, 10), _HS.devotion = 100, _HS.nationality = "Stateless", _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.boobsImplantType = "fillable", _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.buttImplantType = "fillable", _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 100, _HS.skill.entertainment = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 0>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.pubertyXY = 1>>
@@ -71,7 +71,7 @@
<<run newSlave(_HS)>>
//_HS.slaveName,//
-<<set _HS = clone($activeSlave)>>
+<<set _HS = clone(_slave)>>
<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, setHealth(_HS, 10), _HS.devotion = 60, _HS.nationality = "Stateless", _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.boobsImplantType = "normal", _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.buttImplantType = "normal", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.oral = 35, _HS.skill.anal = 35, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["left hand"] = "a large letter 'S'", _HS.custom.desc = "$He speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 1, _HS.ovaries = 1, _HS.skill.vaginal = 35, _HS.pubertyXX = 1>>
@@ -81,7 +81,7 @@
<<run newSlave(_HS)>>
//_HS.slaveName,//
-<<set _HS = clone($activeSlave)>>
+<<set _HS = clone(_slave)>>
<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 60, _HS.nationality = "Stateless", _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty blue cornflower is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
@@ -91,7 +91,7 @@
<<run newSlave(_HS)>>
//_HS.slaveName,//
-<<set _HS = clone($activeSlave)>>
+<<set _HS = clone(_slave)>>
<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), setHealth(_HS, 20), _HS.devotion = 30, _HS.nationality = "Stateless", _HS.muscles = 50, _HS.height = 175, _HS.race = "white", _HS.eye.origColor = "green", _HS.origHColor = "straw blonde", _HS.origSkin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.skill.anal = 35, _HS.skill.combat = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.custom.tattoo = "'Miss Lily' is tattooed in lovely flowing script over $his collarbone.", _HS.custom.desc = "$He once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.ovaries = 1, _HS.pubertyXX = 1>>
@@ -102,7 +102,7 @@
<<set $BodyguardID = _HS.ID>>
//_HS.slaveName,//
-<<set _HS = clone($activeSlave)>>
+<<set _HS = clone(_slave)>>
<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, setHealth(_HS, 20), _HS.devotion = 60, _HS.nationality = "Stateless", _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.skill.oral = 15, _HS.skill.anal = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.custom.tattoo = "A pretty purple lilac is tattooed on each of $his cheeks.", _HS.custom.desc = "$He once spoke with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 100>>
<<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.skill.vaginal = 15, _HS.pubertyXX = 1>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index 4f45c7f0d57..5e0cb31a24f 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -337,7 +337,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
<<elseif _FS != "Youth Preferentialist">>
<<if _S.Concubine && !isAmputee(_S.Concubine)>>
<<setLocalPronouns _S.Concubine>>
- The <<if canSee(_S.Concubine)>>view of your bouncing tits<<elseif canHear($activeSlave)>>sound of lusty sex<<else>>vibrations from your bed bouncing up and down<</if>> is too much for _S.Concubine.slaveName to resist and so $he crawls over to kiss and caress you as your lover finishes.
+ The <<if canSee(_S.Concubine)>>view of your bouncing tits<<elseif canHear(_S.Concubine)>>sound of lusty sex<<else>>vibrations from your bed bouncing up and down<</if>> is too much for _S.Concubine.slaveName to resist and so $he crawls over to kiss and caress you as your lover finishes.
<</if>>
<</if>>
Sometimes society overlooks that you are a woman and have certain needs, but your lover tonight knows exactly how to treat you. When your guest <<if _FS != "Youth Preferentialist">>is finally spent<<else>>wakes up from against your body<</if>>, he showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that @@.green;builds a lasting reputation@@ in the Free Cities.
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index 4367efd12a7..b2629c3363d 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -657,14 +657,14 @@ Now you only have to wait for $him to wake up.
$He quivers a little as $he grabs hold of the @@.lime;two towering protrusions@@ jutting out from $his breasts.
<<case "partially inverted">>
$He quivers a little as $he
- <<if $activeSlave.nipplesPiercing != 0>>
+ <<if $args[0].nipplesPiercing != 0>>
tugs on the piercings, pulling @@.lime;partially inverted nipples@@ out.
<<else>>
teases the @@.lime;little exposed nipples@@ sticking out of $his breasts.
<</if>>
<<case "inverted">>
$He quivers a little as $he
- <<if $activeSlave.nipplesPiercing != 0>>
+ <<if $args[0].nipplesPiercing != 0>>
tugs on the piercings, forcing $his @@.lime;inverted nipples@@ completely out.
<<else>>
accidentally pops one of $his @@.lime;inverted nipples@@ out.
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 9115f68a974..ad3e4c7a549 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -219,7 +219,7 @@
<</if>>
<<if ($arcadeUpgradeFuckdolls == 2)>>
- <<set $activeSlave = 0, _Age = -1, _FD = -1, _MB = -1, _Con = -1>>
+ <<set _currentSlave = 0, _Age = -1, _FD = -1, _MB = -1, _Con = -1>>
<<for _slave range _slaves>>
<<if _slave.sentence == 0>> /* let's not convert slaves we are punishing into Fuckdolls */
<<if (_slave.fetish == "mindbroken")>>
@@ -249,19 +249,19 @@
<</if>>
<</for>>
<<if _FD > -1>>
- <<set $activeSlave = $slaves[_FD]>>
+ <<set _currentSlave = $slaves[_FD]>>
<<elseif _Con > -1>>
- <<set $activeSlave = $slaves[_Con]>>
+ <<set _currentSlave = $slaves[_Con]>>
<<elseif _MB > -1>>
- <<set $activeSlave = $slaves[_MB]>>
+ <<set _currentSlave = $slaves[_MB]>>
<<elseif _Age > -1>>
- <<set $activeSlave = $slaves[_Age]>>
+ <<set _currentSlave = $slaves[_Age]>>
<</if>>
- <<if $activeSlave != 0>>
- <<run App.Utils.setLocalPronouns($activeSlave)>>
- <br> $activeSlave.slaveName is low-quality merchandise, so $he has been converted into a Fuckdoll.
- <<= removeSlave($activeSlave)>>
- <<if $activeSlave == 0>> /% if not zero then technically there was an error INVALID SLAVE %/
+ <<if _currentSlave != 0>>
+ <<run App.Utils.setLocalPronouns(_currentSlave)>>
+ <br> _currentSlave.slaveName is low-quality merchandise, so $he has been converted into a Fuckdoll.
+ <<= removeSlave(_currentSlave)>>
+ <<if _currentSlave == 0>> /% if not zero then technically there was an error INVALID SLAVE %/
<<set $fuckdolls++, _SL-->>
<</if>>
<<else>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 57c3b1f25cf..fb8730ba7f3 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -54,11 +54,10 @@
<<goto "P invasion">>
<<elseif (_effectiveWeek == 44) && ($mercenaries > 0) && $mercRomeo != 1>>
<<set _valid = $slaves.find(function(s) { return (["serve the public", "serve in the club", "whore", "work in the brothel"].includes(s.assignment) || s.counter.publicUse >= 50) && s.fetish != "mindbroken" && s.fuckdoll == 0; })>>
+ <<set $mercRomeo = 1>>
<<if def _valid>>
- <<set $mercRomeo = 1, $activeSlave = 0>>
<<goto "P mercenary romeo">>
<<else>>
- <<set $mercRomeo = 1>>
<<goto "Nonrandom Event">>
<</if>>
<<elseif (_effectiveWeek == 46) && ($mercenaries > 0)>>
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index 8537e1b9306..715eb8b8b74 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -15,22 +15,22 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<<run repX(2500, "event")>>
<<for _prr = 0; _prr < 3; _prr++>>
<<if ($seeDicks > 0)>>
- <<set $activeSlave = GenerateNewSlave("XY")>>
- <<set $activeSlave.origin = "$He is an enslaved refugee who participated in the defeated attack on your arcology.">>
- <<set _newSlaves.push($activeSlave)>>
+ <<set _slave = GenerateNewSlave("XY")>>
+ <<set _slave.origin = "$He is an enslaved refugee who participated in the defeated attack on your arcology.">>
+ <<set _newSlaves.push(_slave)>>
<<else>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
- <<set $activeSlave.origin = "$He is an enslaved refugee who participated in the defeated attack on your arcology.">>
- <<set _newSlaves.push($activeSlave)>>
+ <<set _slave = GenerateNewSlave("XX")>>
+ <<set _slave.origin = "$He is an enslaved refugee who participated in the defeated attack on your arcology.">>
+ <<set _newSlaves.push(_slave)>>
<</if>>
<</for>>
<<elseif $eventResults.raidTarget == 2>>
Under orders to target civilians, your mercenaries head for the isolated group. When the VTOL descends to circle around the large group of refugees, it becomes obvious that it won't even be necessary to expend nonlethal ammunition. A few of the refugees throw themselves down in bitterness, but most just subside into the catatonia of helplessness. They stand quiescent as they are searched, tagged, and loaded onto the VTOL like the wretched human refuse they are. The successful raid @@.green;is the talk of the Free City.@@
<<run repX(1000, "event")>>
<<for _prr = 0; _prr < 4; _prr++>>
- <<set $activeSlave = GenerateNewSlave()>>
- <<set $activeSlave.origin = "$He is an enslaved refugee.">>
- <<set _newSlaves.push($activeSlave)>>
+ <<set _slave = GenerateNewSlave()>>
+ <<set _slave.origin = "$He is an enslaved refugee.">>
+ <<set _newSlaves.push(_slave)>>
<</for>>
<<else>>
<<set _nurseGender = $seeDicks == 100 ? 100 : 0>> /* nurse gender is female unless seeDicks is 100 */
@@ -39,10 +39,10 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<<set $eventResults.slaveMedic = 1>>
<<run repX(1000, "event")>>
<<for _prr = 0; _prr < 5; _prr++>>
- <<set $activeSlave = GenerateNewSlave()>>
- <<set $activeSlave.origin = "$He is an enslaved refugee who was wounded in the defeated attack on your arcology.">>
- <<run setHealth($activeSlave, jsRandom(-50, 40), normalRandInt(20, 3), normalRandInt(15, 3), Math.max(normalRandInt(0, 1), 0), jsRandom(40, 80))>>
- <<set _newSlaves.push($activeSlave)>>
+ <<set _slave = GenerateNewSlave()>>
+ <<set _slave.origin = "$He is an enslaved refugee who was wounded in the defeated attack on your arcology.">>
+ <<run setHealth(_slave, jsRandom(-50, 40), normalRandInt(20, 3), normalRandInt(15, 3), Math.max(normalRandInt(0, 1), 0), jsRandom(40, 80))>>
+ <<set _newSlaves.push(_slave)>>
<</for>>
<</if>>
<br><br>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 542fece06e4..cb31c6422f3 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -86,7 +86,7 @@
<<if $pregInventor == 0>>
<<if $eventSlave.bellyPreg >= 600000 && $eventSlave.counter.birthsTotal > 30 && $eventSlave.ovaries == 1 && canDoVaginal($eventSlave) && canSee($eventSlave)>>
<<if $eventSlave.fetish != "mindbroken" && $eventSlave.fuckdoll == 0>>
- <<if ($eventSlave.devotion > 90 && $eventSlave.trust > 50) || $activeSlave.sexualFlaw == "breeder">>
+ <<if ($eventSlave.devotion > 90 && $eventSlave.trust > 50) || $eventSlave.sexualFlaw == "breeder">>
<<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 50>>
<<set $events.push("RE preg inventor")>>
<</if>>
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index 27aad3256dd..16a1aafe364 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -137,11 +137,11 @@
<<replace "#result">>
<<setLocalPronouns _top.slave 2>>
_S.Concubine.slaveName anticipates you, and is already sliding $himself partway out of _top.slave.slaveName and cocking $his hips to spread $his
- <<if $activeSlave.butt > 15>>
+ <<if _S.Concubine.butt > 15>>
immeasurable
- <<elseif $activeSlave.butt > 10>>
+ <<elseif _S.Concubine.butt > 10>>
expansive
- <<elseif $activeSlave.butt > 7>>
+ <<elseif _S.Concubine.butt > 7>>
enormous
<<elseif (_S.Concubine.butt > 5)>>
huge
@@ -177,11 +177,11 @@
lips
<</if>>
around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina != -1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msSlaves[1].slave.slaveName goes back to fucking _him2. The sex train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _bottomSlave.slaveName is still getting enough stimulation that _he2 whimpers quietly into your <<if ($PC.vagina != -1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_bottomSlave.skill.oral >= 100)>>masterful, despite the distraction<<elseif (_bottomSlave.skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _bottomSlave.slaveName start groping your concubine _S.Concubine.slaveName's
- <<if $activeSlave.butt > 15>>
+ <<if _S.Concubine.butt > 15>>
immeasurable
- <<elseif $activeSlave.butt > 10>>
+ <<elseif _S.Concubine.butt > 10>>
expansive
- <<elseif $activeSlave.butt > 7>>
+ <<elseif _S.Concubine.butt > 7>>
enormous
<<elseif (_S.Concubine.butt > 5)>>
huge
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index f69d0b9b270..2215d712e8f 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -206,5 +206,5 @@
<<print getSlave($expiree).assignment>>.
<</if>>
</div>
- <<includeDOM slaveImpactLongTerm(V.activeSlave)>>
+ <<includeDOM slaveImpactLongTerm(getSlave($expiree))>>
</div>
\ No newline at end of file
--
GitLab