From 06ff780275f99ee59ea26f06ac203097cda53727 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 3 Aug 2017 18:29:18 -0400
Subject: [PATCH] Fixes
---
src/pregmod/generateChild.tw | 8 +-
src/uncategorized/RESS.tw | 4 +-
src/uncategorized/ptWorkaround.tw | 4 +-
src/uncategorized/walkPast.tw | 122 ++++++++++++++++++++++++-
src/utility/descriptionWidgetsFlesh.tw | 2 +-
src/utility/descriptionWidgetsStyle.tw | 40 +++++++-
6 files changed, 170 insertions(+), 10 deletions(-)
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index 0fa83ef513d..d2e06d3859b 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -25,7 +25,7 @@
<<if $babyGender == 1>>
<<include "Generate XX Slave">>
<<if $PC.pregSource < 1>>
- <<set $activeSlave.slaveName = "My daughter">>
+ <<set $activeSlave.slaveName = "Your daughter">>
<<set $activeSlave.mother = -1>>
<<set $activeSlave.father = $missingParentID>>
<<set $missingParentID-->>
@@ -60,7 +60,7 @@
<<break>>
<</if>>
<</for>>
- <<set $activeSlave.slaveName = String("My and " + $mergeDad.slaveName + "'s daughter")>>
+ <<set $activeSlave.slaveName = String("Your and " + $mergeDad.slaveName + "'s daughter")>>
<<set $activeSlave.mother = -1>>
<<set $activeSlave.father = $mergeDad.ID>>
<<if $PC.nationality == $mergeDad.nationality>>
@@ -151,7 +151,7 @@
<<elseif $babyGender == 2>>
<<include "Generate XY Slave">>
<<if $PC.pregSource < 1>>
- <<set $activeSlave.slaveName = "My son">>
+ <<set $activeSlave.slaveName = "Your son">>
<<set $activeSlave.mother = -1>>
<<set $activeSlave.father = $missingParentID>>
<<set $missingParentID-->>
@@ -186,7 +186,7 @@
<<break>>
<</if>>
<</for>>
- <<set $activeSlave.slaveName = String("My and " + $mergeDad.slaveName + "'s son")>>
+ <<set $activeSlave.slaveName = String("Your and " + $mergeDad.slaveName + "'s son")>>
<<set $activeSlave.mother = -1>>
<<set $activeSlave.father = $mergeDad.ID>>
<<if $PC.nationality == $mergeDad.nationality>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index adc9be5838e..4975eaf7e56 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -9172,11 +9172,11 @@ By the time you've finished with her sensitive ass, it shines red, and she is cr
She seems to be focusing on the purely physical aspects of the degradation here. The true meaning of this place is so much more, and you decide to share it with her. You call her name, tearing her attention away from the spectacle mere centimeters over your heads, and <<if canSee($activeSlave)>>point<<else>>direct her<</if>> to a particular slave. You tell $activeSlave.slaveName that this particular Arcade inmate's name is
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].assignment == "be confined in the arcade">>
- $slaves[$i].slaveName. You tell her that she is $slaves[$i].actualAge years old, that she is $slaves[$i].nationality, and that she was once $slaves[$i].career. You list more details of her life before she was placed here to be fucked endlessly. $activeSlave.slaveName's eyes widen as you recite the details of the prior life of this piece of human sexual equipment and the sheer weight of the intellectual sadism smashes into her. Then the slave above you both jerks a little. <<if $activeSlave.dick == 0>>There's no visible sign her pussy's being fucked, so it must be<<else>>Her cock hardens involuntarily, indicating that it's<</if>> going into her ass. You resume, mentioning that she's been buttfucked $slaves[$i].slaveName times.
+ <<SlaveFullName $slaves[$i]>>. You tell her that she is $slaves[$i].actualAge years old, that she is $slaves[$i].nationality, and that she was once $slaves[$i].career. You list more details of her life before she was placed here to be fucked endlessly. $activeSlave.slaveName's eyes widen as you recite the details of the prior life of this piece of human sexual equipment and the sheer weight of the intellectual sadism smashes into her. Then the slave above you both jerks a little. <<if $activeSlave.dick == 0>>There's no visible sign her pussy's being fucked, so it must be<<else>>Her cock hardens involuntarily, indicating that it's<</if>> going into her ass. You resume, mentioning that she's been buttfucked $slaves[$i].analCount times.
<<break>>
<</if>>
<</for>>
- $activeSlave.slaveName jerks suddenly, <<if canAchieveErection($activeSlave)>>shooting her cum onto the floor<<elseif $activeSlave.vagina < 0>>dribbling a little<<elseif $activeSlave.vaginaLube > 0>>squirting onto the floor<<else>>orgasming<</if>>. She came without being touched. She <<if canSee($activeSlave)>>stares at<<else>>faces<</if>>, in the presence of the arcology's @@.hotpink;undisputed preeminent sadist,@@ shuddering at the sheer gothic glory of it. She has a new moment to think of when she feels like @@.lightsalmon;indulging her own sadism.@@
+ $activeSlave.slaveName jerks suddenly, <<if canAchieveErection($activeSlave)>>shooting her cum onto the floor<<elseif $activeSlave.vagina < 0>>dribbling a little<<elseif $activeSlave.vaginaLube > 0>>squirting onto the floor<<else>>orgasming<</if>>. She came without being touched. She <<if canSee($activeSlave)>>stares at<<else>>faces<</if>> the mess she made just by being in the presence of the arcology's @@.hotpink;undisputed preeminent sadist;@@ she shudders at the sheer gothic glory of it. She has a new moment to think of when she feels like @@.lightsalmon;indulging her own sadism.@@
<</replace>>
<<set $activeSlave.devotion += 5, $activeSlave.fetishStrength = Math.clamp($activeSlave.fetishStrength+10, 0, 100)>>
<</link>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 887d14a34e8..f8e163a3888 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -57,7 +57,7 @@
<<set $activeSlave.devotion += 1>>
<</if>>
<<if ($activeSlave.trust > 10)>>
- Spending time with you @@.mediumaquamarine;builds her trust in <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title != 0>>her master<<else>>her mistress<</if>>.@@
+ Spending time with you @@.mediumaquamarine;builds her trust in <<WrittenMaster>>.@@
<<set $activeSlave.trust += 4>>
<<else>>
Spending time with you @@.mediumaquamarine;reduces her fear towards you.@@
@@ -204,6 +204,8 @@
<<case "repressed">>
is repressed. You strike a delicate balance with her, doing your best to train her to fuck as a sex slave should, but trying to retain the rush of doing the forbidden that makes her flush, shiver, and moan.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
+ <<default>>
+ has something. You should probably report this as nobody knows what is currently happening. Her flaw was supposed to be $activeSlave.sexualFlaw.
<</switch>>
<<set $activeSlave.training += 100-($activeSlave.intelligence*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>>
<<if ($PC.slaving >= 100)>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index a4f65a5db12..e1b5f670bcd 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -1476,6 +1476,126 @@
<<default>>
Her bare huge pregnant belly catches your eye.
<</switch>>
+ <<elseif $activeSlave.weight > 190>>
+ <<BellyDescription>>
+ <<switch $activeSlave.clothes>>
+ <<case "a Fuckdoll suit">>
+ Her massive gut is alluringly smooth under the tight suit.
+ <<case "conservative clothing">>
+ Her conservative clothing stands no chance of stilling her massive, jiggling gut.
+ <<case "chains">>
+ Her massive gut jiggles lewdly around her tight chains.
+ <<case "a slutty qipao">>
+ The front of her qipao rests atop her massive gut.
+ <<case "uncomfortable straps">>
+ Her massive gut jiggles lewdly around her tight straps.
+ <<case "shibari ropes">>
+ Her massive gut jiggles lewdly around her tight cords.
+ <<case "restrictive latex" "a latex catsuit">>
+ Her massive gut resembles a large beachball under her tight latex.
+ <<case "a nice nurse outfit">>
+ Her scrub top jiggles along with her massive gut as she moves.
+ <<case "a mini dress">>
+ Her tearing minidress shows every jiggle in her massive gut as she moves.
+ <<case "a nice maid outfit">>
+ As she moves, barely any jiggling can be seen within her straining maid's dress.
+ <<case "a penitent nuns habit">>
+ Her habit does nothing to stop her massive gut from jiggling against the coarse cloth as she moves.
+ <<case "clubslut netting">>
+ Her clubslut netting jiggles lewdly along with her massive gut as she moves. Every so often, another section gives out allowing a roll of fat to spring free; it's quite entertaining to watch.
+ <<case "a cheerleader outfit">>
+ Her massive gut jiggles its own cheer with her every motion.
+ <<case "a slave gown">>
+ Her miassive jiggly gut is gently caressed by her gown.
+ <<case "harem gauze">>
+ Her silken garb and massive, jiggly gut make her look like a belly dancer.
+ <<default>>
+ Her massive bare jiggling gut catches your eye.
+ <</switch>>
+ <<elseif $activeSlave.weight > 160>>
+ <<BellyDescription>>
+ <<switch $activeSlave.clothes>>
+ <<case "a Fuckdoll suit">>
+ Her giant gut is alluringly smooth under the tight suit.
+ <<case "conservative clothing">>
+ Her conservative clothing stands no chance of stilling her giant, jiggling gut.
+ <<case "chains">>
+ Her giant gut jiggles lewdly around her tight chains.
+ <<case "a slutty qipao">>
+ The front of her qipao rests atop her giant gut.
+ <<case "uncomfortable straps">>
+ Her giant gut jiggles lewdly around her tight straps.
+ <<case "shibari ropes">>
+ Her giant gut jiggles lewdly around her tight cords.
+ <<case "restrictive latex" "a latex catsuit">>
+ Her giant gut resembles a beachball under her tight latex.
+ <<case "a military uniform">>
+ The buttons on her staining jacket threaten to pop off with every motion of her giant jiggling gut.
+ <<case "a nice nurse outfit">>
+ Her scrub top jiggles along with her giant gut as she moves.
+ <<case "a mini dress">>
+ Her strained minidress shows every jiggle in her giant gut as she moves.
+ <<case "a nice maid outfit">>
+ As she moves, noticeable jiggling can be seen within her maid's dress.
+ <<case "a penitent nuns habit">>
+ Her habit does nothing to stop her giant gut from jiggling against the coarse cloth as she moves.
+ <<case "clubslut netting">>
+ Her clubslut netting jiggles lewdly along with her giant gut as she moves.
+ <<case "a cheerleader outfit">>
+ Her giant gut is partially covered by her cheerleader's top, which happily jiggles along with every motion.
+ <<case "a slave gown">>
+ Her giant jiggly gut is gently caressed by her gown.
+ <<case "nice business attire">>
+ Her giant gut has no room to move under her strained jacket.
+ <<case "harem gauze">>
+ Her silken garb and giant, jiggly gut make her look like a belly dancer.
+ <<default>>
+ Her giant bare jiggling gut catches your eye.
+ <</switch>>
+ <<elseif $activeSlave.weight > 130>>
+ <<BellyDescription>>
+ <<switch $activeSlave.clothes>>
+ <<case "a Fuckdoll suit">>
+ Her big gut is perfectly smoothed by the tight latex.
+ <<case "conservative clothing">>
+ Her conservative clothing stands no chance of stilling her big, jiggling gut.
+ <<case "chains">>
+ Her big gut jiggles lewdly between her tight chains.
+ <<case "a huipil">>
+ Her huipil jiggles along with her big gut.
+ <<case "a slutty qipao">>
+ The front of her qipao rests atop her big gut.
+ <<case "uncomfortable straps">>
+ Her big gut jiggles lewdly between her tight straps.
+ <<case "shibari ropes">>
+ Her big gut jiggles lewdly between her tight cords.
+ <<case "restrictive latex" "a latex catsuit">>
+ Her big gut has no room to move under her tight latex.
+ <<case "a military uniform">>
+ The buttons on her staining jacket struggle to hold back her big jiggling gut.
+ <<case "a nice nurse outfit">>
+ Her scrub top jiggles along with her big gut as she moves.
+ <<case "a mini dress">>
+ Her stretched minidress shows every jiggle in her big gut as she moves.
+ <<case "a slutty maid outfit">>
+ Her big gut is barely covered by a thin white blouse that happily jiggles along with every motion.
+ <<case "a nice maid outfit">>
+ As she moves, a slight jiggle can be seen within her maid's dress.
+ <<case "a penitent nuns habit">>
+ Her habit does nothing to stop her big gut from jiggling against the coarse cloth as she moves.
+ <<case "clubslut netting">>
+ Her clubslut netting jiggles lewdly along with her big gut as she moves.
+ <<case "a cheerleader outfit">>
+ Her big gut is partially covered by her cheerleader's top, which happily jiggles along with every motion.
+ <<case "a slave gown">>
+ Her big jiggly gut is gently caressed by her gown.
+ <<case "nice business attire">>
+ Noticeable jiggling from her big gut can be seen under her jacket.
+ <<case "harem gauze">>
+ Her silken garb and big, jiggly gut make her look like a belly dancer.
+ <<default>>
+ Her big bare jiggling gut catches your eye.
+ <</switch>>
<<elseif bigBellyPreg($activeSlave) || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
<<BellyDescription>>
<<switch $activeSlave.clothes>>
@@ -1588,7 +1708,7 @@
<<case "nice business attire">>
Slight jiggling from her fat gut can be seen under her jacket.
<<case "harem gauze">>
- Her silken garb and fat, jiggly gut makes her look like a belly dancer.
+ Her silken garb and fat, jiggly gut make her look like a belly dancer.
<<case "a toga">>
Her toga swerves loosely from side to side as her chubby body moves inside it.
<<case "a huipil">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index bcc6d9030c4..6094e3c6be8 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4732,7 +4732,7 @@ $pronounCap has
<<if ($activeSlave.boobs > 20000)>>
$activeSlave.slaveName's immense breasts keep $possessive oversized sweater from covering $possessive massively fat belly; even then, they can barely conceal it themselves.
<<elseif ($activeSlave.boobs > 10000)>>
- $activeSlave.slaveName's massively fat belly adds even more strain to $possessive struggling oversized sweater.
+ $activeSlave.slaveName's massively fat belly adds even more strain to $possessive struggling oversized sweater.
<<elseif ($activeSlave.boobs > 8000)>>
$activeSlave.slaveName's oversized breasts let $possessive massively fat belly hang free.
<<elseif ($activeSlave.boobs > 4000)>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 0114990523a..e49565d373f 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -2240,7 +2240,45 @@ $possessiveCap
<<set _daddy = $slaves.find(function(s) { returns.ID == $activeSlave.pregSource; }), _daddy = _daddy.slaveName>>
<</if>>
<<set _pregCollar = either(1, 2, 3)>>
- $pronounCap is wearing a heavy metal collar with a digital display; it currently reads: "<<if $activeSlave.preg > 0 && $activeSlave.preg < 4>>I might be preggers!<<else>><<if _pregCollar == 1>><<if $activeSlave.pregType >= 50>>ERROR? random(322,344) bab<<if $activeSlave.pregType > 1>>ies<<else>>y<</if>> on board!<<elseif $activeSlave.preg == 0>>Knock me up!<<elseif $activeSlave.preg > 0>><<if $activeSlave.pregType == 0>>1<<else>>$activeSlave.pregType<</if>> bab<<if $activeSlave.pregType > 1>>ies<<else>>y<</if>> on board!<<else>>I'm infertile!<</if>><<elseif _pregCollar == 2>><<if $activeSlave.pregType >= 50>><<print 31-$activeSlave.preg>><<else>><<print 35-$activeSlave.preg>><</if>> weeks till I pop!<<else>><<if $activeSlave.pregSource == -1>>Womb claimed by my master!<<elseif $activeSlave.preg == 0>>Womb available!<<elseif ($activeSlave.pregSource == -2 || $activeSlave.pregSource == 0) and $activeSlave.preg > 0>>Baby made by slutting around!<<elseif $activeSlave.pregSource > 0>>Womb claimed by _daddy!<<else>>Put a baby in me today!<</if>><</if>><</if>>"
+ $pronounCap is wearing a heavy metal collar with a digital display; it currently reads:
+ <<if $activeSlave.preg > 0 && $activeSlave.preg < 4>>
+ "I might be preggers! Rub my belly for luck!"
+ <<else>>
+ <<if _pregCollar == 1>>
+ <<if $activeSlave.preg >= 0 && $activeSlave.preg < 4>>
+ "Knock me up!"
+ <<elseif $activeSlave.pregType >= 50>>
+ "ERROR? random(322,344) bab<<if $activeSlave.pregType > 1>>ies<<else>>y<</if>> on board!"
+ <<elseif $activeSlave.preg > 0>>
+ "<<if $activeSlave.pregType == 0>>1<<else>>$activeSlave.pregType<</if>> bab<<if $activeSlave.pregType > 1>>ies<<else>>y<</if>> on board!"
+ <<else>>
+ "I'm infertile!"
+ <</if>>
+ <<elseif _pregCollar == 2>>
+ <<if $activeSlave.preg > 4>>
+ <<if $activeSlave.pregType >= 50>>
+ "<<print 31-$activeSlave.preg>>
+ <<else>>
+ "<<print 35-$activeSlave.preg>>
+ <</if>>
+ weeks till I pop!"
+ <<else>>
+ "My womb needs filling!"
+ <</if>>
+ <<else>>
+ <<if $activeSlave.preg >= 0 && $activeSlave.preg < 4>>
+ "Womb available!"
+ <<elseif $activeSlave.pregSource == -1>>
+ "Womb claimed by my <<WrittenMaster>>!"
+ <<elseif ($activeSlave.pregSource == -2 || $activeSlave.pregSource == 0)>>
+ "Baby made by slutting around!"
+ <<elseif $activeSlave.pregSource > 0>>
+ "Womb claimed by _daddy!"
+ <<else>>
+ "Put a baby in me today!"
+ <</if>>
+ <</if>>
+ <</if>>
<<case "silk ribbon">>
$pronounCap is wearing a tight silk ribbon fitted to $possessive neck, it is oddly elegant.
<<case "tight steel">>
--
GitLab