diff --git a/src/pregmod/FCTV/seFCTVremote.tw b/src/pregmod/FCTV/seFCTVremote.tw
index c4d15cb5c6df828603b4e019972dd326d63523ad..219ba46e1e7b9caa62718486038b5130014c7817 100644
--- a/src/pregmod/FCTV/seFCTVremote.tw
+++ b/src/pregmod/FCTV/seFCTVremote.tw
@@ -235,14 +235,13 @@
<p id="result">
<<set _ContractCost = 1000>>
<<if $cash >= _ContractCost>>
- <<set $activeSlave = _slave>>
<div>
<<link "Enslave $him">>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", _slave)>>
<<replace "#result">>
<<set $analTotal++>>
_slave.slaveName knows $he has nowhere to turn. Sobbing, $he complies with the process.
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>>
</div>
@@ -296,7 +295,7 @@
<</if>>
<<run repX(500, "event", _slave)>>
<<set $arcologies[0].prosperity += 2>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>>
</div>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index f38bcd56b4a58460e368b028a74658ae8137ee2d..3cfca0248129a6a359a32e3c07796afc08c6cdf1 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -89,12 +89,12 @@
$He forces $his <<print rivalryTerm(_S.Madam)>>, to service all the men in the brothel.
<<set _slave.devotion -= 2, _slave.trust -= 2>>
<<if canDoVaginal(_slave)>>
- <<run seX($activeSlave, "vaginal", "public", "penetrative", 10)>>
+ <<run seX(_slave, "vaginal", "public", "penetrative", 10)>>
<</if>>
<<if canDoAnal(_slave)>>
- <<run seX($activeSlave, "anal", "public", "penetrative", 12)>>
+ <<run seX(_slave, "anal", "public", "penetrative", 12)>>
<</if>>
- <<run seX($activeSlave, "anal", "public", "penetrative", 10)>>
+ <<run seX(_slave, "anal", "public", "penetrative", 10)>>
<<if random(1,100) > 65>>
<<set _S.Madam.rivalry++, _slave.rivalry++>>
<</if>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 1c17bf64e4b5a798ee73851963338a57515ac1ed..dfedb8a41eab985bef489fd720ef02c6972706d5 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -5,158 +5,141 @@
<<switch _event>>
<<case "slave deal">>
<<set _ContractCost = 5000>>
- <<set $activeSlaveOneTimeMinAge = 24>>
- <<set $activeSlaveOneTimeMaxAge = 42>>
- <<set $one_time_age_overrides_pedo_mode = 1>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
- <<set $activeSlave.origin = "$He sold $himself into slavery to buy medical care for $his daughter.">>
- <<set $activeSlave.devotion = random(25,30)>>
- <<set $activeSlave.trust = $activeSlave.devotion-20>>
- <<set $activeSlave.oldDevotion = $activeSlave.devotion>>
- <<run setHealth($activeSlave, jsRandom(0, 20))>>
- <<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.vagina = random(1,2)>>
- <<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.counter.birthsTotal = 1>>
- <<set $activeSlave.shouldersTat = either("flowers", "tribal patterns")>>
- <<set $activeSlave.stampTat = either("flowers", "tribal patterns")>>
+ <<set _slave = GenerateNewSlave("XX", {minAge: 24, maxAge: 42, ageOverridesPedoMode: 1, disableDisability: 1})>>
+ <<set _slave.origin = "$He sold $himself into slavery to buy medical care for $his daughter.">>
+ <<set _slave.devotion = random(25,30)>>
+ <<set _slave.trust = _slave.devotion-20>>
+ <<set _slave.oldDevotion = _slave.devotion>>
+ <<run setHealth(_slave, jsRandom(0, 20))>>
+ <<set _slave.earPiercing = 1>>
+ <<set _slave.vagina = random(1,2)>>
+ <<set _slave.ovaries = 1>>
+ <<set _slave.counter.birthsTotal = 1>>
+ <<set _slave.shouldersTat = either("flowers", "tribal patterns")>>
+ <<set _slave.stampTat = either("flowers", "tribal patterns")>>
<<case "breeding deal">>
<<set _ContractCost = 40000>>
- <<set $activeSlaveOneTimeMinAge = $fertilityAge+3>>
- <<set $activeSlaveOneTimeMaxAge = 24>>
- <<set $one_time_age_overrides_pedo_mode = 1>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
- <<set $activeSlave.origin = "$He was raised to be a mother.">>
- <<set $activeSlave.career = "a breeder">>
- <<set $activeSlave.devotion = random(10,25)>>
- <<set $activeSlave.trust = $activeSlave.devotion>>
- <<run setHealth($activeSlave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>>
- <<set $activeSlave.anus = 0>>
- <<set $activeSlave.vagina = 3>>
- <<set $activeSlave.skill.anal = 0>>
- <<set $activeSlave.skill.oral = 0>>
- <<set $activeSlave.skill.whoring = 0>>
- <<set $activeSlave.skill.vaginal = 0>>
- <<set $activeSlave.skill.entertainment = 0>>
- <<set $activeSlave.bellySag = 10>>
- <<set $activeSlave.bellySagPreg = 10>>
- <<set $activeSlave.counter.birthsTotal = 3>>
- <<set $activeSlave.hips = 2>>
- <<set $activeSlave.boobs = random(4,6)*100>>
+ <<set _slave = GenerateNewSlave("XX", {minAge: $fertilityAge+3, maxAge: 42, ageOverridesPedoMode: 1, disableDisability: 1})>>
+ <<set _slave.origin = "$He was raised to be a mother.">>
+ <<set _slave.career = "a breeder">>
+ <<set _slave.devotion = random(10,25)>>
+ <<set _slave.trust = _slave.devotion>>
+ <<run setHealth(_slave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>>
+ <<set _slave.anus = 0>>
+ <<set _slave.vagina = 3>>
+ <<set _slave.skill.anal = 0>>
+ <<set _slave.skill.oral = 0>>
+ <<set _slave.skill.whoring = 0>>
+ <<set _slave.skill.vaginal = 0>>
+ <<set _slave.skill.entertainment = 0>>
+ <<set _slave.bellySag = 10>>
+ <<set _slave.bellySagPreg = 10>>
+ <<set _slave.counter.birthsTotal = 3>>
+ <<set _slave.hips = 2>>
+ <<set _slave.boobs = random(4,6)*100>>
<<if $seePreg == 1>>
- <<set $activeSlave.belly = 18000>>
+ <<set _slave.belly = 18000>>
<</if>>
<<case "slave training">>
<<set _ContractCost = 10000>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("XY")>>
- <<set $activeSlave.origin = "You bought out a deal involving $him training to be an expert gelded sex slave.">>
- <<set $activeSlave.devotion = random(30,40)>>
- <<set $activeSlave.trust = $activeSlave.devotion>>
- <<set $activeSlave.oldDevotion = $activeSlave.devotion>>
- <<run setHealth($activeSlave, jsRandom(60, 80), 0, 0, 0, jsRandom(10, 30))>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.anus = 2>>
- <<set $activeSlave.skill.anal = 35>>
- <<set $activeSlave.skill.oral = 35>>
- <<set $activeSlave.skill.whoring = 35>>
- <<set $activeSlave.skill.entertainment = 35>>
- <<set $activeSlave.nipplesPiercing = 1>>
- <<set $activeSlave.clitPiercing = 1>>
- <<set $activeSlave.dickPiercing = 1>>
- <<set $activeSlave.anusPiercing = 1>>
- <<set $activeSlave.lipsPiercing = 1>>
- <<set $activeSlave.tonguePiercing = 1>>
- <<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.nosePiercing = 1>>
- <<set $activeSlave.eyebrowPiercing = 1>>
- <<set $activeSlave.navelPiercing = 1>>
- <<set $activeSlave.boobsTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.buttTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.vaginaTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.dickTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.lipsTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.anusTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.shouldersTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.armsTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.legsTat = either("advertisements", "degradation", "rude words")>>
- <<set $activeSlave.stampTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave = GenerateNewSlave("XY", {disableDisability: 1})>>
+ <<set _slave.origin = "You bought out a deal involving $him training to be an expert gelded sex slave.">>
+ <<set _slave.devotion = random(30,40)>>
+ <<set _slave.trust = _slave.devotion>>
+ <<set _slave.oldDevotion = _slave.devotion>>
+ <<run setHealth(_slave, jsRandom(60, 80), 0, 0, 0, jsRandom(10, 30))>>
+ <<set _slave.balls = 0>>
+ <<set _slave.anus = 2>>
+ <<set _slave.skill.anal = 35>>
+ <<set _slave.skill.oral = 35>>
+ <<set _slave.skill.whoring = 35>>
+ <<set _slave.skill.entertainment = 35>>
+ <<set _slave.nipplesPiercing = 1>>
+ <<set _slave.clitPiercing = 1>>
+ <<set _slave.dickPiercing = 1>>
+ <<set _slave.anusPiercing = 1>>
+ <<set _slave.lipsPiercing = 1>>
+ <<set _slave.tonguePiercing = 1>>
+ <<set _slave.earPiercing = 1>>
+ <<set _slave.nosePiercing = 1>>
+ <<set _slave.eyebrowPiercing = 1>>
+ <<set _slave.navelPiercing = 1>>
+ <<set _slave.boobsTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.buttTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.vaginaTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.dickTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.lipsTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.anusTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.shouldersTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.armsTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.legsTat = either("advertisements", "degradation", "rude words")>>
+ <<set _slave.stampTat = either("advertisements", "degradation", "rude words")>>
<<case "majority deal">>
<<set _ContractCost = 20000>>
- <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
- <<set $activeSlaveOneTimeMaxAge = 18>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave()>>
- <<set $activeSlave.origin = "$He was raised to be a slave, since $he was mistakenly thought to be from good slave stock.">>
- <<set $activeSlave.career = "a slave">>
- <<set $activeSlave.devotion = random(10,15)>>
- <<set $activeSlave.trust = $activeSlave.devotion>>
- <<set $activeSlave.oldDevotion = $activeSlave.devotion>>
- <<run setHealth($activeSlave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>>
- <<if $activeSlave.dick == 0>>
- <<set $activeSlave.vagina = 0>>
- <<set $activeSlave.ovaries = 1>>
- <<elseif $activeSlave.balls == 0>>
- <<set $activeSlave.balls = 1>>
+ <<set _slave = GenerateNewSlave("", , {minAge: $minimumSlaveAge, maxAge: 18, disableDisability: 1})>>
+ <<set _slave.origin = "$He was raised to be a slave, since $he was mistakenly thought to be from good slave stock.">>
+ <<set _slave.career = "a slave">>
+ <<set _slave.devotion = random(10,15)>>
+ <<set _slave.trust = _slave.devotion>>
+ <<set _slave.oldDevotion = _slave.devotion>>
+ <<run setHealth(_slave, jsRandom(80, 90), 0, 0, 0, jsRandom(10, 30))>>
+ <<if _slave.dick == 0>>
+ <<set _slave.vagina = 0>>
+ <<set _slave.ovaries = 1>>
+ <<elseif _slave.balls == 0>>
+ <<set _slave.balls = 1>>
<</if>>
- <<set $activeSlave.anus = 0>>
- <<set $activeSlave.skill.anal = 0>>
- <<set $activeSlave.skill.oral = 0>>
- <<set $activeSlave.skill.whoring = 0>>
- <<set $activeSlave.skill.vaginal = 0>>
- <<set $activeSlave.skill.entertainment = 0>>
+ <<set _slave.anus = 0>>
+ <<set _slave.skill.anal = 0>>
+ <<set _slave.skill.oral = 0>>
+ <<set _slave.skill.whoring = 0>>
+ <<set _slave.skill.vaginal = 0>>
+ <<set _slave.skill.entertainment = 0>>
<<case "indenture deal">>
<<set _ContractCost = 7500>>
- <<set $activeSlaveOneTimeMinAge = 24>>
- <<set $activeSlaveOneTimeMaxAge = 42>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave()>>
- <<run setHealth($activeSlave, jsRandom(-20, 20))>>
- <<set $activeSlave.anus = 2>>
- <<if $activeSlave.vagina > -1>>
- <<set $activeSlave.vagina = 2>>
+ <<set _slave = GenerateNewSlave("", , {minAge: 24, maxAge: 42, disableDisability: 1})>>
+ <<run setHealth(_slave, jsRandom(-20, 20))>>
+ <<set _slave.anus = 2>>
+ <<if _slave.vagina > -1>>
+ <<set _slave.vagina = 2>>
<</if>>
- <<set $activeSlave.skill.vaginal = 15>>
- <<set $activeSlave.skill.oral = 15>>
- <<set $activeSlave.skill.anal = 15>>
- <<set $activeSlave.skill.whoring = 0>>
- <<set $activeSlave.skill.entertainment = 15>>
- <<set $activeSlave.boobs += 600>>
- <<set $activeSlave.boobsImplant = 600>>
- <<set $activeSlave.boobsImplantType = "normal">>
- <<set $activeSlave.butt += 1>>
- <<set $activeSlave.buttImplant = 1>>
- <<set $activeSlave.buttImplantType = "normal">>
- <<set $activeSlave.lips += 10>>
- <<set $activeSlave.lipsImplant = 10>>
- <<set $activeSlave.lipsPiercing = 1>>
- <<set $activeSlave.tonguePiercing = 1>>
- <<set $activeSlave.earPiercing = 1>>
- <<set $activeSlave.nosePiercing = 1>>
- <<set $activeSlave.eyebrowPiercing = 1>>
- <<set $activeSlave.navelPiercing = 1>>
- <<set $activeSlave.nipplesPiercing = 1>>
- <<set $activeSlave.clitPiercing = 1>>
- <<set $activeSlave.stampTat = either("flowers", "tribal patterns")>>
+ <<set _slave.skill.vaginal = 15>>
+ <<set _slave.skill.oral = 15>>
+ <<set _slave.skill.anal = 15>>
+ <<set _slave.skill.whoring = 0>>
+ <<set _slave.skill.entertainment = 15>>
+ <<set _slave.boobs += 600>>
+ <<set _slave.boobsImplant = 600>>
+ <<set _slave.boobsImplantType = "normal">>
+ <<set _slave.butt += 1>>
+ <<set _slave.buttImplant = 1>>
+ <<set _slave.buttImplantType = "normal">>
+ <<set _slave.lips += 10>>
+ <<set _slave.lipsImplant = 10>>
+ <<set _slave.lipsPiercing = 1>>
+ <<set _slave.tonguePiercing = 1>>
+ <<set _slave.earPiercing = 1>>
+ <<set _slave.nosePiercing = 1>>
+ <<set _slave.eyebrowPiercing = 1>>
+ <<set _slave.navelPiercing = 1>>
+ <<set _slave.nipplesPiercing = 1>>
+ <<set _slave.clitPiercing = 1>>
+ <<set _slave.stampTat = either("flowers", "tribal patterns")>>
<<default>>
<<set _ContractCost = 10000>>
- <<set $activeSlaveOneTimeMaxAge = 22>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave()>>
- <<set $activeSlave.origin = "You bought out a deal for $his sale after the seller took $his virginity and the buyer no longer wanted $him.">>
- <<set $activeSlave.counter.publicUse += 10>>
- <<set $activeSlave.devotion = random(25,30)>>
- <<set $activeSlave.trust = $activeSlave.devotion-20>>
- <<set $activeSlave.oldDevotion = $activeSlave.devotion>>
- <<run setHealth($activeSlave, jsRandom(0, 20))>>
- <<set $activeSlave.anus = 2>>
- <<if $activeSlave.dick == 0>>
- <<set $activeSlave.vagina = 2>>
- <<set $activeSlave.ovaries = 1>>
- <<if isFertile($activeSlave) && $seePreg == 1>>
- <<= knockMeUp($activeSlave, 100, 2, -2, 1)>>
+ <<set _slave = GenerateNewSlave("", {maxAge: 22, disableDisability: 1})>>
+ <<set _slave.origin = "You bought out a deal for $his sale after the seller took $his virginity and the buyer no longer wanted $him.">>
+ <<set _slave.counter.publicUse += 10>>
+ <<set _slave.devotion = random(25,30)>>
+ <<set _slave.trust = _slave.devotion-20>>
+ <<set _slave.oldDevotion = _slave.devotion>>
+ <<run setHealth(_slave, jsRandom(0, 20))>>
+ <<set _slave.anus = 2>>
+ <<if _slave.dick == 0>>
+ <<set _slave.vagina = 2>>
+ <<set _slave.ovaries = 1>>
+ <<if isFertile(_slave) && $seePreg == 1>>
+ <<= knockMeUp(_slave, 100, 2, -2, 1)>>
<</if>>
<</if>>
<</switch>>
@@ -164,14 +147,14 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt(_slave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt(_slave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(_slave)>>
<<= capFirstChar($assistant.name)>> breaks in on your sleep with an urgent message. You push a slave off you and sit up to take it. As the owner of the arcology, you perform some functions that would traditionally be the province of a government. In this anarcho-liberal polity, it's still necessary for people making deals to have someone to appeal to when disputes arise. Part of your agreement with your tenants is that you will perform this duty on deals between two tenants. The message is about just such a disagreement; they always seem to happen in the middle of the night, and they're always urgent.
@@ -186,8 +169,8 @@
A small-time slave breeder is accusing a customer of reneging on their agreement. For the last nine months, one of his best breeders has been busy growing his client's future slave and now
<<if $seePreg == 1>>
that $he's ready to give birth,
- <<set $activeSlave.belly = 0>>
- <<set $activeSlave.pregWeek = -3>>
+ <<set _slave.belly = 0>>
+ <<set _slave.pregWeek = -3>>
<<else>>
that it's born,
<</if>>
@@ -245,7 +228,7 @@
<br><br>
<<set $arcologies[0].prosperity += 5>>
<<run repX(2500, "event")>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
<<case "breeding deal">>
@@ -281,7 +264,7 @@
<br><br>
<<set $arcologies[0].prosperity += 3>>
<<run repX(300, "event")>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
<<case "slave training">>
@@ -313,7 +296,7 @@
<br><br>
<<set $arcologies[0].prosperity += 5>>
<<run repX(2500, "event")>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
<<case "majority deal">>
@@ -345,7 +328,7 @@
<br><br>
<<set $arcologies[0].prosperity += 3>>
<<run repX(1500, "event")>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
<<case "indenture deal">>
@@ -371,33 +354,33 @@
<</replace>>
<</link>>
<br><<link "Buy out the contract and $his indenture">>
- <<set $activeSlave.devotion = random(10,15)>>
- <<set $activeSlave.trust = $activeSlave.devotion+4>>
- <<set $activeSlave.oldDevotion = $activeSlave.devotion>>
- <<set $activeSlave.indenture = random(52,78)>>
- <<set $activeSlave.indentureRestrictions = 2>>
- <<set $activeSlave.origin = "You took over $his indenture after $he launched a legal complaint against an abusive master.">>
+ <<set _slave.devotion = random(10,15)>>
+ <<set _slave.trust = _slave.devotion+4>>
+ <<set _slave.oldDevotion = _slave.devotion>>
+ <<set _slave.indenture = random(52,78)>>
+ <<set _slave.indentureRestrictions = 2>>
+ <<set _slave.origin = "You took over $his indenture after $he launched a legal complaint against an abusive master.">>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer")>>
<<replace "#result">>
You offer to simply buy out the indenture contract, thereby acquiring $him, to which both parties readily agree. This decision is viewed as @@.green;incredibly generous@@ by both your arcology's romantically-minded and financially-inclined citizens. For their part, your new servant is hopeful that you will be more considerate of $his health, while the former holder is just happy to have $him off his hands.
<br><br>
<<set $arcologies[0].prosperity += 3>>
<<run repX(1500, "event")>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the servant as such//
<br><<link "Buy out the contract and enslave $him">>
- <<set $activeSlave.origin = "$He was enslaved after you manipulated $his deal for indentured servitude.">>
- <<set $activeSlave.devotion = random(-10,-15)>>
- <<set $activeSlave.trust = $activeSlave.devotion+4>>
- <<set $activeSlave.oldDevotion = $activeSlave.devotion>>
+ <<set _slave.origin = "$He was enslaved after you manipulated $his deal for indentured servitude.">>
+ <<set _slave.devotion = random(-10,-15)>>
+ <<set _slave.trust = _slave.devotion+4>>
+ <<set _slave.oldDevotion = _slave.devotion>>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer")>>
<<replace "#result">>
You quietly contact the trader and suggest an alternative method of settling the dispute. He is surprised, but agrees readily, chuckling at how the "recalcitrant bitch" is going to be dealt with. To $his horror, $he finds that your near-total power over deals made in your arcology has been employed to saddle $him with additional debts that, under $his indentured servitude, $he cannot hope to repay. It is then the work of ten minutes to demand payment, and when $he cannot pay, demand $his body for enslavement. The story of your cunning @@.green;impresses@@ the slave traders, but is @@.red;booed@@ by fairer-minded citizens.
<br><br>
<<set $arcologies[0].prosperity += 5>>
<<run repX(-100, "event")>>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the servant as a slave//
<<default>>
@@ -427,7 +410,7 @@
<<replace "#result">>
You offer to simply buy out the contract, taking the slave for yourself. This lets the buyer out of buying $him, and the slaveowner gets his money; but it soon becomes apparent that what both of them were really looking for is an opportunity to put one over on the other. Neither is pleased to be denied a petty victory, but they both have the sense to keep their mouths shut. The poor slave, meanwhile, appears in the penthouse entryway, @@.hotpink;hopeful@@ that $he's been lucky enough to end up in a less abusive situation.
<br><br>
- <<includeDOM App.UI.newSlaveIntro($activeSlave)>>
+ <<includeDOM App.UI.newSlaveIntro(_slave)>>
<</replace>>
<</link>> //This will cost <<print cashFormat(_ContractCost)>> and give you the slave//
<</switch>>
diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw
index 8915829ca70f2d4d98612fbd983058fa701c75ec..2fb31a157b8ebfdd9510bb60364b387ca5bf9fda 100644
--- a/src/uncategorized/pInvasion.tw
+++ b/src/uncategorized/pInvasion.tw
@@ -97,13 +97,13 @@ The loose militia lately organized by the arcology owners has been called out to
<<for _i = 0; _i < 3; _i++>>
<<if (random(0,99) < $seeDicks)>>
<<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("XY")>>
+ <<set _slave = GenerateNewSlave("XY")>>
<<else>>
<<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set _slave = GenerateNewSlave("XX")>>
<</if>>
- <<set $activeSlave.origin = "$He is an enslaved prisoner of war.">>
- <<set _newSlaves.push($activeSlave)>>
+ <<set _slave.origin = "$He is an enslaved prisoner of war.">>
+ <<set _newSlaves.push(_slave)>>
<</for>>
<<set $menials += 5>>
diff --git a/src/uncategorized/peCombatTraining.tw b/src/uncategorized/peCombatTraining.tw
index ac6e057acb857fb219ea3198f0cf1c2112b03169..ab8168d04d47bcc89cbc5bd05035d0dba3ce9327 100644
--- a/src/uncategorized/peCombatTraining.tw
+++ b/src/uncategorized/peCombatTraining.tw
@@ -1,23 +1,22 @@
:: PE combat training [nobr]
-<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
-<<set $activeSlave = _S.Bodyguard>>
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(S.Bodyguard)>>
<span id="art-frame">
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt(_S.Bodyguard, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt(_S.Bodyguard, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
</span>
-<<= App.UI.slaveDescriptionDialog($activeSlave)>> has many duties as a bodyguard, and $his schedule is carefully built to allow $him to complete them. When you're at your desk in your penthouse and there are no guests to intimidate, $his services are least needed, so $he typically uses these lulls to catch up on sleep or train.
+<<= App.UI.slaveDescriptionDialog(_S.Bodyguard)>> has many duties as a bodyguard, and $his schedule is carefully built to allow $him to complete them. When you're at your desk in your penthouse and there are no guests to intimidate, $his services are least needed, so $he typically uses these lulls to catch up on sleep or train.
<br><br>
The feed from the small armory next door shows $him doing the latter. $He has finished working with a heavy practice sword, and has moved to the tiny, one-shooter range. $He seems frustrated, hurrying $his shots and missing unnecessarily.
@@ -26,23 +25,23 @@ The feed from the small armory next door shows $him doing the latter. $He has fi
<span id="result">
<<link "Instruct $him">>
<<replace "#result">>
- $activeSlave.slaveName starts as you enter the range and don ear protection. $He is distracted by your body against $hers as you come in close to correct $his stance, but $he concentrates hard for you. You take whatever time you can spare over the week for serious lessons. $He @@.green;is diligent and learns well,@@ and @@.mediumaquamarine;places greater trust@@ in your judgment.
- <<set $activeSlave.trust += 4>>
- <<set $activeSlave.skill.combat = 1>>
+ _S.Bodyguard.slaveName starts as you enter the range and don ear protection. $He is distracted by your body against $hers as you come in close to correct $his stance, but $he concentrates hard for you. You take whatever time you can spare over the week for serious lessons. $He @@.green;is diligent and learns well,@@ and @@.mediumaquamarine;places greater trust@@ in your judgment.
+ <<set _S.Bodyguard.trust += 4>>
+ <<set _S.Bodyguard.skill.combat = 1>>
<</replace>>
<</link>>
<br><<link "Promise $him a sexual reward if $he improves">>
<<replace "#result">>
- Over the feed, you tell $activeSlave.slaveName that $he can have $his choice of sexual release if $he scores well on the next set of targets. $He concentrates desperately, trying to ignore $his mounting arousal as $he imagines enjoying <<if $activeSlave.fetish == "none">>passionate sexual<<elseif $activeSlave.fetish == "boobs">>breast<<else>>$activeSlave.fetish<</if>> play. $He barely makes the stated score, and hurries smiling in for $his reward. $He feels @@.hotpink;closer to you,@@ but is distracted from any real learning and does not become a better fighter.
- <<set $activeSlave.devotion += 4>>
- <<if canDoVaginal($activeSlave)>>
- <<= VCheck.Vaginal($activeSlave, 1)>>
- <<elseif canDoAnal($activeSlave)>>
- <<= VCheck.Anal($activeSlave, 1)>>
+ Over the feed, you tell _S.Bodyguard.slaveName that $he can have $his choice of sexual release if $he scores well on the next set of targets. $He concentrates desperately, trying to ignore $his mounting arousal as $he imagines enjoying <<if _S.Bodyguard.fetish == "none">>passionate sexual<<elseif _S.Bodyguard.fetish == "boobs">>breast<<else>>_S.Bodyguard.fetish<</if>> play. $He barely makes the stated score, and hurries smiling in for $his reward. $He feels @@.hotpink;closer to you,@@ but is distracted from any real learning and does not become a better fighter.
+ <<set _S.Bodyguard.devotion += 4>>
+ <<if canDoVaginal(_S.Bodyguard)>>
+ <<= VCheck.Vaginal(_S.Bodyguard, 1)>>
+ <<elseif canDoAnal(_S.Bodyguard)>>
+ <<= VCheck.Anal(_S.Bodyguard, 1)>>
<<else>>
- <<set $activeSlave.counter.oral += 1>>
+ <<set _S.Bodyguard.counter.oral += 1>>
<<set $oralTotal += 1>>
<</if>>
<</replace>>
-<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
+<</link>><<if canDoVaginal(_S.Bodyguard) && (_S.Bodyguard.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal(_S.Bodyguard) && (_S.Bodyguard.anus == 0)>> //This option will take anal virginity//<</if>>
</span>
diff --git a/src/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw
index 86dfa5d7787de7b8459fedd0d4af9678541eafd1..ceb352bcd667e96cdaaec1518a1a9cd4ff9e1dd1 100644
--- a/src/uncategorized/reShippingContainer.tw
+++ b/src/uncategorized/reShippingContainer.tw
@@ -8,12 +8,12 @@
<<set _newSlaves = []>>
<<for _reShip = 0; _reShip < 5; _reShip++>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
- <<set $activeSlave.origin = "$He arrived at your arcology in an undocumented shipping container.">>
- <<set $activeSlave.devotion = random(-90,-75)>>
- <<set $activeSlave.trust = -20>>
- <<run setHealth($activeSlave, -10, undefined, undefined, undefined, random(50, 100))>>
- <<set _newSlaves.push($activeSlave)>>
+ <<set _slave = GenerateNewSlave("XX")>>
+ <<set _slave.origin = "$He arrived at your arcology in an undocumented shipping container.">>
+ <<set _slave.devotion = random(-90,-75)>>
+ <<set _slave.trust = -20>>
+ <<run setHealth(_slave, -10, undefined, undefined, undefined, random(50, 100))>>
+ <<set _newSlaves.push(_slave)>>
<</for>>
<<set $menials += 25>>
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index 1f3eb18132b511a688b2a3680510252b21897426..b0c69db8c83c1b5c747e9f89439afc027ca3e14a 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -1899,7 +1899,7 @@
<<set _slave1.relationship = -3>>
<<run seX(_slave1, "oral", "public", "penetrative", 50)>>
- <<if canDoAnal($activeSlave)>>
+ <<if canDoAnal(_slave1)>>
<<run seX(_slave1, "anal", "public", "penetrative", 50)>>
<</if>>
<<if canGetPregnant(_slave1) && _slave1.eggType == "human">>
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index 8927368a2298d284ec0db504e4ebe2456bf7c606..047be1879fffb4333043042016dab404d771a19f 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -2,40 +2,41 @@
<<set $nextButton = "Back", $nextLink = "AS Dump">>
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+<<run App.Utils.setLocalPronouns(getSlave($AS))>>
-<<if $activeSlave.subTarget == $activeSlave.ID>>
- <<set $activeSlave.subTarget = 0>>
-<<elseif $activeSlave.subTarget == -1>>
- <<if $universalRulesImpregnation != "Stud" || $activeSlave.ID != $StudID>>
- <<set $activeSlave.subTarget = 0>>
+<<if getSlave($AS).subTarget == getSlave($AS).ID>>
+ <<set getSlave($AS).subTarget = 0>>
+<<elseif getSlave($AS).subTarget == -1>>
+ <<if $universalRulesImpregnation != "Stud" || getSlave($AS).ID != $StudID>>
+ <<set getSlave($AS).subTarget = 0>>
<</if>>
<</if>>
-<<if $activeSlave.assignment !== "be a subordinate slave">>
- <<= assignJob($activeSlave, "be a subordinate slave")>>
+<<if getSlave($AS).assignment !== "be a subordinate slave">>
+ <<= assignJob(getSlave($AS), "be a subordinate slave")>>
<</if>>
-<<set _st = $slaveIndices[$activeSlave.subTarget]>>
+<<set _st = $slaveIndices[getSlave($AS).subTarget]>>
+<<= getSlave($AS).slaveName>>
<<if def _st>>
- $activeSlave.slaveName will submit to <span class='slave-name'>$slaves[_st].slaveName</span> this week.
-<<elseif $activeSlave.subTarget == -1>>
- $activeSlave.slaveName is acting as your Stud and is tasked with keeping your chattel pregnant.
+ will submit to <span class='slave-name'>$slaves[_st].slaveName</span> this week.
+<<elseif getSlave($AS).subTarget == -1>>
+ is acting as your Stud and is tasked with keeping your chattel pregnant.
<<else>>
- $activeSlave.slaveName has not been given to any particular slave, so $he will have to offer $himself to everyone this week.
- <<set $activeSlave.subTarget = 0>>
+ has not been given to any particular slave, so $he will have to offer $himself to everyone this week.
+ <<set getSlave($AS).subTarget = 0>>
<</if>>
-<<if $activeSlave.subTarget == -1>>
- <br><br><<link "Reign $him in" "Subordinate Targeting">><<set $activeSlave.subTarget = 0, $StudID = 0>><</link>>
+<<if getSlave($AS).subTarget == -1>>
+ <br><br><<link "Reign $him in" "Subordinate Targeting">><<set getSlave($AS).subTarget = 0, $StudID = 0>><</link>>
<<else>>
<<if $universalRulesImpregnation == "Stud" && $StudID == 0>>
- <br><br>[[Stud|Subordinate Targeting][$activeSlave.subTarget = -1, $StudID = $activeSlave.ID]]
+ <br><br>[[Stud|Subordinate Targeting][getSlave($AS).subTarget = -1, $StudID = getSlave($AS).ID]]
<</if>>
- <br><br>[[None|Subordinate Targeting][$activeSlave.subTarget = 0]]
+ <br><br>[[None|Subordinate Targeting][getSlave($AS).subTarget = 0]]
<br><br>__Select a slave for $him to submit to, sexually:__
<<includeDOM App.UI.SlaveList.slaveSelectionList(
- s => s.devotion >= -20 && s.fuckdoll === 0 && State.variables.activeSlave.ID !== s.ID &&
- (!isAmputee(State.variables.activeSlave) || !isAmputee(s)),
- (s) => App.UI.DOM.passageLink(SlaveFullName(s), 'Subordinate Targeting', () => { V.activeSlave.subTarget = s.ID; }),
+ s => s.devotion >= -20 && s.fuckdoll === 0 && V.AS !== s.ID &&
+ (!isAmputee(getSlave(V.AS)) || !isAmputee(s)),
+ (s) => App.UI.DOM.passageLink(SlaveFullName(s), 'Subordinate Targeting', () => { getSlave(V.AS).subTarget = s.ID; }),
)>>
<</if>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index a75d492863188a4f3231a86bb7261fc2f8cb6f6d..266afc96396f150d187fcc3073523f9d312363f8 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -202,18 +202,18 @@ One 'welcome' for a new slave is to have them branded. Where would you like such
<br> It's possible that ''$brandTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$brandTarget.secondary'':
/* Material copied from bodyModification, but please leave commented out any sections that may not be on ALL slaves. */
- /*<<if hasAnyEars($activeSlave)>>[[Ears|Universal Rules][$brandTarget.secondary = "ear"]]<</if>>*/
+ /*<<if hasAnyEars(_slave)>>[[Ears|Universal Rules][$brandTarget.secondary = "ear"]]<</if>>*/
| [[Cheeks|Universal Rules][$brandTarget.secondary = "cheek"]]
| [[Shoulders|Universal Rules][$brandTarget.secondary = "shoulder"]]
| [[Breasts|Universal Rules][$brandTarget.secondary = "breast"]]
- /*<<if hasAnyNaturalArms($activeSlave)>>
+ /*<<if hasAnyNaturalArms(_slave)>>
| [[Arm, upper|Universal Rules][$brandTarget.secondary = "upper arm"]]
| [[Arm, lower|Universal Rules][$brandTarget.secondary = "lower arm"]]
| [[Wrist|Universal Rules][$brandTarget.secondary = "wrist"]]
| [[Hand|Universal Rules][$brandTarget.secondary = "hand"]]
<</if>>*/
| [[Buttocks|Universal Rules][$brandTarget.secondary = "buttock"]]
- /*<<if hasAnyNaturalLegs($activeSlave)>>
+ /*<<if hasAnyNaturalLegs(_slave)>>
| [[Thigh|Universal Rules][$brandTarget.secondary = "thigh"]]
| [[Calf|Universal Rules][$brandTarget.secondary = "calf"]]
| [[Ankle|Universal Rules][$brandTarget.secondary = "ankle"]]
@@ -223,10 +223,10 @@ One 'welcome' for a new slave is to have them branded. Where would you like such
| [[Chest|Universal Rules][$brandTarget.secondary = "chest"]]
| [[Belly|Universal Rules][$brandTarget.secondary = "belly"]]
| [[Pubic Mound|Universal Rules][$brandTarget.secondary = "pubic mound"]]
- /*<<if $activeSlave.dick > 0>>
+ /*<<if _slave.dick > 0>>
| [[Penis|Universal Rules][$brandTarget.secondary = "penis"]]
<</if>>*/
- /*<<if $activeSlave.balls > 0 && $activeSlave.scrotum > 0>>
+ /*<<if _slave.balls > 0 && _slave.scrotum > 0>>
| [[Testicles|Universal Rules][$brandTarget.secondary = "testicle"]]
<</if>>*/
| [[Back|Universal Rules][$brandTarget.secondary = "back"]]
@@ -453,18 +453,18 @@ One 'welcome' for a new slave is to have them scarred. Where would you like such
<br> It's possible that ''$scarTarget.primary'' may be missing from a slave. Choose a fallback in case it is not available: Current backup is ''$scarTarget.secondary'':
/* Material copied from bodyModification, but please leave commented out any sections that may not be on ALL slaves. */
- /*<<if hasAnyEars($activeSlave)>>[[Ears|Universal Rules][$scarTarget.secondary = "ear"]]<</if>>*/
+ /*<<if hasAnyEars(_slave)>>[[Ears|Universal Rules][$scarTarget.secondary = "ear"]]<</if>>*/
| [[Cheeks|Universal Rules][$scarTarget.secondary = "cheek"]]
| [[Shoulders|Universal Rules][$scarTarget.secondary = "shoulder"]]
| [[Breasts|Universal Rules][$scarTarget.secondary = "breast"]]
- /*<<if hasAnyNaturalArms($activeSlave)>>
+ /*<<if hasAnyNaturalArms(_slave)>>
| [[Arm, upper|Universal Rules][$scarTarget.secondary = "upper arm"]]
| [[Arm, lower|Universal Rules][$scarTarget.secondary = "lower arm"]]
| [[Wrist|Universal Rules][$scarTarget.secondary = "wrist"]]
| [[Hand|Universal Rules][$scarTarget.secondary = "hand"]]
<</if>>*/
| [[Buttocks|Universal Rules][$scarTarget.secondary = "buttock"]]
- /*<<if hasAnyNaturalLegs($activeSlave)>>
+ /*<<if hasAnyNaturalLegs(_slave)>>
| [[Thigh|Universal Rules][$scarTarget.secondary = "thigh"]]
| [[Calf|Universal Rules][$scarTarget.secondary = "calf"]]
| [[Ankle|Universal Rules][$scarTarget.secondary = "ankle"]]
@@ -474,10 +474,10 @@ One 'welcome' for a new slave is to have them scarred. Where would you like such
| [[Chest|Universal Rules][$scarTarget.secondary = "chest"]]
| [[Belly|Universal Rules][$scarTarget.secondary = "belly"]]
| [[Pubic Mound|Universal Rules][$scarTarget.secondary = "pubic mound"]]
- /*<<if $activeSlave.dick > 0>>
+ /*<<if _slave.dick > 0>>
| [[Penis|Universal Rules][$scarTarget.secondary = "penis"]]
<</if>>*/
- /*<<if $activeSlave.balls > 0 && $activeSlave.scrotum > 0>>
+ /*<<if _slave.balls > 0 && _slave.scrotum > 0>>
| [[Testicles|Universal Rules][$scarTarget.secondary = "testicle"]]
<</if>>*/
| [[Back|Universal Rules][$scarTarget.secondary = "back"]]