From c28910e760da4bb36267040f429521f91146293a Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Fri, 13 Jul 2018 19:45:07 -0400
Subject: [PATCH] SlaveFullName conversion
---
src/SecExp/propagandaHub.tw | 4 +-
src/SecExp/securityReport.tw | 2 +-
src/npc/startingGirls/commitStartingGirl.tw | 2 +-
.../SecForceEX/SpecialForceUpgradeDec.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 6 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/SFMBarracks.tw | 2 +-
src/uncategorized/arcadeReport.tw | 2 +-
src/uncategorized/arcmgmt.tw | 4 +-
src/uncategorized/attendantSelect.tw | 2 +-
src/uncategorized/bgSelect.tw | 2 +-
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/brothelReport.tw | 6 +-
src/uncategorized/cellblockReport.tw | 6 +-
src/uncategorized/clinicReport.tw | 6 +-
src/uncategorized/clubReport.tw | 6 +-
src/uncategorized/concubineSelect.tw | 2 +-
src/uncategorized/coursingAssociation.tw | 2 +-
src/uncategorized/dairyReport.tw | 8 +--
src/uncategorized/djSelect.tw | 2 +-
src/uncategorized/fsDevelopments.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 40 ++++++------
src/uncategorized/madamSelect.tw | 2 +-
src/uncategorized/main.tw | 6 +-
src/uncategorized/masterSuiteReport.tw | 4 +-
src/uncategorized/milkmaidSelect.tw | 2 +-
src/uncategorized/neighborInteract.tw | 2 +-
src/uncategorized/neighborsDevelopment.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 2 +-
src/uncategorized/nurseSelect.tw | 2 +-
src/uncategorized/pHostageAcquisition.tw | 2 +-
src/uncategorized/pRivalryActions.tw | 44 ++++++-------
src/uncategorized/pRivalryHostage.tw | 40 ++++++------
src/uncategorized/penthouseReport.tw | 4 +-
src/uncategorized/personalAttentionSelect.tw | 2 +-
src/uncategorized/recruiterSelect.tw | 2 +-
src/uncategorized/saLiveWithHG.tw | 12 ++--
src/uncategorized/saRivalries.tw | 62 +++++++++----------
src/uncategorized/saServeThePublic.tw | 6 +-
src/uncategorized/saWhore.tw | 6 +-
src/uncategorized/schoolteacherSelect.tw | 2 +-
src/uncategorized/seWedding.tw | 6 +-
src/uncategorized/securityForceEOWReport.tw | 6 +-
src/uncategorized/servantsQuartersReport.tw | 6 +-
src/uncategorized/slaveInteract.tw | 14 ++---
src/uncategorized/spaReport.tw | 6 +-
src/uncategorized/stewardessSelect.tw | 2 +-
src/uncategorized/wardenessSelect.tw | 2 +-
src/utility/descriptionWidgets.tw | 8 +--
src/utility/miscWidgets.tw | 4 +-
src/utility/saRulesWidgets.tw | 6 +-
51 files changed, 187 insertions(+), 189 deletions(-)
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 7edf60ce273..fc68a563e27 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -16,10 +16,10 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<<if $Recruiter != 0>><br><br>
<<if $RecuriterOffice == 0>>
- <<link "Give ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' an office.""propagandaHub">>
+ <<link "Give ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' an office.""propagandaHub">>
<<set $RecuriterOffice = 1>> <</link>>
<<else>>
- <<link "Remove ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' from her office.""propagandaHub">>
+ <<link "Remove ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' from her office.""propagandaHub">>
<<set $RecuriterOffice = 0>> <</link>>
<</if>>
<</if>>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index 5818fbbb260..56eb883bc4e 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -260,7 +260,7 @@
<<set _recruits += 1>>
<</if>>
<<else>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is able to further boost your militia recruitement campaign from her PR hub office.
+ ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your militia recruitement campaign from her PR hub office.
<<if $propCampaignBoost == 1>>
<<set _recruits += 4+$Recruiter.intelligence+$Recruiter.intelligenceImplant>>
<<else>>
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index 597f6cf3556..8318ec63780 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -25,7 +25,7 @@
<<set $hostage = $slaveWithoutBonuses, $hostageCost = $slaveCost, $hostageAnnounced = -1>>
<</if>>
-<<SlaveFullName $activeSlave>> has been added to your starting stable of slaves. You now have <<print cashFormat($cash)>> remaining.
+<<= SlaveFullName($activeSlave)>> has been added to your starting stable of slaves. You now have <<print cashFormat($cash)>> remaining.
<br>
<<if $cash >= $minimumSlaveCost>>
<br>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index cebd38e90ff..988baf9a0a8 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -61,7 +61,7 @@
<br><br>
''$SupportFacilityName:''
<<if $LieutenantColonel == 1>>
- <<SlaveFullName $LieutenantColonel>> is the Lieutenant Colonel of $securityForceName, primarily in charge of this facility.
+ <<= SlaveFullName($LieutenantColonel)>> is the Lieutenant Colonel of $securityForceName, primarily in charge of this facility.
<</if>>
There are
<<if $SupportFacilitySlaves > 0>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 12f38c95000..0c2049a8bcd 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -747,12 +747,12 @@ $activeSlave.slaveName is up for review:
<</if>>
<br><br>
<<if _passing == 2>>
- The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.yellow;currently unsuitable@@ for breeding, but may be resubmitted after corrections are applied. We understand the subjective nature of "fit" and do not wish to preclude the use a viable breeder over such a trivial fix. She has been placed on a contraceptive routine to protect against "accidents" in the interim.
+ The slave known as "<<= SlaveFullName($activeSlave)>>" has been deemed @@.yellow;currently unsuitable@@ for breeding, but may be resubmitted after corrections are applied. We understand the subjective nature of "fit" and do not wish to preclude the use a viable breeder over such a trivial fix. She has been placed on a contraceptive routine to protect against "accidents" in the interim.
<<elseif _passing != 0>>
- The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.red;unsuitable@@ for breeding and has been @@.green;sterilized@@ as per agreement.
+ The slave known as "<<= SlaveFullName($activeSlave)>>" has been deemed @@.red;unsuitable@@ for breeding and has been @@.green;sterilized@@ as per agreement.
<<set $activeSlave.preg = -3>>
<<else>>
- The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.green;worthy@@ of being used for breeding and has been marked as such. Please note the increased restrictions on breeding slaves.
+ The slave known as "<<= SlaveFullName($activeSlave)>>" has been deemed @@.green;worthy@@ of being used for breeding and has been marked as such. Please note the increased restrictions on breeding slaves.
<br>They are not permitted for public use or anything that may harm their growing child. The child within them is considered a member of the elite class and as such, any harm that comes to them will result in severe penalties to the breeder's owner. Development of the child will be closely monitored; should the fetus be identified as not of the owner's blood (or any other member of the Elite class), said owner shall face severe fines.
<<set $activeSlave.breedingMark = 1, $activeSlave.pregControl = "none">>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index d40a72447e3..98fc8445765 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -18375,7 +18375,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<replace "#result2">>
She seems to be focusing on the purely physical aspects of the degradation here. The true meaning of this place is so much more, and you decide to share it with her. You call her name, tearing her attention away from the spectacle mere centimeters over your heads, and <<if canSee($activeSlave)>>point<<else>>direct her<</if>> to a particular slave. You tell $activeSlave.slaveName that this particular Arcade inmate's name is
<<set _ress = $slaveIndices[$ArcadeiIDs.random()]>>
- <<SlaveFullName $slaves[_ress]>>. You tell her that she is $slaves[_ress].actualAge years old, that she is $slaves[_ress].nationality, and that she was once $slaves[_ress].career. You list more details of her life before she was placed here to be fucked endlessly. $activeSlave.slaveName's eyes widen as you recite the details of the prior life of this piece of human sexual equipment and the sheer weight of the intellectual sadism smashes into her. Then the slave above you both jerks a little. <<if $activeSlave.dick == 0>>There's no visible sign her pussy's being fucked, so it must be<<else>>Her cock hardens involuntarily, indicating that it's<</if>> going into her ass. You resume, mentioning that she's been buttfucked $slaves[_ress].analCount times.
+ <<= SlaveFullName($slaves[_ress])>>. You tell her that she is $slaves[_ress].actualAge years old, that she is $slaves[_ress].nationality, and that she was once $slaves[_ress].career. You list more details of her life before she was placed here to be fucked endlessly. $activeSlave.slaveName's eyes widen as you recite the details of the prior life of this piece of human sexual equipment and the sheer weight of the intellectual sadism smashes into her. Then the slave above you both jerks a little. <<if $activeSlave.dick == 0>>There's no visible sign her pussy's being fucked, so it must be<<else>>Her cock hardens involuntarily, indicating that it's<</if>> going into her ass. You resume, mentioning that she's been buttfucked $slaves[_ress].analCount times.
$activeSlave.slaveName jerks suddenly, <<if canAchieveErection($activeSlave)>>shooting her cum onto the floor<<elseif $activeSlave.vagina < 0>>dribbling a little<<elseif $activeSlave.vaginaLube > 0>>squirting onto the floor<<else>>orgasming<</if>>. She came without being touched. She <<if canSee($activeSlave)>>stares at<<else>>faces<</if>> the mess she made just by being in the presence of the arcology's @@.hotpink;undisputed preeminent sadist;@@ she shudders at the sheer gothic glory of it. She has a new moment to think of when she feels like @@.lightsalmon;indulging her own sadism.@@
<</replace>>
<<set $activeSlave.devotion += 5, $activeSlave.fetishStrength = Math.clamp($activeSlave.fetishStrength+10, 0, 100)>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index fbd00102680..58d4f58f55a 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -1,6 +1,6 @@
:: SFM Barracks [nobr]
-<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
+<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<= SlaveFullName($LieutenantColonel)>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
<<if ndef $ColonelRelationship>>
<<set $ColonelRelationship = 0>> /* 0 - Employee and boss, 10 - Friend, 25 - Close friend, 45 - Girlfriend, 65 - Lover */
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 3278b4a0f15..bf65638ef1c 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -69,7 +69,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 5c9444649de..aee0913f8da 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -116,7 +116,7 @@ This week, <<if _flux >= 20>>many<<elseif _flux >= 5>>some<<else>>few to none<</
<<set _immigrants += random(1,4) * $propCampaign>>
<</if>>
<<else>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is able to further boost your imgration campaign from her PR hub office.
+ ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your imgration campaign from her PR hub office.
<<if $propCampaignBoost == 0>>
<<set _immigrants += random(2,5+$Recruiter.intelligence+$Recruiter.intelligenceImplant) * $propCampaign>>
<<else>>
@@ -372,7 +372,7 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<<set _refugees += random(0,2)>>
<</if>>
<<else>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is able to further boost your self-enslavement campaign from her PR hub office.
+ ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your self-enslavement campaign from her PR hub office.
<<if $propCampaignBoost == 1>>
<<set _refugees += random(0,5+$Recruiter.intelligence+$Recruiter.intelligenceImplant)>>
<<else>>
diff --git a/src/uncategorized/attendantSelect.tw b/src/uncategorized/attendantSelect.tw
index 9d6b548b0fa..0073f42da6e 100644
--- a/src/uncategorized/attendantSelect.tw
+++ b/src/uncategorized/attendantSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Spa", $showEncyclopedia = 1, $encyclopedia = "Attendant">>
<<showallAssignmentFilter>>
<<if ($Attendant != 0)>>
- ''__@@.pink;<<SlaveFullName $Attendant>>@@__'' is serving as your Attendant.<br><br>She will help pamper and counsel your slaves.
+ ''__@@.pink;<<= SlaveFullName($Attendant)>>@@__'' is serving as your Attendant.<br><br>She will help pamper and counsel your slaves.
<<else>>
You have not selected an Attendant.
<</if>>
diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw
index 454a7caac2d..2c003271d03 100644
--- a/src/uncategorized/bgSelect.tw
+++ b/src/uncategorized/bgSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Bodyguard">>
<<showallAssignmentFilter>>
<<if ($Bodyguard != 0)>>
- ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard.<br><br>She will remain close to you at all times and guard your person.
+ ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard.<br><br>She will remain close to you at all times and guard your person.
<<else>>
You have not selected a bodyguard.
<</if>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index fb3399621e3..ee6a1c5aba8 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -9,7 +9,7 @@
<h1>Body Modification Studio</h1>
-<<SlaveFullName $activeSlave>> is lying strapped down on the table in your body modification studio. $pronounCap is entirely at your mercy.
+<<= SlaveFullName($activeSlave)>> is lying strapped down on the table in your body modification studio. $pronounCap is entirely at your mercy.
<<if $brandApplied || $degradation>>
<<if $activeSlave.fuckdoll == 0>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 7708cf21aca..ee6d56c7d9e 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -46,7 +46,7 @@
/% Make sure we have registered living expenses as for any other slave %/
<<run getSlaveStatisticData($Madam, $facility.brothel)>>
<<set $Madam = $slaves[_FLs]>>
- <<SlaveFullName $Madam>> is serving as the Madam.
+ <<= SlaveFullName($Madam)>> is serving as the Madam.
<<if $Madam.relationship == -3 && $Madam.devotion > 50>>
As your loving wife, she does her best to attract attention to your brothel.
<<set $madamCashBonus += 0.25>>
@@ -229,7 +229,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the Madam.
+ ''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as the Madam.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -342,7 +342,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 0ef5e349db6..603ace957a2 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -46,7 +46,7 @@
<<if ($Wardeness.energy > 95) || ($Wardeness.fetish == "sadist")>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
<</if>>
- <<SlaveFullName $Wardeness>> is serving as the Wardeness.
+ <<= SlaveFullName($Wardeness)>> is serving as the Wardeness.
<<if $Wardeness.relationship == -3 && $Wardeness.devotion > 50>>
<<set _devBonus++, _trustMalus++, _idleBonus++>>
As your wife, she tries her best to break the disobedient slaves to your will.
@@ -151,7 +151,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__'' is serving as the Wardeness in $cellblockName.
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__'' is serving as the Wardeness in $cellblockName.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -258,7 +258,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index a1254fd9b78..b0b8e8e5ffd 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -39,7 +39,7 @@
<</if>>
<</if>>
<<set $Nurse = $slaves[_FLs]>>
- <<SlaveFullName $Nurse>> is serving as the clinical nurse.
+ <<= SlaveFullName($Nurse)>> is serving as the clinical nurse.
<<if $Nurse.relationship == -3 && $Nurse.devotion > 50>>
She does her best to be a caring and nurturing wife.
<<set _healthBonus += 2>>
@@ -213,7 +213,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the clinical nurse.
+ ''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as the clinical nurse.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -289,7 +289,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 44460378814..8dbdffa6dd9 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -46,7 +46,7 @@
/% Make sure we have registered living expenses as for any other slave %/
<<run getSlaveStatisticData($DJ, $facility.club)>>
<<set $DJ = $slaves[_FLs]>>
- <<SlaveFullName $DJ>> is performing as the DJ.
+ <<= SlaveFullName($DJ)>> is performing as the DJ.
<<if $DJ.relationship == -3 && $DJ.devotion > 50>>
She tries her best to be your energetic, cheerful wife.
<<set $DJRepBonus += 0.1>>
@@ -138,7 +138,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is performing as the DJ in $clubName.
+ ''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is performing as the DJ in $clubName.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -238,7 +238,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/concubineSelect.tw b/src/uncategorized/concubineSelect.tw
index 5b0299a879b..de211911a9a 100644
--- a/src/uncategorized/concubineSelect.tw
+++ b/src/uncategorized/concubineSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Concubine">>
<<showallAssignmentFilter>>
<<if ($Concubine != 0)>>
- ''__@@.pink;<<SlaveFullName $Concubine>>@@__'' is serving as your Concubine.<br><br>She will take the lead in seeing to your pleasure.
+ ''__@@.pink;<<= SlaveFullName($Concubine)>>@@__'' is serving as your Concubine.<br><br>She will take the lead in seeing to your pleasure.
<<else>>
You have not selected a Concubine.
<</if>>
diff --git a/src/uncategorized/coursingAssociation.tw b/src/uncategorized/coursingAssociation.tw
index 8583cdca472..52c1eaa1976 100644
--- a/src/uncategorized/coursingAssociation.tw
+++ b/src/uncategorized/coursingAssociation.tw
@@ -9,7 +9,7 @@ You are a member of $arcologies[0].name's Coursing Association. Coursing is a Fr
<br><br>The chasing slaves are known as lurchers, the term once used for the sighthounds. They require speed most of all, but must also be able to tackle their quarry; lurchers with the ability and willingness to make a spectacle of molesting the hares can improve their owners' reputations.
<<showallAssignmentFilter>>
<<if $Lurcher != 0>>
- <<SlaveFullName $Lurcher>> is assigned to compete as your lurcher.
+ <<= SlaveFullName($Lurcher)>> is assigned to compete as your lurcher.
<<else>>
You have not selected a lurcher, meaning that you will not participate in coursing events.
<</if>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index c3fd638e642..ed33c55cd44 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -50,7 +50,7 @@
<</if>>
<<run getSlaveStatisticData($Milkmaid, $facility.dairy)>>
<<set $Milkmaid = $slaves[_FLs], $i = _FLs>>
- <<SlaveFullName $Milkmaid>> is serving as your Milkmaid.
+ <<= SlaveFullName($Milkmaid)>> is serving as your Milkmaid.
<<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>>
<<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
She tries her best to be your perfect farmwife.
@@ -258,7 +258,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as your Milkmaid.
+ ''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as your Milkmaid.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -358,7 +358,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
@@ -1031,7 +1031,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
<<if ($slaves[$i].ID == $bioreactorPerfectedID)>>
- <br><br> <<SlaveFullName $slaves[$i]>>'s breasts<<if $slaves[$i].balls > 0>>, balls<</if>><<if $slaves[$i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
+ <br><br> <<= SlaveFullName($slaves[$i])>>'s breasts<<if $slaves[$i].balls > 0>>, balls<</if>><<if $slaves[$i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
<<if $slaves[$i].balls > 0>><<print 1000*Math.trunc((3*52*(45-$slaves[$i].physicalAge))/1000)>> liters of cum,<</if>>
<<if $slaves[$i].ovaries == 1>><<print 100*Math.trunc((52*(45-$slaves[$i].physicalAge))/100)>> liters of vaginal secretions, <<if $dairyPregSetting == 3>><<print 13*(45-$slaves[$i].physicalAge)>><<else>><<print 5*(45-$slaves[$i].physicalAge)>><</if>> slaves,<</if>>
and <<print 1000*Math.trunc((300*52*(45-$slaves[$i].physicalAge))/1000)>> liters of milk over a <<print 45-$slaves[$i].physicalAge>> year period before its biological components must be replaced.
diff --git a/src/uncategorized/djSelect.tw b/src/uncategorized/djSelect.tw
index ab31adb2143..09971ddbab2 100644
--- a/src/uncategorized/djSelect.tw
+++ b/src/uncategorized/djSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Club", $showEncyclopedia = 1>><<set $encyclopedia = "DJ">>
<<showallAssignmentFilter>>
<<if ($DJ != 0)>>
- ''__@@.pink;<<SlaveFullName $DJ>>@@__'' is serving as your DJ.<br><br>She will headline entertainment in $clubName.
+ ''__@@.pink;<<= SlaveFullName($DJ)>>@@__'' is serving as your DJ.<br><br>She will headline entertainment in $clubName.
<<else>>
You have not selected a DJ.
<</if>>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index c76d691ebf2..d52e39f094f 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -134,7 +134,7 @@
<<set _broadProgress += 1>>
<</if>>
<<else>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is able to further boost your societal engineering campaign from her PR hub office.
+ ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your societal engineering campaign from her PR hub office.
<<if $propCampaignBoost == 1>>
<<set _broadProgress += 4+$Recruiter.intelligence+$Recruiter.intelligenceImplant>>
<<else>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index d625959d135..9dd12b4ba85 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -19,7 +19,7 @@
-''@@.pink;<<SlaveFullName $activeSlave>>@@''
+''@@.pink;<<= SlaveFullName($activeSlave)>>@@''
<<if ($activeSlave.customLabel != "")>> (@@.yellow;''<<print $activeSlave.customLabel>>''@@)<</if>>
@@ -91,7 +91,7 @@ is
<<if $activeSlave.assignment == "be a subordinate slave">>
<<set _lsd = $slaveIndices[$activeSlave.subTarget]>>
<<if def _lsd>>
- $He has been ordered to serve ''@@.pink;<<SlaveFullName $slaves[_lsd]>>@@'' specifically.
+ $He has been ordered to serve ''@@.pink;<<= SlaveFullName($slaves[_lsd])>>@@'' specifically.
<</if>>
<</if>>
<<else>>
@@ -201,15 +201,15 @@ $He comes to you for an inspection
<<if def _lsd>>
$He is
<<if $activeSlave.relationship <= 1>>
- ''@@.lightgreen;friends with <<SlaveFullName $slaves[_lsd]>>;@@'' the rules <<if $activeSlave.relationshipRules != "restrictive">>encourage<<else>> discourage<</if>> their relationship.
+ ''@@.lightgreen;friends with <<= SlaveFullName($slaves[_lsd])>>;@@'' the rules <<if $activeSlave.relationshipRules != "restrictive">>encourage<<else>> discourage<</if>> their relationship.
<<elseif $activeSlave.relationship <= 2>>
- ''@@.lightgreen;best friends with <<SlaveFullName $slaves[_lsd]>>;@@'' the rules <<if $activeSlave.relationshipRules != "restrictive">>encourage<<else>> discourage<</if>> their close relationship.
+ ''@@.lightgreen;best friends with <<= SlaveFullName($slaves[_lsd])>>;@@'' the rules <<if $activeSlave.relationshipRules != "restrictive">>encourage<<else>> discourage<</if>> their close relationship.
<<elseif $activeSlave.relationship <= 3>>
- ''@@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s friend with benefits;@@'' the rules <<if $activeSlave.relationshipRules == "permissive">>encourage<<else>> discourage<</if>> their sexual relationship.
+ ''@@.lightgreen;<<= SlaveFullName($slaves[_lsd])>>'s friend with benefits;@@'' the rules <<if $activeSlave.relationshipRules == "permissive">>encourage<<else>> discourage<</if>> their sexual relationship.
<<elseif $activeSlave.relationship <= 4>>
- ''@@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s lover;@@'' the rules <<if $activeSlave.relationshipRules == "permissive">>encourage<<else>> discourage<</if>> their passionate relationship.
+ ''@@.lightgreen;<<= SlaveFullName($slaves[_lsd])>>'s lover;@@'' the rules <<if $activeSlave.relationshipRules == "permissive">>encourage<<else>> discourage<</if>> their passionate relationship.
<<elseif $slaves[_lsd].relationship > 4>>
- ''@@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s slave wife;@@'' the rules <<if $activeSlave.relationshipRules == "permissive">>encourage<<else>> discourage<</if>> marital bliss.
+ ''@@.lightgreen;<<= SlaveFullName($slaves[_lsd])>>'s slave wife;@@'' the rules <<if $activeSlave.relationshipRules == "permissive">>encourage<<else>> discourage<</if>> marital bliss.
<</if>>
<</if>>
<<elseif $activeSlave.fuckdoll == 0>>
@@ -292,7 +292,7 @@ $He comes to you for an inspection
<<if $activeSlave.slaveName != $activeSlave.birthName || $activeSlave.slaveSurname != $activeSlave.birthSurname>>
<<if $activeSlave.fuckdoll == 0>>
<<if $activeSlave.slaveName != $activeSlave.birthName && $activeSlave.slaveSurname != $activeSlave.birthSurname>>
- <<SlaveFullName $activeSlave>> is not $his original full name;
+ <<= SlaveFullName($activeSlave)>> is not $his original full name;
<<if $activeSlave.birthName === "" || $activeSlave.birthSurname === "">>
whatever it was, however, has been lost forever.
<</if>>
@@ -1136,19 +1136,19 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<<set _lover = getSlave($activeSlave.relationshipTarget)>>
<<if def _lover>>
<<if $activeSlave.mother == _lover.ID>>
- $He is in an @@.lightgreen;incestuous relationship with $his mother, <<SlaveFullName _lover>>.@@
+ $He is in an @@.lightgreen;incestuous relationship with $his mother, <<= SlaveFullName(_lover)>>.@@
<<elseif $activeSlave.father == _lover.ID>>
- $He is in an @@.lightgreen;incestuous relationship with $his father, <<SlaveFullName _lover>>.@@
+ $He is in an @@.lightgreen;incestuous relationship with $his father, <<= SlaveFullName(_lover)>>.@@
<<elseif _lover.mother == $activeSlave.ID || _lover.father == $activeSlave.ID>>
- $He is in an @@.lightgreen;incestuous relationship with $his daughter, <<SlaveFullName _lover>>.@@
+ $He is in an @@.lightgreen;incestuous relationship with $his daughter, <<= SlaveFullName(_lover)>>.@@
<<else>>
<<switch areSisters($activeSlave, _lover)>>
<<case 1>>
- $He is in an @@.lightgreen;incestuous relationship with $his twin, <<SlaveFullName _lover>>.@@
+ $He is in an @@.lightgreen;incestuous relationship with $his twin, <<= SlaveFullName(_lover)>>.@@
<<case 2>>
- $He is in an @@.lightgreen;incestuous relationship with $his sister, <<SlaveFullName _lover>>.@@
+ $He is in an @@.lightgreen;incestuous relationship with $his sister, <<= SlaveFullName(_lover)>>.@@
<<case 3>>
- $He is in an @@.lightgreen;incestuous relationship with $his half-sister, <<SlaveFullName _lover>>.@@
+ $He is in an @@.lightgreen;incestuous relationship with $his half-sister, <<= SlaveFullName(_lover)>>.@@
<</switch>>
<</if>>
<</if>>
@@ -1192,9 +1192,9 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<<set _lsd = $slaveIndices[$activeSlave.relationTarget]>>
<<if def _lsd>>
<<if ($slaves[_lsd].ID == $activeSlave.relationshipTarget) && ($activeSlave.relationship >= 3)>>
- $He is @@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s $activeSlave.relation, making their relationship incestuous.@@
+ $He is @@.lightgreen;<<= SlaveFullName($slaves[_lsd])>>'s $activeSlave.relation, making their relationship incestuous.@@
<<else>>
- $He is @@.lightgreen;<<SlaveFullName $slaves[_lsd]>>'s $activeSlave.relation.@@
+ $He is @@.lightgreen;<<= SlaveFullName($slaves[_lsd])>>'s $activeSlave.relation.@@
<</if>>
<</if>>
<</if>>
@@ -1206,11 +1206,11 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<<if def _lsd>>
$He
<<if $activeSlave.rivalry <= 1>>
- @@.lightsalmon;dislikes@@ <<SlaveFullName $slaves[_lsd]>>.
+ @@.lightsalmon;dislikes@@ <<= SlaveFullName($slaves[_lsd])>>.
<<elseif $activeSlave.rivalry <= 2>>
- is <<SlaveFullName $slaves[_lsd]>>'s @@.lightsalmon;rival.@@
+ is <<= SlaveFullName($slaves[_lsd])>>'s @@.lightsalmon;rival.@@
<<else>>
- @@.lightsalmon;bitterly hates@@ <<SlaveFullName $slaves[_lsd]>>.
+ @@.lightsalmon;bitterly hates@@ <<= SlaveFullName($slaves[_lsd])>>.
<</if>>
<</if>>
<</if>>
@@ -1222,7 +1222,7 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0 && $activeSlave.origBodyOwnerID > 0>>
<<set _lsd = $slaveIndices[$activeSlave.origBodyOwnerID]>>
<<if def _lsd>>
- $He is fully aware that <<SlaveFullName $slaves[_lsd]>> is in $his old body.
+ $He is fully aware that <<= SlaveFullName($slaves[_lsd])>> is in $his old body.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/madamSelect.tw b/src/uncategorized/madamSelect.tw
index f0a441c6d80..16237564f8b 100644
--- a/src/uncategorized/madamSelect.tw
+++ b/src/uncategorized/madamSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Madam">>
<<showallAssignmentFilter>>
<<if ($Madam != 0)>>
- ''__@@.pink;<<SlaveFullName $Madam>>@@__'' is serving as your Madam.<br><br>She will manage the brothel.
+ ''__@@.pink;<<= SlaveFullName($Madam)>>@@__'' is serving as your Madam.<br><br>She will manage the brothel.
<<else>>
You have not selected a Madam.
<</if>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 9ff5815ced9..db215524348 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -145,7 +145,7 @@ __''MAIN MENU''__ //[[Summary Options]]//
<div class="content">
<<set $slaveAssignmentTab = "overview">>
<<if def _HG>>
- ''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.
+ ''__@@.pink;<<= SlaveFullName($HeadGirl)>>@@__'' is serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.
<span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<set $showOneSlave = "Head Girl">>
<<include "Slave Summary">>
@@ -156,7 +156,7 @@ __''MAIN MENU''__ //[[Summary Options]]//
<</if>>
<br><br>
<<if def _RC>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working
+ ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is working
<<if $recruiterTarget != "other arcologies">>
to recruit girls.
<<else>>
@@ -177,7 +177,7 @@ __''MAIN MENU''__ //[[Summary Options]]//
<<if ($dojo != 0)>>
<br><br>
<<if def _BG>>
- ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<<set $showOneSlave = "guard you">>
<<include "Slave Summary">>
<<else>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 28517020d49..ee73218403e 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -107,7 +107,7 @@
/* 000-250-006 */
<<if ($slaves[$i].assignment == "be your Concubine")>>
<<set $Concubine = $slaves[_FLs]>>
- ''Your concubine <<SlaveFullName $Concubine>> is serving you in $masterSuiteName.'' More than any other slave, her sexual brilliance and physical appeal are @@.green;critical@@ to your reputation.
+ ''Your concubine <<= SlaveFullName($Concubine)>> is serving you in $masterSuiteName.'' More than any other slave, her sexual brilliance and physical appeal are @@.green;critical@@ to your reputation.
<<if ($Concubine.career == "an arcology owner")>>
She was once your rival, and your relationship is widely thought to be @@.green;the perfect modern romance.@@
@@ -164,7 +164,7 @@
<<set $slaves[$i].devotion++>>
<</if>>
<<else>> /* not Concubine */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/milkmaidSelect.tw b/src/uncategorized/milkmaidSelect.tw
index 49816bff5dc..3b376235814 100644
--- a/src/uncategorized/milkmaidSelect.tw
+++ b/src/uncategorized/milkmaidSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Milkmaid">>
<<showallAssignmentFilter>>
<<if ($Milkmaid != 0)>>
- ''__@@.pink;<<SlaveFullName $Milkmaid>>@@__'' is serving as your Milkmaid.<br><br>She will look after your livestock, helping them give milk<<if $seeDicks > 0>> and semen<</if>>.
+ ''__@@.pink;<<= SlaveFullName($Milkmaid)>>@@__'' is serving as your Milkmaid.<br><br>She will look after your livestock, helping them give milk<<if $seeDicks > 0>> and semen<</if>>.
<<else>>
You have not selected a Milkmaid.
<</if>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index f29fd3c3c20..930dc798dfa 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -228,7 +228,7 @@ A 1% interest in $activeArcology.name is worth <<print cashFormat($seed)>> and w
<br>
<<for $j = 0; $j < $leaders.length; $j++>>
<<if $activeArcology.leaderID == $leaders[$j].ID>>
- Your agent @@.deeppink;<<SlaveFullName $leaders[$j]>>@@ is running this arcology. [[Recall and reenslave her|Agent Retrieve]]
+ Your agent @@.deeppink;<<= SlaveFullName($leaders[$j])>>@@ is running this arcology. [[Recall and reenslave her|Agent Retrieve]]
<span id="rename"> | <<link "Instruct her to rename the arcology">><<replace #rename>> | <<textbox "$activeArcology.name" $activeArcology.name>> [[Confirm name|Neighbor Interact]]<</replace>><</link>></span>
<br>Her <<if $leaders[$j].intelligence >= 3>>brilliance<<else>>intelligence<</if>> and education are the most important qualities for her.
<<if $leaders[$j].actualAge > 35>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 7347b94396e..2df820584f3 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -49,7 +49,7 @@
<<if $arcologies[$i].government == "your agent">>
<<for _k = 0; _k < $leaders.length; _k++>>
<<if $leaders[_k].ID == $arcologies[$i].leaderID>>
- is being run by your agent @@.deeppink;<<SlaveFullName $leaders[_k]>>@@.
+ is being run by your agent @@.deeppink;<<= SlaveFullName($leaders[_k])>>@@.
<<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>>!@@
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 71f2062ff6f..1bb54f4cfdf 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -19,7 +19,7 @@
<</if>>
<br>
-The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if $activeSlave.amp == 1>>lies helplessly on your desk,<<elseif !canWalk($activeSlave)>>kneels before your desk,<<else>>stands before your desk,<</if>>
+The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<if $activeSlave.amp == 1>>lies helplessly on your desk,<<elseif !canWalk($activeSlave)>>kneels before your desk,<<else>>stands before your desk,<</if>>
<<if $activeSlave.devotion < -50>>
looking you in the eyes with defiance.
<<elseif $activeSlave.devotion < -20>>
diff --git a/src/uncategorized/nurseSelect.tw b/src/uncategorized/nurseSelect.tw
index 681c9825f87..0f32ba3b5fb 100644
--- a/src/uncategorized/nurseSelect.tw
+++ b/src/uncategorized/nurseSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Clinic", $showEncyclopedia = 1, $encyclopedia = "Nurse">>
<<showallAssignmentFilter>>
<<if ($Nurse != 0)>>
- ''__@@.pink;<<SlaveFullName $Nurse>>@@__'' is serving as your Nurse.<br><br>She will help heal your slaves.
+ ''__@@.pink;<<= SlaveFullName($Nurse)>>@@__'' is serving as your Nurse.<br><br>She will help heal your slaves.
<<else>>
You have not selected a Nurse.
<</if>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index b7f2d074687..d593002e6f2 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -7,7 +7,7 @@
<<set $activeSlave.ID += 55555>>
<<set $activeSlave.weekAcquired = $week>>
-<<SlaveFullName $activeSlave>>, once
+<<= SlaveFullName($activeSlave)>>, once
<<switch $PC.career>>
<<case "wealth">>
a popular party girl
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 705a07c2f4c..a7113e45096 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -19,7 +19,7 @@
Your inter-arcology war with the arcology owner behind the Daughters of Liberty has dragged on for $rivalryDuration week<<if $rivalryDuration > 1>>s<</if>>. The tone of your arcology is a bit more somber than usual. You have enhanced security in place, and the populace has caught the mood.
<<if $hostageAnnounced == 1>>
-<<if $rivalryDuration >= 30>>The latest message from your rival is a live communication.<<else>>The latest message from your rival recently arrived, showing <<SlaveFullName $hostage>><</if>>
+<<if $rivalryDuration >= 30>>The latest message from your rival is a live communication.<<else>>The latest message from your rival recently arrived, showing <<= SlaveFullName($hostage)>><</if>>
<<if $rivalryDuration == 1>>
<<switch $rivalryFS>>
<<case "Racial Subjugationism">>
@@ -1253,7 +1253,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.fetishStrength = 100>>
<<set $hostage.vaginalCount += 60>>
<<set $hostage.vagina = 5>>
- moaning as she shoves food into her mouth with one hand and fondles her lover's body with the other. "My apologies. I don't have her weight for you this week. You see, she broke the scale when she stepped on it, well I suppose that tells you plenty. Though I have another surprise for you! <<SlaveFullName $hostage>>, would you like to tell 'em yourself?" She shouts, spewing crumbs everywhere,
+ moaning as she shoves food into her mouth with one hand and fondles her lover's body with the other. "My apologies. I don't have her weight for you this week. You see, she broke the scale when she stepped on it, well I suppose that tells you plenty. Though I have another surprise for you! <<= SlaveFullName($hostage)>>, would you like to tell 'em yourself?" She shouts, spewing crumbs everywhere,
<<switch $hostageFetish>>
<<case "submissive">>
"I haven't orgasmed all week, but I've made sure to bring every one of my lovers to climax! That's what I love most, seeing the look of satisfaction on their faces as they blow their loads deep into me!"
@@ -1310,45 +1310,45 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostageAnnounced = 0>>
<<switch $rivalryFS>>
<<case "Racial Subjugationism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her and her lovers someplace far away. Someplace you'll never find them. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her and her lovers someplace far away. Someplace you'll never find them. Bet tha-You end the call.
<<case "Racial Supremacism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, the poor bitch died trying to give birth to her baby. We had lots of room in the clinic too, but slaves like her aren't worth the expenses, you know? I should find some more people you knew, keep our little game goi-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, the poor bitch died trying to give birth to her baby. We had lots of room in the clinic too, but slaves like her aren't worth the expenses, you know? I should find some more people you knew, keep our little game goi-You end the call.
<<case "Repopulation Focus">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
<<case "Eugenics">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
<<case "Gender Radicalism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. Bet that piss-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. Bet that piss-You end the call.
<<case "Gender Fundamentalism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, she took a dick a little too big for her ass and ruined her sphincter. She's off, someplace far away, recovering. But I'll never tell you where, bet that piss-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, she took a dick a little too big for her ass and ruined her sphincter. She's off, someplace far away, recovering. But I'll never tell you where, bet that piss-You end the call.
<<case "Paternalism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, she got kicked around just a little too much. We had lots of fun with her, before she broke of course... Say, do you have anyone else you love, or even were familiar with? I should acquire them, keep our little game goi-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, she got kicked around just a little too much. We had lots of fun with her, before she broke of course... Say, do you have anyone else you love, or even were familiar with? I should acquire them, keep our little game goi-You end the call.
<<case "Degradationism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. I'll keep her saf-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. I'll keep her saf-You end the call.
<<case "Body Purism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, apparently implants can be too big. Her breasts literally popped, couldn't save her though. Definitely going to miss playing with those balloons. I should hunt down more people you knew, keep our little game goi-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, apparently implants can be too big. Her breasts literally popped, couldn't save her though. Definitely going to miss playing with those balloons. I should hunt down more people you knew, keep our little game goi-You end the call.
<<case "Transformation Fetishism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
<<case "Youth Preferentialism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her and her lover someplace far away. Someplace you'll never find them. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her and her lover someplace far away. Someplace you'll never find them. Bet tha-You end the call.
<<case "Maturity Preferentialism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her and her lover someplace far away. Someplace you'll never find them. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her and her lover someplace far away. Someplace you'll never find them. Bet tha-You end the call.
<<case "Slimness Enthusiasm">>
- Looking for <<SlaveFullName $hostage>>? Too bad, apparently those growth drugs have quite the side effects. Pretty much had cancer everywhere. Definitely going to miss playing with those milkbags, though. I should hunt down more people you knew, keep our little game goi-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, apparently those growth drugs have quite the side effects. Pretty much had cancer everywhere. Definitely going to miss playing with those milkbags, though. I should hunt down more people you knew, keep our little game goi-You end the call.
<<case "Asset Expansionism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
<<case "Pastoralism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. Bet that piss-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. Bet that piss-You end the call.
<<case "Physical Idealism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, apparently being that fat isn't good for your heart, who knew? Definitely going to miss playing with those folds; she jiggled so much when I fucked her. I should hunt down more people you knew, fatten them up, keep our little game goi-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, apparently being that fat isn't good for your heart, who knew? Definitely going to miss playing with those folds; she jiggled so much when I fucked her. I should hunt down more people you knew, fatten them up, keep our little game goi-You end the call.
<<case "Hedonistic Decadence">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. Bet that piss-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. I'll miss her, of course, but there is no way I'd let you have her. Bet that piss-You end the call.
<<case "Chattel Religionism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
<<case "Multiculturalism">>
- Looking for <<SlaveFullName $hostage>>? Too bad, she decided to martyr herself for your arcology's salvation. Got fucked till her body gave out. Of course I enjoyed her in her final moments, and don't worry, she died smiling. I should hunt down more people you knew, keep our little game goi-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, she decided to martyr herself for your arcology's salvation. Got fucked till her body gave out. Of course I enjoyed her in her final moments, and don't worry, she died smiling. I should hunt down more people you knew, keep our little game goi-You end the call.
<<default>>
- Looking for <<SlaveFullName $hostage>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
+ Looking for <<= SlaveFullName($hostage)>>? Too bad, I couldn't bear to think of you ever getting your rotten little hands on her, so I sent her far away. Someplace you'll never find her. Bet tha-You end the call.
<</switch>>
<<else>>
<<set $seed = random(0,2)>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 9815e1f7cbb..32a987532bd 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -280,66 +280,66 @@ but you do remember her, and your rival knows it. This is obviously the best the
but look what I have here! I just acquired her recently. Lovely, isn't she? I know she wasn't important to you, but she //is// a reminder of who you were. I think she must have been your type." Your rival turns to the slave and continues. "While we have our little war,
<<switch $rivalryFS>>
<<case "Racial Subjugationism">>
- I'm going to treat her well. Train her. She's a fine Head Girl prospect, don't you think? She'll have lots of nice $arcologies[0].FSSubjugationistRace girls to make love to whenever she wants. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ I'm going to treat her well. Train her. She's a fine Head Girl prospect, don't you think? She'll have lots of nice $arcologies[0].FSSubjugationistRace girls to make love to whenever she wants. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<case "Racial Supremacism">>
- I'm going to destroy her. She's got a whipping post with her name on it, right between a couple of $arcologies[0].FSSupremacist bitches. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave begins to scream, and the noise goes on and on as the slave is tied up and scourged.
+ I'm going to destroy her. She's got a whipping post with her name on it, right between a couple of $arcologies[0].FSSupremacist bitches. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to scream, and the noise goes on and on as the slave is tied up and scourged.
<<case "Gender Radicalism">>
I'm going to treat her well. Train her. Teach her her proper role in society, and make her happy here. Isn't that right, $activeSlave.slaveName?" The slave nods uncertainly.
<<case "Gender Fundamentalism">>
- She's going to be my special pet. She'll have everything she could ever want, as long as she has a dick up her ass. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods hesitantly, but with evident arousal.
+ She's going to be my special pet. She'll have everything she could ever want, as long as she has a dick up her ass. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods hesitantly, but with evident arousal.
<<case "Paternalism">>
- I'm going to destroy her. Holes first, of course. I'll have to get more inventive after that, and I'll leave her vocal cords for last. That way, she'll be able to beg. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave begins to scream, and the noise goes on and on. And on.
+ I'm going to destroy her. Holes first, of course. I'll have to get more inventive after that, and I'll leave her vocal cords for last. That way, she'll be able to beg. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to scream, and the noise goes on and on. And on.
<<case "Repopulation Focus">>
I'm going to ruin her womb, making sure she can never have children again. I bet you spent lots of nights fantasizing about her with a huge belly didn't you?
<<set $activeSlave.preg = -3>>
<<case "Eugenics">>
<<if $seeHyperPreg == 1>>
- I'm going to have her knocked up; not with my seed, of course, but the seed of the lowest of the low. I'm also going to fill her with the most powerful experimental fertility drugs out there. She'll have so many children shoved into her poor womb she'll be bursting at the seams. But she'll enjoy that, won't you <<SlaveFullName $activeSlave>>?" The slave nods hesitantly, but with evident arousal.
+ I'm going to have her knocked up; not with my seed, of course, but the seed of the lowest of the low. I'm also going to fill her with the most powerful experimental fertility drugs out there. She'll have so many children shoved into her poor womb she'll be bursting at the seams. But she'll enjoy that, won't you <<= SlaveFullName($activeSlave)>>?" The slave nods hesitantly, but with evident arousal.
<<else>>
- I'm going to have her knocked up; not with my seed, of course, but the seed of the lowest of the low. I'm also going to fill her with the most powerful fertility drugs I can get. Her poor little womb will be stretched to the limit with society's worst. But she'll enjoy that, won't you <<SlaveFullName $activeSlave>>?" The slave nods hesitantly, but with evident arousal.
+ I'm going to have her knocked up; not with my seed, of course, but the seed of the lowest of the low. I'm also going to fill her with the most powerful fertility drugs I can get. Her poor little womb will be stretched to the limit with society's worst. But she'll enjoy that, won't you <<= SlaveFullName($activeSlave)>>?" The slave nods hesitantly, but with evident arousal.
<</if>>
<<case "Degradationism">>
- She's going to be my lover. She'll have everything she could ever want, and I'll be sure to let her know all about what you do to your slaves. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's going to be my lover. She'll have everything she could ever want, and I'll be sure to let her know all about what you do to your slaves. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<case "Body Purism">>
- I'm going to give her a nice pair of fake tits. No reason to be excessively clever when I can just make her tits so huge she won't be able to walk. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave begins to sob.
+ I'm going to give her a nice pair of fake tits. No reason to be excessively clever when I can just make her tits so huge she won't be able to walk. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob.
<<set $activeSlave.boobs = 300>>
<<case "Transformation Fetishism">>
- She's going to be my lover. I'll be sure to let her know all about what you do to your slaves, and rest assured, I'll never treat her that way. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's going to be my lover. I'll be sure to let her know all about what you do to your slaves, and rest assured, I'll never treat her that way. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<case "Youth Preferentialism">>
- I've set her up with a nice motherly woman already. I believe they'll be a perfect match. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ I've set her up with a nice motherly woman already. I believe they'll be a perfect match. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<case "Maturity Preferentialism">>
- I've set her up with a nice young girl already. I believe they'll be a perfect match. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ I've set her up with a nice young girl already. I believe they'll be a perfect match. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<case "Slimness Enthusiasm">>
- I think I'll make her IV line permanent. After all, she's never going off breast growth hormones. I'd estimate she shouldn't be able to walk within a month. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave begins to sob.
+ I think I'll make her IV line permanent. After all, she's never going off breast growth hormones. I'd estimate she shouldn't be able to walk within a month. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob.
<<set $activeSlave.weight = -20>>
<<set $activeSlave.boobs = 800>>
<<case "Asset Expansionism">>
- She's going to be my lover. I'll be sure to let her know all about what you do to your slaves, and rest assured, I'll never give her growth hormones, not one single dose. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's going to be my lover. I'll be sure to let her know all about what you do to your slaves, and rest assured, I'll never give her growth hormones, not one single dose. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<case "Pastoralism">>
- She's going to be my spotter. Girls should be strong, smoking hot ladies, not disgusting cows. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's going to be my spotter. Girls should be strong, smoking hot ladies, not disgusting cows. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<set $activeSlave.weight = 100>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.boobs = 1200>>
<<case "Cummunism">>
- She's going to be my personal milk dispenser. I shouldn't have to chain her to my desk after the first month, since her udders will pin her in place. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave begins to sob.
+ She's going to be my personal milk dispenser. I shouldn't have to chain her to my desk after the first month, since her udders will pin her in place. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob.
<<set $activeSlave.boobs = 800>>
<<set $activeSlave.weight = -20>>
<<case "Physical Idealism">>
- She's going to learn to enjoy yourself. I'm going to force her face full of food, her cunt full of dicks and discover her deepest, darkest desires. Wouldn't you like that, <<SlaveFullName $activeSlave>>?" The slave begins to sob. "To start, how about a weigh in? Sixty three and a half kilograms, such a pity, but don't worry, I'll have her nice and plump soon enough."
+ She's going to learn to enjoy yourself. I'm going to force her face full of food, her cunt full of dicks and discover her deepest, darkest desires. Wouldn't you like that, <<= SlaveFullName($activeSlave)>>?" The slave begins to sob. "To start, how about a weigh in? Sixty three and a half kilograms, such a pity, but don't worry, I'll have her nice and plump soon enough."
<<set $activeSlave.boobs = 200>>
<<set $activeSlave.butt = 1>>
<<set $activeSlave.weight = -20>>
<<case "Hedonistic Decadence">>
- She's going to be my spotter. Girls should be strong, smoking hot ladies, not disgusting obese slobs. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's going to be my spotter. Girls should be strong, smoking hot ladies, not disgusting obese slobs. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<set $activeSlave.weight = 100>>
<<set $activeSlave.muscles = 0>>
<<set $activeSlave.boobs = 1200>>
<<case "Chattel Religionism">>
- She's going to be the perfect courtesan. No preaching, no praying, just good, clean sex for money. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's going to be the perfect courtesan. No preaching, no praying, just good, clean sex for money. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<case "Multiculturalism">>
- She's going to be the ideal holy whore. Thousands of citizens are going to find rapture inside her. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's going to be the ideal holy whore. Thousands of citizens are going to find rapture inside her. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<<default>>
- She's shaping up to be a good slave. I'm keeping her informed of your revisionist nonsense, and what your slaves suffer because of it. Isn't that right, <<SlaveFullName $activeSlave>>?" The slave nods uncertainly.
+ She's shaping up to be a good slave. I'm keeping her informed of your revisionist nonsense, and what your slaves suffer because of it. Isn't that right, <<= SlaveFullName($activeSlave)>>?" The slave nods uncertainly.
<</switch>>
<<set $activeSlave.trust = 0>>
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
index c4aec477423..16b326270af 100644
--- a/src/uncategorized/penthouseReport.tw
+++ b/src/uncategorized/penthouseReport.tw
@@ -5,7 +5,7 @@
<<for $i = 0; $i < _SL; $i++>>
<<if $slaves[$i].assignmentVisible == 1>>
- <div>''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ <div>''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
$pronounCap
@@ -22,7 +22,7 @@
<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")>>
<<else>>
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
$pronounCap
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 65b16ec46bc..236cfb5d11d 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -196,7 +196,7 @@
<<if _i > 0>><br><br><</if>>
- You will give ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' your personal attention this week.
+ You will give ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' your personal attention this week.
Your training will seek to <<span "training"+_i>><strong>$personalAttention[_i].trainingRegimen</strong><</span>>.
diff --git a/src/uncategorized/recruiterSelect.tw b/src/uncategorized/recruiterSelect.tw
index 398766ffde7..cc3fd7d92b0 100644
--- a/src/uncategorized/recruiterSelect.tw
+++ b/src/uncategorized/recruiterSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Recruiter">>
<<showallAssignmentFilter>>
<<if ($Recruiter != 0)>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is
+ ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is
<<if $recruiterTarget != "other arcologies">>
recruiting girls.
<<else>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index e59a1a7d3ff..b9cc5f13edc 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -5,21 +5,21 @@
<<if $slaves[$i].devotion > 20>>
<<if $HGSlaveSuccess == 1>>
- looks after your Head Girl <<SlaveFullName $HeadGirl>> domestically and sexually, freeing her to devote more of her time to looking after your other slaves.
+ looks after your Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, freeing her to devote more of her time to looking after your other slaves.
<<else>>
- does her best to look after your Head Girl <<SlaveFullName $HeadGirl>> domestically and sexually, but doesn't free up much of her time this week.
+ does her best to look after your Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, but doesn't free up much of her time this week.
<</if>>
<<elseif $slaves[$i].trust < -20>>
<<if $HGSlaveSuccess == 1>>
- obeys Head Girl <<SlaveFullName $HeadGirl>> domestically and sexually, freeing her to devote more of her time to looking after your other slaves.
+ obeys Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, freeing her to devote more of her time to looking after your other slaves.
<<else>>
- tries to look after your Head Girl <<SlaveFullName $HeadGirl>> domestically and sexually, but doesn't free up much of her time this week.
+ tries to look after your Head Girl <<= SlaveFullName($HeadGirl)>> domestically and sexually, but doesn't free up much of her time this week.
<</if>>
<<else>>
<<if $HGSlaveSuccess == 1>>
- resists Head Girl <<SlaveFullName $HeadGirl>>'s domestic and sexual use, but still frees her to devote more of her time to looking after your other slaves.
+ resists Head Girl <<= SlaveFullName($HeadGirl)>>'s domestic and sexual use, but still frees her to devote more of her time to looking after your other slaves.
<<else>>
- resists Head Girl <<SlaveFullName $HeadGirl>>'s domestic and sexual use, and doesn't free up much of her time this week.
+ resists Head Girl <<= SlaveFullName($HeadGirl)>>'s domestic and sexual use, and doesn't free up much of her time this week.
<</if>>
<</if>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 7bf63c5f1f4..5aaecc3d0b6 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -18,7 +18,7 @@
<<if $slaves[_j].devotion < random(20,100)>>
<<if $slaves[_j].trust > random(-100,-20)>>
<<if $slaves[_j].origBodyOwnerID == $slaves[$i].ID && $slaves[_j].devotion > 0 && $slaves[$i].devotion < -30>>
- $slaves[$i].slaveName loathes that <<SlaveFullName $slaves[_j]>> is using //her// body to benefit you and makes it abundantly clear every chance she gets. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName loathes that <<= SlaveFullName($slaves[_j])>> is using //her// body to benefit you and makes it abundantly clear every chance she gets. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
@@ -26,19 +26,19 @@
<<switch $slaves[$i].behavioralFlaw>>
<<case "arrogant">>
<<if $slaves[_j].intelligence > $slaves[$i].intelligence>>
- $slaves[$i].slaveName is an arrogant bitch, and <<SlaveFullName $slaves[_j]>> is authentically smarter than she is, which of course she cannot stand. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName is an arrogant bitch, and <<= SlaveFullName($slaves[_j])>> is authentically smarter than she is, which of course she cannot stand. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
<<case "bitchy">>
<<if $slaves[_j].behavioralFlaw == "odd">>
- $slaves[$i].slaveName is a bit of a bitch, and poor odd <<SlaveFullName $slaves[_j]>> is a convenient target for her bullying. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName is a bit of a bitch, and poor odd <<= SlaveFullName($slaves[_j])>> is a convenient target for her bullying. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
<<case "odd">>
<<if $slaves[_j].behavioralFlaw == "bitchy">>
- $slaves[$i].slaveName is rather strange. <<SlaveFullName $slaves[_j]>>, who is kind of a bitch, frequently bullies her about it. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName is rather strange. <<= SlaveFullName($slaves[_j])>>, who is kind of a bitch, frequently bullies her about it. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
@@ -47,11 +47,11 @@
<<if $slaves[_j].faceShape == "masculine" || $slaves[_j].faceShape == "androgynous" >>
<<if $slaves[_j].muscles > 10>>
<<if $slaves[_j].vagina > -1>>
- $slaves[$i].slaveName hates men, and poor butch <<SlaveFullName $slaves[_j]>> really gets to her, despite having a pussy and everything. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates men, and poor butch <<= SlaveFullName($slaves[_j])>> really gets to her, despite having a pussy and everything. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<<else>>
- $slaves[$i].slaveName hates men, and poor masculine <<SlaveFullName $slaves[_j]>> really gets to her. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates men, and poor masculine <<= SlaveFullName($slaves[_j])>> really gets to her. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
@@ -63,11 +63,11 @@
<<if $slaves[_j].faceShape != "masculine">>
<<if $slaves[_j].muscles <= 30>>
<<if $slaves[_j].vagina > -1>>
- $slaves[$i].slaveName hates women, and something about the feminine <<SlaveFullName $slaves[_j]>> really gets to her. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates women, and something about the feminine <<= SlaveFullName($slaves[_j])>> really gets to her. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<<else>>
- $slaves[$i].slaveName hates women, and something about the girly <<SlaveFullName $slaves[_j]>> really gets to her, despite poor $slaves[_j].slaveName not being perfectly female at all. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates women, and something about the girly <<= SlaveFullName($slaves[_j])>> really gets to her, despite poor $slaves[_j].slaveName not being perfectly female at all. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
@@ -76,25 +76,25 @@
<</if>>
<<case "gluttonous">>
<<if $slaves[_j].behavioralFlaw == "anorexic">>
- $slaves[$i].slaveName, who loves food, can't stand <<SlaveFullName $slaves[_j]>>'s prissy anorexia. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName, who loves food, can't stand <<= SlaveFullName($slaves[_j])>>'s prissy anorexia. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
<<case "anorexic">>
<<if $slaves[_j].behavioralFlaw == "gluttonous">>
- $slaves[$i].slaveName, an anorexic, can't stand <<SlaveFullName $slaves[_j]>>'s disgusting gluttony. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName, an anorexic, can't stand <<= SlaveFullName($slaves[_j])>>'s disgusting gluttony. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
<<case "devout">>
<<if $slaves[_j].behavioralFlaw == "liberated">>
- $slaves[$i].slaveName, who is devout and might be considered rather conservative if she were free, can't stand <<SlaveFullName $slaves[_j]>>'s revolting gender liberation. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName, who is devout and might be considered rather conservative if she were free, can't stand <<= SlaveFullName($slaves[_j])>>'s revolting gender liberation. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
<<case "liberated">>
<<if $slaves[_j].behavioralFlaw == "devout">>
- $slaves[$i].slaveName, who is liberated and might be considered rather liberal if she were free, can't stand <<SlaveFullName $slaves[_j]>>'s bigoted religious faith. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName, who is liberated and might be considered rather liberal if she were free, can't stand <<= SlaveFullName($slaves[_j])>>'s bigoted religious faith. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<</if>>
@@ -102,7 +102,7 @@
<</if>>
<<if $slaves[_j].assignment == $slaves[$i].assignment>>
<<if random(0,1) == 1>>
- $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> see too much of each other while they
+ $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> see too much of each other while they
<<switch $slaves[_j].assignment>>
<<case "be a servant" "work as a servant">>
work as servants
@@ -141,10 +141,10 @@
<<set _j = $slaveIndices[$slaves[$i].rivalryTarget]>>
<<if def _j>>
<<if $slaves[$i].fuckdoll>>
- $slaves[$i].slaveName is a living sex toy, not a person, it @@.lightsalmon;can't really maintain any meaningful rivalry@@ with <<SlaveFullName $slaves[_j]>>.
+ $slaves[$i].slaveName is a living sex toy, not a person, it @@.lightsalmon;can't really maintain any meaningful rivalry@@ with <<= SlaveFullName($slaves[_j])>>.
<<set $slaves[_j].rivalry = 0,$slaves[_j].rivalryTarget = 0, $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
<<elseif $slaves[$i].fetish == "mindbroken">>
- Since $slaves[$i].slaveName is mindbroken, she @@.lightsalmon;can't really maintain any meaningful rivalry@@ with <<SlaveFullName $slaves[_j]>>.
+ Since $slaves[$i].slaveName is mindbroken, she @@.lightsalmon;can't really maintain any meaningful rivalry@@ with <<= SlaveFullName($slaves[_j])>>.
<<set $slaves[_j].rivalry = 0,$slaves[_j].rivalryTarget = 0, $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
<<else>>
<<if $slaves[$i].need>>
@@ -153,14 +153,14 @@
<<if $slaves[_j].releaseRules != "restrictive">>
<<if $slaves[$i].fetishKnown>>
<<if $slaves[$i].fetish == "sadist">>
- $slaves[$i].slaveName is horny and sadistic, so she rapes her rival <<SlaveFullName $slaves[_j]>> every chance she gets; this @@.hotpink;thrills@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;frightened@@ that you let it happen.
+ $slaves[$i].slaveName is horny and sadistic, so she rapes her rival <<= SlaveFullName($slaves[_j])>> every chance she gets; this @@.hotpink;thrills@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;frightened@@ that you let it happen.
<<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].trust -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
<<if $slaves[$i].rivalry < 3>>
Of course, this @@.lightsalmon;worsens their rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1, _worsenedRivalry = 1>>
<</if>>
<<elseif $slaves[$i].fetish == "dom">>
- $slaves[$i].slaveName is horny and dominant, so she forces her rival <<SlaveFullName $slaves[_j]>> to submit to her whenever she can; this @@.hotpink;thoroughly satisfies@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;angered@@ that you let it happen.
+ $slaves[$i].slaveName is horny and dominant, so she forces her rival <<= SlaveFullName($slaves[_j])>> to submit to her whenever she can; this @@.hotpink;thoroughly satisfies@@ $slaves[$i].slaveName, but $slaves[_j].slaveName is @@.golden;angered@@ that you let it happen.
<<set $slaves[$i].need = 0, $slaves[$i].devotion += 3, $slaves[_j].devotion -= 3, $slaves[$i].penetrativeCount += 5, $slaves[_j].oralCount += 5>>
<<if $slaves[$i].rivalry < 3>>
Of course, this @@.lightsalmon;worsens their rivalry.@@
@@ -178,7 +178,7 @@
<<if $slaves[_j].fetish == $slaves[$i].fetish>>
<<if $slaves[_j].fetishKnown>>
<<if $slaves[$i].fetishKnown>>
- $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> share sexual interests, and in the sexual atmosphere of the arcology, it's @@.lightgreen;difficult for them to keep up their dislike@@ of one another with the mutual attraction.
+ $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> share sexual interests, and in the sexual atmosphere of the arcology, it's @@.lightgreen;difficult for them to keep up their dislike@@ of one another with the mutual attraction.
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
@@ -192,25 +192,25 @@
<<if _roll > 80 && $slaves[$i].rivalry > 0>>
<<if $slaves[_j].trust < -20>>
<<if $slaves[$i].trust < -20>>
- Since both $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> are terrified of you, they work together to @@.lightgreen;get over their feud,@@ since it brings punishment on both of them.
+ Since both $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> are terrified of you, they work together to @@.lightgreen;get over their feud,@@ since it brings punishment on both of them.
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
<<if $slaves[_j].devotion > 50>>
<<if $slaves[$i].devotion > 50>>
- Since both $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> are devoted to you, they work together to @@.lightgreen;get over their feud,@@ since it gets in the way of their duties.
+ Since both $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> are devoted to you, they work together to @@.lightgreen;get over their feud,@@ since it gets in the way of their duties.
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
<<if _roll > 90 && $slaves[$i].rivalry > 0>>
<<if $slaves[$i].energy > 95>>
- $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
+ $slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything she can to @@.lightgreen;patch up their differences.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
<</if>>
<<if _lustyFix != 1>>
<<if $slaves[$i].attrXX > 85>>
<<if ($slaves[_j].vagina > -1) || ($slaves[_j].faceShape != "masculine")>>
- $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
+ $slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything she can to @@.lightgreen;patch up their differences.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
<</if>>
<</if>>
@@ -218,7 +218,7 @@
<<if _lustyFix != 1>>
<<if $slaves[$i].attrXY > 85>>
<<if ($slaves[_j].balls > 0) || ($slaves[_j].faceShape == "masculine")>>
- $slaves[$i].slaveName lusts after <<SlaveFullName $slaves[_j]>>, and does everything she can to @@.lightgreen;patch up their differences.@@
+ $slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything she can to @@.lightgreen;patch up their differences.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
<</if>>
<</if>>
@@ -227,7 +227,7 @@
<<if $slaves[_j].assignment != $slaves[$i].assignment>>
<<if $slaves[$i].subTarget != $slaves[_j].ID>>
<<if $slaves[_j].subTarget != $slaves[$i].ID>>
- With time apart $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightgreen;dislike each other less.@@
+ With time apart $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightgreen;dislike each other less.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
@@ -241,10 +241,10 @@
<<if $familyTesting>>
<<if $slaves[$i].mother == $slaves[_j].ID || $slaves[$i].father == $slaves[_j].ID || $slaves[_j].mother == $slaves[$i].ID || $slaves[_j].father == $slaves[$i].ID || areSisters($slaves[$i], $slaves[_j])>>
<<if _roll > 70 && $slaves[$i].rivalry < 3>>
- $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightsalmon;pursue their family rivalry.@@
+ $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightsalmon;pursue their family rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<<elseif _roll > 40 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
- $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightgreen;patch up their family relationship.@@
+ $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightgreen;patch up their family relationship.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
@@ -252,10 +252,10 @@
<<if $slaves[$i].relation>>
<<if $slaves[$i].relationTarget == $slaves[$i].rivalryTarget>>
<<if _roll > 70 && $slaves[$i].rivalry < 3>>
- $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightsalmon;pursue their family rivalry.@@
+ $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightsalmon;pursue their family rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<<elseif _roll > 40 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
- $slaves[$i].slaveName and <<SlaveFullName $slaves[_j]>> @@.lightgreen;patch up their family relationship.@@
+ $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightgreen;patch up their family relationship.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<</if>>
@@ -263,16 +263,16 @@
<</if>>
<<if $slaves[_j].origBodyOwnerID == $slaves[$i].ID>>
<<if $slaves[$i].rivalry < 3>>
- $slaves[$i].slaveName @@.lightsalmon;refuses to accept <<SlaveFullName $slaves[_j]>>'s control of her former body,@@ worsening their rivalry.
+ $slaves[$i].slaveName @@.lightsalmon;refuses to accept <<= SlaveFullName($slaves[_j])>>'s control of her former body,@@ worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<</if>>
<<elseif _roll > $slaves[$i].devotion-$slaves[$i].trust+10>>
<<if $slaves[$i].rivalry < 3>>
- $slaves[$i].slaveName @@.lightsalmon;bickers with <<SlaveFullName $slaves[_j]>>@@ whenever she can, worsening their rivalry.
+ $slaves[$i].slaveName @@.lightsalmon;bickers with <<= SlaveFullName($slaves[_j])>>@@ whenever she can, worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<</if>>
<<elseif _roll < $slaves[$i].devotion-$slaves[$i].trust-10 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
- $slaves[$i].slaveName does her best to be nice to <<SlaveFullName $slaves[_j]>>, and manages to @@.lightgreen;de-escalate their little feud.@@
+ $slaves[$i].slaveName does her best to be nice to <<= SlaveFullName($slaves[_j])>>, and manages to @@.lightgreen;de-escalate their little feud.@@
<<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
<</if>>
<<else>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 763aca9c96d..1cf416d6c53 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -180,7 +180,7 @@ the public.
<<else>>
Living and working
<</if>>
- out of the club, she comes under <<SlaveFullName $DJ>>'s
+ out of the club, she comes under <<= SlaveFullName($DJ)>>'s
<<if $DJRepBonus < 0.1>>
completely inept
<<elseif $DJRepBonus < 0.2>>
@@ -198,10 +198,10 @@ the public.
<</if>>
<<if $DJignoresFlaws != 1>>
<<if !["none", "neglectful", "cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "breeder"].includes($slaves[$i].sexualFlaw) && (random(1,100) > 90)>>
- <<SlaveFullName $DJ>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws.
+ <<= SlaveFullName($DJ)>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws.
<<set $slaves[$i].sexualFlaw = "none">>
<<elseif ($slaves[$i].behavioralFlaw != "none") && (random(1,100) > 90)>>
- <<SlaveFullName $DJ>> manages to @@.green;break@@ $slaves[$i].slaveName of her flaws.
+ <<= SlaveFullName($DJ)>> manages to @@.green;break@@ $slaves[$i].slaveName of her flaws.
<<set $slaves[$i].behavioralFlaw = "none">>
<</if>>
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 14882f6f560..7dfc94a393c 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -171,7 +171,7 @@ her body.
<<else>>
Living and working
<</if>>
- out of the brothel, she comes under <<SlaveFullName $Madam>>'s
+ out of the brothel, she comes under <<= SlaveFullName($Madam)>>'s
<<if $madamCashBonus < 0.1>>
completely inept
<<elseif $madamCashBonus < 0.2>>
@@ -191,10 +191,10 @@ her body.
<</if>>
<<if $MadamIgnoresFlaws != 1>>
<<if !["none", "neglectful", "cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "breeder"].includes($slaves[$i].sexualFlaw) && (random(1,100) > 90)>>
- <<SlaveFullName $Madam>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws.
+ <<= SlaveFullName($Madam)>> manages to @@.green;break@@ $slaves[$i].slaveName of her sexual flaws.
<<set $slaves[$i].sexualFlaw = "none">>
<<elseif ($slaves[$i].behavioralFlaw != "none") && (random(1,100) > 90)>>
- <<SlaveFullName $Madam>> manages to @@.green;break@@ $slaves[$i].slaveName of her flaws.
+ <<= SlaveFullName($Madam)>> manages to @@.green;break@@ $slaves[$i].slaveName of her flaws.
<<set $slaves[$i].behavioralFlaw = "none">>
<</if>>
<</if>>
diff --git a/src/uncategorized/schoolteacherSelect.tw b/src/uncategorized/schoolteacherSelect.tw
index 0df98c5a06b..d81f3f7aae7 100644
--- a/src/uncategorized/schoolteacherSelect.tw
+++ b/src/uncategorized/schoolteacherSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolteacher">>
<<showallAssignmentFilter>>
<<if ($Schoolteacher != 0)>>
- ''__@@.pink;<<SlaveFullName $Schoolteacher>>@@__'' is serving as your Schoolteacher.<br><br>She will help teach your slaves.
+ ''__@@.pink;<<= SlaveFullName($Schoolteacher)>>@@__'' is serving as your Schoolteacher.<br><br>She will help teach your slaves.
<<else>>
You have not selected a Schoolteacher.
<</if>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index ec2b4163525..7b625b544b6 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -273,7 +273,7 @@
<</if>>
<<if $weddingPlanned == 3>>
- The ceremony to bind <<SlaveFullName $activeSlave>> to you as your slave wife, and her womb to you as your private breeding ground, is a polite affair which you host in the lower floor of your penthouse. <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0>>Barely anyone is there, mostly lower-class citizens, several accompanied by their slaves. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. There is a distinct air of unrest in the room, as if the absent Elites' distaste of your actions came in their place.<<else>>All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.<</if>>
+ The ceremony to bind <<= SlaveFullName($activeSlave)>> to you as your slave wife, and her womb to you as your private breeding ground, is a polite affair which you host in the lower floor of your penthouse. <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0>>Barely anyone is there, mostly lower-class citizens, several accompanied by their slaves. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. There is a distinct air of unrest in the room, as if the absent Elites' distaste of your actions came in their place.<<else>>All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.<</if>>
<br><br>
$activeSlave.slaveName appears after everyone has had a chance to socialize,<<if ($activeSlave.amp == 1)>> carried by another slave since she's a quadruple amputee and she cannot walk,<</if>> wearing beautiful bridal lingerie in
<<if ($activeSlave.vagina == 0)>>
@@ -516,7 +516,7 @@
<<set $failedElite += 250>>
<</if>>
<<elseif $weddingPlanned == 2>>
- The ceremony to bind <<SlaveFullName $activeSlave>> to you as your slave wife is an all day affair.
+ The ceremony to bind <<= SlaveFullName($activeSlave)>> to you as your slave wife is an all day affair.
<<if $activeSlave.fetish == "mindbroken">>
She spent the day before resting and preparing herself, if you can call sitting around mindlessly preparing. She spends most of the daylong party at the center of a nonstop gangbang, occasionally moaning as more of physical reaction than anything. The theory is that she’ll be bound to you as your slave wife from this day onward, so she must get the promiscuity that is a sex slave’s responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave’s utter emptiness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside her, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, she’s extracted and taken off to be bathed.
<br><br>
@@ -660,7 +660,7 @@
<</if>>
<<set $trinkets.push($desc)>>
<<else>>
- The ceremony to bind <<SlaveFullName $activeSlave>> to you as your slave wife is a polite affair which you host in the lower floor of your penthouse. All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.
+ The ceremony to bind <<= SlaveFullName($activeSlave)>> to you as your slave wife is a polite affair which you host in the lower floor of your penthouse. All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.
<br><br>
$activeSlave.slaveName appears after everyone has had a chance to socialize,<<if ($activeSlave.amp == 1)>> carried by another slave since she's a quadruple amputee and she cannot walk,<</if>> wearing beautiful bridal lingerie in
<<if ($activeSlave.vagina == 0)>>
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index 6bf53e148ba..35a7d1f6d4f 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -410,14 +410,14 @@
<<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10 && _OverdoseDeaths > 0>> <<print (_OverdoseDeaths)>> soldiers fatally overdosed on the drug cocktail, The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totaling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security.
<</nobr>>
- <br> //Your instructions to <<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>://
+ <br> //Your instructions to <<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<= SlaveFullName($LieutenantColonel)>><<else>>The Colonel<</if>>://
Deployment focus: <span id="focus"><<if $securityForceFocus == "recruit">>''Recruiting and Training''<<elseif $securityForceFocus == "secure">>''Securing Trade Routes''<<else>>''Raiding and Slaving''<</if>></span>. <<link "Recruit and Train">><<set $securityForceFocus = "recruit">><<replace "#focus">>''Recruiting and Training''<</replace>><</link>> | <<link "Secure Trade Routes">><<set $securityForceFocus = "secure">><<replace "#focus">>''Securing Trade Routes''<</replace>><</link>> | <<link "Raiding and Slaving">><<set $securityForceFocus = "raiding">><<replace "#focus">>''Raiding and Slaving''<</replace>><</link>>
Rules of Engagement: <span id="roe"><<if $securityForceRulesOfEngagement == "hold">>''Hold Fire''<<elseif $securityForceRulesOfEngagement == "limited">>''Limited Fire''<<else>>''Free Fire''<</if>></span>. <<link "Hold Fire">><<set $securityForceRulesOfEngagement = "hold">><<replace "#roe">>''Hold Fire''<</replace>><</link>> | <<link "Limited Fire">><<set $securityForceRulesOfEngagement = "limited">><<replace "#roe">>''Limited Fire''<</replace>><</link>> | <<link "Free Fire">><<set $securityForceRulesOfEngagement = "free">><<replace "#roe">>''Free Fire''<</replace>><</link>>
Accountability: <span id="accountability"><<if $securityForceAccountability == "strict">>''Strict Accountability''<<elseif $securityForceAccountability == "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>. <<link "Strict Accountability">><<set $securityForceAccountability = "strict">><<replace "#accountability">>''Strict Accountability''<</replace>><</link>> | <<link "Some Accountability">><<set $securityForceAccountability = "some">><<replace "#accountability">>''Some Accountability''<</replace>><</link>> | <<link "No Accountability">><<set $securityForceAccountability = "none">><<replace "#accountability">>''No Accountability''<</replace>><</link>>
<<if $OverallTradeShowAttendance == 1>>
- <br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully <<if $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job <<else>> that nothing serious happened while I was away.<</if>> There was some interest in our developments, I could probably sell generic schematics next time I go if you want?
+ <br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully <<if $LieutenantColonel == 2>>Lieutenant Colonel <<= SlaveFullName($LieutenantColonel)>> has been doing her job <<else>> that nothing serious happened while I was away.<</if>> There was some interest in our developments, I could probably sell generic schematics next time I go if you want?
<<elseif $OverallTradeShowAttendance >= 2>>
- <br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully <<if $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job <<else>> that nothing serious happened while I was away.<</if>>
+ <br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully <<if $LieutenantColonel == 2>>Lieutenant Colonel <<= SlaveFullName($LieutenantColonel)>> has been doing her job <<else>> that nothing serious happened while I was away.<</if>>
<br>While at the recent TradeShow, <<print cashFormat($TradeShowIncome)>> was made selling generic schematics and $TradeShowHelots menial slaves were sent as a bonus.
Overall <<print cashFormat($TotalTradeShowIncome)>> has been made and <<print commaNum($TotalTradeShowHelots)>> menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended.
<</if>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index a2586f1664b..c82db200d59 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -43,7 +43,7 @@
<<set $slaves[_FLs].livingRules = "luxurious">>
<</if>>
<<set $Stewardess = $slaves[_FLs]>>
- <<SlaveFullName $Stewardess>> is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $Stewardess.devotion > 50>> She does her best to be your perfect lovely housewife.<</if>>
+ <<= SlaveFullName($Stewardess)>> is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $Stewardess.devotion > 50>> She does her best to be your perfect lovely housewife.<</if>>
<<if ($stewardessImpregnates == 1) && (_DL > 0) && (canPenetrate($Stewardess)) && $Stewardess.pubertyXY == 1>>
<<set _stewardessImpregnated = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
@@ -208,7 +208,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as your Stewardess.
+ ''__@@.pink;<<= SlaveFullName($slaves[_FLs])>>@@__'' is serving as your Stewardess.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -273,7 +273,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 76a5f6fccbf..4c5c9a64d68 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -282,20 +282,20 @@
<<set _si = $slaveIndices[$activeSlave.relationshipTarget]>>
<<if isSlaveAvailable($slaves[_si])>>
<<if ($activeSlave.relationship == 1)>>
- | <<link `"Fuck $him with $his friend <<SlaveFullName $slaves[_si]>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
+ | <<link `"Fuck $him with $his friend <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
<<elseif ($activeSlave.relationship == 2)>>
- | <<link `"Fuck $him with $his best friend <<SlaveFullName $slaves[_si]>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
+ | <<link `"Fuck $him with $his best friend <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
<<elseif ($activeSlave.relationship == 3)>>
- | <<link `"Fuck $him with $his FWB <<SlaveFullName $slaves[_si]>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
+ | <<link `"Fuck $him with $his FWB <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
<<elseif ($activeSlave.relationship == 4)>>
- | <<link `"Fuck $him with $his lover <<SlaveFullName $slaves[_si]>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
+ | <<link `"Fuck $him with $his lover <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
<<else>>
- | <<link `"Fuck $him with $his slave wife <<SlaveFullName $slaves[_si]>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
+ | <<link `"Fuck $him with $his slave wife <<= SlaveFullName($slaves[_si])>>"`>><<replace "#miniscene">><<set $partner = "relationship">><<include "FRelation">><br> <</replace>><</link>>
<</if>>
<<else>>
<<if $slaves[_si].assignment == "be your agent">>
<<if $activeSlave.broodmother < 2>>
- | <<link `"Send $him to live with your agent <<SlaveFullName $slaves[_si]>>"`>>
+ | <<link `"Send $him to live with your agent <<= SlaveFullName($slaves[_si])>>"`>>
<<set $subSlave = $slaves[_si]>>
<<goto "Agent Company">>
<</link>>
@@ -303,7 +303,7 @@
| //A hyper-broodmother cannot be sent to live with your agent//
<</if>>
<<else>>
- | //<<SlaveFullName $slaves[_si]>> is unavailable//
+ | //<<= SlaveFullName($slaves[_si])>> is unavailable//
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 8985097f2b6..df76fb78f94 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -40,7 +40,7 @@
<<set _devBonus++>>
<</if>>
<<set $slaves[_FLs].devotion += _devBonus, $Attendant = $slaves[_FLs]>>
- <<SlaveFullName $Attendant>> is serving as the spa attendant.<<if $Attendant.relationship == -3 && $Attendant.devotion > 50>> She tries her best to be your perfect attentive, caring and loving wife.<</if>>
+ <<= SlaveFullName($Attendant)>> is serving as the spa attendant.<<if $Attendant.relationship == -3 && $Attendant.devotion > 50>> She tries her best to be your perfect attentive, caring and loving wife.<</if>>
<<if (_FLsFetish == 1)>>
When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a submissive.@@
<<elseif (_FLsFetish == 2)>>
@@ -235,7 +235,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__'' is serving as the Attendant in $spaName.
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__'' is serving as the Attendant in $spaName.
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
@@ -296,7 +296,7 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__''
+ ''__@@.pink;<<= SlaveFullName($slaves[$i])>>@@__''
<<if $slaves[$i].choosesOwnAssignment == 2>>
<<include "SA chooses own job">>
<<else>>
diff --git a/src/uncategorized/stewardessSelect.tw b/src/uncategorized/stewardessSelect.tw
index d843f64ffee..45d64a5b854 100644
--- a/src/uncategorized/stewardessSelect.tw
+++ b/src/uncategorized/stewardessSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Servants' Quarters", $showEncyclopedia = 1, $encyclopedia = "Stewardesses">>
<<showallAssignmentFilter>>
<<if ($Stewardess != 0)>>
- ''__@@.pink;<<SlaveFullName $Stewardess>>@@__'' is serving as your Stewardess.<br><br>She will manage the Servants' Quarters.
+ ''__@@.pink;<<= SlaveFullName($Stewardess)>>@@__'' is serving as your Stewardess.<br><br>She will manage the Servants' Quarters.
<<else>>
You have not selected a Stewardess.
<</if>>
diff --git a/src/uncategorized/wardenessSelect.tw b/src/uncategorized/wardenessSelect.tw
index 5c56005bd21..fc352b2f0fa 100644
--- a/src/uncategorized/wardenessSelect.tw
+++ b/src/uncategorized/wardenessSelect.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Back", $nextLink = "Cellblock", $showEncyclopedia = 1, $encyclopedia = "Wardeness">>
<<showallAssignmentFilter>>
<<if ($Wardeness != 0)>>
- ''__@@.pink;<<SlaveFullName $Wardeness>>@@__'' is serving as your Wardeness.<br><br>She will help break your prisoners.
+ ''__@@.pink;<<= SlaveFullName($Wardeness)>>@@__'' is serving as your Wardeness.<br><br>She will help break your prisoners.
<<else>>
You have not selected a Wardeness.
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 061c3cea15e..925d8819a6a 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -26,7 +26,7 @@
You plan to train
<<for _dwi = 0; _dwi < _PA.length; _dwi++>>
<<if _dwi > 0 && _dwi == _PA.length - 1>>and<</if>>
- ''__@@.pink;<<SlaveFullName _PA[_dwi]>>@@__'' to $personalAttention[_dwi].trainingRegimen<<if _dwi > 0 && _dwi < _PA.length - 2>>,<</if>>
+ ''__@@.pink;<<= SlaveFullName(_PA[_dwi])>>@@__'' to $personalAttention[_dwi].trainingRegimen<<if _dwi > 0 && _dwi < _PA.length - 2>>,<</if>>
<</for>>
this week.
<</if>>
@@ -39,7 +39,7 @@
<<if $useSlaveSummaryOverviewTab != 1>> /* Hide this block if it will be shown on the overview tab */
<br>
<<if def _HG>>
- ''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.
+ ''__@@.pink;<<= SlaveFullName($HeadGirl)>>@@__'' is serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.
<span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<elseif (ndef _HG) && ($slaves.length > 1)>>
You have not selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
@@ -48,7 +48,7 @@
<</if>>
<br>
<<if def _RC>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working to recruit girls.
+ ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is working to recruit girls.
<span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<<else>>
You have not selected a Recruiter.
@@ -57,7 +57,7 @@
<<if ($dojo != 0)>>
<br>
<<if def _BG>>
- ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<<else>>
You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 3f95ad41abe..690460ea8cc 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2022,8 +2022,6 @@ This experience
/* see how they are on a single line? This permits "."s and other things to be appended directly onto the widget result */
<<widget "PlayerName">><<if $surnameOrder != 1>><<switch $PC.nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><<else>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</if>><</widget>>
-<<widget "SlaveFullName">><<= SlaveFullName($args[0])>><</widget>>
-
<<widget "PoliteRudeTitle">><<switch $args[0].nationality>><<case "Japanese">><<if $args[0].trust > 0>>$PC.name<<if $PC.title > 0>>kun<<else>>chan<</if>><<else>><<if $PC.surname>><<print $PC.surname>><<else>><<print $PC.name>><<s>>an<</if>><</if>><<default>><<if $args[0].intelligence < -2>><<Master>><<elseif $args[0].intelligence > 1>><<if $PC.title > 0>>Ma<<s>>ther<<else>>Mi<<s>>tre<<ss>><</if>><<elseif $args[0].trust > 0>>$PC.name<<else>><<if $PC.surname>>$PC.surname<<else>>$PC.name<</if>><</if>><</switch>><</widget>>
/*
@@ -2036,7 +2034,7 @@ This experience
Call as <<EventNameDelink>>
$args[0]: Slave.
*/
-<<widget "EventNameDelink">><<replace "#name">><<SlaveFullName $args[0]>><</replace>><</widget>>
+<<widget "EventNameDelink">><<replace "#name">><<= SlaveFullName($args[0])>><</replace>><</widget>>
/*
Call as <<DegradingName $slave>> where $slave is any slave object
diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw
index d1227463529..523cd4c01a4 100644
--- a/src/utility/saRulesWidgets.tw
+++ b/src/utility/saRulesWidgets.tw
@@ -423,7 +423,7 @@ and
<<if $slaves[_j].assignmentVisible || $slaves[_j].assignment == $slaves[$i].assignment>>
<<if $slaves[_j].devotion < 20>>
<<if $slaves[_j].trust < -20>>
- Craving a rush, she repeatedly forces a reluctant <<SlaveFullName $slaves[_j]>> to have sex with her in public. $slaves[_j].slaveName resents this, and $slaves[$i].slaveName's ongoing sexual abuse @@.lightsalmon;starts a rivalry@@ between them.
+ Craving a rush, she repeatedly forces a reluctant <<= SlaveFullName($slaves[_j])>> to have sex with her in public. $slaves[_j].slaveName resents this, and $slaves[$i].slaveName's ongoing sexual abuse @@.lightsalmon;starts a rivalry@@ between them.
<<set $slaves[$i].rivalry = 1, $slaves[_j].rivalry = 1, $slaves[$i].rivalryTarget = $slaves[_j].ID, $slaves[_j].rivalryTarget = $slaves[$i].ID>>
<<run SimpleSlaveFucking($slaves[_j], 4)>>
<<if canPenetrate($slaves[_j])>>
@@ -470,7 +470,7 @@ and
<<if $slaves[_j].assignmentVisible || $slaves[_j].assignment == $slaves[$i].assignment>>
<<if $slaves[_j].devotion <= 50>>
<<if $slaves[_j].sexualFlaw != "none">>
- She focuses on <<SlaveFullName $slaves[_j]>>, who has a sexual flaw $slaves[$i].slaveName can exploit. She sadistically
+ She focuses on <<= SlaveFullName($slaves[_j])>>, who has a sexual flaw $slaves[$i].slaveName can exploit. She sadistically
<<if $slaves[_j].sexualFlaw == "hates oral">>
rapes the poor slave's face<<if !canAchieveErection($slaves[$i])>> with her fingers<</if>>. $slaves[_j].slaveName hates oral
<<elseif $slaves[_j].sexualFlaw == "hates penetration" && canDoVaginal($slaves[_j])>>
@@ -536,7 +536,7 @@ and
<<if $slaves[_j].assignmentVisible || $slaves[_j].assignment == $slaves[$i].assignment>>
<<if $slaves[_j].devotion < 20>>
<<if $slaves[_j].trust < -20>>
- She repeatedly rapes a reluctant <<SlaveFullName $slaves[_j]>>; she can't seem to keep her hands off the poor slave, who can't avoid her. Not surprisingly, $slaves[_j].slaveName resents this, and $slaves[$i].slaveName's ongoing sexual abuse @@.lightsalmon;starts a rivalry@@ between them.
+ She repeatedly rapes a reluctant <<= SlaveFullName($slaves[_j])>>; she can't seem to keep her hands off the poor slave, who can't avoid her. Not surprisingly, $slaves[_j].slaveName resents this, and $slaves[$i].slaveName's ongoing sexual abuse @@.lightsalmon;starts a rivalry@@ between them.
<<set $slaves[$i].rivalry = 1, $slaves[_j].rivalry = 1, $slaves[$i].rivalryTarget = $slaves[_j].ID, $slaves[_j].rivalryTarget = $slaves[$i].ID>>
<<break>>
<<run SimpleSlaveFucking($slaves[_j], 4)>>
--
GitLab