From 00dcebc8491770a0a560dccd093fc706cf155dda Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Wed, 27 Jun 2018 21:22:04 -0400
Subject: [PATCH] remove widget use
---
.../mod_EditSlaveCheatDatatypeCleanupNew.tw | 2 +-
src/npc/abort.tw | 2 +-
src/npc/agent/agentCompany.tw | 2 +-
src/npc/agent/agentRetrieve.tw | 2 +-
src/npc/agent/agentWorkaround.tw | 2 +-
src/npc/asDump.tw | 2 +-
src/npc/descriptions/fAnus.tw | 2 +-
src/npc/descriptions/fBoobs.tw | 2 +-
src/npc/descriptions/fButt.tw | 2 +-
src/npc/descriptions/fFuckdollWidgets.tw | 8 +-
src/npc/descriptions/fLips.tw | 2 +-
src/npc/descriptions/fVagina.tw | 2 +-
src/npc/fAbuse.tw | 2 +-
src/npc/fPCImpreg.tw | 2 +-
src/npc/fRelation.tw | 4 +-
src/npc/fRival.tw | 4 +-
src/npc/fSlaveImpregConsummate.tw | 4 +-
src/npc/removeActiveSlave.tw | 2 +-
src/pregmod/csec.tw | 2 +-
src/pregmod/fDick.tw | 2 +-
src/pregmod/fFeet.tw | 2 +-
src/pregmod/fMarry.tw | 2 +-
src/pregmod/fPat.tw | 2 +-
src/pregmod/fSlaveFeed.tw | 4 +-
src/pregmod/fSlaveSelfImpreg.tw | 2 +-
src/pregmod/fSlaveSlaveDickConsummate.tw | 4 +-
src/pregmod/fSlaveSlaveVagConsummate.tw | 4 +-
src/pregmod/fillUpButt.tw | 2 +-
src/pregmod/fillUpFace.tw | 2 +-
src/pregmod/forceFeeding.tw | 2 +-
src/pregmod/huskSlaveSwap.tw | 8 +-
src/pregmod/newChildIntro.tw | 6 +-
src/pregmod/pRaped.tw | 4 +-
src/pregmod/slaveSlaveSwap.tw | 4 +-
src/pregmod/widgets/bodyswapWidgets.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 2 +-
src/pregmod/widgets/slaveSummaryWidgets.tw | 4 -
src/uncategorized/RESS.tw | 14 +-
src/uncategorized/arcade.tw | 2 +-
src/uncategorized/assign.tw | 2 +-
src/uncategorized/attendantWorkaround.tw | 4 +-
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/bodyguardWorkaround.tw | 4 +-
src/uncategorized/brothel.tw | 4 +-
src/uncategorized/cellblock.tw | 4 +-
src/uncategorized/clinic.tw | 4 +-
src/uncategorized/clinicReport.tw | 2 +-
src/uncategorized/club.tw | 4 +-
src/uncategorized/concubineWorkaround.tw | 4 +-
src/uncategorized/dairy.tw | 16 +-
src/uncategorized/djWorkaround.tw | 4 +-
src/uncategorized/fullReport.tw | 2 +-
src/uncategorized/hgWorkaround.tw | 4 +-
src/uncategorized/madamWorkaround.tw | 4 +-
src/uncategorized/masterSuite.tw | 4 +-
src/uncategorized/milkmaidWorkaround.tw | 4 +-
src/uncategorized/neighborsDevelopment.tw | 4 +-
src/uncategorized/newGamePlus.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 4 +-
src/uncategorized/nextSlaveInLine.tw | 2 +-
src/uncategorized/nextWeek.tw | 8 +-
src/uncategorized/ngpWorkaround.tw | 4 +-
src/uncategorized/nurseWorkaround.tw | 4 +-
src/uncategorized/penthouseReport.tw | 2 +-
src/uncategorized/previousSlaveInLine.tw | 2 +-
src/uncategorized/reBusyArcade.tw | 2 +-
src/uncategorized/reMalefactor.tw | 4 +-
src/uncategorized/reRebels.tw | 4 +-
src/uncategorized/reShelterInspection.tw | 2 +-
src/uncategorized/recruiterWorkaround.tw | 4 +-
src/uncategorized/retrieve.tw | 2 +-
src/uncategorized/saChoosesOwnJob.tw | 202 +++++++++---------
src/uncategorized/saStayConfined.tw | 2 +-
src/uncategorized/saTakeClasses.tw | 4 +-
src/uncategorized/schoolroom.tw | 4 +-
src/uncategorized/schoolroomReport.tw | 4 +-
src/uncategorized/schoolteacherWorkaround.tw | 4 +-
src/uncategorized/servantsQuarters.tw | 4 +-
src/uncategorized/slaveAssignmentsReport.tw | 22 +-
src/uncategorized/slaveInteract.tw | 22 +-
src/uncategorized/slaveSold.tw | 154 ++++++-------
src/uncategorized/slaveSummary.tw | 20 +-
src/uncategorized/spa.tw | 4 +-
src/uncategorized/spaReport.tw | 2 +-
src/uncategorized/stewardessWorkaround.tw | 4 +-
src/uncategorized/subordinateTargeting.tw | 4 +-
src/uncategorized/summaryOptions.tw | 2 +-
src/uncategorized/surgeryDegradation.tw | 4 +-
src/uncategorized/wardenessWorkaround.tw | 4 +-
src/utility/assignWidgets.tw | 25 ---
src/utility/miscWidgets.tw | 2 +-
91 files changed, 355 insertions(+), 384 deletions(-)
delete mode 100644 src/utility/assignWidgets.tw
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index f985e7caa27..5be257efdab 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -467,7 +467,7 @@
<</if>>
<<if $tempSlave.breedingMark == 1 && ["whore", "serve the public", "work a glory hole", "work in the dairy", "serve in the club", "be the DJ", "be the Madam", "live with your Head Girl", "be confined in the arcade", "work in the brothel", "be a subordinate slave"].includes($tempSlave.assignment)>>
<<print "Eugenics Breeding Marked slave detected in questionable use, defaulting slave assignment to 'rest'">><br>
- <<assignJob $tempSlave "rest">>
+ <<= assignJob($tempSlave, "rest")>>
<</if>>
<<SetBellySize $tempSlave>>
diff --git a/src/npc/abort.tw b/src/npc/abort.tw
index 42f9e0d2a88..103c12d24e0 100644
--- a/src/npc/abort.tw
+++ b/src/npc/abort.tw
@@ -1,7 +1,7 @@
:: Abort [nobr]
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
The remote surgery makes aborting a pregnancy quick and efficient. $activeSlave.slaveName is
<<if $activeSlave.fetish == "pregnancy">>
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 8dbdbb32649..a02fa49f93e 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Neighbor Interact", _ID = $activeSlave.ID>>
-<<assignJob $activeSlave "live with your agent">>
+<<= assignJob($activeSlave, "live with your agent")>>
<<if $activeSlave.reservedChildren > 0>>
<<set $reservedChildren -= $activeSlave.reservedChildren>>
diff --git a/src/npc/agent/agentRetrieve.tw b/src/npc/agent/agentRetrieve.tw
index 831f39bae86..f0ce24aaef9 100644
--- a/src/npc/agent/agentRetrieve.tw
+++ b/src/npc/agent/agentRetrieve.tw
@@ -4,7 +4,7 @@
<<set _i = $slaveIndices[_ID]>>
<<if def _i>>
- <<removeJob $slaves[_i] "be your agent">>
+ <<= removeJob($slaves[_i], "be your agent")>>
<</if>>
<<set $activeArcology.leaderID = 0, $activeArcology.government = "your trustees">>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index dce564424e8..bb38dcbd44f 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Continue", $nextLink = "Neighbor Interact", _ID = $slaves[$i].ID>>
-<<assignJob $slaves[$i] "be your agent">>
+<<= assignJob($slaves[$i], "be your agent")>>
<<if $slaves[$i].reservedChildren > 0>>
<<set $reservedChildren -= $slaves[$i].reservedChildren>>
diff --git a/src/npc/asDump.tw b/src/npc/asDump.tw
index 859039ff36a..48774cf58f9 100644
--- a/src/npc/asDump.tw
+++ b/src/npc/asDump.tw
@@ -39,7 +39,7 @@
<<case $Collectrix.ID>><<set $Collectrix = $activeSlave>>
<</switch>>
- <<ClearSummaryCache $activeSlave>>
+ <<run clearSummaryCache($activeSlave)>>
<</silently>>
diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index d4d7710c218..da0ee38046a 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -1,7 +1,7 @@
:: FAnus [nobr]
<<set $activeSlave.analCount++, $analTotal++>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
You call $him over so you can
diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw
index 2a606505ad9..444f28e8279 100644
--- a/src/npc/descriptions/fBoobs.tw
+++ b/src/npc/descriptions/fBoobs.tw
@@ -1,7 +1,7 @@
:: FBoobs [nobr]
<<set $activeSlave.mammaryCount++, $mammaryTotal++>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
You call $him over so you can play with $his
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 626f63e8485..2a29f1dfad1 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -1,6 +1,6 @@
:: FButt [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
You call $him over so you can
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index 33ef519ed0f..8a0ae55acb9 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -3,7 +3,7 @@
<<widget "FFuckdollOral">>
<<set $activeSlave.oralCount++, $oralTotal++>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
You decide to use the Fuckdoll's <<if $activeSlave.lips > 95>>facepussy<<else>>face hole<</if>>.
<<if $activeSlave.fuckdoll <= 10>>
Since it is not well adapted to life as a living sex toy yet, it won't respond to position commands. So, you simply <<if $activeSlave.amp == 0>>shove it into a kneeling position<<else>>set it on the couch<</if>> and straddle its face.
@@ -40,7 +40,7 @@ You climax, <<if $PC.dick == 1>>blowing your load down its throat<<else>>giving
<<widget "FFuckdollVaginal">>
<<set $activeSlave.vaginalCount++, $vaginalTotal++>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
You decide to use the Fuckdoll's <<if $activeSlave.vagina > 3>>cavernous<<elseif $activeSlave.vagina == 3>>soft<<elseif $activeSlave.vagina == 2>>inviting<<elseif $activeSlave.vagina == 1>>tight<</if>> front hole.
<<if $activeSlave.fuckdoll <= 10>>
Since it is not well adapted to life as a living sex toy yet, it won't respond to position commands. So, you simply <<if $activeSlave.amp == 0>>push it down to lie on the couch<<else>>set it on your desk<</if>> and shove <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> inside its vagina.
@@ -95,7 +95,7 @@ You climax<<if $PC.dick == 1>>, your cum shooting forward to splash against its
<<widget "FFuckdollImpreg">>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<set _bonus = random(6,20)>>
<<if $activeSlave.mpreg == 1>>
@@ -183,7 +183,7 @@ You repeat this ritual throughout the week, ensuring that it will be an @@.lime;
<<widget "FFuckdollAnal">>
<<set $activeSlave.analCount++, $analTotal++>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
You decide to use the Fuckdoll's <<if $activeSlave.anus > 3>>gaping<<elseif $activeSlave.anus == 3>>loose<<elseif $activeSlave.anus == 2>>relaxed<<elseif $activeSlave.anus == 1>>tight<</if>> rear hole.
<<if $activeSlave.fuckdoll <= 10>>
Since it is not well adapted to life as a living sex toy yet, it won't respond to position commands. So, you simply <<if $activeSlave.amp == 0>>walk over to it<<else>>flip it over<</if>> and ram <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>> up its rear hole.
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index cc5ce1f2f96..4e86b3fcc94 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -2,7 +2,7 @@
<<set $activeSlave.oralCount++, $oralTotal++>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
You tell $activeSlave.slaveName to
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 73ff17a85cd..76bba90f62b 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -1,7 +1,7 @@
:: FVagina [nobr]
<<SlaveTitle $activeSlave>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
You call $him over so you can
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index 392a4b21028..9aa84ce9661 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -1,6 +1,6 @@
:: FAbuse [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<if ($activeSlave.ID == $Bodyguard.ID)>>
<<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 95)>>
diff --git a/src/npc/fPCImpreg.tw b/src/npc/fPCImpreg.tw
index 704849f2ff9..ef6e7577d4d 100644
--- a/src/npc/fPCImpreg.tw
+++ b/src/npc/fPCImpreg.tw
@@ -1,6 +1,6 @@
:: FPCImpreg [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<set _bonus = random(6,20)>>
<<if $activeSlave.mpreg == 1>>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 8eda66e062d..ffc5e76b56b 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -44,10 +44,10 @@
<</switch>>
<</if>>
<<Enunciate $activeSlave>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<<ClearSummaryCache $slaves[$partner]>>
+<<run clearSummaryCache($slaves[$partner])>>
<<setLocalPronouns $slaves[$partner] 2>>
You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your office.
diff --git a/src/npc/fRival.tw b/src/npc/fRival.tw
index 20c7d39baf0..ac91bdb4c39 100644
--- a/src/npc/fRival.tw
+++ b/src/npc/fRival.tw
@@ -1,9 +1,9 @@
:: FRival [nobr]
<<set $partner = $slaveIndices[$activeSlave.rivalryTarget]>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<<ClearSummaryCache $slaves[$partner]>>
+<<run clearSummaryCache($slaves[$partner])>>
<<setLocalPronouns $slaves[$partner] 2>>
You call $activeSlave.slaveName to your office and let $him know you'll be abusing $slaves[$partner].slaveName together.
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index c9a0417fc5f..dd13e6fa828 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -4,9 +4,9 @@ The first necessary step is to prepare the donatrix.
<<set _penCountBonus = random(6,20), _analCountBonus = _penCountBonus, _vagCountBonus = _penCountBonus>>
<<set $impregnatrix.penetrativeCount += _penCountBonus+1, $penetrativeTotal += _penCountBonus+1>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<<ClearSummaryCache $impregnatrix>>
+<<run clearSummaryCache($impregnatrix)>>
<<setLocalPronouns $impregnatrix 2>>
<<if ($impregnatrix.fetish == "pregnancy") && ($impregnatrix.fetishKnown == 1) && ($impregnatrix.fetishStrength > 60) && ($impregnatrix.devotion >= -20)>>
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
index 9d2dd987304..44976f116e7 100644
--- a/src/npc/removeActiveSlave.tw
+++ b/src/npc/removeActiveSlave.tw
@@ -110,7 +110,7 @@
<</if>>
/% Remove from facility array or leadership role, if needed %/
- <<removeJob $activeSlave $activeSlave.assignment>>
+ <<= removeJob($activeSlave, $activeSlave.assignment)>>
<<if $traitor != 0>>
<<if _ID == $traitor.pregSource>>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 4f6756e3f4a..5b6dbf81645 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<set _getFather = getSlave($activeSlave.pregSource)>>
<<if def _getFather>>
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index 501a1e057bd..9e120392218 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -1,6 +1,6 @@
:: FDick [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
<<set _belly = bellyAdjective($activeSlave)>>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 906f4e1aa72..ce4b3d05878 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -1,6 +1,6 @@
:: FFeet [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<SlavePronouns $activeSlave>>
<<set _footSeed = random(1,100)>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 51122926761..310c7eef2b3 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Slave Interact", $weddingSlaveID = $activeSlave.ID>>
<<Enunciate $activeSlave>>
<<set _belly = bellyAdjective($activeSlave)>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
<<setLocalPronouns $assistantPronouns 2>>
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index 545bfb511f1..dbf9a1019b7 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -1,7 +1,7 @@
:: FPat [nobr]
<<Enunciate $activeSlave>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
You tell $activeSlave.slaveName to
diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw
index 7592aec7e94..d3d5be96ef6 100644
--- a/src/pregmod/fSlaveFeed.tw
+++ b/src/pregmod/fSlaveFeed.tw
@@ -5,10 +5,10 @@
<<if $activeSlave.inflationType == "milk">>
<<set $activeSlave.milkSource = $milkTap.ID>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<<ClearSummaryCache $milkTap>>
+<<run clearSummaryCache($milkTap)>>
<<setLocalPronouns $milkTap 2>>
The first necessary step is to prepare the milk cow and _his2 udders.
diff --git a/src/pregmod/fSlaveSelfImpreg.tw b/src/pregmod/fSlaveSelfImpreg.tw
index a2102295941..ede8365bd63 100644
--- a/src/pregmod/fSlaveSelfImpreg.tw
+++ b/src/pregmod/fSlaveSelfImpreg.tw
@@ -1,6 +1,6 @@
:: FSlaveSelfImpreg [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
<<set _pfh = ($activeSlave.fetish == "pregnancy" && $activeSlave.fetishStrength > 50)>>
diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw
index 8e1344eefa7..3fe71925d89 100644
--- a/src/pregmod/fSlaveSlaveDickConsummate.tw
+++ b/src/pregmod/fSlaveSlaveDickConsummate.tw
@@ -1,9 +1,9 @@
:: FSlaveSlaveDick Consummate [nobr]
<<set $nextButton = "Continue", $returnTo = $nextLink, $nextLink = "AS Dump">>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<<ClearSummaryCache $slaverapistx>>
+<<run clearSummaryCache($slaverapistx)>>
<<setLocalPronouns $slaverapistx 2>>
<<if $activeSlave.dick>>
diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw
index 2d631559a12..07f8af205eb 100644
--- a/src/pregmod/fSlaveSlaveVagConsummate.tw
+++ b/src/pregmod/fSlaveSlaveVagConsummate.tw
@@ -1,8 +1,8 @@
:: FSlaveSlaveVag Consummate [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<<ClearSummaryCache $slaverapistx>>
+<<run clearSummaryCache($slaverapistx)>>
<<setLocalPronouns $slaverapistx 2>>
<<set $activeSlave.vaginalCount += 1>>
diff --git a/src/pregmod/fillUpButt.tw b/src/pregmod/fillUpButt.tw
index caea3166e10..03c913140b3 100644
--- a/src/pregmod/fillUpButt.tw
+++ b/src/pregmod/fillUpButt.tw
@@ -1,6 +1,6 @@
:: FillUpButt [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<set $activeSlave.bellyAccessory = "none">>
<<set _pregDiscovery = 0>>
You
diff --git a/src/pregmod/fillUpFace.tw b/src/pregmod/fillUpFace.tw
index 943f640d926..8bae3adb981 100644
--- a/src/pregmod/fillUpFace.tw
+++ b/src/pregmod/fillUpFace.tw
@@ -1,6 +1,6 @@
:: FillUpFace [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<set $activeSlave.bellyAccessory = "none">>
<<set _pregDiscovery = 0>>
<<set _belly = bellyAdjective($activeSlave)>>
diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw
index bdb770da4e7..895ec72271f 100644
--- a/src/pregmod/forceFeeding.tw
+++ b/src/pregmod/forceFeeding.tw
@@ -1,6 +1,6 @@
:: forceFeeding [nobr]
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
<<set _belly = bellyAdjective($activeSlave)>>
diff --git a/src/pregmod/huskSlaveSwap.tw b/src/pregmod/huskSlaveSwap.tw
index a45266e0aa6..33011f09dd1 100644
--- a/src/pregmod/huskSlaveSwap.tw
+++ b/src/pregmod/huskSlaveSwap.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Continue">>
<<set _oldSlave = clone($swappingSlave)>>
<<set _m = $slaveIndices[$swappingSlave.ID]>>
-<<ClearSummaryCache $slaves[_m]>>
+<<run clearSummaryCache($slaves[_m])>>
You strap $slaves[_m].slaveName, and the body to which $pronoun will be transferred, into the remote surgery and stand back as it goes to work.
<<BodySwap $slaves[_m] $activeSlave>>
@@ -25,12 +25,12 @@ $slaves[_m].slaveName's old body was bought by the Flesh Heap for <<print cashFo
<<set $slaves[_myBody].origBodyOwnerID = 0>>
<<if $slaves[_myBody].fetish != "mindbroken" && $slaves[_myBody].fuckdoll == 0>>
<<if $slaves[_myBody].devotion > 20>>
- $slaves[_myBody].slaveName is somwhat saddened to see her body leave forever.
+ $slaves[_myBody].slaveName is somewhat saddened to see her body leave forever.
<<elseif $slaves[_myBody].devotion >= -50>>
- $slaves[_myBody].slaveName is @@.medimorchid;disturbed@@ to find her body is gone for good, damaging her @@.gold;ability to trust you.@@
+ $slaves[_myBody].slaveName is @@.mediumorchid;disturbed@@ to find her body is gone for good, damaging her @@.gold;ability to trust you.@@
<<set $slaves[_myBody].devotion -= 30, $slaves[_myBody].trust -= 30>>
<<else>>
- $slaves[_myBody].slaveName is @@.medimorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.orangered;completely rejecting your ownership of her.@@
+ $slaves[_myBody].slaveName is @@.mediumorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.orangered;completely rejecting your ownership of her.@@
<<set $slaves[_myBody].devotion -= 50, $slaves[_myBody].trust = 100>>
<</if>>
<</if>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index b64ac6b40fd..6e94a531b4e 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1028,7 +1028,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
<<if $activeSlave.vagina > -1>><<set $activeSlave.vagina = Math.clamp($activeSlave.vagina, 3, 4)>><</if>>
<<set $activeSlave.analCount += 10, $analTotal += 10>>
- <<assignJob $activeSlave "dairy">>
+ <<= assignJob($activeSlave, "dairy")>>
<<replace "#result">>
You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $dairyName. The new slave does not know what $dairyName is, not really, and she doesn't know what being set up there means, either. If she knew that you are able to send her there so blithely only because it is equipped with a special preparatory raper that will seize her, <<if $activeSlave.vagina > -1>>mercilessly fuck her pussy and ass until both are gaped<<else>>ream her anus until it's cavernously gaped<</if>>, and then consign her to constant fucking by gargantuan machine phalli, she might resist. But she doesn't, so she does not.
<</replace>>
@@ -1044,7 +1044,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<set $activeSlave.vaginalCount += 10, $vaginalTotal += 10>>
<</if>>
<<set $activeSlave.analCount += 10, $analTotal += 10>>
- <<assignJob $activeSlave "dairy">>
+ <<= assignJob($activeSlave, "dairy")>>
<<replace "#result">>
Making use of her blissful ignorance, you restrain her on one of the chairs in your office in an approximation of the position she'll occupy in $dairyName. Then you put a mask on her, like the ones the machines there feature, and turn it on, watching the slave squirm against her restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed her, and to keep your office reasonably quiet. Then, for the rest of the day, you use her vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape her. By the evening she's been fucked so hard that she's stopped jerking against the chair when you pound <<if $PC.dick == 1>>your huge cock<<else>>a huge strap-on<</if>> in and out of her, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick == 1>>yourself<<else>>it<</if>> to really blow her out. Once that gets too easy, you start adding dildos for double penetration. By the night she's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign her to her fate. She might have some opinion on how she's spent her day, but it's unlikely she'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of her<<if $activeSlave.vagina > -1>> cunt,<</if>> throat, and asshole.
<</replace>>
@@ -1063,7 +1063,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<</link>>
<<if ($arcade > $arcadeSlaves) || ($arcadeUpgradeFuckdolls != 0)>>
<br><<link "Send her straight to the Arcade">>
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.assignmentVisible = 0>>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<replace "#result">>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 06f53c0a212..2eb32e8b270 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -171,7 +171,7 @@ Now the only question is what to do with the would-be rapist. You could toss the
<</link>>
<<if $arcade > 0>>
<br><<link "Enslave her and sentence her to a month in the arcade">>
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.sentence = 4>>
<<set $cash -= $contractCost>>
<<replace "#result">>
@@ -183,7 +183,7 @@ Now the only question is what to do with the would-be rapist. You could toss the
<<if $dairy > 0>>
<<if $dairyRestraintsSetting > 1>>
<br><<link "Enslave her and send her straight to the industrial dairy">>
- <<assignJob $activeSlave "work in the dairy">>
+ <<= assignJob($activeSlave, "work in the dairy")>>
<<set $cash -= $contractCost>>
<<replace "#result">>
You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up <<if $dairyStimulatorsSetting > 1>>in agony as her anus takes the rectal hydration dildo<<else>>to find her chest has begun swelling with milk<</if>>.
diff --git a/src/pregmod/slaveSlaveSwap.tw b/src/pregmod/slaveSlaveSwap.tw
index 1a77380e29c..8073429dc45 100644
--- a/src/pregmod/slaveSlaveSwap.tw
+++ b/src/pregmod/slaveSlaveSwap.tw
@@ -10,8 +10,8 @@
<<set _gps2 = $genePool.findIndex(function(s) { return s.ID == $slaves[_ss2].ID; })>>
<<set _gps2Clone = clone($genePool[_gps2])>>
-<<ClearSummaryCache $slaves[_ss1]>>
-<<ClearSummaryCache $slaves[_ss2]>>
+<<run clearSummaryCache($slaves[_ss1])>>
+<<run clearSummaryCache($slaves[_ss2])>>
You strap $activeSlave.slaveName and $swappingSlave.slaveName into the remote surgery and stand back as it goes to work.
<<BodySwap $slaves[_ss1] _ss2Clone 1>> /* passing a third argument just to detect if it's a slave from the genepool */
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 33e74f67602..caf2df12971 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -171,7 +171,7 @@
<<set $args[0].canRecruit = 0>>
/*
<<if def $args[2]>>
- <<assignJob $args[0] "rest">>
+ <<= assignJob($args[0], "rest")>>
<</if>>
*/
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 3da276b8be2..e8ea263cbc4 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -757,7 +757,7 @@ $activeSlave.slaveName is up for review:
<<set $activeSlave.breedingMark = 1, $activeSlave.pregControl = "none">>
<</if>>
<br>@@.yellowgreen;<<print cashFormat(5000)>>@@ has been deducted from your account as agreed.
-<<removeJob $activeSlave $activeSlave.assignment>>
+<<= removeJob($activeSlave, $activeSlave.assignment)>>
<</widget>>
<<widget "PlayerRace">>
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index 3a0877f83de..0d444650227 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -24,10 +24,6 @@
<</if>>
<</widget>>
-<<widget "ClearSummaryCache">>
- <<run clearSummaryCache($args[0])>>
-<</widget>>
-
<<widget "SlaveSummaryUncached">>
<<set _Slave = $args[0]>>
<<if $abbreviateDevotion == 1>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b9a4ea60446..a2fa503095d 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -6944,7 +6944,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
Her thin form makes immuring her in the arcade pathetically easy.
<</if>>
After she's properly confined, the only sign of her discomfiture is a slight movement of her $activeSlave.skin butt as she wriggles desperately against her restraints.
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.sentence = 4>>
<</replace>>
<</link>>
@@ -6957,7 +6957,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<replace "#result">>
You order $activeSlave.slaveName confined until further notice. $activeSlave.slaveName is @@.hotpink;a little crushed@@ by her failure to escape. However, every single one of your other slaves not already obedient to you is slightly @@.mediumaquamarine;encouraged in her trust that you won't hurt her@@ by this moderate punishment of an escape attempt.
<<set $activeSlave.devotion += 4>>
- <<assignJob $activeSlave "stay confined">>
+ <<= assignJob($activeSlave, "stay confined")>>
<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust += 4; } })>>
<</replace>>
<</link>>
@@ -7049,7 +7049,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
Her thin form makes immuring her in the arcade pathetically easy.
<</if>>
After she's properly confined, the only sign of her discomfiture is a slight movement of her $activeSlave.skin butt as she wriggles desperately against her restraints.
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.sentence = 4>>
<</replace>>
<</link>>
@@ -7132,7 +7132,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
Her thin form makes immuring her in the arcade pathetically easy.
<</if>>
After she's properly confined, the only sign of her discomfiture is a slight movement of her $activeSlave.skin butt as she wriggles desperately against her restraints.
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.sentence = 4>>
<</replace>>
<</link>>
@@ -8515,7 +8515,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
Her thin form makes immuring her in the arcade pathetically easy.
<</if>>
After she's properly confined, the only sign of her discomfiture is a slight movement of her $activeSlave.skin butt as she wriggles desperately against her restraints.
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.sentence = 4>>
<</replace>>
<</link>>
@@ -8767,7 +8767,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
Her thin form makes immuring her in the arcade pathetically easy.
<</if>>
After she's properly confined, the only sign of her discomfiture is a slight movement of her $activeSlave.skin butt as she wriggles desperately against her restraints.
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.sentence = 4>>
<</replace>>
<</link>>
@@ -10884,7 +10884,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
Her thin form makes immuring her in the arcade pathetically easy.
<</if>>
After she's properly confined, the only sign of her discomfiture is a slight movement of her butt as she wriggles desperately against her restraints.
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.sentence = 4>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 8ff694c94ba..a982751c35b 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -79,7 +79,7 @@ $arcadeNameCaps
<<set _NewPop = $arcadeSlaves+$dormitoryPopulation>>
<<link "Remove all slaves" "Arcade">>
<<for $arcadeSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$ArcadeiIDs[0]]] "work a glory hole">>
+ <<= assignJob($slaves[$slaveIndices[$ArcadeiIDs[0]]], "work a glory hole")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/assign.tw b/src/uncategorized/assign.tw
index 8123183ad6c..c8d5757e316 100644
--- a/src/uncategorized/assign.tw
+++ b/src/uncategorized/assign.tw
@@ -18,7 +18,7 @@
<<goto $returnTo>>
<<default>>
- <<assignJob $activeSlave $assignTo>>
+ <<= assignJob($activeSlave, $assignTo)>>
<<if ($showAssignToScenes == 1) && ($activeSlave.fetish != "mindbroken")>>
<<if ($assignTo == "Dairy") && (($dairyStimulatorsSetting >= 2) || ($dairyFeedersSetting >= 2) || ($dairyPregSetting >= 2))>>
diff --git a/src/uncategorized/attendantWorkaround.tw b/src/uncategorized/attendantWorkaround.tw
index a9e497b65f7..025ad2641be 100644
--- a/src/uncategorized/attendantWorkaround.tw
+++ b/src/uncategorized/attendantWorkaround.tw
@@ -1,10 +1,10 @@
:: Attendant Workaround [silently]
<<if $Attendant != 0>>
- <<removeJob $Attendant "be the Attendant">>
+ <<= removeJob($Attendant, "be the Attendant")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the Attendant">>
+ <<= assignJob($slaves[$i], "be the Attendant")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Attendant = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 49f24ac6e0a..190faad1cbd 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1,7 +1,7 @@
:: Body Modification [nobr]
<<set $nextButton = "Continue", $nextLink = "Slave Interact">>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<SlavePronouns $activeSlave>>
<<Enunciate $activeSlave>>
diff --git a/src/uncategorized/bodyguardWorkaround.tw b/src/uncategorized/bodyguardWorkaround.tw
index bcb31008714..6da994d4579 100644
--- a/src/uncategorized/bodyguardWorkaround.tw
+++ b/src/uncategorized/bodyguardWorkaround.tw
@@ -1,10 +1,10 @@
:: Bodyguard Workaround [silently]
<<if $Bodyguard != 0>>
- <<removeJob $Bodyguard "guard you">>
+ <<= removeJob($Bodyguard, "guard you")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "guard you">>
+ <<= assignJob($slaves[$i], "guard you")>>
<<set $Bodyguard = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index f6975eac09f..6255219b18d 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -148,10 +148,10 @@ $brothelNameCaps
<<set _NewPop = $brothelSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Brothel">>
<<if $Madam != 0>>
- <<assignJob $Madam "rest">>
+ <<= assignJob($Madam, "rest")>>
<</if>>
<<for $brothelSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$BrothiIDs[0]]] "whore">>
+ <<= assignJob($slaves[$slaveIndices[$BrothiIDs[0]]], "whore")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index bfc18c7395a..450f46a28a1 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -75,10 +75,10 @@ $cellblockNameCaps
<<set _NewPop = $cellblockSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Cellblock">>
<<if $Wardeness != 0>>
- <<assignJob $Wardeness "rest">>
+ <<= assignJob($Wardeness, "rest")>>
<</if>>
<<for $cellblockSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$CellBiIDs[0]]] "stay confined">>
+ <<= assignJob($slaves[$slaveIndices[$CellBiIDs[0]]], "stay confined")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 86f76f53f56..55e03c049f8 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -75,10 +75,10 @@ $clinicNameCaps
<<set _NewPop = $clinicSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Clinic">>
<<if $Nurse != 0>>
- <<assignJob $Nurse "rest">>
+ <<= assignJob($Nurse, "rest")>>
<</if>>
<<for $clinicSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$CliniciIDs[0]]] "rest">>
+ <<= assignJob($slaves[$slaveIndices[$CliniciIDs[0]]], "rest")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 19cc8771556..27fa4a83ea8 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -277,7 +277,7 @@
<<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))>>
<<else>>
<br><br>''__@@.pink;$slaves[$i].slaveName@@__'' has been returned to health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>, so @@.yellow;her assignment has defaulted to rest.@@
- <<removeJob $slaves[$i] "get treatment in the clinic">>
+ <<= removeJob($slaves[$i], "get treatment in the clinic")>>
<<set _restedSlaves++, _dI--, _DL-->>
<<continue>>
<</if>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index eb61cebaf7b..8e3741a3e1b 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -148,10 +148,10 @@ $clubNameCaps
<<set _NewPop = $clubSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Club">>
<<if $DJ != 0>>
- <<assignJob $DJ "rest">>
+ <<= assignJob($DJ, "rest")>>
<</if>>
<<for $clubSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$ClubiIDs[0]]] "serve the public">>
+ <<= assignJob($slaves[$slaveIndices[$ClubiIDs[0]]], "serve the public")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/concubineWorkaround.tw b/src/uncategorized/concubineWorkaround.tw
index 92d6e9901aa..e7dd5de3e75 100644
--- a/src/uncategorized/concubineWorkaround.tw
+++ b/src/uncategorized/concubineWorkaround.tw
@@ -1,10 +1,10 @@
:: Concubine Workaround [silently]
<<if $Concubine != 0>>
- <<removeJob $Concubine "be your Concubine">>
+ <<= removeJob($Concubine, "be your Concubine")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be your Concubine">>
+ <<= assignJob($slaves[$i], "be your Concubine")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Concubine = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 89ed7378d28..a811c9d641e 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -27,7 +27,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if ($Milkmaid != 0) && ($dairyRestraintsSetting == 2)>>
$Milkmaid.slaveName has been removed from her position as Milkmaid, since an industrialized dairy automates her duties.
- <<removeJob $Milkmaid "be the Milkmaid">>
+ <<= removeJob($Milkmaid, "be the Milkmaid")>>
<br><br>
<</if>>
@@ -42,7 +42,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].vagina > -1) && ($slaves[_i].vagina < 3)>>
$slaves[_i].slaveName's milking machine ejects her, since it cannot fit the mandated dildo into her tight cunt.
- <<removeJob $slaves[_i] "work in the dairy">>
+ <<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
<<if ($dairyPregSetting > 0)>>
@@ -50,7 +50,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $slaves[_i].reservedChildren = 0>>
<<if (($slaves[_i].broodmother > 0) || ($slaves[_i].bellyImplant != -1))>>
$slaves[_i].slaveName's milking machine ejects her, since it detected a foreign body in her womb blocking its required functions.
- <<removeJob $slaves[_i] "work in the dairy">>
+ <<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
<</if>>
@@ -76,7 +76,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].anus < 3)>>
$slaves[_i].slaveName's milking machine ejects her, since it cannot fit its massive anal dildo up her tight asshole.
- <<removeJob $slaves[_i] "work in the dairy">>
+ <<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
<</for>>
@@ -102,7 +102,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].indentureRestrictions >= 2)>>
$slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from restraint for milking.
- <<removeJob $slaves[_i] "work in the dairy">>
+ <<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
<</for>>
@@ -117,7 +117,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set _i = $slaveIndices[$DairyiIDs[_Di]]>>
<<if ($slaves[_i].indentureRestrictions >= 1)>>
$slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from being restrained for milking.
- <<removeJob $slaves[_i] "work in the dairy">>
+ <<= removeJob($slaves[_i], "work in the dairy")>>
<<set _DL--, _Di-->>
<</if>>
<</for>>
@@ -309,10 +309,10 @@ $dairyNameCaps
<<set _NewPop = $dairySlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Dairy">>
<<if $Milkmaid != 0>>
- <<assignJob $Milkmaid "rest">>
+ <<= assignJob($Milkmaid, "rest")>>
<</if>>
<<for $dairySlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$DairyiIDs[0]]] "get milked">>
+ <<= assignJob($slaves[$slaveIndices[$DairyiIDs[0]]], "get milked")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/djWorkaround.tw b/src/uncategorized/djWorkaround.tw
index f41e43e0ca1..90f00e21c81 100644
--- a/src/uncategorized/djWorkaround.tw
+++ b/src/uncategorized/djWorkaround.tw
@@ -1,10 +1,10 @@
:: DJ Workaround [silently]
<<if $DJ != 0>>
- <<removeJob $DJ "be the DJ">>
+ <<= removeJob($DJ, "be the DJ")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the DJ">>
+ <<= assignJob($slaves[$i], "be the DJ")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $DJ = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index 47d165bc6c3..a94cdf59bdc 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -39,7 +39,7 @@
<<case "recruit girls">>
<<include "SA recruit girls">>
<<default>>
- <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<= removeJob($slaves[$i], $slaves[$i].assignment)>>
<<= saRest($slaves[$i])>>
<</switch>>
diff --git a/src/uncategorized/hgWorkaround.tw b/src/uncategorized/hgWorkaround.tw
index a87de77ce3d..5f0a3889f47 100644
--- a/src/uncategorized/hgWorkaround.tw
+++ b/src/uncategorized/hgWorkaround.tw
@@ -1,10 +1,10 @@
:: HG Workaround [silently]
<<if $HeadGirl != 0>>
- <<removeJob $HeadGirl "be your Head Girl">>
+ <<= removeJob($HeadGirl, "be your Head Girl")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be your Head Girl">>
+ <<= assignJob($slaves[$i], "be your Head Girl")>>
<<set $HeadGirl = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/madamWorkaround.tw b/src/uncategorized/madamWorkaround.tw
index 4c3d6432a10..241a97c7fb5 100644
--- a/src/uncategorized/madamWorkaround.tw
+++ b/src/uncategorized/madamWorkaround.tw
@@ -1,10 +1,10 @@
:: Madam Workaround [silently]
<<if $Madam != 0>>
- <<removeJob $Madam "be the Madam">>
+ <<= removeJob($Madam, "be the Madam")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the Madam">>
+ <<= assignJob($slaves[$i], "be the Madam")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Madam = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 4e257d325d9..80b3291e3a1 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -306,10 +306,10 @@ $masterSuiteNameCaps is furnished
<<set _NewPop = $masterSuiteSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Master Suite">>
<<if $Concubine != 0>>
- <<assignJob $Concubine "rest">>
+ <<= assignJob($Concubine, "rest")>>
<</if>>
<<for $masterSuiteSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$MastSiIDs[0]]] "please you">>
+ <<= assignJob($slaves[$slaveIndices[$MastSiIDs[0]]], "please you")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/milkmaidWorkaround.tw b/src/uncategorized/milkmaidWorkaround.tw
index 64a1b6c64cb..d61d15e12da 100644
--- a/src/uncategorized/milkmaidWorkaround.tw
+++ b/src/uncategorized/milkmaidWorkaround.tw
@@ -1,10 +1,10 @@
:: Milkmaid Workaround [silently]
<<if $Milkmaid != 0>>
- <<removeJob $Milkmaid "be the Milkmaid">>
+ <<= removeJob($Milkmaid, "be the Milkmaid")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the Milkmaid">>
+ <<= assignJob($slaves[$i], "be the Milkmaid")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Milkmaid = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index a1b4d5f481a..344e73d7f4c 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -53,7 +53,7 @@
<<set _agentIndex = $slaveIndices[$leaders[_k].ID]>>
<<if def _agentIndex && $slaves[_agentIndex].assignment != "be your agent">>
@@.red;BUG: $slaves[_agentIndex].slaveName also was <<print $slaves[_agentIndex].assignment>>!@@
- <<assignJob $slaves[_agentIndex] "be your agent">>
+ <<= assignJob($slaves[_agentIndex], "be your agent")>>
<</if>>
<<if $agentBonus > 0>>@@.green;She does an excellent job this week.@@<</if>>
The arcology
@@ -82,7 +82,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if def _agentIndex && _agentIndex != -1>>
@@.deeppink;$slaves[_agentIndex].slaveName@@ manages to escape with the help of a few loyal citizens and returns to you @@.gold;fearing your displeasure at her failure.@@
<<set $slaves[_agentIndex].trust -= 40>>
- <<assignJob $slaves[_agentIndex] "rest">> /* this takes care of necessary cleanup for agent and agent companion (if any) */
+ <<= assignJob($slaves[_agentIndex], "rest")>> /* this takes care of necessary cleanup for agent and agent companion (if any) */
<</if>>
A controlling interest has been taken by a single individual, leaving the arcology ruled like yours is.
<<set $arcologies[$i].government = "an individual">>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 483dfaccc19..9b2a62feea0 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -46,7 +46,7 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale
<br><br>
-<<if $cheatMode == 1>><<link "DEBUG: Add all slaves to import list">><<for _ngi = 0; _ngi < $slaves.length; _ngi++>><<assignJob $slaves[_ngi] "be imported">><</for>><<goto "New Game Plus">><</link>><br><</if>>
+<<if $cheatMode == 1>><<link "DEBUG: Add all slaves to import list">><<for _ngi = 0; _ngi < $slaves.length; _ngi++>><<= assignJob($slaves[_ngi], "be imported")>><</for>><<goto "New Game Plus">><</link>><br><</if>>
Select up to $slavesToImportMax slaves to be imported into a new game and then [[click here.|init][$saveImported = 1]]
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index d9e34e9b2ef..3f4693097e0 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1781,7 +1781,7 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
<<if $activeSlave.vagina > -1>><<set $activeSlave.vagina = Math.clamp($activeSlave.vagina, 3, 4)>><</if>>
<<set $activeSlave.analCount += 10, $analTotal += 10>>
- <<assignJob $activeSlave "dairy">>
+ <<= assignJob($activeSlave, "dairy")>>
<<replace "#introResult">>
You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $dairyName. The new slave does not know what $dairyName is, not really, and she doesn't know what being set up there means, either. If she knew that you are able to send her there so blithely only because it is equipped with a special preparatory raper that will seize her, <<if $activeSlave.vagina > -1>>mercilessly fuck her pussy and ass until both are gaped<<else>>ream her anus until it's cavernously gaped<</if>>, and then consign her to constant fucking by gargantuan machine phalli, she might resist. But she doesn't, so she does not.
<</replace>>
@@ -1797,7 +1797,7 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<<set $vaginalTotal += 10>>
<</if>>
<<set $activeSlave.analCount += 10, $analTotal += 10>>
- <<assignJob $activeSlave "dairy">>
+ <<= assignJob($activeSlave, "dairy")>>
<<replace "#introResult">>
Making use of <<if ($activeSlave.trust < -20) || ($activeSlave.devotion > 20)>>her obedience<<else>>the compliance systems<</if>>, you restrain her on one of the chairs in your office in an approximation of the position she'll occupy in $dairyName. Then you put a mask on her, like the ones the machines there feature, and turn it on, watching the slave squirm against her restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed her, and to keep your office reasonably quiet. Then, for the rest of the day, you use her vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape her. By the evening she's been fucked so hard that she's stopped jerking against the chair when you pound <<if $PC.dick == 1>>your huge cock<<else>>a huge strap-on<</if>> in and out of her, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick == 1>>yourself<<else>>it<</if>> to really blow her out. Once that gets too easy, you start adding dildos for double penetration. By the night she's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign her to her fate. She might have some opinion on how she's spent her day, but it's unlikely she'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of her<<if $activeSlave.vagina > -1>> cunt,<</if>> throat, and asshole.
<</replace>>
diff --git a/src/uncategorized/nextSlaveInLine.tw b/src/uncategorized/nextSlaveInLine.tw
index 8149ceb8742..bd5229daa42 100644
--- a/src/uncategorized/nextSlaveInLine.tw
+++ b/src/uncategorized/nextSlaveInLine.tw
@@ -3,7 +3,7 @@
<<silently>>
<<set $i = $slaveIndices[$activeSlave.ID]>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<set $slaves[$i] = $activeSlave>> /* save changes before switching */
<<set $activeSlave = $slaves[$slavesInLine[1]]>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 876ed4f8404..9700e852992 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -54,7 +54,7 @@
<<if $slaves[_i].sentence > 1>>
<<set $slaves[_i].sentence -= 1>>
<<elseif $slaves[_i].sentence == 1>>
- <<removeJob $slaves[_i] $slaves[_i].assignment>>
+ <<= removeJob($slaves[_i], $slaves[_i].assignment)>>
<</if>>
<<if $slaves[_i].weekAcquired < 0>>
<<set $slaves[_i].weekAcquired = 0>>
@@ -116,8 +116,8 @@
<<set $enduringDevotion = ($averageDevotion+($enduringDevotion*3))/4>>
<<if (_OldHG != -1) && (_NewHG != -1)>>
- <<removeJob $slaves[_NewHG] "live with your Head Girl">>
- <<assignJob $slaves[_OldHG] "live with your Head Girl">>
+ <<= removeJob($slaves[_NewHG], "live with your Head Girl")>>
+ <<= assignJob($slaves[_OldHG], "live with your Head Girl")>>
<<set $HeadGirl = $slaves[_NewHG], $slaves[_NewHG].assignment = "be your Head Girl", $slaves[_NewHG].diet = "healthy">>
<</if>>
@@ -267,7 +267,7 @@
<<set $analSkinDesc = "", $applyDesc = "", $bellyAccessory = "", $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "", $nickname = "", $notApplyDesc = "", $oldName = "", $oldSurname = "", $situationDesc = "", $skinDesc = "", $k = "">>
/% Done with zeroing out, what should be for the most part Temps %/
-<<ClearSummaryCache>>
+<<run clearSummaryCache()>>
/*HACKY EVENT WORKAROUNDS*/
<<if $eventID != -1>>
diff --git a/src/uncategorized/ngpWorkaround.tw b/src/uncategorized/ngpWorkaround.tw
index c120d4b2dcd..41b7dc063d4 100644
--- a/src/uncategorized/ngpWorkaround.tw
+++ b/src/uncategorized/ngpWorkaround.tw
@@ -1,9 +1,9 @@
:: NGP Workaround [silently]
<<if $slavesToImport == 1>>
- <<assignJob $slaves[$i] "be imported">>
+ <<= assignJob($slaves[$i], "be imported")>>
<<else>>
- <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<= removeJob($slaves[$i], $slaves[$i].assignment)>>
<</if>>
<<goto "New Game Plus">>
diff --git a/src/uncategorized/nurseWorkaround.tw b/src/uncategorized/nurseWorkaround.tw
index 846407e35b4..503e1bba468 100644
--- a/src/uncategorized/nurseWorkaround.tw
+++ b/src/uncategorized/nurseWorkaround.tw
@@ -1,10 +1,10 @@
:: Nurse Workaround [silently]
<<if $Nurse != 0>>
- <<removeJob $Nurse "be the Nurse">>
+ <<= removeJob($Nurse, "be the Nurse")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the Nurse">>
+ <<= assignJob($slaves[$i], "be the Nurse")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Nurse = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
index 8be58f71c5c..c4aec477423 100644
--- a/src/uncategorized/penthouseReport.tw
+++ b/src/uncategorized/penthouseReport.tw
@@ -20,7 +20,7 @@
<<if $slaves[$i].assignment != "live with your Head Girl">>
<br>@@.red;$slaves[$i].slaveName had been assigned to live with your Head Girl, but this week she was assigned to $slaves[$i].assignment. She has been released to your penthouse for reassignment.@@
- <<removeJob $slaves[$i] "live with your Head Girl">>
+ <<= removeJob($slaves[$i], "live with your Head Girl")>>
<<else>>
''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
diff --git a/src/uncategorized/previousSlaveInLine.tw b/src/uncategorized/previousSlaveInLine.tw
index 008ccb819a4..9df0c2e9e30 100644
--- a/src/uncategorized/previousSlaveInLine.tw
+++ b/src/uncategorized/previousSlaveInLine.tw
@@ -3,7 +3,7 @@
<<silently>>
<<set $i = $slaveIndices[$activeSlave.ID]>>
-<<ClearSummaryCache $activeSlave>>
+<<run clearSummaryCache($activeSlave)>>
<<set $slaves[$i] = $activeSlave>> /* save changes before switching */
<<set $activeSlave = $slaves[$slavesInLine[0]]>>
diff --git a/src/uncategorized/reBusyArcade.tw b/src/uncategorized/reBusyArcade.tw
index 2da960dff38..8e890428605 100644
--- a/src/uncategorized/reBusyArcade.tw
+++ b/src/uncategorized/reBusyArcade.tw
@@ -30,7 +30,7 @@ Facing the ground, <<if !canTalk($activeSlave)>>she gestures with shaking hands
<<replace "#result">>
When you accept, $activeSlave.slaveName looks up at you in incomprehension, expecting you to correct yourself or reveal that this is a cruel trick. When you do neither, she scrabbles spastically to your feet, kisses them as she cries, and then clings to your knees, sobbing. She is so relieved by this reprieve that she is now on the cusp of @@.hotpink;devotion to you,@@ and will obey out of near-paralytic fear of being sent back to the arcade.
<<set $activeSlave.devotion = 45>>
- <<removeJob $activeSlave "be confined in the arcade">>
+ <<= removeJob($activeSlave, "be confined in the arcade")>>
<</replace>>
<</link>>
<br><<link "Refuse">>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index b17ae65c18d..286e90c5b38 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -317,7 +317,7 @@
<</link>>
<<if $arcade > 0>>
<br><<link "Enslave her and sentence her to a month in the arcade">>
- <<assignJob $activeSlave "be confined in the arcade">>
+ <<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.sentence = 4>>
<<set $cash -= $contractCost>>
@@ -347,7 +347,7 @@
<<if $dairy > 0>>
<<if $dairyRestraintsSetting > 1>>
<br><<link "Enslave her and send her straight to the industrial dairy">>
- <<assignJob $activeSlave "work in the dairy">>
+ <<= assignJob($activeSlave, "work in the dairy")>>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<if $malefactor == "addict">>
diff --git a/src/uncategorized/reRebels.tw b/src/uncategorized/reRebels.tw
index c181aaea957..f10a88128e8 100644
--- a/src/uncategorized/reRebels.tw
+++ b/src/uncategorized/reRebels.tw
@@ -90,9 +90,9 @@ You have a rebel problem. $slaves[_i].slaveName and $slaves[_j].slaveName are bo
<br><<link "Sentence them to a month in the arcade">>
<<replace "#result">>
They scream and beg when they realize what their punishment is to be, but you are obdurate. Each tries to inform on the other to avoid such a fate, but to no avail. After they're properly confined, the only sign of their discomfiture is a slight movement of their butts as they wriggle desperately against their restraints.
- <<assignJob $slaves[_j] "be confined in the arcade">>
+ <<= assignJob($slaves[_j], "be confined in the arcade")>>
<<set $slaves[_j].sentence = 4>>
- <<assignJob $slaves[_i] "be confined in the arcade">>
+ <<= assignJob($slaves[_i], "be confined in the arcade")>>
<<set $slaves[_i].sentence = 4>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index c4c2e5d6b87..40b5f294152 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -99,7 +99,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<</link>> //This will cost <<print cashFormat($contractCost)>>//
<<if ($dairy > 0) && ($dairyRestraintsSetting > 1) && ($subSlave.assignment == "work in the dairy")>>
<br><<link "The slave is attached to a milking machine, and so will be the inspector">>
- <<assignJob $activeSlave "work in the dairy">>
+ <<= assignJob($activeSlave, "work in the dairy")>>
<<set $activeSlave.clothes = "no clothing">>
<<set $cash -= $contractCost/2>>
<<replace "#result">>
diff --git a/src/uncategorized/recruiterWorkaround.tw b/src/uncategorized/recruiterWorkaround.tw
index 009c781e340..04d089f201b 100644
--- a/src/uncategorized/recruiterWorkaround.tw
+++ b/src/uncategorized/recruiterWorkaround.tw
@@ -1,10 +1,10 @@
:: Recruiter Workaround [silently]
<<if $Recruiter != 0>>
- <<removeJob $Recruiter "recruit girls">>
+ <<= removeJob($Recruiter, "recruit girls")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "recruit girls">>
+ <<= assignJob($slaves[$i], "recruit girls")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Recruiter = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/retrieve.tw b/src/uncategorized/retrieve.tw
index 0c60b3c0ef8..952ced5cdcf 100644
--- a/src/uncategorized/retrieve.tw
+++ b/src/uncategorized/retrieve.tw
@@ -6,7 +6,7 @@
<<case "Coursing Association">>
<<set $Lurcher = 0>>
<<default>>
- <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<= removeJob($slaves[$i], $slaves[$i].assignment)>>
<</switch>>
<<goto $returnTo>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index a19695ac30e..dc8a1b0aa97 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -18,38 +18,38 @@
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to rest, taking advantage of your permission to @@.mediumorchid;remain indolent@@.">>
- <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<= removeJob($slaves[$i], $slaves[$i].assignment)>>
<<set $slaves[$i].devotion -= 5>>
<<elseif ($slaves[$i].health < 20)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($clinic > $clinicSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is unhealthy, so $pronoun decides to get treatment at $clinicName.">>
- <<assignJob $slaves[$i] "get treatment in the clinic">>
+ <<= assignJob($slaves[$i], "get treatment in the clinic")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is unhealthy, so $pronoun decides to rest.">>
- <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<= removeJob($slaves[$i], $slaves[$i].assignment)>>
<</if>>
<<elseif ($slaves[$i].intelligenceImplant != 1)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($schoolroom > $schoolroomSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is uneducated, so $pronoun sits _oself down in $schoolroomName.">>
- <<assignJob $slaves[$i] "learn in the schoolroom">>
+ <<= assignJob($slaves[$i], "learn in the schoolroom")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is uneducated, so $pronoun sits _oself down to learn.">>
- <<assignJob $slaves[$i] "take classes">>
+ <<= assignJob($slaves[$i], "take classes")>>
<</if>>
<<elseif ($Attendant != 0) && ($universalRulesAssignsSelfFacility == 1) && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45) || ($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none"))>>
<<set $slaves[$i].choosesOwnAssignmentText += " could use some counseling, so $pronoun decides to visit $spaName.">>
- <<assignJob $slaves[$i] "rest in the spa">>
+ <<= assignJob($slaves[$i], "rest in the spa")>>
<<elseif ($slaves[$i].devotion <= 50) && canWalk($slaves[$i]) && canSee($slaves[$i])>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is obedient but not devoted, so $pronoun decides to work from $servantsQuartersName since it's the least sexually demanding job available.">>
- <<assignJob $slaves[$i] "work as a servant">>
+ <<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is obedient but not devoted, so $pronoun decides to work as a servant since it's the least sexually demanding job available.">>
- <<assignJob $slaves[$i] "be a servant">>
+ <<= assignJob($slaves[$i], "be a servant")>>
<</if>>
<<elseif ($slaves[$i].relationship == -1)>>
@@ -58,19 +58,19 @@
<<set $slaves[$i].choosesOwnAssignmentText += " and doesn't mind being a whore, so $pronoun prostitutes _oself">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $brothelName.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun eagerly decides to slut around">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $clubName.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<</if>>
@@ -80,47 +80,47 @@
<<set $slaves[$i].choosesOwnAssignmentText += " but insecure, so $pronoun decides to make you money by prostituting _oself">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $brothelName.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].behavioralQuirk == "advocate")>>
<<set $slaves[$i].choosesOwnAssignmentText += " and an advocate for slavery, so $pronoun decides to burnish your reputation by slutting it up">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $clubName.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " on the streets.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<<elseif ($slaves[$i].energy > 60)>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $pronoun thinks of little but sex with you,">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun heads straight to $masterSuiteName.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun cheerfully designates _oself one of your fucktoys.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun decides to work">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " from $servantsQuartersName">>
- <<assignJob $slaves[$i] "work as a servant">>
+ <<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " as a servant">>
- <<assignJob $slaves[$i] "be a servant">>
+ <<= assignJob($slaves[$i], "be a servant")>>
<</if>>
<<set $slaves[$i].choosesOwnAssignmentText += " to make your penthouse as clean and homelike as possible.">>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " but unable to do much on $possessive own,">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun heads straight to $masterSuiteName to await your caress.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun cheerfully designates _oself one of your fucktoys to be close to you.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<</if>>
@@ -139,66 +139,66 @@
<<set $slaves[$i].choosesOwnAssignmentText += " and $pronoun thinks of little but sex with you,">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun heads straight to $masterSuiteName.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun cheerfully designates _oself one of your fucktoys.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun decides to work">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " from $servantsQuartersName">>
- <<assignJob $slaves[$i] "work as a servant">>
+ <<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " as a servant">>
- <<assignJob $slaves[$i] "be a servant">>
+ <<= assignJob($slaves[$i], "be a servant")>>
<</if>>
<<set $slaves[$i].choosesOwnAssignmentText += " to make your penthouse as clean and homelike as possible.">>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " but unable to do much on $possessive own">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun heads straight to $masterSuiteName to await your caress.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun cheerfully designates _oself one of your fucktoys to be close to you.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<</if>>
<<elseif $slaves[$i].devotion < -20 && $slaves[$i].trust > 20>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $pronoun thinks of all the ways $pronoun can take advantage of this,">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($spa > $spaSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun heads straight to $spaName to relax.">>
- <<assignJob $slaves[$i] "rest in the spa">>
+ <<= assignJob($slaves[$i], "rest in the spa")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun cheerfully decides to lounge about the penthouse.">>
- <<assignJob $slaves[$i] "rest">>
+ <<= assignJob($slaves[$i], "rest")>>
<</if>>
<<elseif $slaves[$i].devotion < -20>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $pronoun is scared of you, so $pronoun chooses to work as a servant so that $pronoun may serve you without "serving" you.">>
- <<assignJob $slaves[$i] "be a servant">>
+ <<= assignJob($slaves[$i], "be a servant")>>
<<else>>
<<if ($slaves[$i].energy > 60)>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $pronoun thinks of little but sex,">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun heads straight to $masterSuiteName.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun cheerfully designates _oself one of your fucktoys.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $pronoun decides to work">>
<<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " from $servantsQuartersName">>
- <<assignJob $slaves[$i] "work as a servant">>
+ <<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " as a servant">>
- <<assignJob $slaves[$i] "be a servant">>
+ <<= assignJob($slaves[$i], "be a servant")>>
<</if>>
<<set $slaves[$i].choosesOwnAssignmentText += " to make your penthouse as clean and homelike as possible.">>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " but unable to do much on $possessive own, so $pronoun designates _oself one of your fucktoys to get more intimate with you.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<</if>>
@@ -206,275 +206,275 @@
<<if ($slaves[$i].fetish == "submissive") && canWalk($slaves[$i]) && canSee($slaves[$i])>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " thinks $pronoun belongs at the bottom of the penthouse hierarchy, so $pronoun goes to live in $servantsQuartersName.">>
- <<assignJob $slaves[$i] "work as a servant">>
+ <<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " thinks $pronoun belongs at the bottom of the penthouse hierarchy, so $pronoun decides $pronoun should be a servant.">>
- <<assignJob $slaves[$i] "be a servant">>
+ <<= assignJob($slaves[$i], "be a servant")>>
<</if>>
<<elseif ($slaves[$i].fetish == "dom") || ($slaves[$i].fetish == "sadist")>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is self-confident, so $pronoun decides to work in $clubName.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is self-confident, so $pronoun decides to work as a public servant.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<<elseif ($slaves[$i].fetish == "masochist")>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " enjoys abuse, so $pronoun hurries down to $brothelName.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " enjoys abuse, so $pronoun decides to become a whore.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " hurries down to $brothelName to suck cocks.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to become a whore, mostly to suck cock.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].fetish == "humiliation")>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since it's even more embarrassing to be a whore than a club slut.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to whore, since it's even more embarrassing to be a whore than to be a public servant.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].fetish == "buttslut")>>
<<if ($slaves[$i].balls > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " chooses confinement in $dairyName, since all $pronoun will be expected to do is produce cum by orgasming to buttsex.">>
- <<assignJob $slaves[$i] "work in the dairy">>
+ <<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to get milked, since all $pronoun will be expected to do is produce cum by orgasming to buttsex.">>
- <<assignJob $slaves[$i] "get milked">>
+ <<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<else>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since whores get buttfucked more than anyone else.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to whore, since whores get buttfucked more than anyone else.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "pregnancy")>>
<<if ($slaves[$i].lactation > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads down to $dairyName to be around other lactating girls.">>
- <<assignJob $slaves[$i] "work in the dairy">>
+ <<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to get milked, since $pronoun is already lactating.">>
- <<assignJob $slaves[$i] "get milked" >>
+ <<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<elseif ($PC.dick == 1) && isFertile($slaves[$i])>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to serve you in $masterSuiteName, hoping that you'll get $possessive pregnant.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be your fucktoy, hoping that you'll get $possessive pregnant.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif ($universalRulesAssignsSelfFacility == 1) && ($dairyPregSetting > 0) && ($dairy > $dairySlaves) && isFertile($slaves[$i])>>
<<if $dairyPregSetting > 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " eagerly rushes to $dairyName in the hopes that $possessive fertile womb will be packed full of children.">>
- <<assignJob $slaves[$i] "work in the dairy">>
+ <<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " rushes to $dairyName in the hopes that $possessive fertile womb will be rented out.">>
- <<assignJob $slaves[$i] "work in the dairy">>
+ <<= assignJob($slaves[$i], "work in the dairy")>>
<</if>>
<<elseif ($slaves[$i].bellyPreg >= 1500)>>
<<if $arcologies[0].FSRepopulationFocus > 20>>
<<if ($cash < 10000)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads to $brothelName since $pronoun wants to set an example for any unimpregnated girls.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads to the streets to lavish in the attention given to pregnant prostitutes.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<else>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads to $clubName to show off $possessive growing middle and lavish in the public's attention.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads to the streets to contribute to the number of visibly pregnant woman around.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<</if>>
<<elseif $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads straight to $masterSuiteName to share the intimacy of $possessive pregnant body with you.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be your fucktoy to share the intimacy of $possessive pregnant body with you.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif ($slaves[$i].pregKnown == 1)>>
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads straight to $masterSuiteName so you may watch for the day that $pronoun finally starts to show.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be your fucktoy so you may enjoy watching $object begin showing.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<<else>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " can't indulge $possessive fetish by getting pregnant _oself, so $pronoun just heads down to $brothelName.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " can't indulge $possessive fetish by getting pregnant _oself, so $pronoun glumly decides to be a whore.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "boobs")>>
<<if ($slaves[$i].lactation > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads down to $dairyName for all the attention that'll be lavished on $possessive nipples.">>
- <<assignJob $slaves[$i] "work in the dairy">>
+ <<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to get milked, since $pronoun loves getting off to it.">>
- <<assignJob $slaves[$i] "get milked">>
+ <<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<else>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $pronoun can show off $possessive bare breasts.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $pronoun can show off $possessive bare breasts.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<</if>>
<<elseif ($slaves[$i].attrXX > 85)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $pronoun can hit on hot girls.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $pronoun can hit on hot girls.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<<elseif ($slaves[$i].attrXY > 85)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $pronoun can hit on cute boys.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work as a public servant so $pronoun can hit on cute boys.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<<elseif ($slaves[$i].energy > 95)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to help those of your girls who mind taking dick all day by working in $brothelName.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to help those of your girls who mind taking dick all day by working as a whore.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($arcologies[0].FSChattelReligionist > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a pure and faithful slave, so $pronoun sells $possessive body in the holy brothel.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a pure and faithful slave, so $pronoun sells $possessive body as a holy prostitute.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($arcologies[0].FSEgyptianRevivalist > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $pronoun immediately joins your harem.">>
- <<assignJob $slaves[$i] "serve in the master suite">>
+ <<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $pronoun immediately joins your harem.">>
- <<assignJob $slaves[$i] "please you">>
+ <<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif ($arcologies[0].FSRomanRevivalist > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $pronoun decides $pronoun can best serve the state by raising money for the treasury, by selling $possessive body in $brothelName.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $pronoun decides $pronoun can best serve the state by raising money for the treasury, by selling $possessive body as a prostitute.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($arcologies[0].FSAztecRevivalist > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $pronoun decides $pronoun can best serve the empire by serving at the fertility temple.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $pronoun decides $pronoun can best serve the empire by offering herself to the public.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<<elseif ($arcologies[0].FSPaternalist > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, a respectable position for a slave in this enlightened arcology.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be a whore, a respectable position for a slave in this enlightened arcology.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($arcologies[0].FSPastoralist > 0)>>
<<if ($slaves[$i].lactation > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " hurries to join your herd of dairy cows.">>
- <<assignJob $slaves[$i] "work in the dairy">>
+ <<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " hurries to join your herd of cows.">>
- <<assignJob $slaves[$i] "get milked">>
+ <<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<else>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName to help raise money to get more girls lactating properly.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to prostitute _oself to help raise money to get more girls lactating properly.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<</if>>
<<elseif ($arcologies[0].FSHedonisticDecadence > 0)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($spa > $spaSlaves) && (($slaves[$i].trust < 60) || ($slaves[$i].devotion <= 60))>>
<<set $slaves[$i].choosesOwnAssignmentText += " could use a break, so $pronoun heads to take a dip in the spa.">>
- <<assignJob $slaves[$i] "rest in the spa">>
+ <<= assignJob($slaves[$i], "rest in the spa")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " could use a meal and a nap, so $pronoun grabs a cup of food and heads to bed.">>
- <<assignJob $slaves[$i] "rest">>
+ <<= assignJob($slaves[$i], "rest")>>
<</if>>
<<else>>
<<if ($slaves[$i].whoreSkill > $slaves[$i].entertainSkill)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since $pronoun thinks _oself a better whore than a public slut.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to whore, since $pronoun thinks _oself a better whore than a public slut.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].entertainSkill > $slaves[$i].whoreSkill)>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be a club girl, since $pronoun thinks _oself a better public slut than a whore.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to serve the public, since $pronoun thinks _oself a better public slut than a whore.">>
- <<assignJob $slaves[$i] "serve the public">>
+ <<= assignJob($slaves[$i], "serve the public")>>
<</if>>
<<else>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to join $possessive sisters and work in $brothelName.">>
- <<assignJob $slaves[$i] "work in the brothel">>
+ <<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to prostitute _oself to help you upgrade $arcologies[0].name and improve everyone's life.">>
- <<assignJob $slaves[$i] "whore">>
+ <<= assignJob($slaves[$i], "whore")>>
<</if>>
<</if>>
<</if>>
<<else>>
<<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be a club girl, since partying is better than sitting around and failing to think of a job to do.">>
- <<assignJob $slaves[$i] "serve in the club">>
+ <<= assignJob($slaves[$i], "serve in the club")>>
<<elseif canWalk($slaves[$i]) && canSee($slaves[$i])>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to tidy up the penthouse a little while $pronoun thinks.">>
- <<assignJob $slaves[$i] "be a servant">>
+ <<= assignJob($slaves[$i], "be a servant")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " stays in bed, unable to come up with anything.">>
- <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<= removeJob($slaves[$i], $slaves[$i].assignment)>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saStayConfined.tw b/src/uncategorized/saStayConfined.tw
index b3d3cc4eb0e..43d7171f67c 100644
--- a/src/uncategorized/saStayConfined.tw
+++ b/src/uncategorized/saStayConfined.tw
@@ -46,6 +46,6 @@ The stress of confinement @@.red;damages $possessive health@@.
<<if $slaves[$i].assignment == "be confined in the cellblock">>
<<set _brokenSlaves++, _DL--, _dI-->>
<</if>>
- <<removeJob $slaves[$i] $slaves[$i].assignment>>
+ <<= removeJob($slaves[$i], $slaves[$i].assignment)>>
<</if>>
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index dae37313d59..6ffaaadaeb0 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -7,7 +7,7 @@
<<if $slaves[$i].fetish == "mindbroken">>
is no longer mentally capable and @@.yellow;has been dropped from class.@@
<<if $slaves[$i].assignment == "take classes">>
- <<removeJob $slaves[$i] "take classes">>
+ <<= removeJob($slaves[$i], "take classes")>>
<</if>>
<<elseif ($slaves[$i].assignment == "learn in the schoolroom")>>
<<if ($Schoolteacher != 0)>>
@@ -225,7 +225,7 @@
<<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>>
<<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>>
$pronounCap can learn little from further classes, so @@.yellow;$possessive assignment has defaulted to rest.@@
- <<removeJob $slaves[$i] "take classes">>
+ <<= removeJob($slaves[$i], "take classes")>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 9cbed24404a..9e1296800f3 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -76,10 +76,10 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<<set _NewPop = $schoolroomSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Schoolroom">>
<<if $Schoolteacher != 0>>
- <<assignJob $Schoolteacher "rest">>
+ <<= assignJob($Schoolteacher, "rest")>>
<</if>>
<<for $schoolroomSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$SchlRiIDs[0]]] "take classes">>
+ <<= assignJob($slaves[$slaveIndices[$SchlRiIDs[0]]], "take classes")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index c495b888e1b..379d25789d9 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -180,7 +180,7 @@
<</if>>
/% Education done? Has to be here before we run the SA's or there will be double entries for slave %/
<<if $slaves[$i].fetish == "mindbroken">>
- <<removeJob $slaves[$i] "learn in the schoolroom">>
+ <<= removeJob($slaves[$i], "learn in the schoolroom")>>
<<set _restedSlaves++, _dI--, _DL-->>
<<continue>>
<<else>>
@@ -192,7 +192,7 @@
<<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>>
<<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>>
<br><br>''__@@.pink;$slaves[$i].slaveName@@__'' can learn little from further classes, so @@.yellow;her assignment has defaulted to rest.@@
- <<removeJob $slaves[$i] "learn in the schoolroom">>
+ <<= removeJob($slaves[$i], "learn in the schoolroom")>>
<<set _restedSlaves++, _dI--, _DL-->>
<<continue>>
<</if>>
diff --git a/src/uncategorized/schoolteacherWorkaround.tw b/src/uncategorized/schoolteacherWorkaround.tw
index e537c3f0bdc..fa740c8d575 100644
--- a/src/uncategorized/schoolteacherWorkaround.tw
+++ b/src/uncategorized/schoolteacherWorkaround.tw
@@ -1,10 +1,10 @@
:: Schoolteacher Workaround [silently]
<<if $Schoolteacher != 0>>
- <<removeJob $Schoolteacher "be the Schoolteacher">>
+ <<= removeJob($Schoolteacher, "be the Schoolteacher")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the Schoolteacher">>
+ <<= assignJob($slaves[$i], "be the Schoolteacher")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Schoolteacher = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 8a4a600f89d..0d647dc1b6f 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -75,10 +75,10 @@ $servantsQuartersNameCaps
<<set _NewPop = $servantsQuartersSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Servants' Quarters">>
<<if $Schoolteacher != 0>>
- <<assignJob $Stewardess "rest">>
+ <<= assignJob($Stewardess, "rest")>>
<</if>>
<<for $servantsQuartersSlaves > 0>>
- <<assignJob $slaves[$slaveIndices[$ServQiIDs[0]]] "be a servant">>
+ <<= assignJob($slaves[$slaveIndices[$ServQiIDs[0]]], "be a servant")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 4dde852b420..bf972a72647 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -68,7 +68,7 @@
<<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health/95)+($HeadGirl.devotion/95)+($reproductionFormula*5))>>
<</if>>
<<else>>
- <<removeJob $slaves[$i] "be your Head Girl">>
+ <<= removeJob($slaves[$i], "be your Head Girl")>>
<</if>>
<<case "live with your Head Girl">>
<<if $slaves[$i].devotion >= random(-30,20)>>
@@ -95,7 +95,7 @@
<<set $Recruiter = 0>>
<</if>>
<<if $Recruiter == 0>>
- <<removeJob $slaves[$i] "recruit girls">>
+ <<= removeJob($slaves[$i], "recruit girls")>>
<</if>>
<<case "be the Madam">>
<<set $Madam = $slaves[$i]>>
@@ -116,7 +116,7 @@
<<set $Madam = 0>>
<</if>>
<<if $Madam == 0>>
- <<removeJob $slaves[$i] "be the Madam">>
+ <<= removeJob($slaves[$i], "be the Madam")>>
<</if>>
<<case "be the DJ">>
<<set $DJ = $slaves[$i]>>
@@ -134,7 +134,7 @@
<<set $DJ = 0>>
<</if>>
<<if $DJ == 0>>
- <<removeJob $slaves[$i] "be the DJ">>
+ <<= removeJob($slaves[$i], "be the DJ")>>
<</if>>
<<case "be the Milkmaid">>
<<set $Milkmaid = $slaves[$i]>>
@@ -152,7 +152,7 @@
<<set $Milkmaid = 0>>
<</if>>
<<if $Milkmaid == 0>>
- <<removeJob $slaves[$i] "be the Milkmaid">>
+ <<= removeJob($slaves[$i], "be the Milkmaid")>>
<</if>>
<<case "be the Stewardess">>
<<set $Stewardess = $slaves[$i]>>
@@ -173,7 +173,7 @@
<<set $Stewardess = 0>>
<</if>>
<<if $Stewardess == 0>>
- <<removeJob $slaves[$i] "be the Stewardess">>
+ <<= removeJob($slaves[$i], "be the Stewardess")>>
<</if>>
<<case "be the Schoolteacher">>
<<set $Schoolteacher = $slaves[$i]>>
@@ -191,7 +191,7 @@
<<set $Schoolteacher = 0>>
<</if>>
<<if $Schoolteacher == 0>>
- <<removeJob $slaves[$i] "be the Schoolteacher">>
+ <<= removeJob($slaves[$i], "be the Schoolteacher")>>
<</if>>
<<case "be the Wardeness">>
<<set $Wardeness = $slaves[$i]>>
@@ -206,7 +206,7 @@
<<set $Wardeness = 0>>
<</if>>
<<if $Wardeness == 0>>
- <<removeJob $slaves[$i] "be the Wardeness">>
+ <<= removeJob($slaves[$i], "be the Wardeness")>>
<</if>>
<<case "be the Attendant">>
<<set $Attendant = $slaves[$i]>>
@@ -221,7 +221,7 @@
<<set $Attendant = 0>>
<</if>>
<<if $Attendant == 0>>
- <<removeJob $slaves[$i] "be the Attendant">>
+ <<= removeJob($slaves[$i], "be the Attendant")>>
<</if>>
<<case "be the Nurse">>
<<set $Nurse = $slaves[$i]>>
@@ -239,7 +239,7 @@
<<set $Nurse = 0>>
<</if>>
<<if $Nurse == 0>>
- <<removeJob $slaves[$i] "be the Nurse">>
+ <<= removeJob($slaves[$i], "be the Nurse")>>
<</if>>
<<case "guard you">>
<<set $Bodyguard = $slaves[$i]>>
@@ -254,7 +254,7 @@
<<set $Bodyguard = 0>>
<</if>>
<<if $Bodyguard == 0>>
- <<removeJob $slaves[$i] "guard you">>
+ <<= removeJob($slaves[$i], "guard you")>>
<</if>>
<<case "be your Concubine">>
<<set $Concubine = $slaves[$i], $fuckSlaves++>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 07eefa8f21e..27b65615320 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -472,18 +472,18 @@
/* CAN BE REASSIGNED */
Assignment: <strong><span id="assign">$activeSlave.assignment<<if $activeSlave.sentence>> ($activeSlave.sentence weeks)<</if>></span>.</strong>
- <<link "Rest">> <<removeJob $activeSlave $activeSlave.assignment>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
- | <<link "Fucktoy">> <<assignJob $activeSlave "please you">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ <<link "Rest">> <<= removeJob($activeSlave, $activeSlave.assignment)>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Fucktoy">> <<= assignJob($activeSlave, "please you")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<if ($activeSlave.indentureRestrictions <= 0) && $activeSlave.breedingMark != 1>>
- | <<link "Gloryhole">> <<assignJob $activeSlave "work a glory hole">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Gloryhole">> <<= assignJob($activeSlave, "work a glory hole")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
<<if $activeSlave.fuckdoll == 0>> /* NON-FUCKDOLL ASSIGNMENTS */
<<if ($activeSlave.devotion >= -20) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50)>>
<<if $activeSlave.intelligenceImplant < 1 && $activeSlave.fetish != "mindbroken">>
- | <<link "Classes">> <<assignJob $activeSlave "take classes">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Classes">> <<= assignJob($activeSlave, "take classes")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
| Classes
<</if>>
@@ -492,9 +492,9 @@
<</if>>
<<if (($activeSlave.devotion >= -20) || (($activeSlave.trust < -20) && ($activeSlave.devotion >= -50)) || ($activeSlave.trust < -50))>>
- | <<link "Subordinate Slave" "Subordinate Targeting">> <<assignJob $activeSlave "be a subordinate slave">><</link>>
+ | <<link "Subordinate Slave" "Subordinate Targeting">> <<= assignJob($activeSlave, "be a subordinate slave")>><</link>>
<<if canSee($activeSlave) && canWalk($activeSlave)>>
- | <<link "House Servant">> <<assignJob $activeSlave "be a servant">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "House Servant">> <<= assignJob($activeSlave, "be a servant")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
/*| //Blind or immobile slaves cannot be servants// */
<</if>>
@@ -503,18 +503,18 @@
<</if>>
<<if $activeSlave.breedingMark != 1>>
- | <<link "Whore">> <<assignJob $activeSlave "whore">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
- | <<link "Public Servant">> <<assignJob $activeSlave "serve the public">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Whore">> <<= assignJob($activeSlave, "whore")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Public Servant">> <<= assignJob($activeSlave, "serve the public")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
<<if ($activeSlave.lactation > 0) || ($activeSlave.balls > 0 && $activeSlave.ballType == "human")>>
- | <<link "Milked">> <<assignJob $activeSlave "get milked">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Milked">> <<= assignJob($activeSlave, "get milked")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
/*| //Not lactating// */
<</if>>
- | <<link "Confinement">> <<assignJob $activeSlave "stay confined">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
- | <<link "Let $him choose">> <<assignJob $activeSlave "choose her own job">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Confinement">> <<= assignJob($activeSlave, "stay confined")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Let $him choose">> <<= assignJob($activeSlave, "choose her own job")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
| <<link "Stay on this assignment for another month">><<if $activeSlave.assignment != "choose her own job">><<set $activeSlave.sentence += 4>><<replace "#assign">>$activeSlave.assignment ($activeSlave.sentence weeks)<</replace>><</if>><</link>>
<</if>>/* CLOSES FUCKDOLL CHECK */
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index c5b3644465a..b902b25bc64 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -85,42 +85,42 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $activeSlave.mother == $slaves[_ss].ID>>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling her daughter.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 20>>
<</if>>
<<if $activeSlave.father == $slaves[_ss].ID>>
$slaves[_ss].slaveName is @@.mediumorchid;disappointed@@ that you are selling her daughter.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 10>>
<</if>>
<<if $activeSlave.ID == $slaves[_ss].father>>
$slaves[_ss].slaveName is @@.mediumorchid;saddened@@ that you are selling her father.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 10>>
<</if>>
<<if $activeSlave.ID == $slaves[_ss].mother>>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling her mother.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 20>>
<</if>>
<<switch areSisters($activeSlave, $slaves[_ss])>>
<<case 1>>
$slaves[_ss].slaveName is @@.mediumorchid;devastated@@ that you are selling her twin.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 30>>
<<case 2>>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling her sister.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 20>>
<<case 3>>
$slaves[_ss].slaveName is @@.mediumorchid;disheartened@@ that you are selling her half-sister.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 10>>
<</switch>>
@@ -130,7 +130,7 @@
<<set _ss = $slaveIndices[$activeSlave.relationTarget]>>
<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling her $activeSlave.relation.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= 20>>
<<set $display = 1>>
@@ -141,14 +141,14 @@
<<set _ss = $slaveIndices[$activeSlave.relationshipTarget]>>
<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
$slaves[_ss].slaveName is @@.mediumorchid;grieved@@ that you are selling her best source of comfort and companionship in a life of bondage.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>>
<<set $display = 1>>
<</if>>
<<elseif $activeSlave.relationship == -3>>
Selling one of your slave wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status.
- <<ClearSummaryCache>>
+ <<run clearSummaryCache()>>
<br><br>
<<set $rep -= 200>>
<<set $display = 1>>
@@ -162,7 +162,7 @@
<<set _ss = $slaveIndices[$activeSlave.rivalryTarget]>>
<<if def _ss && $slaves[_ss].fetish != "mindbroken">>
$slaves[_ss].slaveName is @@.hotpink;pleased@@ that she won't have to see her rival any more.
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<br><br>
<<set $slaves[_ss].devotion += $slaves[_ss].rivalry*3>>
<<set $display = 1>>
@@ -177,7 +177,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].trust >= -20)>>
<<if ($slaves[_ss].physicalAge > 30)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -191,7 +191,7 @@
In short order, $activeSlave.slaveName is heard out on the promenade, sobbing and screaming as her new owner breaks in her virgin butt in public.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].anus == 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -204,7 +204,7 @@
$activeSlave.slaveName is soon seen on shift outside a seedy establishment in the lower arcology, mechanically offering her holes to passersby and flinching whenever her superiors come out to check on her.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].assignment == "whore") || ($slaves[_ss].assignment == "work in the brothel")>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -217,7 +217,7 @@
$activeSlave.slaveName disappears for a time as her training is perfected, but she reappears in the refined brothel, wearing classy clothes and flirting gracefully with patrons of her body.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].assignment == "whore") || ($slaves[_ss].assignment == "work in the brothel")>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -230,7 +230,7 @@
$activeSlave.slaveName is never again seen in public, but her fate is obvious: she's chained to a milking rack somewhere in a cavernous factory farm, with milk draining from her tits<<if $activeSlave.balls > 0>> and an electroshock stimulator up her butt to force her to cum<<elseif $activeSlave.ovaries > 0>> and a new baby in her belly every ten months<</if>>.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion <= 50)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -243,7 +243,7 @@
$activeSlave.slaveName is quickly escorted out by her new master. She is rarely seen in public anymore, but her records show she is settling well into being her new owner's breeder.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].breedingMark != 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 5>>
<<set $seed = 1>>
<</if>>
@@ -256,7 +256,7 @@
$activeSlave.slaveName is a common sight around the arcology, since free range cows are allowed to range between milkings. She seems reasonably content.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].assignment == "get milked") || ($slaves[_ss].assignment == "work in the dairy")>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -269,7 +269,7 @@
The breeder already has stud stock, and $activeSlave.slaveName is rapidly impregnated. She's kept in a stockyard on the lower service levels of the arcology, one of a dense crowd of beaten-down women with gravid bellies.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].ovaries == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -283,7 +283,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "pregnancy")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -298,7 +298,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "boobs")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -314,7 +314,7 @@
<<if ($slaves[_ss].fetish == "boobs")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
<<if $slaves[_ss].nipples == "fuckable">>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -330,7 +330,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "buttslut")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -345,7 +345,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "cumslut")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -360,7 +360,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "masochist")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -375,7 +375,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "sadist")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -390,7 +390,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "dom")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -405,7 +405,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "submissive")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -419,7 +419,7 @@
$activeSlave.slaveName leaves your control forthwith, to be freed and installed in a favored life in an arcology that gives $activeSlave.race people every possible advantage.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion < 10)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -432,7 +432,7 @@
$activeSlave.slaveName is shipped off to help produce a race of $activeSlave.race idiots to perform eternal servitude. She is not perceptive enough to fear her upcoming life as a downtrodden breeder.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].intelligence > 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -446,7 +446,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].dick > 0)>>
<<if ($slaves[_ss].devotion <= 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -460,7 +460,7 @@
$activeSlave.slaveName is taken away to join the legion of airheaded, big-titted sex slaves that throng the arcology owned by her purchaser.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].intelligence > 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -474,7 +474,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion < -20)>>
<<if ($slaves[_ss].intelligenceImplant == 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -488,7 +488,7 @@
Stories about the place she's going have reached $arcologies[0].name, and $activeSlave.slaveName suspects the fate she's been condemned to when she's loaded into a shipping container expressly designed to keep the inmate awake and uncomfortable.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion > 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -501,7 +501,7 @@
$activeSlave.slaveName is taken away to join the tribe of squealing, slim forms that populate the arcology of her new owner.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].intelligence > 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -514,7 +514,7 @@
A shipping container arrives for $activeSlave.slaveName; as she's loaded into it, it sedates her and begins to pump hormones, curatives and growth enhancers into no less than seven places scattered over her body.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion <= 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -527,7 +527,7 @@
$activeSlave.slaveName is seen in a research report nine months later; she has undergone some interesting changes. As expected by someone interested in her odd womb, she is quite pregnant, but what really stands out is the massive size of her testicles and her huge round implants. A quick glance at the article reveals that they aren't implants, in fact, her breasts and testicles are rounded with children.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].mpreg == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 5>>
<<set $seed = 1>>
<</if>>
@@ -540,7 +540,7 @@
$activeSlave.slaveName is soon seen on live TV, restrained and still grotesquely pregnant. She screams into her restraints as the host approaches with a comically large syringe of abortifacients and drives it deep into her womb. Within minutes, a flood of liquid and fetuses are pouring from her gaping cunt, all the while he times how long it takes her overburdened womb to drain of all its contents.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $slaves[_ss].bellyPreg >= 300000>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 15>>
<<set $seed = 1>>
<</if>>
@@ -554,7 +554,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].vagina == 0)>>
<<if isFertile($slaves[_ss])>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 20>>
<<set $seed = 1>>
<</if>>
@@ -570,7 +570,7 @@
<<if ($slaves[_ss].vagina == 0)>>
<<if isFertile($slaves[_ss])>>
<<if ($slaves[_ss].fetish == "pregnancy")>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -586,7 +586,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].intelligence <= 0)>>
<<if isFertile($slaves[_ss])>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -600,7 +600,7 @@
$activeSlave.slaveName is taken away to join a quivering mass of plump, pampered ladies that crowd the bedroom of her new owner.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $slaves[_ss].behavioralFlaw == "gluttonous">>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -613,7 +613,7 @@
$activeSlave.slaveName's new owner is quite fond of his work and typically sends out photos of his progress. This is no exception; you are treated to a series of images featuring $activeSlave.slaveName being force fed until her stomach bulges. Day after day, you watch her handle more and more food until her belly is big enough to fill her lap even when empty.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if $slaves[_ss].weight < 10>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -626,7 +626,7 @@
A purchasing agent arrives for $activeSlave.slaveName; he uses a lull in the proceedings to use a permanent marker to begin mapping out surgical sites across her body. There are a lot of them.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion <= 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -640,7 +640,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].weight > 10)>>
<<if ($slaves[_ss].intelligence < 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -655,7 +655,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].lactation == 0)>>
<<if ($slaves[_ss].devotion <= 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -669,7 +669,7 @@
$activeSlave.slaveName is terrified of her impending religious life; perhaps she's heard the new text that reads 'no woman come of age is holy unless she performs the act as many times per day as she has years less than forty.'
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].analCount < 200)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -682,7 +682,7 @@
$activeSlave.slaveName is shipped to a new arcology, and culturally, across the centuries. Her skill at arms is well enough known that her impending role as a gladiatrix is easily deduced.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].combatSkill > 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -695,7 +695,7 @@
$activeSlave.slaveName is transported after losing a military engagement. Though her will remains strong, she's @@.gold;filled with fear@@ when she sees the rivers of blood that flow through the city.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].combatSkill > 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -708,7 +708,7 @@
$activeSlave.slaveName's journey to her new home is respectful, even celebratory, as far as you can see. She is gravely informed by the purchasing agent that many slaves await her learned instruction.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].intelligence < -1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -722,7 +722,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].vagina == 0)>>
<<if ($slaves[_ss].ovaries == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -737,7 +737,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion <= 50)>>
<<if ($slaves[_ss].boobsImplant > 1000)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 2>>
<<set $seed = 1>>
<</if>>
@@ -751,7 +751,7 @@
$activeSlave.slaveName is soon well-known among the slaves of the arcology, as many of them are sold after passing under her hands in training. She performs effectively, imparting good sex slave ethics in a generation of sluts.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].intelligence > 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -764,7 +764,7 @@
$activeSlave.slaveName is not pleased by her change in circumstances, since she is soon subjected to training rigor that she did not experience while your property.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].intelligenceImplant == 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -777,7 +777,7 @@
A few weeks later, $activeSlave.slaveName is seen in a shipment of slaves heading out of the arcology. She has new fake tits, a bigger butt, lip implants, and even some facial bone structure alterations, but her balloon breasts are the most shocking change.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].boobsImplant == 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -790,7 +790,7 @@
A few weeks later, $activeSlave.slaveName is seen in a shipment of slaves heading out of the arcology. She is almost unrecognizable, having been quickly returned to as natural an appearance as skillful removal of her implants could manage.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].boobsImplant > 800)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -803,7 +803,7 @@
$activeSlave.slaveName's buyer takes charge of her, and cannot resist immediately running a hand between her buttocks to sink a couple of groping fingers into her soft asspussy.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "buttslut")>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -816,7 +816,7 @@
$activeSlave.slaveName heads off to form part of whatever great design her new master is pursuing; all you know is that it apparently requires lots of lithe, sharp toothed slave girls.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion <= 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -829,7 +829,7 @@
$activeSlave.slaveName becomes a common sight around the arcology, training slaves for her new master. They're usually seen hanging close by her as she manages them with an air at once protective and frankly sexual.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].actualAge > 35)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -842,7 +842,7 @@
$activeSlave.slaveName becomes quite a fixture at social events hosted by her new master; he enjoys showing off how healthy, happy and productive his cow is.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].lactation > 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -855,7 +855,7 @@
$activeSlave.slaveName's nervous buyer comes to collect her, stammering and sweating and doing his best to pretend he does this all the time.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].vaginalCount + $slaves[_ss].analCount < 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<<set $seed = 1>>
<</if>>
@@ -868,7 +868,7 @@
$activeSlave.slaveName is occasionally visible around the arcology, looking rather tired and gaunt under the stresses of a severe crash diet coupled with a punishing cardio regime.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].weight > 10)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -881,7 +881,7 @@
$activeSlave.slaveName is only rarely seen around the arcology, since her new owners force her to spend most of her time sleeping, eating and looking after herself. But her belly, painfully distended with food, makes her situation obvious.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].weight > 10)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -894,7 +894,7 @@
$activeSlave.slaveName is last seen somewhat later, packed into a shipment of cows heading out of the arcology. She looks rather ill from the drugs she's been filled with, and her now-distended breasts are marred by unsightly stretch marks.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].lactation == 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -907,7 +907,7 @@
$activeSlave.slaveName is frequently seen in public over the next few weeks, since she's being trained to improve her feminine deportment. She grows visibly more feminine as time passes, as the hormonal effects of having her balls cut off become apparent.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].balls > 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -920,7 +920,7 @@
$activeSlave.slaveName is next seen after some weeks of surgery. She's barely recognizable, and now possesses a serviceable vagina which she clearly is unsure of. Her original status is scarcely discernible.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].dick > 0)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -933,7 +933,7 @@
The upper half of $activeSlave.slaveName's body is never seen again. Her butt, on the other hand, is periodically visible in a lower-level arcade, her orifices gradually showing the wear and her price gradually decreasing, until finally she is seen no more.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].devotion < 10)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust -= 2>>
<<set $seed = 1>>
<</if>>
@@ -944,21 +944,21 @@
<<case "D cannibal">>
$activeSlave.slaveName is never seen again. Her buyer prefers to keep whatever happened to her private. However, rumors of steaks, rump roasts, sweetbreads, and blood pudding eaten at three in the morning filter out from time to time. Naturally, these murmurs never fail to @@.gold;terrify@@ your other slaves.
- <<ClearSummaryCache>>
+ <<run clearSummaryCache()>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<set $slaves[_ss].trust -= 2>>
<</for>>
<<case "harvester">>
Though $activeSlave.slaveName's fate as a source of organs for transplantation is not announced, rumors of what happens to girls who @@.gold;fail to be valuable to you@@ pass among your slaves.
- <<ClearSummaryCache>>
+ <<run clearSummaryCache()>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<set $slaves[_ss].trust -= 2>>
<</for>>
<<case "D amazon hunter">>
When $activeSlave.slaveName's buyer appears, the big girl is almost bashful. He tries to resist the impulse, but quickly breaks down and sweeps her into a tight hug. She accepts the embrace meekly. Your other slaves find this @@.mediumaquamarine;very romantic.@@
- <<ClearSummaryCache>>
+ <<run clearSummaryCache()>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<set $slaves[_ss].trust += 1>>
<</for>>
@@ -968,7 +968,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetishKnown == 1)>>
<<if ($slaves[_ss].fetish == "cumslut")>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<</if>>
<</if>>
@@ -979,7 +979,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].dick > 0)>>
<<if ($slaves[_ss].devotion > 20)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<</if>>
<</if>>
@@ -990,7 +990,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "buttslut")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<</if>>
<</if>>
@@ -1001,7 +1001,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].dick > 0)>>
<<if ($slaves[_ss].boobs > 400)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 1>>
<</if>>
<</if>>
@@ -1012,7 +1012,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "pregnancy")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].trust += 4>>
<</if>>
<</if>>
@@ -1023,7 +1023,7 @@
<<case "fuckdoll">>
Though $activeSlave.slaveName's fate as a living fucktoy is not obvious, since most of her body will forever after be encased in thick latex, rumors of what happens to girls who @@.gold;fail to be valuable to you@@ pass among your slaves.
- <<ClearSummaryCache>>
+ <<run clearSummaryCache()>>
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<set $slaves[_ss].trust -= 2>>
<</for>>
@@ -1033,7 +1033,7 @@
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if canSee($slaves[_ss])>>
<<if $slaves[_ss].intelligence < 0>>
- <<ClearSummaryCache $slaves[_ss]>>
+ <<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 4>>
<<set $seed = 1>>
<</if>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index c74363aee35..f3d0c130816 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -573,18 +573,18 @@ will
<<if ($displayAssignments == 1) && (_Pass == "Main") && (_Slave.ID != $HeadGirl.ID) && (_Slave.ID != $Recruiter.ID) && (_Slave.ID != $Bodyguard.ID)>>
<<if _Slave.assignment != "rest">>
- <<link "Rest" "Main">><<removeJob $slaves[_ssi] $slaves[_ssi].assignment>><</link>>
+ <<link "Rest" "Main">><<= removeJob($slaves[_ssi], $slaves[_ssi].assignment)>><</link>>
<<else>>
Rest
<</if>>
<<if _Slave.assignment != "please you">>
- | <<link "Fucktoy" "Main">><<assignJob $slaves[_ssi] "please you">><</link>>
+ | <<link "Fucktoy" "Main">><<= assignJob($slaves[_ssi], "please you")>><</link>>
<<else>>
| Fucktoy
<</if>>
<<if _Slave.indentureRestrictions <= 0 && _Slave.breedingMark != 1>>
<<if _Slave.assignment != "work a glory hole">>
- | <<link "Gloryhole" "Main">><<assignJob $slaves[_ssi] "work a glory hole">><</link>>
+ | <<link "Gloryhole" "Main">><<= assignJob($slaves[_ssi], "work a glory hole")>><</link>>
<<else>>
| Hole
<</if>>
@@ -592,37 +592,37 @@ will
<<if _Slave.fuckdoll == 0>> /* NON-FUCKDOLL ASSIGNMENTS */
<<if (_Slave.assignment != "take classes")>>
<<if (_Slave.intelligenceImplant != 1) && ((_Slave.devotion >= -20) || ((_Slave.trust < -20) && (_Slave.devotion >= -50)) || (_Slave.trust < -50)) && (_Slave.fetish != "mindbroken")>>
- | <<link "Classes" "Main">><<assignJob $slaves[_ssi] "take classes">><</link>>
+ | <<link "Classes" "Main">><<= assignJob($slaves[_ssi], "take classes")>><</link>>
<</if>>
<<else>>
| Classes
<</if>>
<<if (_Slave.assignment != "be a servant")>>
<<if ((_Slave.devotion >= -20) || ((_Slave.trust < -20) && (_Slave.devotion >= -50)) || (_Slave.trust < -50)) && canWalk(_Slave) && canSee(_Slave)>>
- | <<link "House Servant" "Main">><<assignJob $slaves[_ssi] "be a servant">><</link>>
+ | <<link "House Servant" "Main">><<= assignJob($slaves[_ssi], "be a servant")>><</link>>
<</if>>
<<else>>
| House Servant
<</if>>
<<if (_Slave.assignment != "whore") && _Slave.breedingMark != 1>>
- | <<link "Whore" "Main">><<assignJob $slaves[_ssi] "whore">><</link>>
+ | <<link "Whore" "Main">><<= assignJob($slaves[_ssi], "whore")>><</link>>
<<else>>
| Whore
<</if>>
<<if (_Slave.assignment != "serve the public") && _Slave.breedingMark != 1>>
- | <<link "Public Servant" "Main">><<assignJob $slaves[_ssi] "serve the public">><</link>>
+ | <<link "Public Servant" "Main">><<= assignJob($slaves[_ssi], "serve the public")>><</link>>
<<else>>
| Public Servant
<</if>>
<<if (_Slave.lactation > 0) || (_Slave.balls > 0)>>
<<if (_Slave.assignment != "get milked")>>
- | <<link "Milked" "Main">><<assignJob $slaves[_ssi] "get milked">><</link>>
+ | <<link "Milked" "Main">><<= assignJob($slaves[_ssi], "get milked")>><</link>>
<<else>>
| Milked
<</if>>
<</if>>
<<if (_Slave.assignment != "stay confined")>>
- | <<link "Confinement" "Main">><<assignJob $slaves[_ssi] "stay confined">><</link>>
+ | <<link "Confinement" "Main">><<= assignJob($slaves[_ssi], "stay confined")>><</link>>
<<else>>
| Confinement
<</if>>
@@ -639,7 +639,7 @@ will
<br>Transfer to:
<<if _Slave.assignment != "rest" && _Slave.assignment != "please you" && _Slave.assignment != "take classes" && _Slave.assignment != "be a servant" && _Slave.assignment != "whore" && _Slave.assignment != "serve the public" && _Slave.assignment != "get milked" && _Slave.assignment != "stay confined">>
- <<link "Penthouse" "Main">><<removeJob $slaves[_ssi] $slaves[_ssi].assignment>><</link>>
+ <<link "Penthouse" "Main">><<= removeJob($slaves[_ssi], $slaves[_ssi].assignment)>><</link>>
<<else>>
Penthouse |
<</if>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index fe4cdd69e68..3158bd35004 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -75,10 +75,10 @@ $spaNameCaps
<<set _NewPop = $spaSlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Spa">>
<<if $Attendant != 0>>
- <<assignJob $Attendant "rest">>
+ <<= assignJob($Attendant, "rest")>>
<</if>>
<<for $spaSlaves > 0>>
- <assignJob $slaves[$slaveIndices[$SpaiIDs[0]]] "rest">>
+ <<= assignJob($slaves[$slaveIndices[$SpaiIDs[0]]], "rest")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 3f2fc4c42da..cdf0fdcc142 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -284,7 +284,7 @@
<</switch>>
<<if ($slaves[$i].health >= 20) && ($slaves[$i].trust > 60) && ($slaves[$i].devotion > 60) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].sexualFlaw == "none") && ($slaves[$i].behavioralFlaw == "none")>>
<br><br>''__@@.pink;$slaves[$i].slaveName@@__'' is feeling well enough to leave $spaName, so @@.yellow;her assignment has defaulted to rest@@.
- <<removeJob $slaves[$i] "rest in the spa">>
+ <<= removeJob($slaves[$i], "rest in the spa")>>
<<set _restedSlaves++, _DL--, _dI-->>
<<continue>>
<</if>>
diff --git a/src/uncategorized/stewardessWorkaround.tw b/src/uncategorized/stewardessWorkaround.tw
index f6b7e4be779..7efd7ede9c6 100644
--- a/src/uncategorized/stewardessWorkaround.tw
+++ b/src/uncategorized/stewardessWorkaround.tw
@@ -1,10 +1,10 @@
:: Stewardess Workaround [silently]
<<if $Stewardess != 0>>
- <<removeJob $Stewardess "be the Stewardess">>
+ <<= removeJob($Stewardess, "be the Stewardess")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the Stewardess">>
+ <<= assignJob($slaves[$i], "be the Stewardess")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Stewardess = $slaves[$i]>>
<</if>>
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index 51525b259db..973fae1d9c1 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -7,7 +7,7 @@
<<if $activeSlave.subTarget == $activeSlave.ID>>
<<set $activeSlave.subTarget = 0>>
<</if>>
-<<assignJob $activeSlave "be a subordinate slave">>
+<<= assignJob($activeSlave, "be a subordinate slave")>>
<<set _st = $slaveIndices[$activeSlave.subTarget]>>
<<if def _st>>
$activeSlave.slaveName will submit to ''__@@.pink;$slaves[_st].slaveName@@__'' this week.
@@ -22,5 +22,5 @@
<br><br>[[None|Subordinate Targeting][$activeSlave.subTarget = 0]]
<<set $activeSlave = _displaySlave>>
-<<assignJob $activeSlave "be a subordinate slave">>
+<<= assignJob($activeSlave, "be a subordinate slave")>>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 20533c92279..a3ba75c1c55 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -1,7 +1,7 @@
:: Summary Options [nobr]
<<set $nextButton = "Back", $nextLink = "Options">>
-<<ClearSummaryCache>>
+<<run clearSummaryCache()>>
//These options will affect the short slave summaries that appear on the main menu and the facility management screens.//
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 9bb93553f35..58081b7807c 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -133,7 +133,7 @@
<</if>>
<</for>>
/% Remove from facility array if assigned. %/
- <<removeJob $activeSlave $activeSlave.assignment>>
+ <<= removeJob($activeSlave, $activeSlave.assignment)>>
<</switch>>
As the remote surgery's long recovery cycle completes,
@@ -704,7 +704,7 @@ As the remote surgery's long recovery cycle completes,
She notices almost immediately that the soreness that used to tell her she needed to be milked has gone. She bounces her breasts idly; it looks like she doesn't know what to think about having her lactation dry up. As with all surgery @@.red;her health has been slightly affected.@@
<<if $activeSlave.assignment == "get milked">>
@@.yellow;Her assignment has defaulted to rest.@@
- <<removeJob $activeSlave $activeSlave.assignment>>
+ <<= removeJob($activeSlave, $activeSlave.assignment)>>
<</if>>
<<case "precum">>
diff --git a/src/uncategorized/wardenessWorkaround.tw b/src/uncategorized/wardenessWorkaround.tw
index 48169182a61..b587730ba71 100644
--- a/src/uncategorized/wardenessWorkaround.tw
+++ b/src/uncategorized/wardenessWorkaround.tw
@@ -1,10 +1,10 @@
:: Wardeness Workaround [silently]
<<if $Wardeness != 0>>
- <<removeJob $Wardeness "be the Wardeness">>
+ <<= removeJob($Wardeness, "be the Wardeness")>>
<</if>>
<<if $i > -1>>
- <<assignJob $slaves[$i] "be the Wardeness">>
+ <<= assignJob($slaves[$i], "be the Wardeness")>>
<<set $slaves[$i].livingRules = "luxurious">>
<<set $Wardeness = $slaves[$i]>>
<</if>>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
deleted file mode 100644
index 68339781768..00000000000
--- a/src/utility/assignWidgets.tw
+++ /dev/null
@@ -1,25 +0,0 @@
-:: Assign Widgets [widget nobr]
-
-/*
- Call as <<assignJob slaveObject $returnTo | _currentRule.facilityRemove | "serve in the master suite"
- $args[0] slave object. *MUST be present*
- $args[1] Job to assign slave to. Will accept the $returnTo vars and the _currentRule.assignFacility vars and the actual job assignments "serve in the master suite" etc.
-
- This is basically a Widget version of assign but will work anywhere, and saves to the slaves[..] array, and changes your $args[0] var sent.
-*/
-
-<<widget assignJob>>
- <<= assignJob($args[0], $args[1]) >>
-<</widget>>
-
-/%
- Call as <<removeJob slaveObject $returnTo | _currentRule.facilityRemove | "serve in the master suite">>
- $args[0] slave object. *MUST be present*
- $args[1] Job to remove slave from. Will accept the $returnTo vars and the _currentRule.assignFacility vars and the actual job assignments "serve in the master suite" etc.
-
- This is basically a Widget version of Retrieve but will work anywhere. It changes the assignment and saves to the slaves[..] array, and changes your $args[0] var sent.
- Retrieve overrides the 'rest' in most cases.
-%/
-<<widget removeJob>>
- <<= removeJob($args[0], $args[1]) >>
-<</widget>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index e58a0a82387..53f94563e5a 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1793,7 +1793,7 @@
/* add to facilities array if needed */
<<if $args[0].assignment != "rest">>
- <<assignJob $args[0] $args[0].assignment>>
+ <<= assignJob($args[0], $args[0].assignment)>>
<</if>>
/** do not run the Rules Assistant before adding the new slave to the slaves list! **/
--
GitLab