From 6b6cfcfd92676993e81a2dc19b457e24d5d61c9f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 21 May 2018 00:03:32 -0400
Subject: [PATCH] fixes and body swapping
---
devNotes/twine JS | 3 +
slave variables documentation - Pregmod.txt | 3 +-
src/init/storyInit.tw | 3 +
src/js/economyJS.tw | 3 +
src/pregmod/huskSlaveSwap.tw | 1 +
src/pregmod/seHuskSlaveDelivery.tw | 4 +-
src/pregmod/widgets/bodySwapReaction.tw | 473 ++++++++++++++++++--
src/pregmod/widgets/bodyswapWidgets.tw | 7 +-
src/uncategorized/costs.tw | 4 +
src/uncategorized/costsReport.tw | 4 +
src/uncategorized/neighborsDevelopment.tw | 5 +-
11 files changed, 469 insertions(+), 41 deletions(-)
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 16dcf6433e9..c32d332409c 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2320,6 +2320,9 @@ window.getSlaveCost = function(s) {
if(s.hormones !== 0) {
cost += (drugsCost * Math.abs(s.hormones) * 0.5);
}
+ if(s.bodySwap > 0) {
+ cost += (drugsCost * s.bodySwap * 10);
+ }
if(s.preg === -1 && isFertile(s)) {
cost += (drugsCost * 0.5);
}
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 415d2f47b9a..a19cc8a728e 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2542,8 +2542,7 @@ bodySwap:
Slave is in original body.
0 - yes
-1 - no, failed operation
-2 - no, successful operation
+1+ number of swaps (increases upkeep each time)
mother:
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 6652fa6febd..9ad7220cce5 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -566,6 +566,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $servantMilkers = 0>>
<<set $servantMilkersMultiplier = 1>>
<<set $foodCost = 25>>
+<<set $revealFoodEffects = 0>>
<<set $legendaryWhoreID = 0>>
<<set $legendaryEntertainerID = 0>>
@@ -626,6 +627,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $drugUpgradeHormones = "unselected">>
<<set $drugUpgradeInjectionOne = "unselected">>
<<set $drugUpgradeInjectionTwo = "unselected">>
+<<Set $corpValue = 0>>
<<set $shelterSlave = 0>>
<<set $shelterSlaveBought = 0>>
@@ -1036,6 +1038,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nicaeaPower = 0>>
<<set $nicaeaHeld = 0>>
<<set $peacekeepers = 0>>
+<<set $peacekeepersFate = 0>>
<<set $oralUseWeight = 5>>
<<set $vaginalUseWeight = 5>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 98539fa3dbe..f3bf36af3d1 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -578,6 +578,9 @@ window.getSlaveCost = function(s) {
if(s.hormones !== 0) {
cost += (drugsCost * Math.abs(s.hormones) * 0.5);
}
+ if(s.bodySwap > 0) {
+ cost += (drugsCost * s.bodySwap * 10);
+ }
if(s.preg === -1 && isFertile(s)) {
cost += (drugsCost * 0.5);
}
diff --git a/src/pregmod/huskSlaveSwap.tw b/src/pregmod/huskSlaveSwap.tw
index a09c484adc4..6ec70ad4761 100644
--- a/src/pregmod/huskSlaveSwap.tw
+++ b/src/pregmod/huskSlaveSwap.tw
@@ -18,5 +18,6 @@ After an honestly impressive procedure,
<<slaveCost _oldSlave>>
<<set _payout = Math.trunc($slaveCost/3)>>
$slaves[_m].slaveName's body was bought by the Flesh Heap for <<print cashFormat(_payout)>>.
+<<set $slaves[_m].bodySwap++>>
<<set $cash += _payout>>
<<set $activeSlave = 0, $swappingSlave = 0>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 8fe499219ac..5703b26692e 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -96,11 +96,11 @@ A slave came in fitting the description you provided.
<br>
//As expected, she is a complete vegetable, but that is what you ordered after all. You lack the facilities to care for her in this state, so you should do what you are planning quickly. Or you could return her to the Flesh Heap, though you won't get your credits back.//
<br><br>
-<<set $saleDescription = 1, $applyLaw = 0>><<include "Long Slave Description">><<set $saleDescription = 0>>
+<<set $saleDescription = 1, $applyLaw = 0>><<include "Long Slave Description">><<set $saleDescription = 1>>
<br><br>
<span id="result">
<<if $cash >= $surgeryCost>>
- [[Accept the offered slave and contact the bodyswap surgeon.|husk Slave Swap Workaround]]
+ [[Accept the offered slave and contact the bodyswap surgeon.|husk Slave Swap Workaround]] //Will significantly increase the selected slave's upkeep.//
<<else>>
//You can't sustain her and thus must return her.//
<</if>>
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index fb577c1218f..6c3e21a6bc3 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -1397,12 +1397,12 @@ Now you only have to wait for her to wake up.
not bothered one way or the other by this development; it isn't even clear if she notices anything different about her cock.
<<elseif $args[0].devotion > 20>>
<<if $args[0].dick > $args[1].dick + 4>>
- @@.hotpink;incredibly excited@@ about this change. She laughs and groans at the weight of her shaft, and as she fiddles with it it becomes increasingly obvious that she is having difficulty not straight up jerking herself off. She regains control over herself, though just barely.
+ @@.hotpink;incredibly excited@@ about this change. She laughs and groans at the weight of her shaft, and as she fiddles with it, it becomes increasingly obvious that she is having difficulty not straight up jerking herself off. She regains control over herself, though just barely.
<<set $args[0].devotion += 3>>
<<elseif $args[0].dick > $args[1].dick>>
pleased with this development. She takes the time to grope and tease her newfound length.
<<else>>
- toy with her now shorter dick.
+ accepting of it. She takes a moment to toy with her now shorter dick.
<</if>>
<<else>>
<<if $args[0].dick > $args[1].dick + 4>>
@@ -1411,7 +1411,8 @@ Now you only have to wait for her to wake up.
<<elseif $args[0].dick > $args[1].dick>>
annoyed at this development. She frowns as she tests her newfound growth, only groping it for a moment before <<if canSee($args[0])>>noticing your amused grin<<else>>sensing your gaze<</if>> and stopping.
<<else>>
- <<if $args[0].amp !=1>>pokes and prods at <<else>>jostles <</if>>her smaller dick, only stopping when she starts to become flushed and <<if canSee($args[0])>>notices your questioning<<else>>senses your<</if>> gaze.
+ @@.mediumorchid;infuriated by it.@@ She <<if $args[0].amp !=1>>pokes and prods at <<else>>jostles <</if>>her smaller dick, only stopping when she starts to become flushed and <<if canSee($args[0])>>notices your questioning<<else>>senses your<</if>> gaze.
+ <<set $args[0].devotion -= 5>>
<</if>>
<</if>>
<<set _cockChanged = 1>>
@@ -1428,7 +1429,7 @@ Now you only have to wait for her to wake up.
@@.lime;much larger@@ now. This
<<if $args[0].devotion > 20>>
amazing addition to her body is @@.hotpink;surely welcome@@. She moans as she fondles her new balls, groaning as she rolls their weight around. Her face is flushed by the time she’s done "examining" them.
- <<set $args[0].devotion +=5>>
+ <<set $args[0].devotion += 5>>
<<else>>
addition to her body is @@mediumaquamarine;annoying@@, clearly. The frustrated irritation on her face contrasts sharply with the actions of her hands, which are busy causing <<if $args[0].dick>>her dick to become engorged with blood<<else>>precum to start flowing freely<</if>>. Catching herself, she takes a few soothing breaths to calm her body down.
<<set $args[0].trust += 5>>
@@ -1626,9 +1627,9 @@ Now you only have to wait for her to wake up.
<</if>>
/* tattoos */
- <<if ($args[0].boobsTat != $args[1].boobsTat || $args[0].buttTat != $args[1].buttTat || $args[0].lipsTat != $args[1].lipsTat || $args[0].vaginaTat != $args[1].vaginaTat || $args[0].anusTat != $args[1].anusTat || $args[0].dickTat != $args[1].dickTat || $args[0].customTat != $args[1].customTat || $args[0].shouldersTat != $args[1].shouldersTat || $args[0].armsTat != $args[1].armsTat || $args[0].legsTat != $args[1].legsTat || $args[0].backTat != $args[1].backTat || $args[0].stampTat != $args[1].stampTat || $args[0].bellyTat != $args[1].bellyTat) && $args[0].fetish != "mindbroken" && canSee($args[0])>>
+ <<if ($args[0].boobsTat != $args[1].boobsTat || $args[0].buttTat != $args[1].buttTat || $args[0].lipsTat != $args[1].lipsTat || $args[0].vaginaTat != $args[1].vaginaTat || $args[0].anusTat != $args[1].anusTat || $args[0].dickTat != $args[1].dickTat || $args[0].customTat != $args[1].customTat || $args[0].shouldersTat != $args[1].shouldersTat || $args[0].armsTat != $args[1].armsTat || $args[0].legsTat != $args[1].legsTat || $args[0].backTat != $args[1].backTat || $args[0].stampTat != $args[1].stampTat || $args[0].bellyTat != $args[1].bellyTat) && $args[0].fetish != "mindbroken">>
<br><br>
- The ink adorning her body was not lost on her, but compared to everything else, it was truly insignificant.
+ The changes to her tattoos were not lost on her, but compared to everything else, they were truly insignificant.
<</if>>
<</if>>
@@ -1645,6 +1646,8 @@ Now you only have to wait for her to wake up.
She just stares at the cieling for some time, @@.green;just enjoying how clear it is.@@ She's @@.hotpink;quite grateful@@ that @@.mediumaquamarine;you would give her perfect vision.@@
<<set $args[0].devotion += 5, $args[0].trust += 3>>
<</if>>
+ <<elseif _sight == 2>>
+ She just stares at the cieling for some time, having difficulty processing that @@.green;she can now see.@@ The gift of sight is lost upon her, as is that she is no longer in her own body.
<</if>>
She lets out a low groan and reaches up to rub at her eyes. Or rather, she attempts to. A visible look of confusion crosses her face and she strains to sit up, but all she manages to do is wiggle, her movements reminding you of a suffocating goldfish. As the cloud of anesthetics fades, she realizes what's happened to her
<<if $args[0].fetish == "mindbroken">>
@@ -1961,7 +1964,7 @@ Now you only have to wait for her to wake up.
<<set $args[0].devotion -= 5>>
<<elseif $args[0].boobs <= 300>> /*flat*/
<<if $args[0].fetish == "mindbroken">>
- and @@.orange;finds nothing.@@ She doesn't seem to care, though.
+ and @@.orange;finds nothing.@@ She doesn't seem to care, though.
<<elseif $args[0].devotion > 20>>
and finds nothing; @@.orange;her breasts are completely gone.@@ At least it's a literal weight off her chest.
<<else>>
@@ -2610,9 +2613,9 @@ Now you only have to wait for her to wake up.
/*stomach*/
<<if _weightChange != 1>>
<br><br>
- Her hands drift over
+ She wiggles into a better position to see her middle, and begins to shift
<<else>>
- She continues to fondle
+ She continues to shift
<</if>>
<<if $args[0].weight >= $args[1].weight+30>> /*(fatter)*/
her stomach until she feels just how @@.red;much more weight@@ she is carrying.
@@ -2697,7 +2700,7 @@ Now you only have to wait for her to wake up.
<</if>>
<</if>>
<<elseif $args[0].weight < 10 && $args[0].muscles > 5 && $args[0].belly < 100>>
- her @@.lime;muscled stomach.@@ She stops to trace her abs.
+ her @@.lime;muscled stomach.@@
<<if $args[0].fetish != "mindbroken">>
<<if $args[0].devotion > 20>>
She finds her new strength intriguing.
@@ -2712,35 +2715,447 @@ Now you only have to wait for her to wake up.
<</if>>
/* waist */
- <<if $args[0].waist > $args[1].waist+40>>
- As she explores her middle, she also takes note of her @@.orange;wider waist.@@
- <<if $args[0].fetish == "mindbroken">>
- The effects of such a change on her appearance go right over her head.
- <<elseif $args[0].devotion > 20>>
- This change disappoints her. She wishes she could have been more feminine for you.
+ <<if $args[0].belly < 30000 || $args[0].weight <= 95>>
+ <<if $args[0].waist > $args[1].waist+40>>
+ As she explores her middle, she also takes note of her @@.orange;wider waist.@@
+ <<if $args[0].fetish == "mindbroken">>
+ The effects of such a change on her appearance go right over her head.
+ <<elseif $args[0].devotion > 20>>
+ This change disappoints her. She wishes she could have been more feminine for you.
+ <<else>>
+ This change @@.mediumorchid;disgusts her;@@ it will only leave her treated worse compared to the more feminine slaves.
+ <<set $args[0].devotion -= 1>>
+ <</if>>
+ <<elseif args[0].waist < $args[1].waist-40>>
+ As she explores her middle, she also takes note of her @@.lime;narrower waist.@@
+ <<if $args[0].fetish == "mindbroken">>
+ The effects of such a change on her appearance go right over her head.
+ <<elseif $args[0].devotion > 20>>
+ This change pleases her; she can't wait to feel your hands around her.
+ <<else>>
+ That you would make such a change to her @@.mediumorchid;disgusts her,@@ though she @@.mediumaquamarine;takes solace@@ in the fact that she will likely be treated better for being more attractive.
+ <<set $args[0].devotion -= 1, $args[0].trust += 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+
+ /*(butt)*/
+ <br><br>
+ She cranes her neck back to review her rear, finding how
+ <<if $args[0].butt > $args[1].butt>> /*(bigger)*/
+ much @@.lime;bigger her butt is now.@@ As she bounces her cheeks, it becomes clear that it has grown
+ <<if $args[0].butt >= $args[1].butt+5>> /*(+to max size description or above)*/
+ an incredible amount.
+ <<elseif $args[0].butt > $args[1].butt+1>> /*(+more sizes)*/
+ a lot.
+ <<else>> /*(+1 size)*/
+ a fair bit.
+ <</if>>
+ <<if $args[0].fetish != "mindbroken">>
+ <<if $args[0].devotion > 20>>
+ This is a pleasing development as she looks forward to putting this new rear to the test with you.
+ <<else>>
+ While she’s not terribly upset, this still feels like a violation of her, somehow. Still, there are worse things that could happen then waking up with a bigger rear.
+ <</if>>
+ <</if>>
+ <<if $args[0].butt >= $args[1].butt+5 && $args[0].butt > 12>>
+ She is overwhelmed by how large her new bottom is. She doubts she can even lay flat on her back any longer.
+ <</if>>
+ <<elseif $args[0].butt < $args[1].butt>> /*(smaller)*/
+ much @@.orange;smaller her butt is now.@@ As she bounces her cheeks, it becomes clear that it has shrunk
+ <<if $args[0].butt <= $args[1].butt-5>> /*(+to max size description or above)*/
+ an incredible amount.
+ <<elseif $args[0].butt > $args[1].butt-1>> /*(+more sizes)*/
+ a lot.
+ <<else>> /*(-1 size)*/
+ a fair bit.
+ <</if>>
+ <<if $args[0].fetish != "mindbroken">>
+ <<if $args[0].devotion > 20>>
+ She is saddened that there is now less of her for you to play with, but remembers that you chose this body for her and hopes that you will still make use of her rear.
+ <<else>>
+ This is just @@.mediumorchid;depressing@@ to her. A nice rear is one of the two parts of her body that almost every women (or “womenâ€) is defined by, and now she feels like just that much less of a person.
+ <<set $args[0].devotion -= 1>>
+ <</if>>
+ <</if>>
+ <<else>>
+ little her butt has changed in size.
+ <</if>>
+ <<if $args[0].buttImplant > 0 && $args[1].buttImplant == 0>> /*(+butt implants)*/
+ She also notes that @@.coral;there are implants in her,@@ as her ass’s shape didn't really change as it moved.
+ <<if $args[0].fetish != "mindbroken">>
+ <<if $args[0].devotion > 20>>
+ It pleases her that you would invest in such a minor way in her body.
+ <<else>>
+ It feels like you have modified her in a such a minor way for your own benefit, and she doesn’t kid herself in thinking otherwise.
+ <</if>>
+ <</if>>
+ <<elseif $args[0].buttImplant == 0 && $args[1].buttImplant > 0>> /*(-butt implants)*/
+ She also notes that she @@.coral;no longer has ass implants,@@ as her experimentation reveals a more natural bounce to her buttocks.
+ <<if $args[0].fetish != "mindbroken">>
+ <<if $args[0].devotion > 20>>
+ She is happy that you think her body doesn’t need any artificial modification to be pleasing.
+ <<else>>
+ She views this as one more thing she @@.mediumorchid;didn’t have a choice in.@@
+ <<set $args[0].devotion -= 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $args[0].fetish != "mindbroken">>
+ <<if $args[0].hips != $args[1].hips>>
+ As she prepares to look at her crotch, it occurs to her that her hips are
+ <<if $args[0].hips > $args[1].hips>>
+ @@.lime;<<if $args[0].hips > $args[1].hips+3>>considerably <<elseif $args[0].hips < $args[1].hips-1>>much <</if>> wider.@@
+ <<if $args[0].fetish == "pregnancy" && $args[0].birthsTotal > 0>>
+ She seems @@.hotpink;overjoyed@@ at their new size; It means she'll be even better at popping out babies than ever. She continues around back to learn how
+ <<elseif $args[0].devotion > 20>>
+ She gives them a little wiggle for your amusement before continuing around back to learn how
+ <<else>>
+ She takes the new addition well enough since it is likely to raise her worth in society and thus not the worst thing ever. How you intend to make use of her hips @@.gold;worries her,@@ however. She continues around back to learn how
+ <<set $args[0].trust -= 1>>
+ <</if>>
+ <<else>>
+ @@.orange;<<if $args[0].hips < $args[1].hips-3>>considerably <<elseif $args[0].hips < $args[1].hips-1>>much <</if>> narrower.@@
+ <<if $args[0].fetish == "pregnancy" && $args[0].birthsTotal > 0>>
+ She seems a little caught up on their new size, likely by concern over future pregnancies and childbirth.
+ <<elseif $args[0].devotion > 50>>
+ She gives them a little wiggle for your amusement.
+ <<elseif $args[0].devotion >= -20>>
+ She accepts your judgement that her new hips suit her better.
+ <<if $args[0].pregKnown && $args[0].birthsTotal > 0>>
+ She @@.gold;worries@@ about what this means for her coming birth.
+ <<set $args[0].trust -= 3>>
+ <</if>>
+ <<else>>
+ She seems upset, @@.mediumorchid;both from her loss of feminity and the overreach of your power,@@ that you would alter her body is such a way.
+ <<if $args[0].pregKnown && $args[0].birthsTotal > 0>>
+ A @@.gold;terrifying realization@@ dawns on her; her upcoming birth is going to be much harder than her last.
+ <<set $args[0].trust -= 5>>
+ <</if>>
+ <<set $args[0].devotion -= 3>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $args[0].anusPiercing != 0 && $args[1].anusPiercing == 0>>
+ As she moved, she felt something odd in her butt. She can only speculate that she has a new addition down there.
+ <</if>>
+ <</if>>
+
+ <br><br>
+ <<set _seeCrotch = 1>>
+ <<if $args[0].weight > 97 || $args[0].belly >= 60000 || $args[0].boobs >= 20000>> /* crotch blockers */
+ She tries to get a good view of her crotch, but finds it impossible with her
+ <<if $args[0].belly >= 60000>>
+ <<set _belly = bellyAdjective($args[0])>>
+ _belly belly in the way.
+ <<elseif $args[0].weight > 97>>
+ hanging gut obstructing things.
<<else>>
- This change @@.mediumorchid;disgusts her;@@ it will only leave her treated worse compared to the more feminine slaves.
- <<set $args[0].devotion -= 1>>
+ enormous boobs taking up so much space.
<</if>>
- <<elseif args[0].waist < $args[1].waist-40>>
- As she explores her middle, she also takes note of her @@.lime;narrower waist.@@
- <<if $args[0].fetish == "mindbroken">>
- The effects of such a change on her appearance go right over her head.
- <<elseif $args[0].devotion > 20>>
- This change pleases her; she can't wait to feel your hands around her.
+ <<if $args[0].fetish != "mindbroken">>
+ She shifts her weight so that she falls onto her back
+ <<if $args[0].corsetPiercing != 0 && $args[1].corsetPiercing == 0>>
+ and recoils as she lands on something unfamiliar and hard. Her mind races as to what it could be, before the realization sets in that she now has a corset piercing up her back. Once she gets used to the feeling, she leans to her side to finally get a view around her body.
+ <<else>>
+ and leans to her side to finally see what's under her body.
+ <</if>>
+ <<if $args[0].weight > 160 || ($args[0].boobs >= 20000 && ["wide-set", "saggy",].includes($args[0].boobShape)) || $args[0].boobs >= 40000 || $args[0].hips == 3>> /* still can't see */
+ Unfortunately for her,
+ <<if $args[0].boobs >= 40000>>
+ her tits are so massive they hang over her sides and block any line of sight she may have been able to use.
+ <<elseif $args[0].boobs >= 20000 && ["wide-set", "saggy",].includes($args[0].boobShape)>>
+ her tits are resting heavily to her sides and block any line of sight she may have been able to use.
+ <<elseif $args[0].weight > 160>>
+ she is so fat her gut rests past her sides and block any line of sight she may have been able to use.
+ <<else>>
+ her hips are so absurdly wide, there is no way for her to see around them.
+ <</if>>
+ <<set _seeCrotch = 0>>
+ <</if>>
<<else>>
- That you would make such a change to her @@.mediumorchid;disgusts her,@@ though she @@.mediumaquamarine;takes solace@@ in the fact that she will likely be treated better for being more attractive.
- <<set $args[0].devotion -= 1, $args[0].trust += 1>>
+ Her simple mind can not fathom a good way to see her junk like this, so what she has will come as a surprise sooner or later to her.
+ <<set _seeCrotch = 0>>
<</if>>
+ <<else>>
+ As her eyes center on her crotch,
<</if>>
+
+ <<if _seeCrotch == 1>>
- /* corest piercing */
- <<if $args[0].corsetPiercing != 0 && $args[1].corsetPiercing == 0>>
- An odd feeling on her back draws her attention. She discovers a series of rings running down her spine and, flexing her back muscles, shudders at the sensation.
+ /*(changed genitals)*/
+ <<if $args[1].vagina > -1>> /*(had a vagina)*/
+ <<if $args[0].dick > 0 && $args[1].dick > 0>> /*(had a penis)*/
+ she is relieved to find @@.coral;
+ <<if $args[0].balls > 0 && $args[0].scrotum > 0 && $args[1].balls > 0 && $args[1].scrotum > 0>>
+ a cock, balls and pussy.
+ <<elseif $args[0].balls == 0 && $args[1].balls > 0 && $args[1].scrotum > 0>>
+ both a cock and pussy, though she is a little miffed that she now lacks testicles.
+ <<elseif $args[0].balls > 0 && $args[0].scrotum > 0 && $args[1].balls == 0>>
+ both a cock, pussy and, more surprisingly, balls.
+ <<else>>
+ both a cock and pussy.
+ <</if>>
+ @@
+ <<elseif $args[0].dick > 0 && $args[1].dick == 0>> /*(+penis)*/
+ she is startled to find she @@.coral;has a penis@@ now.
+ <<if $args[0].vagina > -1>> /*(kept vagina)*/
+ She is confused for a moment until she lifts her new penis to @@.coral;<<if canSee($args[0])>>see<<else>>discover<</if>> a pussy under it.@@
+ <<else>> /*(did not keep vagina, +penis or not)*/
+ She understands that she @@.coral;no longer has a vagina.@@
+ <</if>>
+ <<elseif $args[0].dick == 0 && $args[1].dick > 0>> /*(had a penis)*/
+ she is shocked to <<if canSee($args[0])>>see<<else>>discover<</if>> that she @@.coral;no longer has a
+ <<if $args[0].balls > 0 && $args[0].scrotum > 0>>
+ penis, mostly because she still has balls.@@
+ <<elseif $args[0].vagina > -1>>
+ penis, though she is glad to still have a pussy.@@
+ <<else>>
+ penis, or anything, for that matter, on her crotch.@@
+ <</if>>
+ <<elseif $args[0].vagina > -1>>
+ she is happy to find a familiar hole.
+ <<else>>
+ she is startled to find she @@.coral;no longer has genitals.@@
+ <</if>>
+ <<elseif $args[1].dick > 0>> /*(had a penis)*/
+ <<if $args[0].dick > 0>>
+ she is relieved to find she @@.coral;still has her
+ <<if $args[0].balls > 0 && $args[0].scrotum > 0 && $args[1].balls > 0 && $args[1].scrotum > 0>>
+ penis and testicles.
+ <<elseif $args[0].balls == 0 && $args[1].balls > 0 && $args[1].scrotum > 0>>
+ penis, but is a little alarmed to find she now lacks testicles.
+ <<elseif $args[0].balls > 0 && $args[0].scrotum > 0 && $args[1].balls == 0>>
+ penis, but is more interested in the dangling pair of objects beneath it.
+ <<else>>
+ penis.
+ <</if>>
+ @@
+ <<if $args[0].vagina > -1 && $args[0].balls < 6 && $args[0].dick < 10>>
+ A new sensation causes her to gaze lower. Much to her surprise, she @@.coral;now also has a pussy.@@
+ <</if>>
+ <<else>>
+ she is shocked to find that she @@.coral;no longer has a
+ <<if $args[0].balls > 0 && $args[0].scrotum > 0 && $args[1].balls > 0 && $args[1].scrotum > 0>>
+ penis, but still has balls.
+ <<elseif $args[0].vagina > -1>>
+ penis, but a pussy.
+ <<else>>
+ penis, or anything, for genitals.
+ <</if>>
+ @@
+ <</if>>
+ <<else>>
+ she is surprised to find
+ <<if $args[0].dick > 0 && $args[0].vagina > -1 && $args[0].balls > 0 && $args[0].scrotum > 0>>
+ her crotch is fully loaded.
+ <<elseif $args[0].dick > 0 && $args[0].vagina > -1>>
+ she has both a dick and pussy.
+ <<elseif $args[0].dick > 0>>
+ she now has a cock<<if $args[0].balls > 0 && $args[0].scrotum > 0>> and balls<</if>> to entertain with.
+ <<elseif $args[0].vagina > -1>>
+ she now has a pussy to get pounded in.
+ <<else>>
+ she is still a null. She expected something more.
+ <</if>>
+ <</if>>
+
+ <<set _cockChanged = 0>>
+ /*(penis changes)*/
+ <<if $args[0].dick != $args[1].dick && $args[1].dick != 0>>
+ Her penis is <<if $args[0].dick > $args[1].dick + 4>>@@.lime;way bigger@@<<elseif $args[0].dick > $args[1].dick>>@@.lime;a good deal larger@@<<else>>@@.orange;smaller@@<</if>> than it was, and she is
+ <<if $args[0].fetish == "mindbroken">>
+ not bothered one way or the other by this development; it isn't even clear if she notices anything different about her cock.
+ <<elseif $args[0].devotion > 20>>
+ <<if $args[0].dick > $args[1].dick + 4>>
+ @@.hotpink;incredibly excited@@ about this change. She laughs and groans at the weight of her shaft, and as she waggles it, it becomes increasingly obvious that she is having difficulty not straight up humping the air. She regains control over herself, though just barely.
+ <<set $args[0].devotion += 3>>
+ <<elseif $args[0].dick > $args[1].dick>>
+ pleased with this development. She takes the time to rub her newfound length across the sheets.
+ <<else>>
+ accepting of it. She takes a moment to jostle her now shorter dick.
+ <</if>>
+ <<else>>
+ <<if $args[0].dick > $args[1].dick + 4>>
+ @@.mediumaquamarine;incredibly aggravated@@ about this change. This is just one more thing she has to deal with now. How dare you give her such a massive, throbbing, sensitive piece of meat between her legs! Her glower loses its bite as you note her subconsciously thrusting her ridiculously enlarged organ against the sheets. She stops after she realizes what she is doing, nervously staying completely still to not blast a load out of her massive prick.
+ <<set $args[0].trust += 3>>
+ <<elseif $args[0].dick > $args[1].dick>>
+ annoyed at this development. She frowns as she tests her newfound growth, only thrusting once before <<if canSee($args[0])>>noticing your amused grin<<else>>sensing your gaze<</if>> and stopping.
+ <<else>>
+ @@.mediumorchid;infuriated by it.@@ She jostles her smaller dick, only stopping when she starts to become flushed.
+ <<set $args[0].devotion -= 5>>
+ <</if>>
+ <</if>>
+ <<set _cockChanged = 1>>
+ <</if>>
+ <<if $args[0].dickPiercing != 0 && $args[1].dickPiercing == 0>>
+ There was no missing the piercing in her dick as well.
+ <<set _cockChanged = 1>>
+ <</if>>
+
+ /*(ball changes)*/
+ <<if $args[0].balls != $args[1].balls && $args[1].balls != 0>>
+ Then she takes a moment to jostle her balls, it seems they are
+ <<if $args[0].balls > $args[1].balls + 4>>
+ @@.lime;much larger@@ now. This
+ <<if $args[0].devotion > 20>>
+ amazing addition to her body is @@.hotpink;surely welcome@@. She moans as she rubs against her new balls, groaning as their weight shifts around. Her face is flushed by the time she’s done "examining" them.
+ <<set $args[0].devotion +=5>>
+ <<else>>
+ addition to her body is @@mediumaquamarine;annoying@@, clearly. The frustrated irritation on her face contrasts sharply with the actions of her hips, which are busy causing <<if $args[0].dick>>her dick to become engorged with blood<<else>>precum to start flowing freely<</if>>. Catching herself, she takes a few soothing breaths to calm her body down.
+ <<set $args[0].trust += 5>>
+ <</if>>
+ <<elseif $args[0].balls > $args[1].balls>>
+ @@.lime;larger@@ now. This
+ <<if $args[0].fetish == "mindbroken">>
+ change doesn't mean much of anything to her.
+ <<elseif $args[0].devotion > 20>>
+ change delights her and she spends ample time jostling her bigger nuts.
+ <<else>>
+ change is just one more @@.hotpink;bother@@ for her. Her brow furrows as she takes a moment to feel them up and stops as <<if $args[0].dick>>her cock starts to stiffen<<else>>as a bead of precum starts to form from her urethra<</if>>.
+ <<set $args[0].devotion += 3>>
+ <</if>>
+ <<else>>
+ @@.orange;smaller@@ now, and this
+ <<if $args[0].fetish == "mindbroken">>
+ goes largely unnoticed.
+ <<elseif $args[0].devotion > 20>>
+ change, while not necessarily fun, is appreciated by your devoted slave nonetheless.
+ <<else>>
+ change causes her consternation and humiliation.
+ <</if>>
+ <</if>>
+ <<set _cockChanged = 1>>
+ <</if>>
+
+ <<if _cockChanged == 1 && $args[0].fetish != "mindbroken">>
+ <<if $args[0].devotion > 20>>
+ She is thrilled at your modifications to her genitals and is excited to explore those changes with you.
+ <<else>>
+ She is @@.mediumorchid;enraged@@ and @@.gold;frightened@@ to see such changes to her genitals, as they were fundamental parts of her identity.
+ <<set $args[0].devotion -= 10, $args[0].trust -= 10>>
+ <</if>>
+ <</if>>
+
+ /*(vagina)*/
+
+ <<if $args[0].vagina != -1>>
+ <<set _seeVagina = 1>>
+ <<if $args[0].dick > 0>>
+ Then she leans to her side to shift her dick<<if $args[0].scrotum > 0>> and balls<</if>> out of the way to inspect her vagina more closely.
+ <<if $args[0].balls >= 6 || $args[0].dick >= 10>>
+ There's only one problem: Her maleness is so huge it steadfastly remains in the way; there is no angle she can manage to see her vagina from.
+ <<set _seeVagina = 0>>
+ <</if>>
+ <<elseif $args[0].scrotum > 0>>
+ Then she leans to her side to shift her balls out of the way to inspect her vagina more closely.
+ <<if $args[0].balls >= 6>>
+ There's only one problem: Her testicles are so huge they steadfastly remain in the way; there is no angle she can manage to see her vagina from.
+ <<set _seeVagina = 0>>
+ <</if>>
+ <<else>>
+ Next she gives her vagina a closer inspection.
+ <</if>>
+ <<if _seeVagina == 1>>
+ <<if $args[0].vagina == 0>> /*(+virginity)*/
+ She can't really tell, but it looks like it may be @@.lime;unbroken.@@
+ <<if $args[0].vagina > 0>>
+ <<if $args[0].fetish == "mindbroken">>
+ And this would likely mean something to her, if her mind was not lost.
+ <<elseif $args[0].devotion > 20>>
+ She is happy to be a virgin again so that she can lose it to you.
+ <<else>>
+ She is @@.hotpink;happy@@ to be a virgin again, but @@.gold;worries@@ about how long it will last.
+ <<set $args[0].devotion += 3, $args[0].trust -= 3>>
+ <</if>>
+ <</if>>
+ <<elseif $args[1].vagina != -1 && $args[0].vagina < $args[1].vagina>> /*(+tightness)*/
+ She can't really tell, but it looks like it may be @@.lime;tighter@@ now.
+ <<if $args[0].fetish == "mindbroken">>
+ And this might have been significant to her, if her brain worked correctly.
+ <<elseif $args[0].devotion > 20>>
+ Sex will be more pleasurable than it was before and she looks forward to breaking in her new pussy with you.
+ <<else>>
+ She groans in @@.mediumorchid;frustration.@@ She is well aware of the displeasure of having a pussy forcibly broken in and does not look forward to it again.
+ <<set $args[0].devotion -= 2>>
+ <</if>>
+ <<elseif $args[1].vagina != -1 && $args[0].vagina > $args[1].vagina>> /*(-tightness)*/
+ She can't really tell, but it looks like it may be @@.orange;looser@@ now.
+ <<if $args[0].fetish == "mindbroken">>
+ And this might be important to her, if her head was in working order.
+ <<elseif $args[0].devotion > 20>>
+ She giggles a bit as she tests out how many fingers she can fit inside her new loose hole, though she wishes she were still tight for you.
+ <<else>>
+ She @@.mediumorchid;frowns@@ as she feels out how much looser she is now. She supposes it saves her from getting fucked loose, but it is humiliating how many more fingers she can fit inside herself without even having to part her lips. /*This is not how vaginas work goddamit. - is that better? */
+ <<set $args[0].devotion -= 1>>
+ <</if>>
+ <<elseif $args[0].vagina == $args[1].vagina>>
+ It's looks like her old vagina.
+ <<else>>
+ After a bit of flexing, she's satisfied with her new organ.
+ <</if>>
+ <<if $args[0].clitPiercing > 0 && $args[1].clitPiercing == 0 && $args[0].dick == 0>>
+ She also noticed a glimmer her clit.
+ <</if>>
+ <<if $args[0].vaginaPiercing != 0 && $args[1].vaginaPiercing == 0>>
+ She also now has piercings in her vagina, a ring around her labia, creating a halo of sparkles that she couldn't help but marvel at.
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+
+ <<if ($args[0].boobsTat != $args[1].boobsTat || $args[0].buttTat != $args[1].buttTat || $args[0].lipsTat != $args[1].lipsTat || $args[0].vaginaTat != $args[1].vaginaTat || $args[0].anusTat != $args[1].anusTat || $args[0].dickTat != $args[1].dickTat || $args[0].customTat != $args[1].customTat || $args[0].shouldersTat != $args[1].shouldersTat || $args[0].armsTat != $args[1].armsTat || $args[0].legsTat != $args[1].legsTat || $args[0].backTat != $args[1].backTat || $args[0].stampTat != $args[1].stampTat || $args[0].bellyTat != $args[1].bellyTat) && $args[0].fetish != "mindbroken">>
+ <br><br>
+ The changes to her tattoos were not lost on her, but compared to everything else, they were truly insignificant.
<</if>>
<</if>>
<<else>> /* blind amp that needs you to detail the changes to her body */
+ After a while, she begins to stir, her eyes fluttering.
+ <<if _sight == -2>>
+ <<if $args[0].fetish != "mindbroken">>
+ <<if $args[0].devotion >= 50>>
+ She nearly panics when she finds @@.red;she can no longer see.@@ She barely manages to keep calm before accepting this is the fate you have chosen for her.
+ <<elseif $args[0].devotion > 20>>
+ She starts to panic as she realizes @@.red;she can no longer see.@@ After a short expurgation of @@.gold;grief and terror,@@ she takes a deep breath and visibly suppresses her emotions before returning to her inspection.
+ <<set $args[0].trust -= 15>>
+ <<else>>
+ A deep panic sets in as she realizes @@.red;she can no longer see.@@ After a short expurgation of @@.gold;grief and terror,@@ she takes a deep breath and visibly suppresses her emotions.
+ <<set $args[0].trust -= 30>>
+ <</if>>
+ <<else>>
+ A deep panic sets in as she realizes @@.red;she can no longer see.@@ She begins thrashing violently until she is restrained and sedated. Hopefully when she comes to again, she'll have forgotten she could ever see in the first place.
+ <<set _end = 1>>
+ <</if>>
+ <</if>>
+ <<if _end != 1>>
+ She lets out a low groan and reaches up to rub at her eyes. Or rather, she attempts to. A visible look of confusion crosses her face and she strains to sit up, but all she manages to do is wiggle, her movements reminding you of a suffocating goldfish. As the cloud of anesthetics fades, she realizes what's happened to her
+ <<if $args[0].fetish == "mindbroken">>
+ and is supremely unaffected by it, as her mind has already left her.
+ <<elseif $args[0].devotion > 20>>
+ and begins to panic, her breaths quickening. With a visible look of concentration, her breathing slows and she tries to take stock of her new body.
+ <<if $args[1].amp == 1>> /*(was already an amputee)*/
+ but she realizes that at least nothing about her limbs, or lack thereof, has changed.
+ <<else>>
+ and begins to panic, her breaths quickening. She quickly realizes @@.gold;you have taken her arms and legs.@@
+ <<set $args[0].trust -= 15>>
+ <</if>>
+ <<else>>
+ <<if $args[1].amp == 1>> /*(was already an amputee)*/
+ but she realizes that at least nothing about her limbs, or lack thereof, has changed.
+ <<else>>
+ Her eyes seemed to bulge, her heart monitor begins to beep faster and more insistently. Eventually, your assistant is forced to inject her with a sedative. Her eyes flutter closed and the heart monitors beeping slows to a steady pulse. Hopefully she’ll be calmer when she wakes up again, though the memory of waking without limbs will @@.gold;stick with her.@@
+ <br>
+ ...
+ <br>
+ When she wakes up again, she seems stable; the cold @@.hotpink;acceptance@@ of her fate clouds her eyes.
+ <<set $args[0].devotion += 5, $args[0].trust -= 15>>
+ <</if>>
+ <</if>>
+
+ Since she has no sight to see the changes to her body, nor hands to feel them, she lacks any real ability to visualize her new body. You could explain the changes to her, or even fondle her new assets, but ultimately it will lack the same impact of forcing her to discover herself.
+
+ <</if>>
<</if>>
/*(Flavor text for slave description after body transfer)*/
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index cb1a1fe2308..56da9f919ed 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -172,11 +172,6 @@
<<set $args[0].laborCount = $args[1].laborCount>>
<<set $args[0].canRecruit = 0>>
-
-<<if $swapFailure > 600>>
- <<set $args[0].bodySwap = 1>>
-<<elseif $args[0].bodySwap == 0>>
- <<set $args[0].bodySwap = 2>>
-<</if>>
+<<assignJob $args[0] "rest">>
<</widget>>
\ No newline at end of file
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 8949d074b01..f222bb993fb 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -389,6 +389,10 @@
<<set $costs += $drugsCost*Math.abs($slaves[$i].hormones)*0.5>>
+<<if $slaves[$i].bodySwap > 0>>
+ <<set $costs += $drugsCost*10*$slaves[$i].bodySwap>>
+<</if>>
+
<<if ($slaves[$i].preg == -1) && isFertile($slaves[$i])>>
<<set $costs += $drugsCost*0.5>>
<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index c531012cb25..07b459aa85e 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -525,6 +525,10 @@ trainer fees: <<print cashFormat(_cost)>>
<br> Hormones: <<print cashFormat((Math.trunc($drugsCost*Math.abs($slaves[$i].hormones)*0.5)))>>
<<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))>>
+ <<set $individualCosts += Math.trunc($drugsCost*10*$slaves[$i].bodySwap)>>
+ <</if>>
<<if ($slaves[$i].preg == -1) && isFertile($slaves[$i])>>
<br> Contraceptives: <<print cashFormat((Math.trunc($drugsCost*0.5)))>>
<<set $individualCosts += Math.trunc($drugsCost*0.5)>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index f9c4adc42e4..98bf10fb362 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -547,8 +547,9 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<elseif $PC.hacking >= 100>>
<<set _Catchtchance = 100>>
<</if>>
- <<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation, $activeArcology.ownership -= $arcologies[0].CyberReputation>>
+ <<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation, $arcologies[$i].ownership -= $arcologies[0].CyberReputation>>
<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>>
+ <<set $arcologies[$i].ownership = Math.clamp($arcologies[$i].ownership, 0, 300)>>
<<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberReputation)>>
<<set $arcologies[0].prosperity -= $arcologies[0].CyberReputation*3, $rep -= random(100,200), _redHanded = 1>>
<<if $secExp == 1>>
@@ -588,7 +589,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<set $arcologies[$j].prosperity -= $arcologies[$j].embargo*2>>
<</if>>
<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>>
- $arcologies[$i].name targets $arcologies[$j].name for @@.red;economic warfare@@.
+ $arcologies[$j].name targets $arcologies[$i].name for @@.red;economic warfare@@.
<</if>>
<</for>>
--
GitLab