From 97f17e6e38729cffcdb6b6d5e4a97f21ee7364d7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 5 Mar 2017 22:33:21 -0500
Subject: [PATCH] Bugfixes and vanilla fixes.
---
src/pregmod/newChildIntro.tw | 119 ++++++++------------------
src/uncategorized/RESS.tw | 38 +++++++-
src/uncategorized/RESSTR.tw | 2 +-
src/uncategorized/cellblockReport.tw | 85 +++++++++++++++++-
src/uncategorized/clinicReport.tw | 4 +-
src/uncategorized/newSlaveIntro.tw | 5 ++
src/uncategorized/recETS.tw | 14 +--
src/uncategorized/schoolroomReport.tw | 4 +-
src/uncategorized/spaReport.tw | 4 +-
9 files changed, 172 insertions(+), 103 deletions(-)
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 1ae69bb6730..1ea09c3c1b4 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -695,12 +695,17 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<set $activeSlave.health -= 10>>
<<set $activeSlave.trust -= 100>>
<<replace "#result">>
- You drag her to the remote surgery and strap her face down with her legs spread. She doesn't understand what's happening, since the anaesthetics totally deprive her of any sensation. She's so drugged and drowsy with @@color:red;surgical recovery@@ that it takes a while for her to figure out what's happened. When she does, her poor mind scarcely processes the @@color:gold;horror@@ of what's happened. She numbly carries on, terrified.
+ You escort her to the remote surgery and strap her face down with her legs spread. She doesn't understand what's happening, but giggles at the sensations running through he rnumb body. She's so drugged and drowsy with @@color:red;surgical recovery@@ that it takes a while for her to figure out what's happened. When she does, her poor mind scarcely processes the @@color:gold;horror@@ of what's happened. She spends the rest of the week dimly trying to find where her balls went.
<<if $arcologies[0].FSGenderRadicalist != "unset">>
Society @@color:green;approves@@ of your promptly gelding her; this advances the idea that all societal inferiors can be made female.
<<set $rep += $FSSingleSlaveRep*($arcologies[0].FSGenderRadicalist/$FSLockinLevel)>>
<<set $arcologies[0].FSGenderRadicalist += 0.05*$FSSingleSlaveRep>>
<</if>>
+ <<if $arcologies[0].FSGenderRestart != "unset" && $activeSlave.pubertyXY == 1>>
+ Society @@color:green;approves@@ of your promptly gelding her; this advances the idea that all only the elite should breed.
+ <<set $rep += $FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel)>>
+ <<set $arcologies[0].FSRestart += 0.05*$FSSingleSlaveRep>>
+ <</if>>
<</replace>>
<</click>>
<</if>>
@@ -709,11 +714,11 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<if $activeSlave.indentureRestrictions <= 0>>
<br><<click "Clip her Achilles tendons">>
<<set $activeSlave.heels to 1>>
-<<set $activeSlave.devotion -= 5>>
+<<set $activeSlave.devotion += 5>>
<<set $activeSlave.health -= 10>>
-<<set $activeSlave.trust -= 20>>
+<<set $activeSlave.trust -= 5>>
<<replace "#result">>
- You drag her to the remote surgery and strap her face down with her legs bare. She doesn't understand what's coming for a while, even as her lower legs are carefully cleaned and disinfected. She can't see the approaching surgical manipulators, but eventually she feels a tugging at her lower legs even through the local anaesthetic. She gets one squeal of protest out before the surgery begins to apply healing agents. She now requires special heels to walk, and will @@color:mediumorchid;remember her status@@ with every @@color:red;painful@@ step she takes. She's barefoot, crawling, and @@color:gold;frightened@@ for now, until you decide to give her heels - if you ever do.
+ You escort her to the remote surgery and strap her face down with her legs bare. She doesn't understand what's coming for a while, but giggles as her lower legs are carefully cleaned and disinfected. She can't see the approaching surgical manipulators, but eventually she feels a tugging at her lower legs even through the local anaesthetic. She gets one squeal of protest out before the surgery begins to apply healing agents. She now requires special heels to walk, and will @@color:gold;remember your power@@ with every @@color:red;painful@@ step she takes. She seems @@color:hotpink;inappropriately happy@@ about getting to wear pretty shoes when she can no longer walk without them.
<</replace>>
<</click>>
<</if>>
@@ -721,40 +726,28 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<if $arcologies[0].FSRestart >= 10>>
<<if $activeSlave.preg != -2 && $activeSlave.ovaries > 0>>
-<<if $activeSlave.indentureRestrictions <= 0>>
+<<if $activeSlave.breedingMark == 0>>
<br><<click "Sterilize her">>
<<set $activeSlave.preg to -2>>
<<set $activeSlave.ovaries to 0>>
- <<set $activeSlave.devotion -= 50>>
+ <<set $activeSlave.devotion -= 100>>
<<set $activeSlave.health -= 10>>
- <<set $activeSlave.trust -= 20>>
+ <<set $activeSlave.trust -= 100>>
<<replace "#result">>
- You drag her to the remote surgery and strap her face up with her<<if $activeSlave.preg > 10>> pregnant<</if>> stomach bare. She doesn't understand what's coming for a while, even as her belly is carefully cleaned and disinfected. She begins to panic at the sight of the approaching surgical manipulators, cringing as they cut into her<<if $activeSlave.preg > 10>> swollen<</if>> abdomen. She squeals in horror as her<<if $activeSlave.preg > 10>> pregnant<</if>> womb and ovaries are extracted before her eyes. She will never bear children, and will @@color:mediumorchid;remember her status@@ with every fucking she receives. Your absolute power over her body is rightfully @@color:gold;terrifying@@.
+ You escort her to the remote surgery and strap her face up with her stomach bare. She doesn't understand what's coming for a while, even iggling as her belly is carefully cleaned and disinfected. She begins to panic at the sight of the approaching surgical manipulators, screaming out as they cut into her abdomen. She squeals in horror as her womb and ovaries are extracted before her eyes. She will never bear children, and will @@color:mediumorchid;remember her status@@ with every fucking she receives. Your absolute power is rightfully @@color:gold;terrifying@@ to her undeveloped mind.
<</replace>>
<</click>>
<</if>>
<</if>>
<</if>>
-<<if $activeSlave.balls > 0>>
-<<if $activeSlave.attrXY < 65>>
-<br><<click "Threaten her balls">>
-<<set $activeSlave.devotion += 10>>
-<<set $activeSlave.trust -= 10>>
-<<replace "#result">>
- You ask her how she feels about taking cock up her ass. A look of revulsion and fear crosses her face, and she backs away from you slightly, unconsciously protecting her bottom. Before she can muster any kind of response, you tell her that you suspected as much, and that she has balls. She looks confused at the apparently unrelated remarks until you explain that in your arcology, balls are a privilege. If she won't be a good little bitch, you'll take them away and turn her into a bitch anyway. Only good girls get to keep their hardons, and if she isn't a good girl, you'll make her a little good girl with a bouncing little bitchclit. She begins to cry, @@color:gold;sobbing and sobbing@@ as she promises to @@color:hotpink;be a good girl.@@
-<</replace>>
-<</click>>
-<</if>>
-<</if>>
-
<<if $dairy > 0>>
<<if $dairyRestraintsSetting > 1>>
<br><<click "Threaten her with the Industrial Dairy">>
<<set $activeSlave.devotion += 10>>
<<set $activeSlave.trust -= 10>>
<<replace "#result">>
- You tell her that it's in her interests to be a good girl. She does not react immediately, perhaps wondering if you think such a trite statement will have a real impact, but then you point at a wallscreen behind her. She turns, and beholds a live feed from the Industrial Dairy. She gazes spellbound at the interleaved row of bodies intertwined with machines in embraces far more intimate than any lover could hope to match. The gently heaving masses of breastflesh hold her fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen. It withdraws its horse-sized phallus from the slave's anus, leaving her gape pulsing gently as it awaits the resumption of the endless assrape. $activeSlave.slaveName lets out a huge sob and turns to you, @@color:gold;fear suffusing her@@ as she promises to @@color:hotpink;be a good girl.@@
+ You tell her that it's in her interests to be a good girl. She smiles happily, taking it as a compliment. You point behind her; she turns, and beholds a live feed from the Industrial Dairy. She gazes spellbound at the interleaved row of bodies intertwined with machines in embraces far more intimate than any lover could hope to match. The gently heaving masses of breastflesh hold her fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen. It withdraws its horse-sized phallus from the slave's anus, leaving her gape pulsing gently as it awaits the resumption of the endless assrape.<<if $dairyPregSetting > 0>> Her attention is caught by another slave in the throes of birth, gasping as she watches her newborns taken away. She begins to cry as the machine inserts it's inseminator and pumps the cow's womb full of fresh cum, leaving her bloated.<</if>> $activeSlave.slaveName lets out a huge sob and turns to you, @@color:gold;fear suffusing her@@ as she promises to @@color:hotpink;be a good girl.@@
<</replace>>
<</click>>
<<if $dairyPrepUpgrade == 1>>
@@ -787,7 +780,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<set $activeSlave.analCount += 10>>
<<set $analTotal += 10>>
<<replace "#result">>
- Making use of <<if ($activeSlave.trust < -20) || ($activeSlave.devotion > 20)>>her obedience<<else>>the compliance systems<</if>>, you restrain her on one of the chairs in your office in an approximation of the position she'll occupy in $dairyName. Then you put a mask on her, like the ones the machines there feature, and turn it on, watching the slave squirm against her restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed her, and to keep your office reasonably quiet. Then, for the rest of the day, you use her vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape her. By the evening she's been fucked so hard that she's stopped jerking against the chair when you pound <<if $PC.dick == 1>>your huge cock<<else>>a huge strap-on<</if>> in and out of her, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick == 1>>yourself<<else>>it<</if>> to really blow her out. Once that gets too easy, you start adding dildos for double penetration. By the night she's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign her to her fate. She might have some opinion on how she's spent her day, but it's unlikely she'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of her<<if $activeSlave.vagina > -1>> cunt,<</if>> throat, and asshole.
+ Making use of her blissful ignorance, you restrain her on one of the chairs in your office in an approximation of the position she'll occupy in $dairyName. Then you put a mask on her, like the ones the machines there feature, and turn it on, watching the slave squirm against her restraints under the sudden bombardment of garish hardcore porn. Finally, you add a dildo gag, both to mimic the dildo that will feed her, and to keep your office reasonably quiet. Then, for the rest of the day, you use her vulnerable <<if $activeSlave.vagina > -1>>holes<<else>>asshole<</if>> as an outlet for your sexual energy. You are not gentle; in fact, the point of the whole exercise is to gape her. By the evening she's been fucked so hard that she's stopped jerking against the chair when you pound <<if $PC.dick == 1>>your huge cock<<else>>a huge strap-on<</if>> in and out of her, so you're obliged to get creative, sliding fingers in alongside <<if $PC.dick == 1>>yourself<<else>>it<</if>> to really blow her out. Once that gets too easy, you start adding dildos for double penetration. By the night she's properly prepared to take $dairyName's giant phalli, and you're bored, so you consign her to her fate. She might have some opinion on how she's spent her day, but it's unlikely she'll remember it by tomorrow, what with the forearm-sized dildos sliding in and out of her<<if $activeSlave.vagina > -1>> cunt,<</if>> throat, and asshole.
<</replace>>
<</click>>
<</if>>
@@ -799,7 +792,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<set $activeSlave.devotion += 10>>
<<set $activeSlave.trust -= 10>>
<<replace "#result">>
- You tell her that it's in her interests to be a good girl. She does not react immediately, perhaps wondering if you think such a trite statement will have a real impact, but then you point at a wallscreen behind her. She turns, and beholds a live feed from $arcadeName. She gazes at the row of butts sticking out of the wall at dick height, not quite realizing what she's seeing. Then she notices that there are citizens pumping away in front of two of the butts, and she understands. As she watches, terrified, first one citizen and then the other finishes and steps away. The first arcade inmate's <<if $seeDicks != 100>>pussy<<else>>butt<</if>> is left looking sore until $arcadeName's systems cover her for a quick cleaning, and the second inmate's asshole <<if $seeDicks != 0>>has obviously seen severe use, since the poor girl doesn't have a pussy to spread the load<<else>>is loose enough that the machines have to clean up the cum it drools onto the floor<</if>>. $activeSlave.slaveName lets out a huge sob and turns to you, @@color:gold;fear suffusing her@@ as she promises to @@color:hotpink;be a good girl.@@
+ You tell her that it's in her interests to be a good girl. She smiles happily, taking it as a compliment. You point behind her; she turns, and beholds a live feed from $arcadeName. She gazes at the row of butts sticking out of the wall at dick height, not quite realizing what she's seeing<<if canAchieveErection($activeSlave)>>, but becoming stiff at the sight of all the holes<</if>>. Then she notices that there are citizens pumping away in front of two of the butts, and she understands. As she watches, aroused, first one citizen and then the other finishes and steps away. The first arcade inmate's <<if $seeDicks != 100>>pussy<<else>>butt<</if>> is left looking sore until $arcadeName's systems cover her for a quick cleaning, and the second inmate's asshole <<if $seeDicks != 0>>has obviously seen severe use, since the poor girl doesn't have a pussy to spread the load<<else>>is loose enough that the machines have to clean up the cum it drools onto the floor<</if>>. $activeSlave.slaveName lets out a cheer and turns to you, @@color:hotpink;eagerly awaiting the day she gets to go to $arcadeName and play with the holes.@@ It seems she missed the point.
<</replace>>
<</click>>
<<if ($arcade > $arcadeSlaves) || ($arcadeUpgradeFuckdolls != 0)>>
@@ -808,7 +801,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<set $activeSlave.assignmentVisible to 0>>
<<set $activeSlave.choosesOwnAssignment to 0>>
<<replace "#result">>
- You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and she doesn't know what being set up there means, either. She'll be confined inside a small space, not too different from the indignities she's suffered already. It's only when the restraints lock into place that she'll understand her doom. Her mouth will be forced open and presented at one wall of $arcadeName, and her ass will protrude from its other side, her holes available for public relief at both ends. She'll probably refuse to believe the truth, until the first cockhead enters her mouth<<if $activeSlave.vagina > -1>>, parts her pussylips,<</if>> or presses against her poor anus.
+ You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and she doesn't know what being set up there means, either. She'll be confined inside a small space, not too different from the tube she was grown in. It's only when the restraints lock into place that she'll understand her doom. Her mouth will be forced open and presented at one wall of $arcadeName, and her ass will protrude from its other side, her holes available for public relief at both ends. She'll probably refuse to believe the truth, until the first cockhead enters her mouth<<if $activeSlave.vagina > -1>>, parts her pussylips,<</if>> or presses against her poor anus.
<<if ($arcade <= $arcadeSlaves)>>Mere meters away, preparations to convert the least appealing Arcade slave into a Fuckdoll begin. As $activeSlave.slaveName is broken in by her first customers, she's blissfully unaware that she's $arcade new slaves away from the same fate.<</if>>
<</replace>>
<</click>>
@@ -837,12 +830,11 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
//This option costs ¤$SPcost//
<</if>>
-<<if $activeSlave.amp != 1>>
<br><<click "Tie her up and give her a good whipping">>
-<<set $activeSlave.devotion -= 5>>
-<<set $activeSlave.trust -= 10>>
+<<set $activeSlave.devotion -= 50>>
+<<set $activeSlave.trust -= 100>>
<<replace "#result">>
- You cuff her wrists and tie the cuffs to a hook in the ceiling so she's forced up on tiptoe. Reflecting that sometimes the old ways are best, you take a whip to her. It's soft leather and you have some skill, so her skin isn't broken, but you lash her buttocks and every stroke draws a scream. After a while, the pain grows dull for her and she slumps in her bindings, moaning. You switch to her nipples, bringing her back to howling life as she dances on tiptoe and tries to dodge. <<if $activeSlave.dick != 0>>You finish by taking the whip to her penis, leaving her sobbing and begging. <</if>>If she was wondering what kind of master her new master is, now she @@color:gold;knows.@@ She will remember @@color:mediumorchid;what you can do to her@@.
+ You cuff her wrists and tie the cuffs to a hook in the ceiling so she's forced up on tiptoe. Reflecting that sometimes the old ways are best, you take a whip to her. It's soft leather and you have some skill, so her skin isn't broken, but you lash her buttocks and every stroke draws a scream. After a while, the pain grows dull for her and she slumps in her bindings, moaning. You switch to her nipples, bringing her back to howling life as she dances on tiptoe and tries to dodge. <<if $activeSlave.dick != 0>>You finish by taking the whip to her penis, leaving her sobbing and begging. <</if>>Her first true introduction to you sinks deep; now she @@color:gold;deeply fears you@@ and @@color:mediumorchid;hates being around you.@@
<</replace>>
<</click>>
@@ -850,91 +842,54 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<br><<click "Give her a lewd tramp stamp">>
<<set $activeSlave.stampTat to either("advertisements", "rude words", "degradation")>>
<<replace "#result">>
-You <<if $activeSlave.devotion > 20>>bring her down to the studio, lay the compliant<<else>>drag her down to the studio, strap the reluctant<</if>> slave in the chair facedown, and select a sufficiently lewd pattern to decorate her lower back. When the automated tattooing is done, a topical application of analgesics leaves her with nothing more than a slight ache there. When allowed to stand, she immediately turns her back to one of the studio's full length mirrors and cranes around to read the writing just over her butt. It's difficult, since of course it's reversed, and she mouths the words letter by letter.
-<<if $activeSlave.stampTat is "advertisements">>
- She mouths, 'Fuck my ass!'
-<<elseif $activeSlave.stampTat is "rude words">>
- 'Rear Entrance,' she mouths, and then understands the arrow pointing down between her buttocks.
-<<elseif $activeSlave.stampTat is "degradation">>
- Struggling to read the ornate gothic lettering, she slowly mouths, 'Anal Whore.'
-<</if>>
-<<if $activeSlave.devotion > 20>>
- She gasps at the realization that taking it up the ass is about to become a dominant part of her life. She isn't surprised by that, but it's a little stark, having her status as an anal slave permanently written on her lower back for anyone to see. Nevertheless, she @@color:hotpink;resolves to do her best.@@
- <<set $activeSlave.devotion += 5>>
-<<else>>
- She begins to cry softly. It's not likely that she didn't know, on some level, that she's a sex slave, and that most sex slaves are expected to take it up the ass. She's @@color:gold;frightened@@ to find, though, that it's apparently so essential to her existence that it's worth tattooing right over her bottom. She continues to weep as yo lead her out, but @@color:hotpink;offers no real resistance.@@ She's just mourning her poor anal sphincter in an anticipatory sort of way.
+ You bring her down to the studio, lay the compliant girls in the chair facedown, and select a sufficiently lewd pattern to decorate her lower back. When the automated tattooing is done, a topical application of analgesics leaves her with nothing more than a slight ache there. When allowed to stand, she immediately turns her back to one of the studio's full length mirrors and cranes around to gawk at the picture just over her butt. She wiggles her rear and giggles at the drawing moving along with it. It seems she @@color:hotpink;enjoys it.@@
<<set $activeSlave.devotion += 5>>
- <<set $activeSlave.trust -= 5>>
-<</if>>
<</replace>>
<</click>>
-<</if>>
<<set $toSearch to $activeSlave.hStyle>>
<<if ($toSearch.indexOf("shaved") is -1)>>
<br><<click "Shave her hair">>
-<<set $activeSlave.devotion -= 5>>
+<<set $activeSlave.devotion -= 25>>
<<set $activeSlave.hStyle to "shaved">>
<<set $activeSlave.hLength to 0>>
-<<set $activeSlave.trust -= 10>>
+<<set $activeSlave.trust -= 50>>
<<replace "#result">>
- You seize her by the hair and drag her to the auto salon. She struggles and thrashes around but soon scrambles to keep up with you to relieve the pain in her scalp as she's dragged. You strap her in and set the auto salon to shave. She looks around frantically as the manipulators with their buzzing shears descend menacingly. As they run quickly back and forth across her head, she begins to sob, obviously @@color:gold;fearing@@ that her new master is @@color:mediumorchid;one to enjoy degradation and abuse.@@ She has a strong indication that obedience is her only hope.
+ You escort her to the auto salon running your fingers through her long hair the entire way. She sighs contently under your patting until you reach the salon. You strap her in and set the auto salon to shave. She looks around frantically as the manipulators with their buzzing shears descend menacingly. As they run quickly back and forth across her head, she begins to sob, obviously @@color:gold;fearing@@ the strange device. When she catches sight of her bald head, @@color:mediumorchid;her face twists with revulsion.@@ She didn't seem to take it well.
<</replace>>
<</click>>
<</if>>
-<<if canTalk($activeSlave)>>
<br><<click "Make her an office ornament for the day">>
-<<set $activeSlave.devotion -= 5>>
-<<set $activeSlave.trust -= 10>>
+<<set $activeSlave.devotion += 5>>
+<<set $activeSlave.trust += 10>>
<<replace "#result">>
- You cuff her wrists and ankles, bend all four limbs behind her, secure them together, and hoist her up to the ceiling on a rope. She hangs up there like a sex slave chandelier, breasts swaying in a lovely way whenever she struggles. Periodically you let her down to stretch her aching limbs, but whenever you put your decoration back up you add some clips with little bells on them: first the nose, then the nipples, and finally the <<if $activeSlave.dick != 0>>dickhead<<else>>pussylips<</if>>. By the end of the day your work is accompanied by the sweet sounds of ringing bells and @@color:gold;agonized pleas@@ for mercy in her <<if $activeSlave.voice is 3>>high, girlish<<elseif $activeSlave.voice is 2>>feminine<<else>>deep<</if>> voice. She will remember @@color:mediumorchid;what you can do to her@@.
+ You cuff her wrists and ankles, bend all four limbs behind her, secure them together, and hoist her up to the ceiling on a rope. She hangs up there like a sex slave chandelier, breasts swaying in a lovely way whenever she squirms. Periodically you let her down to stretch her aching limbs, but whenever you put your decoration back up you add some clips with little bells on them: first the nose, then the nipples, and finally the <<if $activeSlave.dick != 0>>dickhead<<else>>pussylips<</if>>. By the end of the day your work is accompanied by the sweet sounds of ringing bells and @@color:hotpink;inappropriate laguther@@ in her <<if $activeSlave.voice is 3>>high, girlish<<elseif $activeSlave.voice is 2>>feminine<<else>>deep<</if>> voice. She seems to think it's a game and @@color:aquamarine;tust you more@@ for playing it with her.
<</replace>>
<</click>>
-<</if>>
-<<if ($activeSlave.devotion < -10) && ($activeSlave.vagina == 0)>>
-<br><<click "Tie her up and take her virginity">>
-<<set $activeSlave.devotion -= 5>>
-<<set $activeSlave.trust -= 10>>
-<<set $activeSlave.vagina to 1>>
-<<replace "#result">>
- You cuff her wrists and ankles and secure her struggling, screeching body to the couch next to your desk with her legs spread. She wriggles and protests as you take her virginity. She's certainly entered your service in a way that colors her impression of you @@color:mediumorchid;with hatred@@ and @@color:gold;fear.@@ @@color:lime;Her tight little pussy has been broken in.@@
-<</replace>>
-<</click>>
-<<elseif ($activeSlave.vagina == 0)>>
-<br><<click "Tie her up and take her virginity">>
-<<set $activeSlave.devotion -= 5>>
-<<set $activeSlave.trust -= 10>>
+<<if $activeSlave.vagina == 0>>
+<br><<click "Take her virginity">>
+<<set $activeSlave.devotion += 5>>
+<<set $activeSlave.trust += 5>>
<<set $activeSlave.vaginalCount += 1>>
<<set $vaginalTotal += 1>>
<<set $activeSlave.vagina to 1>>
<<replace "#result">>
- You cuff her wrists and ankles and secure her unresisting body to the couch next to your desk with her legs spread. She writhes and moans as you enter her virgin pussy. You might not have even had to restrain her for this, but being tied up and deflowered sends her a message. She's certainly entered your service in a way that colors her impression of you @@color:hotpink;with pain@@ and @@color:gold;fear.@@ @@color:lime;Her tight little pussy has been broken in.@@
+ You gently lead her unresisting body to the couch next to your desk and spread her legs. She writhes and moans as you enter her virgin pussy, but after getting into the rhythm of sex, she enthusiastically moves along trying to make the feeling even better. She's almost sad when @@color:hotpink;her beloved parter@@ finishes, but @@color:aquamarine;hopes@@ she'll get to play sex with you again soon. @@color:lime;Her tight little pussy has been broken in.@@
<</replace>>
<</click>>
<</if>>
-<<if ($activeSlave.devotion < -10) && ($activeSlave.anus == 0)>>
-<br><<click "Tie her up and rape her virgin ass">>
-<<set $activeSlave.devotion -= 5>>
-<<set $activeSlave.trust -= 10>>
-<<set $activeSlave.analCount += 1>>
- <<set $analTotal += 1>>
-<<set $activeSlave.anus to 1>>
-<<replace "#result">>
- You cuff her wrists and ankles and secure her struggling, screeching body to the couch next to your desk so that she's straddling the back of the couch with her butt sticking out. She wriggles and protests until she feels the lubricated head of <<if $PC.dick == 1>>your dick<<else>>a strap-on<</if>> pushing against her virgin butthole, at which point she desperately tries to break free. She fails, but she never stops writhing and begging you to take <<if $PC.dick == 1>>your cock<<else>>the phallus<</if>> out of her asshole. She's certainly entered your service in a way that colors her impression of you @@color:mediumorchid;with hatred@@ and @@color:gold;fear.@@ @@color:lime;Her tight little ass has been broken in.@@
-<</replace>>
-<</click>>
-<<elseif ($activeSlave.anus == 0)>>
-<br><<click "Tie her up and break her ass in">>
-<<set $activeSlave.devotion -= 5>>
-<<set $activeSlave.trust -= 10>>
+<<if $activeSlave.anus == 0>>
+<br><<click "Take her anal virginity">>
+<<set $activeSlave.devotion += 5>>
+<<set $activeSlave.trust += 5>>
<<set $activeSlave.analCount += 1>>
<<set $analTotal += 1>>
<<set $activeSlave.anus to 1>>
<<replace "#result">>
- You cuff her wrists and ankles and secure her unresisting body to the couch next to your desk so that she's straddling the back of the couch with her butt sticking out. She lies obediently still until she feels the lubricated head of your cock pushing against her virgin butthole, at which point she starts in surprise. When the pain of the buttfuck gets to be too much she begs you to use her <<if $activeSlave.dick == 0>>pussy<<else>>mouth<</if>> instead. She gasps and cries as you slowly push your cock all the way up her tight little butt, and in no time you fill her rectum with cum. She's certainly entered your service in a way that colors her impression of you @@color:mediumorchid;with pain@@ and @@color:gold;fear.@@ @@color:lime;Her tight little ass has been broken in.@@
+ You gently lead her unresisting body to the couch next to your desk and arrange her with her rear in the air. She writhes and moans as you enter her virgin anus, but after getting into the rhythm of sex, she enthusiastically moves along trying to make the feeling even better. She's almost sad when @@color:hotpink;her beloved parter@@ finishes, but @@color:aquamarine;hopes@@ she'll get to play sex with you again soon. @@color:lime;Her tight little anus has been broken in.@@
<</replace>>
<</click>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 6016f6aadfe..1556ec34df4 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -7728,6 +7728,32 @@ By the time you've finished with her sensitive ass, it shines red, and she is cr
bending her avatar over to show off its cleavage, and then giving her tits a jiggle, as though the point wasn't clear enough already.
<<elseif $assistantAppearance is "goddess">>
hefting her own motherly breasts and telling $activeSlave.slaveName that she should be happy, since bigger breasts are a sign of health and fertility.
+ <<elseif $assistantAppearance is "hypergoddess">>
+ massaging her own heaving breasts and telling $activeSlave.slaveName that she should be happy, since bigger breasts are a sign of health and fertility.
+ <<elseif $assistantAppearance is "loli">>
+ <<if $assistantFSAppearance == "asset expansionist">>
+ playing with her oversized breasts under her swimsuit and telling $activeSlave.slaveName that being busty is amazing.
+ <<elseif $assistantFSAppearance == "pastoralist">>
+ cupping her pitiful milk nubs and telling $activeSlave.slaveName that if she was in her shoes she would be soo happy to be busty.
+ <<elseif $assistantFSAppearance == "transformation fetishist">>
+ playing with her absurd implants and telling $activeSlave.slaveName that being busty is great, though she'd look better with big fake balloons for breasts.
+ <<else>>
+ cupping her nonexistant breasts and telling $activeSlave.slaveName that if she was in her shoes she would be soo happy to be busty.
+ <</if>>
+ <<elseif $assistantAppearance is "preggololi">>
+ <<if $assistantFSAppearance == "asset expansionist">>
+ playing with her oversized breasts under her swimsuit and telling $activeSlave.slaveName that being busty is amazing.
+ <<elseif $assistantFSAppearance == "pastoralist">>
+ cupping her milky handfuls and telling $activeSlave.slaveName that if she was in her shoes she would be soo happy to be that busty.
+ <<elseif $assistantFSAppearance == "transformation fetishist">>
+ playing with her absurd implants and telling $activeSlave.slaveName that being busty is great, though she'd look better with big fake balloons for breasts.
+ <<else>>
+ cupping her tiny breasts and telling $activeSlave.slaveName that if she was in her shoes she would be soo happy to be busty.
+ <</if>>
+ <<elseif $assistantAppearance is "fairy">>
+ //place holder//
+ <<elseif $assistantAppearance is "pregnant fairy">>
+ //place holder//
<<else>>
purring that she'd love to.
<</if>>
@@ -7746,18 +7772,22 @@ By the time you've finished with her sensitive ass, it shines red, and she is cr
<<set $cash -= $surgeryCost>>
<</replace>>
<</click>>
-<</if>>
+<</if>> //This option will cost <<print $surgeryCost>>¤//
<<if canGetPregnant($activeSlave) && $PC.dick == 1>>
<<click "Give her bust a boost by knocking her up">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- You announce that you're resolved to continue growing her breasts, and plan to increase their rate of growth in the coming months. She's experienced enough to know not to question what that means, just to @@color:gold;fear the intent behind it.@@ She's right to worry, as you easily tip her off balance and to the ground; mounting her <<if $activeSlave.vagina == 0>>virgin<<else>>exposed<</if>> pussy as she struggles to lift her swollen breasts from the floor. She <<if $activeSlave.voice > 0>>squeals<<else>>rasps<</if>> with displeasure as you roughly plow her into her distended breasts until you cum deep inside her fertile cunt. You return to your desk, leaving her to sob into her unwelcome bust as cum pools from her abused pussy. She knows full well what you meant now, and @@color:hotpink;lets you have your way@@ with her body every time you catch her in a vulnurable moment or complaining about her tits. By the week's end, scans reveal that your seed has taken root; @@color:lime;she's pregnant.@@ As her breasts grow to feed her coming child, she will likely be too distracted by her swelling middle to complain about their added weight.
+ You announce that you're resolved to continue growing her breasts, and plan to increase their rate of growth in the coming months. She's experienced enough to know not to question what that means, just to @@color:gold;fear the intent behind it.@@ She's right to worry, as you easily tip her off balance and to the ground; mounting her <<if $activeSlave.mpreg == 1>><<if $activeSlave.anus == 0>>virgin<<else>>exposed<</if>> ass<<else>><<if $activeSlave.vagina == 0>>virgin<<else>>exposed<</if>> pussy<</if>> as she struggles to lift her swollen breasts from the floor. She <<if $activeSlave.voice > 0>>squeals<<else>>rasps<</if>> with displeasure as you roughly plow her into her distended breasts until you cum deep inside her fertile hole. You return to your desk, leaving her to sob into her unwelcome bust as cum pools from her abused <<if $activeSlave.mpreg == 1>>ass<<else>>pussy<</if>>. She knows full well what you meant now, and @@color:hotpink;lets you have your way@@ with her body every time you catch her in a vulnurable moment or complaining about her tits. By the week's end, scans reveal that your seed has taken root; @@color:lime;she's pregnant.@@ As her breasts grow to feed her coming child, she will likely be too distracted by her swelling middle to complain about their added weight.
<<set $activeSlave.trust -= 5>>
<<set $activeSlave.devotion += 5>>
<<set $activeSlave.preg = 1>>
- <<VaginalVCheck 10>>
+ <<if $activeSlave.mpreg == 1>>
+ <<AnalVCheck 10>>
+ <<else>>
+ <<VaginalVCheck 10>>
+ <</if>>
<</replace>>
-<</click>><<if $activeSlave.vagina == 0>> //This option will take virginity//<</if>>
+<</click>><<if $activeSlave.vagina == 0>> //This option will take virginity//<<elseif $activeSlave.anus == 0 && $activeSlave.mpreg == 1>> //This option will take anal virginity//<</if>>
<</if>>
<br><<click "Praise her breasts and reassure her">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 929e1461c62..ae96af774e8 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -296,7 +296,7 @@ She shrieks, backpedaling, and then falls backward, her <<if $activeSlave.butt >
<</replace>>
<</click>>
<<if $dairyRestraintsSetting == 2>>
-<br><click "Threaten her with the industrial Dairy">>
+<br><<click "Threaten her with the industrial Dairy">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
You grab her by the scruff of her neck and drag her down to $dairyName. She tries to control herself, but breaks down in tears when you haul her to a stop, forcing her to get a good look at the rows of bodies being mercilessly milked. You explain that if she continues to fail to control herself, your patience with her will eventually expire, and you'll be forced to immure her here. Indicating a slave who's being
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index c124347c463..33e0f1ddea0 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -14,7 +14,11 @@
<<set $cellblockSlaves += 1>>
<<silently>>
<<display [[SA stay confined]]>>
+ <<display "SA diet">>
<<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
<</silently>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -20)>>
@@ -149,7 +153,17 @@
<<elseif ($Wardeness != 0) && ($slaves[$i].ID is $Wardeness.ID)>>
<<silently>>
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<set $slaves[$i].devotion -= 5>>
+ <<else>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <<display "SA diet">>
<<display "SA long term effects">>
+ <<display "SA drugs">>
<<display "SA relationships">>
<<display "SA rivalries">>
<</silently>>
@@ -287,8 +301,8 @@
<</if>>
<</if>>
<</for>>
- <<if ($cellblockSlaves < 5)>>
- <<set $seed to random(1,10)+((5-$cellblockSlaves)*(random(150,170)+($idleBonus*10)))>>
+ <<if ($cellblockSlaves < $cellblock)>>
+ <<set $seed to random(1,10)+(($cellblock-$cellblockSlaves)*(random(150,170)+($idleBonus*10)))>>
<<set $cash += $seed>>
Since she doesn't have enough prisoners to occupy all her time, the cellblock takes in citizens' slaves on a contract basis, and she works on them too, earning @@color:yellowgreen;¤$seed.@@
<</if>>
@@ -313,12 +327,77 @@
<</if>>
<</if>>
-<<elseif ($Wardeness != 0)>>
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if ($slaves[$i].ID is $Wardeness.ID)>>
+ <br><br>
+ <<if $showEWD == 0>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Wardeness in $cellblockName.
+ <<else>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Wardeness in $cellblockName.
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <br>
+ <<display "SA devotion">>
+ <br>
+ <</if>>
+ <</if>>
+ <</for>>
+
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if ($slaves[$i].assignment is "be confined in the cellblock")>>
+ <br>
+ <<if $showEWD == 0>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is confined in $cellblockName.
+ <<else>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__''
+ <<display [[SA stay confined]]>>
+ <br>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <br>
+ <<display "SA devotion">>
+ <br>
+ <</if>>
+ <</if>>
+ <</for>>
+
+ <<elseif ($Wardeness != 0)>>
''$cellblockNameCaps is empty'' except for $Wardeness.slaveName, the wardeness.
<<set $seed to random(1,10)+(($cellblock-$cellblockSlaves)*(random(150,170)+($idleBonus*10)))>>
<<set $cash += $seed>>
Since she doesn't have anyone to break, she works on citizens' slaves, earning @@color:yellowgreen;¤$seed.@@
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if ($slaves[$i].ID is $Wardeness.ID)>>
+ <br><br>
+ <<if $showEWD == 0>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Wardeness in $cellblockName.
+ <<else>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Wardeness in $cellblockName.
+ <<if $slaves[$i].choosesOwnClothes == 1>>
+ <<display "SA chooses own clothes">>
+ <</if>>
+ <<display "SA diet">>
+ <<display "SA long term effects">>
+ <<display "SA drugs">>
+ <<display "SA relationships">>
+ <<display "SA rivalries">>
+ <br>
+ <<display "SA devotion">>
+ <br>
+ <</if>>
+ <</if>>
+ <</for>>
+
<<else>>
''$cellblockNameCaps is empty.''
<</if>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 62e7ccf4144..2ecb9c3ad76 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -290,8 +290,8 @@
<</if>>
<</if>>
<</for>>
- <<if ($clinicSlaves < 5)>>
- <<set $seed to random(1,10)+((5-$clinicSlaves)*(random(150,170)+($idleBonus*10)))>>
+ <<if ($clinicSlaves < $clinic)>>
+ <<set $seed to random(1,10)+(($clinic-$clinicSlaves)*(random(150,170)+($idleBonus*10)))>>
<<set $cash += $seed>>
Since $Nurse.slaveName doesn't have enough girls to occupy all her time, the clinic takes in citizens' slaves on a contract basis and she helps them too, earning @@color:yellowgreen;¤$seed.@@
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 41f94653479..e567c89dd3b 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -838,6 +838,11 @@ The legalities completed, ''__@@color:pink;$activeSlave.slaveName@@__'' <<if ($a
<<set $rep += $FSSingleSlaveRep*($arcologies[0].FSGenderRadicalist/$FSLockinLevel)>>
<<set $arcologies[0].FSGenderRadicalist += 0.05*$FSSingleSlaveRep>>
<</if>>
+ <<if $arcologies[0].FSGenderRestart != "unset" && $activeSlave.pubertyXY == 1>>
+ Society @@color:green;approves@@ of your promptly gelding her; this advances the idea that all only the elite should breed.
+ <<set $rep += $FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel)>>
+ <<set $arcologies[0].FSRestart += 0.05*$FSSingleSlaveRep>>
+ <</if>>
<</replace>>
<</click>>
<</if>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 66a71cb41c6..d55a65d372b 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -314,7 +314,7 @@ One of them speaks up. "We're twins, <<if def $PC.customTitle>>$PC.customTitle<<
<br><br>
-"We cost ¤<<print $slaveCost*2>>, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+"We cost ¤<<print $contractCost>>, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
<br><br>
@@ -378,7 +378,7 @@ One of them speaks up. "We're twins, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>
<br><br>
-"We cost ¤<<print $slaveCost*2>>, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+"We cost ¤<<print $contractCost>>, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
<br><br>
@@ -452,7 +452,7 @@ The other blurts out. "But we kinda got too into each other, in more ways than o
<br><br>
-"We cost ¤<<print $slaveCost*2>>, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
+"We cost ¤<<print $contractCost>>, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>."
<br><br>
@@ -524,7 +524,7 @@ The other blurts out. "But we kinda got too into each other, in more ways than o
//You lack the necessary funds to enslave her.//
<</if>>
-<<if $cash >= $contractCost*2>>
+<<if $cash >= $contractCost>>
<br>
<<switch $RecETSevent>>
@@ -555,7 +555,7 @@ The other blurts out. "But we kinda got too into each other, in more ways than o
<<case "incest mother son" "incest father daughter">>
<<click "Buy both">>
- <<set $sissy to $activeSlave, $cash -= ($contractCost*2)>>
+ <<set $sissy to $activeSlave, $cash -= $contractCost>>
<<AddSlave $sissy>>
<<goto "RecETS workaround">>
<</click>>
@@ -563,7 +563,7 @@ The other blurts out. "But we kinda got too into each other, in more ways than o
<<case "matched pair" "identical pair" "identical herm pair">>
<<click "Buy both">>
- <<set $sissy to $activeSlave, $cash -= ($contractCost*2)>>
+ <<set $sissy to $activeSlave, $cash -= $contractCost>>
<<AddSlave $sissy>>
<<goto "RecETS workaround">>
<</click>>
@@ -572,7 +572,7 @@ The other blurts out. "But we kinda got too into each other, in more ways than o
ERROR: bad event
<</switch>>
<<else>>
- <<if $cash >= $contractCost>>//You lack the necessary funds to enslave them both.//<</if>>
+ <<if $cash < $contractCost>>//You lack the necessary funds to enslave them both.//<</if>>
<</if>>
</span>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index de6a5ef5ffd..b6a905cf859 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -152,8 +152,8 @@
<</if>>
<</if>>
<</for>>
- <<if ($schoolroomSlaves < 5)>>
- <<set $seed to random(1,10)+((5-$schoolroomSlaves)*(random(150,170)+($idleBonus*10)))>>
+ <<if ($schoolroomSlaves < $schoolroomS)>>
+ <<set $seed to random(1,10)+(($schoolroomS-$schoolroomSlaves)*(random(150,170)+($idleBonus*10)))>>
<<set $cash += $seed>>
Since she doesn't have enough students to occupy all her time, $schoolroomName takes in citizens' slaves on a contract basis and she teaches them too, earning @@color:yellowgreen;¤$seed.@@
<</if>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index d68721cf216..c6b6c0e5254 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -349,8 +349,8 @@
<</if>>
<</if>>
<</for>>
- <<if ($spaSlaves < 5)>>
- <<set $seed to random(1,10)+((5-$spaSlaves)*(random(150,170)+($idleBonus*10)))>>
+ <<if ($spaSlaves < $spa)>>
+ <<set $seed to random(1,10)+(($spa-$spaSlaves)*(random(150,170)+($idleBonus*10)))>>
<<set $cash += $seed>>
Since she doesn't have enough girls to occupy all her time, the spa takes in citizens' slaves on a contract basis and she helps them too, earning @@color:yellowgreen;¤$seed.@@
<</if>>
--
GitLab