From a4d9315c14e39b2f6dabb47df624d7596336bace Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 15 Jun 2020 16:42:19 -0400 Subject: [PATCH] UH cleanup final --- Changelog.txt | 1 + src/gui/Encyclopedia/encyclopedia.tw | 2 +- src/pregmod/widgets/pregmodBirthWidgets.tw | 14 +++++++------- src/utility/birthWidgets.tw | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index dc9676a4cbc..a1f06ab7eda 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -5,6 +5,7 @@ Pregmod 3 -custom hotkeys -custom theme support + -added Uterine Hypersensitivity genetic quirk -lactation rules applicable to all slaves -fixes & code improvements diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index f59c24bc62c..67b8b146a85 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2803,7 +2803,7 @@ LORE: INTERVIEWS <br>''PandemoniumPenguin'' for giving players a choice in FS names. <br>''torbjornhub'' for adding pit rules to the RA. <br>''CheatMode'' for additional cheatmode options. - <br>''Transhumanist01'' for the production of husk slaves via incubator. + <br>''Transhumanist01'' for the production of husk slaves via incubator. Contributed the uterine hypersensitivity genetic quirk. <br>''Fake_Dev'' for nipple enhancers. <br>''UnwrappedGodiva'' for a tool to edit save files. <br>''git contributors lost to time'' for their submissions and work through pregmod's git. diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw index 9b9b161ca78..18aff113131 100644 --- a/src/pregmod/widgets/pregmodBirthWidgets.tw +++ b/src/pregmod/widgets/pregmodBirthWidgets.tw @@ -84,7 +84,7 @@ <</if>> <<else>> <<if (random(1,20) > $suddenBirth)>> - $He is taken by _tempSub.slaveName to a private room so that _he2 may <<if canSee(_tempSub)>>watch<<else>>be present<</if>>. Reluctantly, $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, fully aware of _tempSub.slaveName's <<if _tempSub.fetish == "pregnancy">>hungry gaze<<else>>amused gaze<</if>><<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, but is quicly overwhelmed by the pleasure from birthing<</if>>. $His child is promptly taken and _tempSub.slaveName eagerly descends upon $his exhausted and still very gravid body. + $He is taken by _tempSub.slaveName to a private room so that _he2 may <<if canSee(_tempSub)>>watch<<else>>be present<</if>>. Reluctantly, $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, fully aware of _tempSub.slaveName's <<if _tempSub.fetish == "pregnancy">>hungry gaze<<else>>amused gaze<</if>><<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, but is quicly overwhelmed by the pleasure from $his orgmasmic birth<</if>>. $His child is promptly taken and _tempSub.slaveName eagerly descends upon $his exhausted and still very gravid body. <<set $humiliation = 1>> <<else>> While servicing _tempSub.slaveName, $slaves[$i].slaveName's water breaks, causing $him to immediately try to break off. $His dom eagerly watches _his2 gravid sub's ordeal. @@ -708,9 +708,9 @@ <<if $slaves[$i].devotion > 20>> $He settles $himself onto a patron's lap and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, basking in the attention of $his audience<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>and convulsing with orgasms in the process<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he beckons the audience to enjoy $his still very gravid body. <<elseif $slaves[$i].devotion >= -20>> - $He hesitantly begins to pose, but one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He winces as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even orgasms from birth can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. + $He hesitantly begins to pose, but one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He winces as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even $his powerful orgasm can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. <<else>> - $He stands shaking, $his waters flowing down $his <<if hasAnyLegs($slaves[$i])>>leg<<if hasBothLegs($slaves[$i])>>s<</if>><<else>>body<</if>>, until one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He cries out as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even orgasms from birth can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. + $He stands shaking, $his waters flowing down $his <<if hasAnyLegs($slaves[$i])>>leg<<if hasBothLegs($slaves[$i])>>s<</if>><<else>>body<</if>>, until one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He cries out as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even powerful orgasm can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. <</if>> <<else>> <<if (_birthScene > 80) && canDoVaginal($slaves[$i])>> @@ -757,9 +757,9 @@ <<if $slaves[$i].devotion > 20>> $He settles $himself onto a patron's lap and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, basking in the attention of $his audience<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>and convulsing with orgasms in the process<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he beckons the audience to enjoy $his still very gravid body. <<elseif $slaves[$i].devotion >= -20>> - $He hesitantly begins to pose, but one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He winces as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even orgasms from birth can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. + $He hesitantly begins to pose, but one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He winces as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even $his powerful orgasm can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. <<else>> - $He stands shaking, $his waters flowing down $his <<if hasAnyLegs($slaves[$i])>>leg<<if hasBothLegs($slaves[$i])>>s<</if>><<else>>body<</if>>, until one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He cries out as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even orgasms from birth can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. + $He stands shaking, $his waters flowing down $his <<if hasAnyLegs($slaves[$i])>>leg<<if hasBothLegs($slaves[$i])>>s<</if>><<else>>body<</if>>, until one of the patrons grabs $him by the swollen waist and pulls $him onto his lap. $He cries out as his dick slips over $his exposed crotch, but can do nothing to stop <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby from being born. $He hates that the first thing $his child will touch is an erect cock; a bitter reminder<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, which even $his powerful orgasm can't erase,<</if>> of what its future will likely hold. $His fully born child is promptly taken and $his clients descend upon $his vulnerable, still very gravid, body. <</if>> <<else>> <<if (_birthScene > 80) && canDoVaginal($slaves[$i])>> @@ -786,7 +786,7 @@ <<case "be the Schoolteacher">> <<if !canWalk($slaves[$i])>> <<if (random(1,20) > $suddenBirth)>> - $He calls for $his teaching aid to help position $him so the class may receive a lesson on childbirth. $He begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, fully aware of $his watching students. $He demonstrates the proper ways to labor and how to deliver a baby<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> even if your body is warcked by one orgasm after another<</if>>. $He explains the infant's future as $his child taken and excuses the class for a short break in order to freshen up. Upon their return, $he begins a lesson on being a broodmother, as there is always a curious face locked onto $his still very gravid middle. + $He calls for $his teaching aid to help position $him so the class may receive a lesson on childbirth. $He begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, fully aware of $his watching students. $He demonstrates the proper ways to labor and how to deliver a baby<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> even if your body is wracked by nonstop orgasm<</if>>. $He explains the infant's future as $his child taken and excuses the class for a short break in order to freshen up. Upon their return, $he begins a lesson on being a broodmother, as there is always a curious face locked onto $his still very gravid middle. <<set $humiliation = 1>> <<else>> While teaching a lesson, $slaves[$i].slaveName's water breaks. Sensing $he wouldn't be able to make it to the birthing area, $he instead chooses to act on the opportunity. Today's lesson will be on childbirth. @@ -796,7 +796,7 @@ <</if>> <<else>> <<if (random(1,20) > $suddenBirth)>> - While stripping, $he makes $his way to the front of the classroom and settles $himself in a way $his entire class can see. Birth <<if $slaves[$i].counter.birthsTotal == 0>>will be<<else>>is<</if>> a regular occurrence in $his life and it would be a waste to not work it into $his lesson plan. $He wiggles $himself into a comfortable spot and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, fully aware of $his watching students. $He demonstrates the proper ways to labor and how to deliver a baby<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> even if your body is warcked by one orgasm after another<</if>>. $He explains the infant's future as $his child is taken and excuses the class for a short break in order to freshen up. Upon their return, $he begins a lesson on being a broodmother, as there is always a curious face locked onto $his still very gravid middle. + While stripping, $he makes $his way to the front of the classroom and settles $himself in a way $his entire class can see. Birth <<if $slaves[$i].counter.birthsTotal == 0>>will be<<else>>is<</if>> a regular occurrence in $his life and it would be a waste to not work it into $his lesson plan. $He wiggles $himself into a comfortable spot and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, fully aware of $his watching students. $He demonstrates the proper ways to labor and how to deliver a baby<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> even if your body is wracked by nonstop orgasm<</if>>. $He explains the infant's future as $his child is taken and excuses the class for a short break in order to freshen up. Upon their return, $he begins a lesson on being a broodmother, as there is always a curious face locked onto $his still very gravid middle. <<set $humiliation = 1>> <<else>> While teaching a lesson, $slaves[$i].slaveName's water breaks. Sensing $he wouldn't be able to make it to the birthing area, $he instead chooses to act on the opportunity. Today's lesson will be on childbirth. diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw index a6ca0a78187..7344347161f 100644 --- a/src/utility/birthWidgets.tw +++ b/src/utility/birthWidgets.tw @@ -25,7 +25,7 @@ <</if>> <<else>> <<if $clinic != 0>> - $He is lead to $clinicName since $he is likely to face complications with childbirth. $He is helped from $his clothes and into a comfortable hospital bed to relax until $he is ready. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers.<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> $His body is so heavily modified, that even difficult birth is an intensly pleasurable experience for $him.<</if>> <<if $birthDamage > 10>><<set $csec = 1>><<run App.Medicine.Modification.addScar($slaves[$i], "belly", "c-section")>>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours<<if $slaves[$i].geneticQuirks.uterineHypersensitivity != 1>>, and a touch of morphine,<</if>> $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers. + $He is lead to $clinicName since $he is likely to face complications with childbirth. $He is helped from $his clothes and into a comfortable hospital bed to relax until $he is ready. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers.<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> $His body is so sensetive that even difficult birth is an intensly pleasurable experience for $him.</if>> <<if $birthDamage > 10>><<set $csec = 1>><<run App.Medicine.Modification.addScar($slaves[$i], "belly", "c-section")>>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity != 1>> and a touch of morphine,<</if>> $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers. <<else>> <<set $csec = 1>> <<run App.Medicine.Modification.addScar($slaves[$i], "belly", "c-section")>> @@ -406,7 +406,7 @@ <<if $birthDamage > 5>> <<set $csec = 1>> <<if $clinic != 0>> - $He is carried to $clinicName, since $he is likely to face complications with childbirth. $He is stripped from $his clothes and set up in a comfortable hospital bed to relax until $he is ready. $He wiggles $himself into a comfortable spot and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers.<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> $His body is so heavily modified, that even difficult birth is an intensly pleasurable experience for $him.<</if>> <<if $birthDamage > 10>><<set $csec = 1>><<run App.Medicine.Modification.addScar($slaves[$i], "belly", "c-section")>>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours<<if $slaves[$i].geneticQuirks.uterineHypersensitivity != 1>>, and a touch of morphine,<</if>> $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers. + $He is carried to $clinicName, since $he is likely to face complications with childbirth. $He is stripped from $his clothes and set up in a comfortable hospital bed to relax until $he is ready. $He wiggles $himself into a comfortable spot and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, fully aware of $his watching helpers.<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>> $His body is so sensetive that even difficult birth is an intensly pleasurable experience for $him.<</if>> <<if $birthDamage > 10>><<set $csec = 1>><<run App.Medicine.Modification.addScar($slaves[$i], "belly", "c-section")>>After several hours of intense labor, $he is transferred to the surgery wing. Following an emergency c-section, $he is returned to the recovery wing to rest<<else>>After several hours,<<if $slaves[$i].geneticQuirks.uterineHypersensitivity != 1>> and a touch of morphine,<</if>> $he has successfully given birth<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is left under observation to make sure $he recovers. <<else>> <<set $csec = 1>> <<run App.Medicine.Modification.addScar($slaves[$i], "belly", "c-section")>> @@ -466,7 +466,7 @@ <<if $slaves[$i].fetish == "mindbroken">> $He is locked, nude, in a glory hole box and ordered to suck. Instinctively, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> quickly extracted from the box. $He never notices, focused entirely on the fresh cock poking through the glory hole. <<else>> - $He is locked, nude, in a glory hole box and ordered to suck. $He quickly finishes the dick off before wiggling $himself into a slightly, though not by much, more comfortable position. $He begins laboring on $his child<<if $slaves[$i].pregType > 1>>ren<</if>><<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>,convulsing with orgasms in the process<</if>>. As $he finishes, the box is opened and $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> gathered and taken away before $he is forcefully repositioned with $his mouth over the glory hole. + $He is locked, nude, in a glory hole box and ordered to suck. $He quickly finishes the dick off before wiggling $himself into a slightly, though not by much, more comfortable position. $He begins laboring on $his child<<if $slaves[$i].pregType > 1>>ren<</if>><<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>, convulsing with orgasms in the process<</if>>. As $he finishes, the box is opened and $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> gathered and taken away before $he is forcefully repositioned with $his mouth over the glory hole. <</if>> <<case "get milked">> -- GitLab