From 9aeb6f3420a81b837a102dc91f1031edb1aa86c6 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 26 May 2018 19:03:54 -0400
Subject: [PATCH] fixes, minor tweaks to BS and some fPat cleanup.
---
src/init/storyInit.tw | 2 +-
src/npc/acquisition.tw | 3 +-
src/pregmod/fPat.tw | 99 +++++++++++++------------
src/pregmod/huskSlaveSwap.tw | 1 +
src/pregmod/huskSlaveSwapWorkaround.tw | 4 +-
src/pregmod/slaveSlaveSwap.tw | 9 ++-
src/pregmod/slaveSlaveSwapWorkaround.tw | 4 +-
src/uncategorized/costsReport.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 4 +-
9 files changed, 70 insertions(+), 58 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 0ba7cdb8943..775e0779e58 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -627,7 +627,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $drugUpgradeHormones = "unselected">>
<<set $drugUpgradeInjectionOne = "unselected">>
<<set $drugUpgradeInjectionTwo = "unselected">>
-<<Set $corpValue = 0>>
+<<set $corpValue = 0>>
<<set $shelterSlave = 0>>
<<set $shelterSlaveBought = 0>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index fe50df7512a..4fd79f05f69 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -2,7 +2,7 @@
<<unset $slaveWithoutBonuses, $startingGirlCopied, $startingGirlRelation>>
-<<set $fixedNationality = 0>>
+<<set $fixedNationality = 0, $encyclopedia = " ">>
<<if $saveImported == 1>><<set _valueOwed = 5000>><<else>><<set _valueOwed = 50000>><</if>>
<<if $freshPC == 1 || $saveImported == 0>>
@@ -553,6 +553,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.oldTrust = $activeSlave.trust>>
<<set _valueGiven += $slaveCost>>
+ <<SetBellySize $activeSlave>>
<<AddSlave $activeSlave>>
<<if $activeSlave.fetish == "mindbroken">>
$activeSlave.slaveName is, sadly, not mentally competent, and is wandering through the penthouse at the moment.
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index 282c7777829..28e7a4286be 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -20,7 +20,7 @@ You tell $activeSlave.slaveName to
<<elseif tooFatSlave($activeSlave)>>
have another slave help $him up so $he can be near you.
<<else>>
- have another slave set $him down on your desk.
+ have another slave set $him up onto your desk.
<</if>>
/*approach*/
@@ -30,16 +30,16 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.relationship == -2)>>
$He eagerly complies, happy to be near the object of $his longing. Once $he's close, you hold $his face in your palms and gaze deeply
<<if canSee($activeSlave)>>
- into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves overwhelming, and $his eyes flick downward after a moment.
+ into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves overwhelming, and $his eyes flick downward after a moment.
<<else>>
- upon $his face. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves overwhelming, and after a moment glances away.
+ upon $his face. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he loves overwhelming, and after a moment glances away.
<</if>>
$He blushes furiously.
<<elseif ($activeSlave.relationship == -3)>>
<<if $activeSlave.fetish == "mindbroken">>
- $He complies mechanically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank $activeSlave.eyeColor eyes. $He shows no reaction
+ $He complies mechanically. $He remembers that when <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his empty $activeSlave.eyeColor eyes. $He shows no reaction
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- $He complies in a wifely fashion, moving $his body as $he approaches to best catch your desire, eager to be close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married $him. Once $he's close, you hold $his face in your palms and gaze
+ $He complies in a wifely fashion, moving $his body as $he approaches to best enflame your desire, eager to be close to the <<if $PC.title == 1>>man<<else>>woman<</if>> who married $him. Once $he's close, you hold $his face in your palms and gaze
<<if canSee($activeSlave)>>
deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
<<else>>
@@ -48,31 +48,31 @@ You tell $activeSlave.slaveName to
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
$He complies. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his tearing $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to disturbing, and breaks eye contact.
+ into $his tearful $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to disturbing, and breaks eye contact.
<<else>>
- upon $his face. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to disturbing, and quickly turns $his face away.
+ upon $his face. $He can feel the intense gaze of the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to, and finds it disturbing. $He quickly turns $his face away.
<</if>>
<<elseif $activeSlave.devotion < -20>>
- $He complies out of fear. Once $he's close, you hold $his shaking face in your palms and take a moment to gaze deeply
+ $He complies out of fear. Once $he's close, you hold $his quivering face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- look into $his teary $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to terrifying, and quickly breaks eye contact.
+ into $his teary $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to terrifying, and quickly breaks eye contact.
<<else>>
- upon $his tear-streaked face. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to horrifying, and quickly turns $his face away.
+ upon $his tear-streaked face. $He can feel the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's forcibly married to, and it is horrifying, causing $him to turn his face away after only a moment.
<</if>>
<<else>>
$He complies obediently. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>>.
<<else>>
- upon $his face. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to reassuring, and looks down with a slight smile.
+ upon $his face. The intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to is reassuring to $him, and $he looks down with a slight smile.
<</if>>
<</if>>
<<elseif ($activeSlave.devotion > 75)>>
$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $his eyes flick downward after a moment.
+ into $his $activeSlave.eyeColor eyes. $He finds the intense look from $his beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $his eyes flick downward after a moment.
<<else>>
- upon $his face. $He finds the intense look from $his beloved <<Master>> disconcerting, and after a moment glances away.
+ upon $his face. $He can feel the intense look from $his beloved <<Master>> and it is disconcerting, causing $him to glance away after only a moment, $his face flushed.
<</if>>
$He blushes furiously.
<<elseif ($activeSlave.devotion > 50)>>
@@ -80,7 +80,7 @@ You tell $activeSlave.slaveName to
<<if canSee($activeSlave)>>
into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> disconcerting, and $he looks down after a moment, blushing.
<<else>>
- upon $his face. $He finds the intense attention from $his <<Master>> disconcerting, and $he looks down after a moment, blushing.
+ upon $his face. $He finds the intense attention from $his <<Master>> disconcerting, and it causes him to glance away after only a moment, blushing.
<</if>>
<<elseif ($activeSlave.devotion > 20)>>
$He hurriedly complies, happy to be near you. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
@@ -92,12 +92,12 @@ You tell $activeSlave.slaveName to
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > -20)>>
$He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
- $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness.
+ into $his $activeSlave.eyeColor eyes. $He finds the intense attention from $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> troubling, and $he looks down after a moment, $his lower lip trembling with nervousness.
<<else>>
upon $his face. $He finds the intense attention from $his <<Master>> worrying, and turns away after a moment, $his lower lip trembling with nervousness.
<</if>>
<<elseif ($activeSlave.trust < -20)>>
- The command terrifies $his, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
+ The command terrifies $him, but $he's more frightened still of the consequences of disobedience, and $he complies. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
into $his $activeSlave.eyeColor eyes. After a mere instant of locked faces, $he looks down fearfully and begins to shake with terror, tears leaking silently down $his cheeks.
<<else>>
@@ -111,30 +111,33 @@ You tell $activeSlave.slaveName to
upon $his face. $He faces you defiantly, but after a few moments $he loses the contest of wills and looks down.
<</if>>
<</if>>
-You walk around $his, drawing closer and slowly resting your hand on $his head. You let it lean for a few seconds for $his to accustom to your touch.
+
+/* action */
+
+You walk around $him, drawing closer and slowly resting your hand on $his head. You let it lean for a few seconds for $him to get accustomed to your touch.
<<if ($activeSlave.fetish == "mindbroken")>>
- Tenderly you brush your fingers down $his head lovingly again and again. $He initially reacts slightly to your physical touch but soon stops reacting completely.
+Tenderly and lovingly you brush your fingers along $his head again and again. $He initially reacts slightly to your physical touch, but soon stops reacting completely. Nevertheless, you continue to gingerly stroke $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>shaven scalp <<else>>hair <</if>>, as you gently press his body into your chest. The warmth from your slaves body, and the action of petting $his head, combinded with the sound of $his breathing, allow you to feel more relaxed by the minute.
+<<elseif ($activeSlave.relationship == -3)>>
+Tenderly and lovingly you brush your fingers along $his head, again and again. $He slowly leans $his body closer and closer to you, relaxing as $he feels your caress. As $he leans into you, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips. You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content $husband.//Does this work?
<<elseif ($activeSlave.relationship == -2)>>
- Tenderly you brush your fingers down $his head lovingly again and again. $He slowly leans $his body closer and closer to you, relaxing as $he feels your caress.
+Tenderly and lovingly you brush your fingers along $his head, again and again. $He slowly leans $his body closer and closer to you, relaxing as $he feels your caress. As $he leans into you, $he feels all of the daily stresses of the day melt away, and a small, respectful sigh escapes $his pursed lips. You smile fondly, allowing all of your troubled thoughts of being an arcology owner to drift away, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her<</if>>devoted and content servant.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.amp != 1)>>
- As you start to touch $him $he smiles at you and takes your hand in $hers, following its movements. You tenderly kiss it and let it rest on $his side.
+As you start to touch $him $he smiles at you and takes your hand, following its movements. You tenderly and lovingly kiss it and let it rest on the side of $his head, before continuing with your ministrations. As opposed to your more submissive slaves, $activeSlave.slaveName takes a more active role in your petting, gently guiding where your hand goes along $his head. You enjoy the feel of $his hand on yours, as well as $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>smooth scalp<<else>> hair<</if>>.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- $He stiffens at your touch but slowly relaxes to your hand on $his. Tenderly you brush your fingers down $his head lovingly again and again.
+$He stiffens at your touch but slowly relaxes at the feeling of your hand on $his head. You tenderly and lovingly stroke your fingers along $his scalp again and again. $He gently, submissively, presses $his head against your hand, like a dog. As you continue <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>kneading $his shaved scalp<<else>>stroking $his hair<</if>>, $he starts to clutch $his thighs, and if you listen you can hear subdued whimpers. $He looks up at you with adoring eyes, as $he enjoys the feeling of being a pet to $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>.
<<elseif ($activeSlave.devotion > 50)>>
- $He accepts your touch with devotion, leaning $his head back at your gentle caress. Tenderly you brush your fingers down $his head lovingly again and again. $He leans $his body forward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>.
+$He accepts your touch with devotion, leaning $his head back at your gentle caress. You tenderly and lovingly brush your fingers along $his head again and again. $He leans $his body forward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the feeling of <<if $activeSlave.hstyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tention start to melt away as well.
<<elseif ($activeSlave.devotion > 20)>>
- $He accepts your touch willingly. As you tenderly brush your fingers down $his head lovingly again and again, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch.
+$He accepts your touch willingly. As you tenderly and lovingly brush your fingers along $his head again and again, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch. As you continue your ministrations, your slave slowly, and with more then a bit of uncertainty, finally starts to relax. $He looks at you with confusion and trepidation. Your eyes betray nothing however, you simply smile and press $his head into your <<if $PC.boobs == 1>>soft breasts<<else>>masculine chest<</if>>, all the while enjoying the feeling of your <<if $activeSlave.hStyle == "shaven bald" || $activeSlave.bald == 1>>hands gliding over $his smooth head<<else>>fingers gliding through $his hair<</if>>.
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
- $He shakes at your touch fearfully. As you tenderly brush your fingers down $his unresisting head again and again, $his eagerness to avoid punishment leads $him to stiffen, making $his nervousness apparent. You continue stroking $him, enjoying $his fear, as the physical intimacy slowly does its work. $He starts to relax, $his resistance easing as $his eyes start to close.
+$He shakes at your touch fearfully. As you tenderly brush your fingers down $his unresisting head again and again, $his eagerness to avoid punishment leads $him to stiffen, making $his nervousness apparent. You continue stroking $him, enjoying $his fear, as the physical intimacy slowly does its work. $He starts to relax, $his resistance easing as $his eyes start to close. Your hands continue to gently scratch at $his scalp, and you enjoy the sensation as well as the feeling of power over your hapless slave. Gently, slowly, so not as to spook $him, you ease your property's head back into your <<if $PC.boobs == 1>>breasts<<else>>chest<</if>>. Nevertheless your slave starts at the action, but at your insistence finally gives in to the motion, and finally relaxes against you.
<<elseif ($activeSlave.trust < -50)>>
- $He is nearly frozen with fear and does not resist as you tenderly brush your fingers down $his head lovingly again and again. In fact, $he barely reacts at all.
+$He is nearly frozen with fear and does not resist as you tenderly and lovingly brush your fingers along $his head again and again. In fact, $he barely reacts at all. But being an arcology owner has taught you many things, not least of which is patience. With time and a gentle hand, your slaves shoulders slowly start to relax, so slowly if you weren't paying attention you wouldn't have noticed. With a feeling of satisfaction, you continue your actions, enjoying the feeling of your <<if $activeSlave.hStyle == "shaven bald" || $activeSlave.bald == 1>>hand gliding over $his smooth head<<else>>fingers combing through $his hair and gently scritching $his scalp<</if>>. You settle with this for now, knowing that any attempt at further intimacy will likely scare your slave off, but you enjoy it nonetheless.
<<else>>
- $He reflexively turns away from you, but you tenderly hold $his chin and maneuver $him in position with one hand and slowly but gently move your other hand to the top of $his head. Spluttering, $he leans backwards, but you catch $him by the shoulder and pin $him against you, where you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>, before resuming your gentle stroking. $He tries to wriggle out of your grasp desperately, but $his struggles slowly subside as $he realizes that you're not taking this any farther. Tenderly you brush your fingers down $his head lovingly again and again.
+$He reflexively turns away from you, but you tenderly hold $his chin and maneuver $him in position with one hand and slowly but gently move your other hand to the top of $his head. Spluttering, $he leans backwards, but you catch $him by the shoulder and pin $him against you, where you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>, before resuming your gentle stroking. $He desperately tries to wriggle out of your grasp, but $his struggles slowly subside as $he realizes that you're not taking this any farther. Tenderly and lovingly you stroke your fingers over $his head again and again.
<</if>>
-/* action */
-
-You pat $him softly and use your palm to move down $his head with a soothing touch as pet $his. Tenderly you start to run your fingers <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>against $his baldness<<else>>through $his hair<</if>>, gently running your fingertips down $his scalp, softly stroking and caressing $him. You delicately lift $his head and touch your fingertips to $his chin, tenderly brushing along the line of $his mouth with the your <<if $PC.title == 1>>manly<<else>>feminine<</if>> thumb.
+You pat $him softly and use your palm to move down $his head with a soothing touch as you pet $him. Gently you start to run your fingers <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>against $his baldness<<else>>through $his hair<</if>>, gently running your fingertips down $his scalp, softly stroking and caressing $him. You delicately lift $his head and touch your fingertips to $his chin, tenderly brushing along the line of $his mouth with the your <<if $PC.title == 1>>manly<<else>>feminine<</if>> thumb.
<<if $activeSlave.hStyle == "shaved bald">>
Then, you gently touch $his
@@ -166,7 +169,7 @@ face and lightly touch $his
lips
<</if>>
with your fingertips.
-<<if ($activeSlave.fetish != "mindbroken")>> $he starts to gasp as<<else>> starts to shudder as<</if>> you softly stroke $his temple, moving your hand up $his head where you brush softly over and over again, your fingers moving against $his head tenderly. You move your hand down to caress $his forehead, you smoothly motion along $his face as you tenderly stroke $his head front to back and goes up $his head once again. You take $his head lightly and trace around it, gently massaging as you go.
+<<if ($activeSlave.fetish != "mindbroken")>>$He starts to gasp as<<else>>$He starts to shudder as<</if>> you softly stroke $his temple, moving your hand up $his head where you brush softly over and over again, your fingers delicately brushing against $his head. You move your hand down to caress $his forehead, and then smoothly slide your hand along $his cheek. After doing this for a bit, you start to tenderly stroke $his head from front to back. The last thing you do is take $his head lightly and trace around it, gently massaging as you go.
You pat $him a few times before letting $him go.
/* outro + reaction */
@@ -176,11 +179,11 @@ You pat $him a few times before letting $him go.
<<if canSee($activeSlave)>>
$his $activeSlave.eyeColor eyes track the movements of your hands briefly before returning to their usual stare,
<<else>>
- $he exposes $himself to you,
+ $he stands at attention before you,
<</if>>
awaiting further use of $his body.
<<elseif ($activeSlave.relationship == -2)>>
- When you finally stop gently petting $him, $his eyes remain closed and $his mouth in a rapturous shape for a moment before $he slowly opens $his eyes and smiles at you. An eager look spreads across $his face <<if ($activeSlave.amp != 1)>> as $his hand traces your path up to $his head and mimics your last movements<</if>>.
+ When you finally stop petting $him, <<if canSee($activeSlave)>>$his eyes remain closed just for a second <</if>>and $his mouth stands open in slackjawed joy, before $he slowly <<if canSee($activeSlave)>> opens $his eyes<<else>> turns his gaze towards you<</if>> and smiles warmly at you. Pleasure lights up $his face<<if ($activeSlave.amp != 1)>> as $his hand traces the path yours took up to $his head and mimics your last movements<<else>> as $his gaze drifts off to the right in memory, tilting $his head from side to side in sympathetic memory of how it felt to have your hand on $his head<</if>>.
<<if ($activeSlave.accent >= 3)>>
$He does $his best to communicate love with $his <<if canSee($activeSlave)>>$activeSlave.eyeColor eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
@@ -191,8 +194,8 @@ You pat $him a few times before letting $him go.
"I love you, <<Master>>," $he <<say>>s dreamily.
<</if>>
$He looks as though $he wants much more than your mere caress.
-<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- $He tries hard to stop $himself from losing $himself in your masterful hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling.
+<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && !$activeSlave.amp != 1>>
+ $He tries hard to stop from losing $himself in your incredibly skilled hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. When you are finally finished stroking your slave, they remove their hand from yours. Then you give them a playful flick on the nose, and the mischievous twinkle in your eye is only half playful, reminding $him of $his place in these walls.
<<if ($activeSlave.accent >= 3)>>
$He does $his best to communicate enjoyment with $his <<if canSee($activeSlave)>>$activeSlave.eyeColor eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
@@ -202,9 +205,9 @@ You pat $him a few times before letting $him go.
<<else>>
"That wa<<s>> ni<<c>>e, <<Master>>," $he <<say>>s cheerfully. "Maybe next time I can <<s>>troke you..."
<</if>>
- $He looks at you, $his <<if canSee($activeSlave)>>lovely $activeSlave.eyeColor eyes<<else>>face<</if>> practically asking you to let $him take this farther.
+ $He looks at you, $his <<if canSee($activeSlave)>>lovely $activeSlave.eyeColor eyes<<else>>face<</if>> practically begging you to let $him take this farther.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- As you stroke $his head, $he reacts almost as though you're taking $his, beginning to moan and press $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>. $He achieves a weak orgasm before you stop petting $his; $he is your pet, after all.
+ As you stroke $his head, $he reacts almost as though you're stroking $his nether regions, and begins to moan and press $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>. $He achieves a weak orgasm before you finally stop caressing $his head; $he is your pet, after all.
<<if ($activeSlave.accent >= 3)>>
$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>>$activeSlave.eyeColor eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
@@ -214,9 +217,9 @@ You pat $him a few times before letting $him go.
<<else>>
"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully. "But why <<s>>top there?"
<</if>>
- $He looks at you as if $he wants more than your hands touching $his.
+ $He looks at you as if $he wants more than your hands touching $his head.
<<elseif ($activeSlave.devotion > 50)>>
- $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face<</if>>; a euphoric look quickly spreading across it.
+ $He gradually closes $his eyes and when you finally stop, <<if ($activeSlave.amp != 1)>>$he runs $his hand delightfully across $his face; <</if>>a euphoric look quickly lighting up his features.
<<if ($activeSlave.accent >= 3)>>
$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>>$activeSlave.eyeColor eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
@@ -232,27 +235,27 @@ You pat $him a few times before letting $him go.
<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
<<elseif !canTalk($activeSlave)>>
- $He signs hesitantly, asking if that's it.
+ $He signs hesitantly, asking if that's all.
<<else>>
- $He asks hesitantly, "I-i<<s>> that it, <<Master>>?"
+ $He asks hesitantly, "I-i<<s>> that all, <<Master>>?"
<</if>>
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
- When finally move your hand away, $he <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you for a long moment, before visibly catching $himself with a reminder that $he's a slave and you're $his owner.
+ When you finally move your hand away, $he <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you for a long moment, as if looking for answers, before visibly catching $himself with a reminder that $he's a slave and you're $his owner.
<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
- $His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
+ $His <<if canSee($activeSlave)>>eyes hesitantly question<<else>>expression hesitantly questions<</if>> for an answer: is that it?
<<elseif !canTalk($activeSlave)>>
- $He signs hesitantly, asking if that's it.
+ $He signs hesitantly, asking if that's all.
<<else>>
- $He asks hesitantly, "I-is that it, <<Master>>?"
+ $He asks hesitantly, "I-is that all, <<Master>>?"
<</if>>
<<elseif ($activeSlave.trust < -50)>>
$He stares <<if canSee($activeSlave)>>at you<<else>>blankly<</if>> as you move your fingers across $his stiff head, but it's like touching a statue. $He is so filled with terror that $he remains rigid even as it becomes clear to $him you're not going to hurt $him. When you bore of touching the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>> and move your hand away, $he turns to you in utter incomprehension.
<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> beg for an answer: is that it?
<<elseif !canTalk($activeSlave)>>
- $He signs spastically, begging fearfully to know if that's it.
+ $He signs spastically, asking fearfully to know if that's all.
<<else>>
- $He asks nervously, "I-i<<s>> that it, <<Master>>?"
+ $He stammers fearfully, although somewhat less then before this session, "I-i<<s>> that all, <<Master>>?"
<</if>>
$He then cringes.
<<else>>
@@ -260,8 +263,8 @@ You pat $him a few times before letting $him go.
<<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
$His <<if canSee($activeSlave)>>eyes demand<<else>>expression demands<</if>> an answer: is that it?
<<elseif !canTalk($activeSlave)>>
- $He signs irritably, asking whether that's it.
+ $He signs irritably, asking whether that's all.
<<else>>
- $He splutters, "I<<s>> that it, <<Master>>!?"
+ $He scowls, muttering, "I<<s>> that all, <<Master>>?"
<</if>>
<</if>>
diff --git a/src/pregmod/huskSlaveSwap.tw b/src/pregmod/huskSlaveSwap.tw
index 685f57c8372..e15bf8918ee 100644
--- a/src/pregmod/huskSlaveSwap.tw
+++ b/src/pregmod/huskSlaveSwap.tw
@@ -3,6 +3,7 @@
<<set $nextButton = "Continue">>
<<set _oldSlave = clone($swappingSlave)>>
<<set _m = $slaveIndices[$swappingSlave.ID]>>
+<<ClearSummaryCache $slaves[_m]>>
You strap $slaves[_m].slaveName, and the body to which $pronoun will be transferred, into the remote surgery and stand back as it goes to work.
<<BodySwap $slaves[_m] $activeSlave>>
diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw
index 362fd349b18..ce39f57a185 100644
--- a/src/pregmod/huskSlaveSwapWorkaround.tw
+++ b/src/pregmod/huskSlaveSwapWorkaround.tw
@@ -4,7 +4,7 @@
"This operation is neither simple nor is it perfected. There are extreme health risks involved and no guarantee of success. Strap a slave into your remote surgery to consent to the operation. Indentured servants<<if $incubator > 0>> and slaves with reserved children<</if>> not eligible."
<br>
-//Select the slave whose mind will be transferred into the waiting husk.<<if $cyberMod == 1>> Amputated slaves must not be wearing prosthetics.<</if>>//
+//Select the slave whose mind will be transferred into the waiting husk.<<if $cyberMod == 1>> Amputated slaves must not be wearing prosthetics.<</if>> This operation will cost <<print cashFormat(10000)>>.//
<br><br>
__Select an eligible slave:__
@@ -16,7 +16,7 @@ __Select an eligible slave:__
<<if ($slaves[_i].breedingMark == 0)>>
<<if ($slaves[_i].reservedChildren == 0)>>
<<if ($slaves[_i].ID != $activeSlave.ID)>>
- <br><<print "[[$slaves[_i].slaveName|Husk Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= $surgeryCost]]">>
+ <br><<print "[[$slaves[_i].slaveName|Husk Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= 10000]]">>
<</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/slaveSlaveSwap.tw b/src/pregmod/slaveSlaveSwap.tw
index 9b2dc0096a5..76c57cf0e3d 100644
--- a/src/pregmod/slaveSlaveSwap.tw
+++ b/src/pregmod/slaveSlaveSwap.tw
@@ -10,11 +10,13 @@
<<set _gps2 = $genePool.findIndex(function(s) { return s.ID == $slaves[_ss2].ID; })>>
<<set _gps2Clone = clone($genePool[_gps2])>>
+<<ClearSummaryCache $slaves[_ss1]>>
+<<ClearSummaryCache $slaves[_ss2]>>
+
You strap $activeSlave.slaveName and $swappingSlave.slaveName into the remote surgery and stand back as it goes to work.
<<BodySwap $slaves[_ss1] _ss2Clone>>
<<BodySwap $genePool[_gps1] _gps2Clone>>
-<<BodySwap $slaves[_ss2] _ss1Clone>>
-<<BodySwap $genePool[_gps2] _gps1Clone>>
+
<br><br>
After an honestly impressive procedure, $slaves[_ss1].slaveName is recovering nicely.
@@ -23,6 +25,9 @@ After an honestly impressive procedure, $slaves[_ss1].slaveName is recovering ni
<br><br><hr style="margin:0"><br>
+<<BodySwap $slaves[_ss2] _ss1Clone>>
+<<BodySwap $genePool[_gps2] _gps1Clone>>
+
In the neighboring bed, $slaves[_ss2].slaveName rests peacefully.
<<BodySwapReaction $slaves[_ss2] _ss1Clone>>
diff --git a/src/pregmod/slaveSlaveSwapWorkaround.tw b/src/pregmod/slaveSlaveSwapWorkaround.tw
index a85a91cf4a0..76b90510f11 100644
--- a/src/pregmod/slaveSlaveSwapWorkaround.tw
+++ b/src/pregmod/slaveSlaveSwapWorkaround.tw
@@ -4,7 +4,7 @@
The surgeon awaits the pair of slaves to be strapped into the surgery. So far only $activeSlave.slaveName is prepped:
<br>
-//Select the slave who will be trading bodies with $object.//
+//Select the slave who will be trading bodies with $object. This operation will cost <<print cashFormat(10000)>>.//
<br><br>
__Select an eligible slave:__
@@ -12,7 +12,7 @@ __Select an eligible slave:__
<<if isSlaveAvailable($slaves[_i])>>
<<if $slaves[_i].fuckdoll == 0>>
<<if ($slaves[_i].ID != $activeSlave.ID)>>
- <br><<print "[[$slaves[_i].slaveName|Slave Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= $surgeryCost]]">>
+ <br><<print "[[$slaves[_i].slaveName|Slave Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= 10000]]">>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 07b459aa85e..2002f5adb0b 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -526,7 +526,7 @@ trainer fees: <<print cashFormat(_cost)>>
<<set $individualCosts += Math.trunc($drugsCost*Math.abs($slaves[$i].hormones)*0.5)>>
<</if>>
<<if ($slaves[$i].bodySwap > 0)>>
- <br> Immunosuppressants: <<print cashFormat(($drugsCost*10*$slaves[$i].bodySwap))>>
+ <br> JS-Suppressants: <<print cashFormat(($drugsCost*10*$slaves[$i].bodySwap))>>
<<set $individualCosts += Math.trunc($drugsCost*10*$slaves[$i].bodySwap)>>
<</if>>
<<if ($slaves[$i].preg == -1) && isFertile($slaves[$i])>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index f3943bc8305..81681c83dc9 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1621,9 +1621,11 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<<else>>
$pronounCap is no longer in her native body.
<</if>>
- <<if $slaves[_i].indenture == -1>>
+ <<if $activeSlave.indenture == -1>>
[[Swap her body with another of your stock's|Slave Slave Swap Workaround]]
<<else>>
//Indentured servants must remain in their own bodies.//
<</if>>
+<<elseif $cheatMode == 1>>
+ <br>[[Force enable bodyswapping|Remote Surgery][$bodyswapAnnounced = 1]]
<</if>>
--
GitLab