diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index da519485498315e8f05ae4a0fc288e5dada7dbaf..5e14b9b54538ddc6040d8f9ef774bde3c606188e 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -684,6 +684,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $bodyswapAnnounced = 0>> <<set $allowFamilyTitles = 0>> <<set $surnamesForbidden = 0>> +<<set $menstruation = 0>> <<set $FCTVcount = 0>> <<set $FCTVrate = 4>> <<set $FCTVreceiver = 0>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index e964bd551ff2e08d37fb92e5eee57c4f7081c3c3..436079d9f41a5a29b8add4ad8f1abbfd98ae6e25 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -240,6 +240,9 @@ <<if ndef $buckets>> <<set $buckets = 0>> <</if>> +<<if ndef $menstruation>> + <<set $menstruation = 0>> +<</if>> <<if ndef $FCTVenable>> <<set $FCTVenable = 1>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 5d75ea1a121aaccbc67e519ef543beebd2d8e151..ac815f2aacace449a5f40fb69e531e27271feeee 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -95,23 +95,23 @@ She was mindbroken, but seems to have snapped out of it do to a deep love of you <<set $mutinery = 1>> Finishing your work, you lean back for a break well deserved break. Your peace is quickly disturbed by several loud smashes from down the penthouse hall. As you get up from your desk, you hear somebody running down the hallway, and before you know it, <<EventNameLink $activeSlave>> is inside. She is looking quite treacherous and <<if $activeSlave.combatSkill > 0>>relatively confident<<else>>somewhat unsure<</if>>. She quickly reaches in to grab you, -<<if ($PC.Career == "gang")>> +<<if ($PC.career == "gang")>> <<if ($personalArms != 0)>> but when you point your handgun towards her, she stutters back with her hands pointing upwards. <<else>> but you just have to reach for your trusty handgun to make the slave step back in fear. <</if>> <<set $mutinery = 0>> -<<elseif ($PC.Career == "mercenary")>> +<<elseif ($PC.career == "mercenary")>> <<if ($personalArms != 0)>> but you quickly draw the weapon you always keep close at hand, forcing the slave to put her hands on the back of her head. <<else>> but you quickly grab her arm, pull it towards you and lock it in her back, pushing her over the desk. <</if>> <<set $mutinery = 0>> -<<elseif ($PC.Career == "escort")>> +<<elseif ($PC.career == "escort")>> but you simply give her a kick to the groin; she wouldn't be the first person to try this shit on you. -<<elseif ($PC.Career == "slaver") || $PC.slaving >= 20>> +<<elseif ($PC.career == "slaver") || $PC.slaving >= 20>> but you simply give her a kick to the groin, a little trick you remember from your early memories on how to deal with rebellious slaves. <<set $mutinery = 0>> <<elseif ($PC.warfare >= 20)>> @@ -2449,7 +2449,7 @@ She does her very best to get through the inspection without disgrace, hugging h You start trying to her down, hoping to persuade them that you migt reconsider your punishment if they stopped this foolishness; she doesn't seem too keen on listening to you, instead pushing you against a wall and tearing your clothes off. Ignoring your words, she thruss her <<if $activeSlave.dick == 1>>pathetic<<elseif $activeSlave.dick == 2>>little<<elseif $activeSlave.dick == 3>><<elseif $activeSlave.dick == 4>>big <<elseif $activeSlave.dick == 5>>impressive<<elseif $activeSlave.dick == 6>>huge<<elseif $activeSlave.dick == 7>>gigantic<<elseif $activeSlave.dick == 8>>titanic<<elseif $activeSlave.dick == 9>>absurd<<elseif $activeSlave.dick == 10>>inhuman<<else>>hypertrophied<</if>> dick in without a second thought. You make sure to clamp down as hard as possible so the experience is not all that pleasant for her, but she continues to thrust in a daze. <<if $activeSlave.balls > 0 && $activeSlave.vasectomy == 0 && $activeSlave.ballType == "human" && $PC.preg == 0>> You make one last plea for her not to cum inside, it's a danger day. If anything, it only encourages her to thrust deeper before painting the insides of your pussy with her load. - <<KnockMeUP $PC 100 0 $activeSlave.ID>> + <<KnockMeUp $PC 100 0 $activeSlave.ID>> <</if>> Once spent, she shoves you to the ground and crashes into your office chair. The moment she lets down her guard, you slam the heaviest object you can find into her head. Now that you have her controlled, it's time she learned her place; when she wakes up, of course. It's more fun that way. <</replace>> @@ -2498,7 +2498,7 @@ She does her very best to get through the inspection without disgrace, hugging h <<set $cash -= $surgeryCost>> <</replace>> //Will cost ¤$surgeryCost// <</link>> - <<if $slave.vagina == -2>> + <<if $activeSlave.vagina == -2>> <br><<link "Surgically alter her gender">> <<replace "#result2">> You ask her if she enjoyed the last time she used her dick and if it was worth crossing you, because it will not happen again. Restrained as she is, the most she can do is cry and beg. Once she comes to after the surgery, she faces her new body; @@.mediumorchid;she's now a shemale@@ and she's @@.gold;the only one to blame@@ for her @@.red;suffering.@@ You waste no time in shoving her against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into her virgin pussy. You use her until you are satisfied and toss her to the floor to think about her new life. Every other rebellious slave is @@.gold;horrified by the example.@@ @@ -4230,7 +4230,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <<link "Give her something more appropriate to suck on">> <<EventNameDelink $activeSlave>> <<replace "#result">> - <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>, as usual, has to give the stupid slut considerable coaching to get her to your office without getting lost. This is a near-miraculous imbecility, as the penthouse is expressly designed to make it nearly impossible to get anywhere from anywhere else without passing by the office door. She understands orders to <<if $PC.dick == 0>>perform cunnilingus<<else>>suck a dick<</if>>, though, and gets down to it eagerly enough. When she finishes the job, <<if $PC.dick == 0>>wipes her mouth<<else>>she busily swallows every drop of your ejaculate<</if>> and then looks up at you doubtfully. <<if canTalk($activeSlave) == false>>She slowly spells out a question with her hands, asking if she's a good slave.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She lisps a hesitant question: "<<Master>>, am I a good thlave?"<<else>>She mumbles a hesitant question: "<<Master>>, am I a good slave?"<</if>> You tell her that she is, running a hand <<if $activeSlave.hStyle == "shaved bald">>across her bald scalp<<else>>through her hair<</if>>. She seems @@.hotpink;reassured,@@ and thankful when you give her a cup of her proper rations from your own hand. + <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>, as usual, has to give the stupid slut considerable coaching to get her to your office without getting lost. This is a near-miraculous imbecility, as the penthouse is expressly designed to make it nearly impossible to get anywhere from anywhere else without passing by the office door. She understands orders to <<if $PC.dick == 0>>perform cunnilingus<<else>>suck a dick<</if>>, though, and gets down to it eagerly enough. When she finishes the job, <<if $PC.dick == 0>>wipes her mouth<<else>>she busily swallows every drop of your ejaculate<</if>> and then looks up at you doubtfully. <<if !canTalk($activeSlave)>>She slowly spells out a question with her hands, asking if she's a good slave.<<else>>She mumbles a hesitant question: "<<if $activeSlave.rudeTitle == 1>><<PoliteRudeTitle $activeSlave>><<else>><<Master>><</if>>, am I a good <<s>>lave?"<</if>> You tell her that she is, running a hand <<if $activeSlave.hStyle == "shaved bald">>across her bald scalp<<else>>through her hair<</if>>. She seems @@.hotpink;reassured,@@ and thankful when you give her a cup of her proper rations from your own hand. <<set $activeSlave.devotion += 4>> <<set $activeSlave.oralCount += 1>> <<set $oralTotal += 1>> @@ -4239,7 +4239,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <br><<link "Reassure her and get her to slow down">> <<EventNameDelink $activeSlave>> <<replace "#result">> - She's so intent on trying to suck off the food dispenser that she doesn't hear you enter the room. She starts with surprise when you encircle her<<if $activeSlave.preg > 20>> pregnant belly<<else>> waist<</if>> with your arms and murmur reassuringly in her ear. <<if canTalk($activeSlave) == false>>She sadly gestures at the spigot and then flicks her own head.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She lisps, "Thorry <<Master>>. I'm trying but ith hard."<<else>>She says sadly, "Sorry <<Master>>. I'm trying to be a good slave but it's hard."<</if>> You kindly tell her that you know she's trying, and that that's what really matters. <<if canTalk($activeSlave) == false>>Her hands awkwardly ask, "Really?"<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"Really, <<Master>>?" she asks hopefully.<<else>>"Really, <<Master>>?" she asks hopefully.<</if>> You whisper into her ear that yes, she will be all right as long as she does her best. She wiggles her butt against you a little and giggles <<if $PC.dick == 1>>at the responding stiffness she feels between her buttocks<<else>>as you shove her to her knees<</if>>. She shimmies down and <<if $PC.dick == 1>>takes you into her mouth<<if $PC.vagina == 1>> and does her best to reach the top of your pussy with the tip of her tongue<</if>><<else>>eats you out<</if>>, <<if canSee($activeSlave)>>looking you in the eyes the whole time and <</if>>@@.hotpink;smiling@@ as much as she can manage with <<if $PC.dick == 1>>a dick in her mouth<<else>>her tongue working your clit<</if>>. + She's so intent on trying to suck off the food dispenser that she doesn't hear you enter the room. She starts with surprise when you encircle her<<if $activeSlave.preg > 20>> pregnant belly<<else>> waist<</if>> with your arms and murmur reassuringly in her ear. <<if !canTalk($activeSlave)>>She sadly gestures at the spigot and then flicks her own head.<<else>>She <<say>>s sadly, "<<S>>orry <<if $activeSlave.rudeTitle == 1>><<PoliteRudeTitle $activeSlave>><<else>><<Master>><</if>>. I'm trying to be a good <<s>>lave but it'<<s>> hard."<</if>> You kindly tell her that you know she's trying, and that that's what really matters. <<if !canTalk($activeSlave)>>Her hands awkwardly ask, "Really?"<<else>>"Really, <<Master>>?" she asks hopefully.<</if>> You whisper into her ear that yes, she will be all right as long as she does her best. She wiggles her butt against you a little and giggles <<if $PC.dick == 1>>at the responding stiffness she feels between her buttocks<<else>>as you shove her to her knees<</if>>. She shimmies down and <<if $PC.dick == 1>>takes you into her mouth<<if $PC.vagina == 1>> and does her best to reach the top of your pussy with the tip of her tongue<</if>><<else>>eats you out<</if>>, <<if canSee($activeSlave)>>looking you in the eyes the whole time and <</if>>@@.hotpink;smiling@@ as much as she can manage with <<if $PC.dick == 1>>a dick in her mouth<<else>>her tongue working your clit<</if>>. <<set $activeSlave.devotion += 4>> <<set $activeSlave.oralCount += 1>> <<set $oralTotal += 1>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 6f7f28c5024a85984010447139c357c0bbc61247..1f7d2ce4ed55283843dad620d94bf83e7f5df1f2 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -2649,12 +2649,32 @@ Call as <<SlaveSort [$slaves]>> <<set $args[0].preg = 1>> <<set $args[0].pregSource = $args[3] || 0>> <<SetPregType $args[0]>> - <<set $args[0].pregKnown = 1>> /* remove me later */ + <<if $menstruation == 1>> + <<else>> + <<set $args[0].pregKnown = 1>> + <<if $args[0].ID == -1>> + /*@@.lime;You have gotten pregnant.@@*/ + <<elseif $args[0].fuckdoll == 0>> + @@.lime;She has become pregnant.@@ + <<else>> + @@.lime;It has become pregnant.@@ + <</if>> + <</if>> <<elseif $args[2] == 2>> <<set $args[0].preg = 1>> <<set $args[0].pregSource = $args[3] || 0>> <<SetPregType $args[0]>> - <<set $args[0].pregKnown = 1>> /* remove me later */ + <<if $menstruation == 1>> + <<else>> + <<set $args[0].pregKnown = 1>> + <<if $args[0].ID == -1>> + /*@@.lime;You have gotten pregnant.@@*/ + <<elseif $args[0].fuckdoll == 0>> + @@.lime;She has become pregnant.@@ + <<else>> + @@.lime;It has become pregnant.@@ + <</if>> + <</if>> <</if>> <</if>> <</widget>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index fb9e46f6eb10d9be7d966df2baed757928f5f327..acdae7c64c12caa44939353f7f61d48bd8f65b71 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -4015,7 +4015,7 @@ check if a rule attribute, any one, is defined and otherwise skip everything. <<if _combinedRule.growth.lips != "no default setting">> <<if $args[0].lips > _combinedRule.growth.lips>> <<if $args[0].drugs != "lip atrophiers">> - <<set $args[0].drugs = "lip injections">> + <<set $args[0].drugs = "lip atrophiers">> <br>$args[0].slaveName has been put on $args[0].drugs. <</if>> <<break>>