From eb2ded7d5a50394a4604274480d60f700a5aa3bc Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Thu, 30 Aug 2018 22:47:51 -0400
Subject: [PATCH] Convert AddSlave and FaceIncrease widgets
---
src/npc/acquisition.tw | 4 +-
src/npc/asDump.tw | 2 +-
src/npc/databases/cheatmodeDatabase.tw | 12 ++---
src/npc/importSlave.tw | 2 +-
src/npc/rgASDump.tw | 2 +-
src/pregmod/eliteTakeOverResult.tw | 4 +-
src/pregmod/incubatorRetrievalWorkaround.tw | 2 +-
src/pregmod/pRaped.tw | 6 +--
src/uncategorized/REFS.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/REroyalblood.tw | 44 +++++++++----------
src/uncategorized/bulkSlaveIntro.tw | 4 +-
src/uncategorized/genericPlotEvents.tw | 10 ++---
src/uncategorized/motherDaughterWorkaround.tw | 4 +-
src/uncategorized/pCoupAttempt.tw | 4 +-
src/uncategorized/pInvasion.tw | 2 +-
src/uncategorized/pRaidResult.tw | 2 +-
...EgyptianRevivalistAcquisitionWorkaround.tw | 4 +-
src/uncategorized/reMalefactor.tw | 4 +-
src/uncategorized/reRecruit.tw | 2 +-
src/uncategorized/reShelterInspection.tw | 2 +-
src/uncategorized/reShippingContainer.tw | 4 +-
src/uncategorized/recETS.tw | 20 ++++-----
src/uncategorized/recETSWorkaround.tw | 2 +-
src/uncategorized/resFailure.tw | 18 ++++----
src/uncategorized/saHormoneEffects.tw | 8 ++--
src/uncategorized/saLongTermEffects.tw | 4 +-
src/uncategorized/seCoursingRace.tw | 2 +-
src/uncategorized/seRaidingAssault.tw | 38 ++++++++--------
src/uncategorized/siblingsWorkaround.tw | 4 +-
src/uncategorized/surgeryDegradation.tw | 2 +-
src/uncategorized/twinsWorkaround.tw | 4 +-
src/utility/miscWidgets.tw | 17 -------
33 files changed, 113 insertions(+), 130 deletions(-)
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 23cacc52402..f3b45886cb6 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -575,7 +575,7 @@ The previous owner seems to have left in something of a hurry.
<<else>>
<<set _valueGiven += $slaveCost>>
<</if>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<</for>>
<<else>>
<<for $j = 0; $j < $heroSlaves.length; $j++>>
@@ -590,7 +590,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.oldTrust = $activeSlave.trust>>
<<set _valueGiven += $slaveCost>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<if $activeSlave.fetish == "mindbroken">>
$activeSlave.slaveName is, sadly, not mentally competent, and is wandering through the penthouse at the moment.
<<elseif $activeSlave.amp == 1>>
diff --git a/src/npc/asDump.tw b/src/npc/asDump.tw
index 48774cf58f9..1eb348f3431 100644
--- a/src/npc/asDump.tw
+++ b/src/npc/asDump.tw
@@ -17,7 +17,7 @@
<<else>>
<<set $i = $slaveIndices[_ID]>> /* find $i if exists */
<<if ndef $i>> /* not found, so new slave */
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<else>>
<<set $slaves[$i] = $activeSlave>>
<</if>>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index bfcaf20d6d1..65f9b28f52a 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -8,7 +8,7 @@
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1>>
<</if>>
-<<AddSlave _HS>>
+<<run newSlave(_HS)>>
<<set $HeadGirl = clone(_HS)>>
//There are quite a few left; their names are _HS.slaveName,//
@@ -19,7 +19,7 @@
<<else>>
<<set _HS.genes = "XX", _HS.vagina = 3, _HS.ovaries = 1>>
<</if>>
-<<AddSlave _HS>>
+<<run newSlave(_HS)>>
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
@@ -29,7 +29,7 @@
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 2, _HS.balls = 2, _HS.scrotum = 2, _HS.foreskin = 2, _HS.prostate = 1>>
<</if>>
-<<AddSlave _HS>>
+<<run newSlave(_HS)>>
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
@@ -39,7 +39,7 @@
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.dickTat = "bovine patterns">>
<</if>>
-<<AddSlave _HS>>
+<<run newSlave(_HS)>>
//_HS.slaveName,//
<<set _HS = clone($activeSlave)>>
@@ -49,7 +49,7 @@
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1>>
<</if>>
-<<AddSlave _HS>>
+<<run newSlave(_HS)>>
<<set $Bodyguard = clone(_HS)>>
//_HS.slaveName,//
@@ -60,5 +60,5 @@
<<else>>
<<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 5, _HS.balls = 5, _HS.scrotum = 5, _HS.foreskin = 5, _HS.prostate = 1, _HS.dickTat = "bovine patterns">>
<</if>>
-<<AddSlave _HS>>
+<<run newSlave(_HS)>>
//and _HS.slaveName.//
diff --git a/src/npc/importSlave.tw b/src/npc/importSlave.tw
index 3cf9c6d207f..888cc32df60 100644
--- a/src/npc/importSlave.tw
+++ b/src/npc/importSlave.tw
@@ -15,7 +15,7 @@
<<set $tempSlave = eval('({' + $tempSlave + '})')>>
<<set $tempSlave.ID = $IDNumber>>
<<set $IDNumber += 1>>
- <<AddSlave $tempSlave>>
+ <<run newSlave($tempSlave)>>
<<replace #import>>
''Slave imported successfully!''
<br><br>
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index baa264041b0..5d1b399cd9e 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -110,7 +110,7 @@
<<if def _i>>
<<set $slaves[_i] = $activeSlave>>
<<elseif def $activeSlave.slaveName>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<</if>>
<<goto $returnTo>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index ff5aa824740..2e5a5778eb8 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -138,7 +138,7 @@
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(60,75)>>
<<set $activeSlave.canRecruit = 0>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</if>>
<<for _i = $eliteLeft; _i > 0; _i-->>
@@ -175,7 +175,7 @@
<<set $activeSlave.health = random(60,75)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
<</if>>
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index 75afde68a91..df1d4e396e8 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -8,7 +8,7 @@ $readySlave.slaveName has been discharged from $incubatorName and is ready for h
<<set $saleDescription = 0, $applyLaw = 0>>
<<set $incubatorSlaves-->>
<<include "Long Slave Description">>
-<<AddSlave $activeSlave>>
+<<run newSlave($activeSlave)>>
<<set $nextLink = "AS Dump">>
<<set $returnTo = "Main">>
<<if $incubatorOrgans.length > 0>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 28c9102989d..c2969f5f449 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -178,7 +178,7 @@ Now the only question is what to do with the would-be rapist. You could toss the
<<set $cash -= $contractCost>>
<<replace "#result">>
You complete the legalities and biometric scanning quickly and cautiously. The idiot will be in for a surprise when $he awakes to find $he can't move and a dick is in $his ass.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
@@ -190,7 +190,7 @@ Now the only question is what to do with the would-be rapist. You could toss the
<<replace "#result">>
You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up <<if $dairyStimulatorsSetting > 1>>in agony as $his anus takes the rectal hydration dildo<<else>>to find $his chest has begun swelling with milk<</if>>.
<<set $activeSlave.boobs += 300>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
@@ -211,7 +211,7 @@ Now the only question is what to do with the would-be rapist. You could toss the
<<set $activeSlave.balls = 0>>
<<set $activeSlave.devotion -= 25>>
<<set $activeSlave.trust -= 25>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<set $cash -= $contractCost>>
<<replace "#result">>
You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction.
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 1d2d4efb4d2..974a141be2c 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -318,7 +318,7 @@ On this particular outing you happen to cross paths with a comely female citizen
<<link "Enslave $him afterwards">>
<<replace "#result2">>
As your new playmate lies slumbering in bed, you consult with $assistantName as to the cost of the surgery conducted today. With some creative accounting, you settle the citizen's other outstanding debts and then arrange for $him to be charged a sum in excess of $his financial means for the surgery conducted on $him today. Of course, that was not what you agreed, but it was $his mistake for undergoing an expensive procedure without a formal contract. When $he awakens, though $he will retain $his new bimbo body, $he will be just another slave in your penthouse.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $cash -= 10000>>
<</replace>>
<</link>> // Purchasing $his outstanding debts will cost <<print cashFormat(10000)>>. //
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 74cad1ef44e..81cbb7be60c 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -17052,7 +17052,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<set $activeSlave.attrXY = random(60,90)>>
<<set $activeSlave.attrXX = random(10,20)>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<br><br><span id="result2">
<<link "Let your public servant take revenge on them">>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 05a9be89aba..87ed821241f 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -259,7 +259,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _princess.relation = "sister">>
<<set _princess.relationTarget = _prince.ID>>
<</if>>
- <<AddSlave _princess>> /* skip New Slave Intro */
+ <<run newSlave(_princess)>> /* skip New Slave Intro */
/* prince */
<<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was sold to you in exchange for aid.">>
<<set _prince.recruiter = 0>>
@@ -270,7 +270,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _prince.relation = "sister">>
<<set _prince.relationTarget = _princess.ID>>
<</if>>
- <<AddSlave _prince>> /* skip New Slave Intro */
+ <<run newSlave(_prince)>> /* skip New Slave Intro */
<</replace>>
<</link>> // You will need to utilize a sizable portion of your reputation and <<print cashFormat(100000)>> to enslave them.//
<<else>>
@@ -298,7 +298,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _princess.relation = "sister">>
<<set _princess.relationTarget = _prince.ID>>
<</if>>
- <<AddSlave _princess>> /* skip New Slave Intro */
+ <<run newSlave(_princess)>> /* skip New Slave Intro */
/* prince */
<<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
<<set _prince.recruiter = 0>>
@@ -309,7 +309,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _prince.relation = "sister">>
<<set _prince.relationTarget = _princess.ID>>
<</if>>
- <<AddSlave _prince>> /* skip New Slave Intro */
+ <<run newSlave(_prince)>> /* skip New Slave Intro */
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
<</if>>
@@ -354,7 +354,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
<</replace>>
@@ -405,7 +405,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
<</replace>>
@@ -485,7 +485,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _princess.relation = "daughter">>
<<set _princess.relationTarget = _queen.ID>>
<</if>>
- <<AddSlave _princess>> /* skip New Slave Intro */
+ <<run newSlave(_princess)>> /* skip New Slave Intro */
/*Queen*/
<<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was sold for credits.">>
<<set _queen.recruiter = 0>>
@@ -496,7 +496,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _queen.relation = "mother">>
<<set _queen.relationTarget = _princess.ID>>
<</if>>
- <<AddSlave _queen>> /* skip New Slave Intro */
+ <<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> // It will cost about <<print cashFormat(500000)>> to enslave both the princess and Queen.//
<<else>>
@@ -522,7 +522,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _princess.relation = "daughter">>
<<set _princess.relationTarget = _queen.ID>>
<</if>>
- <<AddSlave _princess>> /* skip New Slave Intro */
+ <<run newSlave(_princess)>> /* skip New Slave Intro */
/*Queen*/
<<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was sold for credits.">>
<<set _queen.recruiter = 0>>
@@ -533,7 +533,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _queen.relation = "mother">>
<<set _queen.relationTarget = _princess.ID>>
<</if>>
- <<AddSlave _queen>> /* skip New Slave Intro */
+ <<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
<</if>>
@@ -578,7 +578,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/*Queen*/
@@ -588,7 +588,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
<<set $missingParentID-->>
- <<AddSlave _queen>> /* skip New Slave Intro */
+ <<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> // It will cost about <<print cashFormat(500000)>> to enslave the Queen and her court ladies.//
<<if $securityForceActive == 1>>
@@ -633,7 +633,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/*Queen*/
@@ -643,7 +643,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
<<set $missingParentID-->>
- <<AddSlave _queen>> /* skip New Slave Intro */
+ <<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
<</if>>
@@ -689,7 +689,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/* princess */
@@ -698,13 +698,13 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _princess.mother = _queen.ID>>
<<set _princess.father = $missingParentID>>
<<set $missingParentID-->>
- <<AddSlave _princess>> /* skip New Slave Intro */
+ <<run newSlave(_princess)>> /* skip New Slave Intro */
/* prince */
<<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was sold for credits.">>
<<set _prince.recruiter = 0>>
<<set _prince.mother = _princess.mother>>
<<set _prince.father = _princess.father>>
- <<AddSlave _prince>> /* skip New Slave Intro */
+ <<run newSlave(_prince)>> /* skip New Slave Intro */
/*Queen*/
<<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was sold for credits.">>
<<set _queen.recruiter = 0>>
@@ -712,7 +712,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
<<set $missingParentID-->>
- <<AddSlave _queen>> /* skip New Slave Intro */
+ <<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> // It will cost about <<print cashFormat(2500000)>> to enslave the entire court.//
<<elseif $familyTesting == 1>>
@@ -762,7 +762,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.health = random(30,60)>>
<<set $activeSlave.canRecruit = 0>>
<<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
/* princess */
@@ -771,13 +771,13 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set _princess.mother = _queen.ID>>
<<set _princess.father = $missingParentID>>
<<set $missingParentID-->>
- <<AddSlave _princess>> /* skip New Slave Intro */
+ <<run newSlave(_princess)>> /* skip New Slave Intro */
/* prince */
<<set _prince.origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was acquired by "+$securityForceName+".">>
<<set _prince.recruiter = 0>>
<<set _prince.mother = _princess.mother>>
<<set _prince.father = _princess.father>>
- <<AddSlave _prince>> /* skip New Slave Intro */
+ <<run newSlave(_prince)>> /* skip New Slave Intro */
/*Queen*/
<<set _queen.origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was acquired by "+$securityForceName+".">>
<<set _queen.recruiter = 0>>
@@ -785,7 +785,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $missingParentID-->>
<<set _queen.father = $missingParentID>>
<<set $missingParentID-->>
- <<AddSlave _queen>> /* skip New Slave Intro */
+ <<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> //You will be loathed for this action and trade will be crippled.//
<</if>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 01f6a046cdf..5674cb4fa0a 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -58,7 +58,7 @@
<<if ($newSlaveIndex >= $newSlaves.length) || ($newSlavesDone == 1)>>
<<if $newSlaves.length > 0>>
/* Push the induction changes for the final slave to the newSlave array */
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
/* Variable Clean-up */
<<set $newSlaves = []>>
@@ -69,7 +69,7 @@
<<else>>
/* If looking at 2nd slave, push the induction changes for the prior slave to the newSlave array */
<<if $newSlaveIndex > 0>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<</if>>
<<if $newSlaves.length > 1>>
Showing new slave <<print $newSlaveIndex+1>> of <<print $newSlaves.length>>:
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 6fa1e3fb907..5ee49f98865 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -881,7 +881,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetish = "none">>
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.sexualFlaw = "idealistic">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
<<if $pedo_mode == 1 && $minimumSlaveAge <= 8>>
@@ -927,7 +927,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetishStrength = 60>>
<<set $activeSlave.behavioralFlaw = "anorexic">>
<<set $activeSlave.sexualFlaw = "idealistic">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
@@ -965,7 +965,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetish = "none">>
<<set $activeSlave.behavioralFlaw = "bitchy">>
<<set $activeSlave.sexualFlaw = "hates anal">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
<br><<link "Hit the slave with the tits, pussy and impressive dick">>
@@ -1009,7 +1009,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetish = "none">>
<<set $activeSlave.sexualFlaw = "none">>
<<set $activeSlave.behavioralFlaw = "odd">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
@@ -1063,7 +1063,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<br><<link "Enslave them all">>
<<replace "#result">>
<<for _genPlot = 0; _genPlot < _newSlaves.length; _genPlot++>>
- <<AddSlave _newSlaves[_genPlot]>> /* skip New Slave Intro - TODO: use Bulk Slave Intro */
+ <<run newSlave(_newSlaves[_genPlot])>> /* skip New Slave Intro - TODO: use Bulk Slave Intro */
<</for>>
You simply enslave all of the escapees yourself. These slaves will more than make up for the costs you expended, in the long run.
<</replace>>
diff --git a/src/uncategorized/motherDaughterWorkaround.tw b/src/uncategorized/motherDaughterWorkaround.tw
index fea2093b80a..fab76ac383b 100644
--- a/src/uncategorized/motherDaughterWorkaround.tw
+++ b/src/uncategorized/motherDaughterWorkaround.tw
@@ -2,7 +2,7 @@
Your new pair of slaves look frightened and uncertain, but seem encouraged by each other's presence.
-<<AddSlave $activeSlave>>
+<<run newSlave($activeSlave)>>
<<set _secondSlave = clone($activeSlave)>>
<<unset $activeSlave>>
@@ -69,4 +69,4 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.butt += random(-1, 1)>>
<</if>>
-<<AddSlave _secondSlave>>
+<<run newSlave(_secondSlave)>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 766b70ce7c0..f25bff4a2ab 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -200,7 +200,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<</if>>
<<set $traitor.health = random(-80,-60)>>
<<set $traitor.origin = "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">>
- <<AddSlave $traitor>> /* skip New Slave Intro */
+ <<run newSlave($traitor)>> /* skip New Slave Intro */
<<set $traitor = 0, $traitorStats = 0>>
<</if>>
@@ -228,7 +228,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<br><<link "Enslave all of your prisoners">>
<<replace "#result">>
<<for _pca = 0; _pca < _newSlaves.length; _pca++>>
- <<AddSlave _newSlaves[_pca]>> /* skip New Slave Intro */
+ <<run newSlave(_newSlaves[_pca])>> /* skip New Slave Intro */
<</for>>
You simply enslave all of the prisoners yourself. You will make them pay for attacking your arcology.
<</replace>>
diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw
index 4043e6c889d..37c43186161 100644
--- a/src/uncategorized/pInvasion.tw
+++ b/src/uncategorized/pInvasion.tw
@@ -132,7 +132,7 @@ The loose militia lately organized by the arcology owners has been called out to
<br><<link "Enslave all of your prisoners">>
<<replace "#result">>
<<for _i = 0; _i < _newSlaves.length; _i++>>
- <<AddSlave _newSlaves[_i]>> /* skip New Slave Intro */
+ <<run newSlave(_newSlaves[_i])>> /* skip New Slave Intro */
<</for>>
You simply enslave all of your prisoners yourself. These slaves will regret attacking your arcology.
<</replace>>
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index d35e6b92d46..2cdb76de521 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -67,7 +67,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<br><<link "Enslave all of the refugees">>
<<replace "#result">>
<<for _prr = 0; _prr < _newSlaves.length; _prr++>>
- <<AddSlave _newSlaves[_prr]>> /* skip New Slave Intro */
+ <<run newSlave(_newSlaves[_prr])>> /* skip New Slave Intro */
<</for>>
You simply enslave all of the refugees yourself. They would have been worse off had you not intervened.
<</replace>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
index 9d8d043b3ba..6ae818f1e71 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
@@ -3,7 +3,7 @@
/* Written and coded by Boney M */
They arrive hand-in-hand and don't let go of each other until the end of the enslavement process, and even after they break their grip and undress at your instruction, their eyes never stray far from each other. With a closer look at them, their blood relation is as obvious as their infatuation with one another. No wonder they couldn't keep it a secret.
-<<AddSlave $sibling>>
+<<run newSlave($sibling)>>
<<set _secondSlave = clone($activeSlave)>>
@@ -97,4 +97,4 @@ They arrive hand-in-hand and don't let go of each other until the end of the ens
<</if>>
-<<AddSlave _secondSlave>>
\ No newline at end of file
+<<run newSlave(_secondSlave)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 2c41409e92f..705be309e23 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -393,7 +393,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. It would be best to have her restrained for public use in the arcade first. The public @@.green;looks forward@@ to seeing her there.
<</switch>>
<<set $rep += 50>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
@@ -422,7 +422,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction<<elseif $dairyStimulatorsSetting > 1>>discomfort as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>, together with a report on the likely productivity of such a fit body capable of withstanding the stress of high throughput.
<</if>>
<<set $rep += 50>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index f817d8704c2..b6532b91c97 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2374,7 +2374,7 @@ The <<if ($activeSlave.actualAge >= 18)>>young woman<<elseif ($activeSlave.actua
<</switch>>
<<switch $recruit>>
<<case "desperate birth" "blessed vessel">>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<default>>
<<include "New Slave Intro">>
<</switch>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 5c77a0bcea0..7f642e7ff03 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -106,7 +106,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<<replace "#result">>
$subSlave.slaveName is attached to a milking machine, so it would be extremely unwise to let the inspector report on $subSlave.slaveName's industrial fate in all its gorgeous productivity. So, you greet her politely, and bring her down to $dairyName to show her $subSlave.slaveName. The inspector has a single moment to stiffen in shock at the sight before she stiffens involuntarily due to the security drone tazing her unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more big-boobed milk producer. You leave the inspector's drug dosage low to start, so she can appreciate her situation for a while. When the inspector awakes, her visor is set to show an overhead view of her bay in $dairyName. She sees her breasts, already larger than she remembers, gently swaying with the pumping of the milkers.<<if $dairyFeedersSetting > 1>> She sees the huge phallus occupying her mouth, and feels nutrition sliding down her throat.<</if>><<if $dairyPregSetting > 1>> She sees her vagina drooling as it's fucked in preparation for pregnancy.<</if>><<if $dairyPregSetting > 1>> She sees a massive piston moving slowly back and forth beneath her buttocks, and understands what the ache of impossible fullness in her bottom is.<</if>> Her hands ball into fists.
<<set $shelterAbuse += 10>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>> //This will cost <<print cashFormat($contractCost/2)>>//
<</if>>
diff --git a/src/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw
index 3472b1ee61e..56ffa659c32 100644
--- a/src/uncategorized/reShippingContainer.tw
+++ b/src/uncategorized/reShippingContainer.tw
@@ -52,7 +52,7 @@ For now, the crowd around you is looking at the helpless human cargo with
<br><<link "Keep them">>
<<replace "#result">>
<<for _reShip = 0; _reShip < _newSlaves.length; _reShip++>>
- <<AddSlave _newSlaves[_reShip]>> /* skip New Slave Intro */
+ <<run newSlave(_newSlaves[_reShip])>> /* skip New Slave Intro */
<</for>>
You announce that the shipment is in violation of shipping and slave market regulations, and is being confiscated. There's a certain @@.red;disappointment@@ in the crowd that nothing more interesting came of it, but it's minor when compared to the chattel you just seized.
<<set $rep -= 50>>
@@ -65,7 +65,7 @@ For now, the crowd around you is looking at the helpless human cargo with
<<if _newSlaves[_reShip].vagina > -1>><<set _newSlaves[_reShip].vagina = 3>><</if>>
<<set _newSlaves[_reShip].anus = 3>>
<<set _newSlaves[_reShip].health -= 20>>
- <<AddSlave _newSlaves[_reShip]>> /* skip New Slave Intro */
+ <<run newSlave(_newSlaves[_reShip])>> /* skip New Slave Intro */
<</for>>
You use the container handling systems to segregate the obvious menials from those with any potential as sex slaves. The menials go into a different container, which is whisked off, leaving a little shivering knot of frightened bodies, vulnerable and naked. The crowd watched all this with good humor, and there's silence enough that everyone hears your quiet announcement. You announce that the shipment is in violation of shipping and slave market regulations, and is being confiscated; however, you don't expect to see these particular slaves delivered to your penthouse for a couple of hours. Then you turn your back and walk away. The crowd gives a kind of @@.green;appreciative howl@@ which, understandably, produces a wail of terror from the slaves. As you head off, the sobbing turns into screaming. It sounds like your new slaves might be a bit stretched out, here and there.
<<set $rep += 200>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index d3e49917290..0fd1295c644 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -901,7 +901,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<set $activeSlave.relationTarget = 0>>
<<set $activeSlave.oralCount += 1>>
<<set $oralTotal += 1>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<set $cash -= $contractCost>>
<<replace "#result">>
Despite herself, she sobs with relief when you agree. She offers to <<if $PC.dick == 1>>suck you off<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eat you out<</if>> while you complete the necessary legalities, so you work away with a <<if $PC.dick == 1>>pair of motherly lips wrapped around your dick<<else>>motherly tongue pleasuring your clit<</if>> as she pumps away eagerly under the desk. She's definitely on aphrodisiacs. She masturbates while she sucks.
@@ -913,7 +913,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<link "Enslave the mother">>
<<set $activeSlave.relation = 0>>
<<set $activeSlave.relationTarget = 0>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<set $cash -= $contractCost>>
<<replace "#result">>
You press your thumb down on your desk interface and then tell her to read the display, strip, and show you her body. She knits her brow in confusion and begins to curse at you but reads anyway. Comprehension dawns on her and she stares you in the eye for a long moment - and then drops her gaze. She knows the Free Cities well enough to understand. She stands and sadly strips off her blouse and slacks. Following orders, she rotates slowly for you. Then, she bends over facing away from you and spreads her buttocks to display her holes. Unsurprisingly, she's got a well-used pussy but has clearly never taken it up the ass. That will change.
@@ -929,7 +929,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<set $activeSlave.relationTarget = 0>>
<<set $activeSlave.rivalry = 0>>
<<set $activeSlave.rivalryTarget = 0>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<set $cash -= $contractCost>>
<<replace "#result">>
The poor sissy isn't happy to become a slave, but she's clearly relieved to be away from her sister. The bitch isn't likely to have an easy time; the sale didn't clear her from debt. $activeSlave.slaveName describes her basic sexual experience, which includes a lot of sucking and anal whoring. Without more ado she moves from practical sexual slavery at the hands of her sister to actual sexual slavery.
@@ -941,7 +941,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<link "Enslave the mother">>
<<set $activeSlave.relation = 0>>
<<set $activeSlave.relationTarget = 0>>
- <<AddSlave $activeSlave>>
+ <<run newSlave($activeSlave)>>
<<set $cash -= $contractCost>>
<<replace "#result">>
You have the needy girl immediately bought to your penthouse where you help her laboring body into an available bed for inspection. She asks where her children were taken, to which you reply somewhere they can be raised properly. They'll be taken care of and won't have to grow up on the streets, plus they were sucking the life out of her. She's a little depressed at the news, but understands your reasons. You take the opportunity to give her a good look over; she is really dilated! Apart from that, between all the births and dicks, her vagina is rather worn out, though she seems to understand how to use it. Her anus has also seen use, but not nearly as much.
@@ -965,7 +965,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<link "Manipulate her to enslave both mother and daughter">>
<<set $mother = $activeSlave, $mother.devotion -= 50, $cash -= ($contractCost*2)>>
- <<AddSlave $mother>>
+ <<run newSlave($mother)>>
<<goto "RecETS workaround">>
<</link>>
@@ -973,7 +973,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<link "Manipulate her to enslave both mother and daughter">>
<<set $mother = $activeSlave, $mother.devotion -= 25, $cash -= ($contractCost*2)>>
- <<AddSlave $mother>>
+ <<run newSlave($mother)>>
<<goto "RecETS workaround">>
<</link>>
@@ -981,7 +981,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<link "Enslave both">>
<<set $sissy = $activeSlave, $cash -= ($contractCost*2)>>
- <<AddSlave $sissy>>
+ <<run newSlave($sissy)>>
<<goto "RecETS workaround">>
<</link>>
@@ -990,7 +990,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<if $minimumSlaveAge <= 3>>
<<link "Accept her offer">>
<<set $sissy = $activeSlave, $cash -= ($contractCost*2)>>
- <<AddSlave $sissy>>
+ <<run newSlave($sissy)>>
<<goto "RecETS workaround">>
<</link>>
<</if>>
@@ -999,7 +999,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<link "Buy both">>
<<set $sissy = $activeSlave, $cash -= $contractCost>>
- <<AddSlave $sissy>>
+ <<run newSlave($sissy)>>
<<goto "RecETS workaround">>
<</link>>
@@ -1007,7 +1007,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<link "Buy both">>
<<set $sissy = $activeSlave, $cash -= $contractCost>>
- <<AddSlave $sissy>>
+ <<run newSlave($sissy)>>
<<goto "RecETS workaround">>
<</link>>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 797df23701e..a32934104d3 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -649,7 +649,7 @@ You turn to the child clutching her mother's grotesque belly.
<<if _familyName>><<set $activeSlave.slaveSurname = _familyName>><</if>>
<<set $activeSlave.birthSurname = _familyBirthSurname>>
-<<AddSlave $activeSlave>>
+<<run newSlave($activeSlave)>>
<<switch $RecETSevent>>
<<case "incest mother son" "incest father daughter" "incest brother sister" "incest sister sister" "incest brother brother" "incest mother daughter" "incest father son" "incest twin sister" "incest twins mixed" "incest twin brother">>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 068abb42690..516c0d49039 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -82,7 +82,7 @@
<<set $activeSlave.behavioralFlaw = either("none")>>
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.customTat = "She has the simple logo of the corporation that operates The Slavegirl School tattooed on her left cheek.">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "TCR">>
<<set $TCR.schoolPresent = 0>>
@@ -151,7 +151,7 @@
<<set $activeSlave.armsTat = "bovine patterns">>
<<set $activeSlave.legsTat = "bovine patterns">>
<<set $activeSlave.stampTat = "bovine patterns">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "GRI">>
<<set $GRI.schoolPresent = 0>>
@@ -204,7 +204,7 @@
<<set $activeSlave.hStyle = "shaved">>
<<set $activeSlave.hLength = 0>>
<<set $activeSlave.customTat = "She has a barcode that identified her when she was a test subject at the Growth Research Institute tattooed on her left cheek.">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "SCP">>
<<set $SCP.schoolPresent = 0>>
@@ -281,7 +281,7 @@
<<set $activeSlave.override_Race = 1>>
<<set $activeSlave.override_Skin = 1>>
<<set $activeSlave.customTat = "She has the coat of arms of St. Claver Preparatory tattooed on her left cheek.">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "LDE">>
<<set $LDE.schoolPresent = 0>>
@@ -344,7 +344,7 @@
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.hLength = 100>>
<<set $activeSlave.customTat = "She has the buttock-shaped symbol of the École des Enculées that created her tattooed on her left cheek.">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "TGA">>
<<set $TGA.schoolPresent = 0>>
@@ -400,7 +400,7 @@
<<set $activeSlave.hStyle = "short">>
<<set $activeSlave.hLength = 2>>
<<set $activeSlave.customTat = "She has the baroque crest of the Gymnasium-Academy that trained her branded into her left cheek.">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<elseif $RESFailure == "HA">>
<<set $HA.schoolPresent = 0>>
@@ -458,7 +458,7 @@
<<set $activeSlave.hStyle = either("neat", "braided", "tails", "ponytail", "bun")>>
<<set $activeSlave.hLength = random(5,50)>>
<<set $activeSlave.customTat = "She has the sword and eagle symbol of the Hippolyta Academy tattooed on her left shoulder.">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<else>>
<<set $TFS.schoolPresent = 0>>
@@ -664,7 +664,7 @@
<<set $activeSlave.hLength = 150>>
<<set $activeSlave.customTat = "She has a simple pink heart tattooed on her right temple.">>
<<set $REFutaSisterCheckinIDs.push($activeSlave.ID)>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XY Slave">>
@@ -747,7 +747,7 @@
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.hLength = 150>>
<<set $activeSlave.customTat = "She has a simple pink heart tattooed on her right temple.">>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<setLocalPronouns $activeSlave>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 494c47d4c01..4624cf69c2b 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -108,7 +108,7 @@
<<if ($slaves[$i].inducedNCS == 1) && (random(1,100) > 50)>>
<<set _faceInc *= 2>>
<</if>>
- <<FaceIncrease $slaves[$i] _faceInc>>
+ <<= faceIncrease($slaves[$i], _faceInc)>>
<</if>>
<<if ($slaves[$i].voice < 3) && ($slaves[$i].voice > 0)>>
@@ -209,7 +209,7 @@
<<if ($slaves[$i].inducedNCS == 1) && (random(1,100) > 50)>>
<<set _faceInc *= 2>>
<</if>>
- <<FaceIncrease $slaves[$i] _faceInc>>
+ <<= faceIncrease($slaves[$i], _faceInc)>>
<</if>>
<<if ($slaves[$i].voice < 3) && ($slaves[$i].voice > 0)>>
@@ -309,7 +309,7 @@
<<if ($slaves[$i].inducedNCS == 1) && (random(1,100) > 50)>>
<<set _faceInc *= 2>>
<</if>>
- <<FaceIncrease $slaves[$i] _faceInc>>
+ <<= faceIncrease($slaves[$i], _faceInc)>>
<</if>>
<<if ($slaves[$i].voice < 2) && ($slaves[$i].voice > 0)>>
@@ -406,7 +406,7 @@
<<if ($slaves[$i].inducedNCS == 1) && (random(1,100) > 50)>>
<<set _faceInc *= 2>>
<</if>>
- <<FaceIncrease $slaves[$i] _faceInc>>
+ <<= faceIncrease($slaves[$i], _faceInc)>>
<</if>>
<<if ($slaves[$i].voice < 2) && ($slaves[$i].voice > 0)>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index d684a8c5366..ab1560c5495 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3428,7 +3428,7 @@
<<set $slaves[$i].boobs += 100>>
<<case "FaceSofter">>
Dependence on the hormone-based aphrodisiacs makes @@.lime;$his facial structure soften and become sexier.@@
- <<FaceIncrease $slaves[$i] 10>>
+ <<= faceIncrease($slaves[$i], 10)>>
<<case "FaceSofterAndrogynous">>
Dependence on the hormone-based aphrodisiacs makes @@.lime;$his face soften into androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
@@ -6348,7 +6348,7 @@
<<if $slaves[$i].face <= 95>>
<<if $slaves[$i].trust > 95>>
$He is so healthy and trusting that @@.lime;the minute flaws in $his facial appearance seem to be smoothed away@@ every time $he sleeps.
- <<FaceIncrease $slaves[$i] 5>>
+ <<= faceIncrease($slaves[$i], 5)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seCoursingRace.tw b/src/uncategorized/seCoursingRace.tw
index 31d80535974..3857a261ac3 100644
--- a/src/uncategorized/seCoursingRace.tw
+++ b/src/uncategorized/seCoursingRace.tw
@@ -326,7 +326,7 @@ You place your hand on the leash's quick release and whisper your direction into
<</if>>
<</if>>
<<set $Lurcher.penetrativeCount += 1, $penetrativeTotal += 1>>
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<<else>>
<<if $Lurcher.devotion > 50>>
She makes her way back to you dejectedly, hanging her head.
diff --git a/src/uncategorized/seRaidingAssault.tw b/src/uncategorized/seRaidingAssault.tw
index 508d522b404..448f4be348c 100644
--- a/src/uncategorized/seRaidingAssault.tw
+++ b/src/uncategorized/seRaidingAssault.tw
@@ -19,7 +19,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Your $mercenariesTitle pry open the door to the mansion's panic room and pull the protesting housewife from its depths.
The housewife watches in terror as your $mercenariesTitle slake their lust on her servants and maids, knowing that her respite from a brutal rape must only be a temporary blessing.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "university professor">>
<<if $targetEscape >= _MercCapture>>
@@ -29,7 +29,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Your $mercenariesTitle corner the professors and their department head in one of the university's many conference rooms, hauling them off to the VTOLs when the academics promptly surrender.
The department head spends the VTOL ride back to your arcology watching in terror as her colleagues and peers are raped wholesale by your mercenaries. With her educated mind, she knows that being singled out from a similar fate must mean she is being saved for someone and worries about who that might be.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "university student">>
<<if $targetEscape >= _MercCapture>>
@@ -39,7 +39,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Your $mercenariesTitle corner the students in their rooms, hauling them off one by one to the VTOLs as they protest feebly.
The peerless student spends the VTOL ride back to your arcology watching in terror as her friends and peers are raped wholesale by your mercenaries. With her educated mind, she knows that being singled out from a similar fate must mean she is being saved for someone and worries about who that might be.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "female military officer">>
<<if $targetEscape >= _MercCapture>>
@@ -49,7 +49,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
As your mercenaries gain the upper hand on the officer's escort, she promptly puts her service weapon to her temple but hesitates. Luckily one of your $mercenariesTitle is close by and able to pluck the pistol from her stiff fingers. The despondent officer is cuffed and taken back to the VTOL for transport.
The officer spends the VTOL ride back to your arcology watching as your $mercenariesTitle rape her defeated subordinates. Given their brutal treatment, she doubts her respite from such a fate is due to any battlefield rules of conduct.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "male military officer">>
<<if $targetEscape >= _MercCapture>>
@@ -59,7 +59,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
As your mercenaries gain the upper hand on the officer's escort, he promptly puts his service weapon to his temple but hesitates. Luckily one of your $mercenariesTitle is close by and able to pluck the pistol from his stiff fingers. The despondent officer is cuffed and taken back to the VTOL for transport.
The officer spends the VTOL ride back to your arcology watching as your $mercenariesTitle rape his defeated subordinates. Given their brutal treatment, he doubts his respite from such a fate is due to any battlefield rules of conduct.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "military soldier">>
<<if $targetEscape >= _MercCapture>>
@@ -69,7 +69,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
The young soldiers fight valiantly, but when the battle turns against them they decide to surrender. Their sergeant is cuffed with the remaining survivors and taken back to the VTOL for transport.
The sergeant spends the VTOL ride back to the arcology watching as her childhood friends turned comrades in arms are raped by your mercenaries. She wonders why she has been spared this seemingly shared fate, but suspects it has little to do with her nominally higher rank.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "doctor">>
<<if $targetEscape >= _MercCapture>>
@@ -79,7 +79,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
The security staff of the hospital is easily overpowered and surrender rapidly, allowing your $mercenariesTitle to take the doctors and their staff into custody with little fuss.
The distinguished doctor spends the VTOL ride looking on at her colleagues and peers being raped by your mercenaries. She naively hopes that she has been spared from that fate out of a desire for her medical knowledge rather than her body.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "nun">>
<<if $targetEscape >= _MercCapture>>
@@ -89,7 +89,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Unarmed and defenseless, the nuns are easily cowed by your $mercenariesTitle and taken away one by one to the VTOLs. The most pious sister prays vehemently until she is dragged out of the inner sanctum in cuffs.
The pious nun spends the VTOL ride engaged in fervent prayer as her sisters are raped by your mercenaries. She naively believes that her devotion and piety will see her spared from the same fate as her sisters.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "journalist">>
<<if $targetEscape >= _MercCapture>>
@@ -99,7 +99,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Once the lone security guard is subdued, the journalists and editors of the firm quietly accept their restraints and file out of the building and into the waiting VTOL.
The journalist spends the VTOL ride watching as her colleagues are raped by your mercenaries. She studies every brutal detail, records ever anguished scream in her mind, hoping that one day she might escape to produce an editorial to surpass all others.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "local news anchor">>
<<if $targetEscape >= _MercCapture>>
@@ -109,7 +109,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
The news anchor is subdued without issue and quietly escorted out of the recording studio and into the waiting VTOL.
The anchor is initially resistant during the VTOL ride, but soon grows complacent when she is told of the luxury of your penthouse.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "classical dancer">>
<<if $targetEscape >= _MercCapture>>
@@ -119,7 +119,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Once your $mercenariesTitle close in on the stage and reveal their concealed weapons, the dance troupe promptly surrenders. With the shocked audience looking on, each member is cuffed and escorted out the door to the waiting VTOL.
The dancer spends the VTOL ride in abject terror as her friends and peers are raped by your $mercenariesTitle all around her. She clings to the hope that she is being spared from the same fate out of a desire for her dancing talent rather than her body.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "law enforcement officer">>
<<if $targetEscape >= _MercCapture>>
@@ -129,7 +129,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Your $mercenariesTitle break through the door of the precinct with their guns drawn. The precinct is so understaffed that each officer has a number of weapons drawn on them from every angle, so its no surprise when the precinct's sterling policewoman formally surrenders the precinct and its officers to your mercenaries.
The officer spends the VTOL ride watching impassively as her fellow officers are raped by your $mercenariesTitle all around her. Before she exits the VTOL upon her arrival, she informs your $mercenariesTitle that she intends to bring each of them to justice for their supposed crimes.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "classical musician">>
<<if $targetEscape >= _MercCapture>>
@@ -139,7 +139,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Once your $mercenariesTitle close in on the stage and reveal their concealed weapons, the orchestra promptly surrenders. With the shocked audience looking on, each member is cuffed and escorted out the door to the waiting VTOL.
The musician spends the VTOL ride in abject terror as her friends and peers are raped by your $mercenariesTitle all around her. She clings to the hope that she is being spared from the same fate out of a desire for her musical talent rather than her body.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "politician">>
<<if $targetEscape >= _MercCapture>>
@@ -149,7 +149,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
With their security detail defeated and their crowd of supporters offering no protection, the politician promptly surrenders in the hopes that they won't be harmed and is escorted to the waiting VTOL.
The politician spends the VTOL ride quietly, only breaking her silence to ask your $mercenariesTitle about where she is being brought and why. When they do not answer she simply fusses with her outfit, as if headed to an important interview.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "shut-in">>
<<if $targetEscape >= _MercCapture>>
@@ -159,7 +159,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
When your $mercenariesTitle break down the door to the shut-in's shack, they are met with a surprised and somewhat unkempt woman staring at them. Despite their lack of social interaction, they know better than to argue with a small army of armed $mercenariesTitle and quietly accepts being escorted back to the waiting VTOL.
The shut-in spends the VTOL ride sitting quietly in their seat. Confused by her silence, your $mercenariesTitle attempt to engage her in conversation but are granted no response.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "procuress">>
<<if $targetEscape >= _MercCapture>>
@@ -169,7 +169,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
When your $mercenariesTitle enter the halfway house, the impoverished women within mistake them for an international rescue mission. Before your $mercenariesTitle can say otherwise, the women band together and drag the procuress out of her office and restrain her themselves. The $mercenariesTitle have to do little more than escort the grinning women to the waiting VTOLs, while they drag the protesting procuress with them.
The procuress spends the VTOL ride watching uneasily as the girls she intended to sell into slavery are raped by your mercenaries. Far from having a conscience, she realizes that her own capture indicates that she will not be long spared from such treatment. The revelation brings her to weep tears down her mature face, doomed to the same fate she herself sent many girls to.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "investor">>
<<if $targetEscape >= _MercCapture>>
@@ -179,7 +179,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
When your $mercenariesTitle corner the investor in the exposition, she seemingly mistakes them for international police intent on taking her in for prior economic crimes. She begrudgingly surrenders and is subsequently escorted back to a waiting VTOL.
The investor spends the VTOL ride practicing their sales pitches, techniques and speeches. It seems they haven't grasped what their destination is, nor the fate that awaits them upon arrival.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "scientist">>
<<if $targetEscape >= _MercCapture>>
@@ -189,7 +189,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
The bulk of the scientists surrender shortly after your $mercenariesTitle make an explosive entrance into their lab. Before she can be cuffed, the chief scientist takes a swig from some mysterious beaker of liquid. As the triumphant look on her face fades, it becomes clear that the liquid did not have the transformative effect that she desired.
The scientist spends the VTOL ride watching as her colleagues and peers are raped around her. That some of the earth's greatest minds have been reduced to sexual objects is disquieting enough, but the realization that she is not likely to be spared from such a fate brings the woman to tears.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "lawyer">>
<<if $targetEscape >= _MercCapture>>
@@ -199,7 +199,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<else>>
Your $mercenariesTitle capture the law firm's staff without much difficulty, but when they open the door to the lawyer's office they find her frothing from the mouth and unresponsive. Despite her attempts to drug herself into suicide, the effects are temporary and the lawyer soon finds herself being hauled off to a waiting VTOL with her staff.
The lawyer spends the VTOL ride scarcely sparing any attention to the rape of her staff all about her. Instead she seems almost lost in thought, as if concentrating on finding some loophole or legal means to escape the fate that has befallen her staff.
- <<AddSlave $activeSlave>> /* skip New Slave Intro */
+ <<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<</switch>>
<<if ($targetEscape >= _MercCapture) || (_raidescape == 1)>>
diff --git a/src/uncategorized/siblingsWorkaround.tw b/src/uncategorized/siblingsWorkaround.tw
index 56ccd02d852..06b6f10a87b 100644
--- a/src/uncategorized/siblingsWorkaround.tw
+++ b/src/uncategorized/siblingsWorkaround.tw
@@ -2,7 +2,7 @@
Your new pair of slaves look frightened and uncertain, but seem encouraged by each other's presence.
-<<AddSlave $activeSlave>>
+<<run newSlave($activeSlave)>>
<<set _secondSlave = clone($activeSlave)>>
<<unset $activeSlave>>
@@ -67,4 +67,4 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.butt += random (-1, 1)>>
<</if>>
-<<AddSlave _secondSlave>>
+<<run newSlave(_secondSlave)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index d72010e82bd..598bd264c66 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -887,7 +887,7 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<<case "face">>
- <<FaceIncrease $activeSlave 20>>
+ <<= faceIncrease($activeSlave, 20)>>
<<if $activeSlave.fetish == "mindbroken">>
$He doesn't notice the improvements to $his face, but $he's not the one looking at it. As with all surgery @@.red;$his health has been slightly affected.@@
<<elseif ($activeSlave.devotion > 50)>>
diff --git a/src/uncategorized/twinsWorkaround.tw b/src/uncategorized/twinsWorkaround.tw
index 10c27869511..64b7d90a8c0 100644
--- a/src/uncategorized/twinsWorkaround.tw
+++ b/src/uncategorized/twinsWorkaround.tw
@@ -2,7 +2,7 @@
Your new pair of slaves look frightened and uncertain, but seem encouraged by each other's presence.
-<<AddSlave $activeSlave>>
+<<run newSlave($activeSlave)>>
<<set _secondSlave = clone($activeSlave)>>
<<unset $activeSlave>>
@@ -19,4 +19,4 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.relationTarget = _secondSlave.ID - 1000>>
<</if>>
-<<AddSlave _secondSlave>>
+<<run newSlave(_secondSlave)>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 545a98ad6e8..c64a84f77fb 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -657,23 +657,6 @@
<</widget>>
-/%
- Call as <<FaceIncrease>>
- $args[0]: Slave.
- $args[1]: Amount of increase.
-%/
-<<widget "FaceIncrease">>
- <<= faceIncrease($args[0], $args[1]) >>
-<</widget>>
-
-/%
- Call as <<AddSlave>>
- $args[0]: Slave.
-%/
-<<widget "AddSlave">>
- <<run newSlave($args[0])>>
-<</widget>>
-
<<widget "Master">><<if def $args[0]>><<run Enunciate($args[0])>><<elseif ndef $titleEnunciate>><<run Enunciate($activeSlave)>><</if>>$titleEnunciate<</widget>>
<<widget "say">><<if def $args[0] && $sayEnunciate != "lisp">>$args[0]<<else>>$sayEnunciate<</if>><</widget>>
<<widget "s">>$sEnunciate<</widget>>
--
GitLab