From f03e23a00bf42bb41c11dcc17646361af96b3338 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 2 Feb 2018 01:23:36 -0500 Subject: [PATCH] Fixed missing headgirls --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++++ src/pregmod/widgets/assignmentFilterWidget.tw | 2 +- src/pregmod/widgets/pregmodBirthWidgets.tw | 26 ++++++++++++++++--- src/utility/birthWidgets.tw | 9 ++----- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 96f626dfc2b..cf30be4e2f4 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,11 @@ 0.10.7.0/1 +2/02/18 + + 323 + -fixed hidden headgirls + 2/01/18 322 diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw index 00ea9121f28..46fb94c3f87 100644 --- a/src/pregmod/widgets/assignmentFilterWidget.tw +++ b/src/pregmod/widgets/assignmentFilterWidget.tw @@ -12,7 +12,7 @@ */ <<widget "resetAssignmentFilter">> - <<set $slaves.map(function(y){y.assignmentVisible = 1})>><<set $slaves.filter(function(x){return x.assignment.includes("in the") || x.assignment.includes("be the") || x.assignment.includes("live with") || x.assignment.includes("be your") || x.assignment == "work as a servant"}).map(function(y){y.assignmentVisible = 0})>> + <<set $slaves.map(function(y){y.assignmentVisible = 1})>><<set $slaves.filter(function(x){return x.assignment.includes("in the") || x.assignment.includes("be the") || x.assignment.includes("live with") || (x.assignment.includes("be your") && x.assignment != "be your Head Girl") || x.assignment == "work as a servant"}).map(function(y){y.assignmentVisible = 0})>> <</widget>> <<widget "showallAssignmentFilter">> diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw index 3c39fd3a960..df27ca2de9b 100644 --- a/src/pregmod/widgets/pregmodBirthWidgets.tw +++ b/src/pregmod/widgets/pregmodBirthWidgets.tw @@ -16,16 +16,34 @@ <<else>> $slaves[$i].slaveName is awoken from her rest by a strong contraction. She rolls over and begins to fall back to sleep as another contraction wracks her body. <<ClothingBirth>> - She draws her child to her breast<<if $slaves[$i].pregType > 1>>s<</if>> and resumes resting. + She fishes around under her still huge dome of a stomach searching for her newborn. Once she finds it, she draws it to her breast and resumes resting. <</if>> <<else>> - She is helped back to her bed and stripped before slipping into it. She makes herself comfortable and begins working on birthing <<if $slaves[$i].birthsTotal == 0>> her first<<else>>this week's<</if>> baby. Her child is promptly taken and she is encouraged to keep resting. She rolls over, cradling her heavily rounded middle, and dozes off. + <<if (random(1,20) > $suddenBirth)>> + She is helped back to her bed and stripped before slipping into it. She makes herself comfortable and begins working on birthing <<if $slaves[$i].birthsTotal == 0>> her first<<else>>this week's<</if>> baby. Her child is promptly taken and she is encouraged to keep resting. She rolls over, cradling her heavily rounded middle, and dozes off. + <<else>> + $slaves[$i].slaveName is awoken from her rest by a moist sensation followed by a contraction. She rolls over and clutches her gravid belly as another contraction wracks her body. + <<ClothingBirth>> + She struggles to collect her child and places them in the cradle readied for her. She is helped to the shower as your servants clean up and remove her child. + <</if>> <</if>> <<else>> <<if $slaves[$i].fetish == "mindbroken">> - She returns to her bed and strips before slipping into it. Instinctively, she begins to push out <<if $slaves[$i].birthsTotal == 0>> her first<<else>>this week's<</if>> baby. Her child is promptly taken and she is encouraged to keep resting. She runs her hands across the still huge dome of her middle; to her, gravidity and birth is nothing out of the ordinary. + <<if (random(1,20) > $suddenBirth)>> + She returns to her bed and strips before slipping into it. Instinctively, she begins to push out <<if $slaves[$i].birthsTotal == 0>> her first<<else>>this week's<</if>> baby. Her child is promptly taken and she is encouraged to keep resting. She runs her hands across the still huge dome of her middle; to her, gravidity and birth is nothing out of the ordinary. + <<else>> + $slaves[$i].slaveName is awoken from her rest by a strong contraction. She rolls over and begins to fall back to sleep as another contraction wracks her body. + <<ClothingBirth>> + She fishes around under her still huge dome of a stomach searching for her newborn. Once she finds it, she draws it to her breast and resumes resting. + <</if>> <<else>> - She returns to her bed and strips before slipping into it. She makes herself comfortable and begins working on birthing <<if $slaves[$i].birthsTotal == 0>> her first<<else>>this week's<</if>> baby. Her child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and she is encouraged to keep resting. She rolls over, cradling her heavily rounded middle, and dozes off. + <<if (random(1,20) > $suddenBirth)>> + She returns to her bed and strips before slipping into it. She makes herself comfortable and begins working on birthing <<if $slaves[$i].birthsTotal == 0>> her first<<else>>this week's<</if>> baby. Her child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and she is encouraged to keep resting. She rolls over, cradling her heavily rounded middle, and dozes off. + <<else>> + $slaves[$i].slaveName is awoken from her rest by a moist sensation followed by a contraction. She rolls over and clutches her gravid belly as another contraction wracks her body. + <<ClothingBirth>> + She struggles to collect her child and places them in the cradle readied for her. She hefts her still gravid body out of bed to take a shower as your servants clean up and remove her child. + <</if>> <</if>> <</if>> diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw index bc5fc62a081..436c7495d62 100644 --- a/src/utility/birthWidgets.tw +++ b/src/utility/birthWidgets.tw @@ -1231,7 +1231,7 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i]. <<set _clothesSeed += 20>> <</if>> <<if $slaves[$i].induce == 1>> - <<set $suddenBirth += 90>> + <<set _clothesSeed += 90>> <</if>> <<switch $slaves[$i].clothes>> @@ -1263,11 +1263,6 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i]. <</switch>> -<<if $slaves[$i].broodmother == 2>> - <<set $undressed = 1>> -<</if>> - - <<if $undressed == 0 && $slaves[$i].clothes != "no clothing" && $slaves[$i].clothes != "body oil">> <<if $slaves[$i].mpreg == 1>> @@ -1276,7 +1271,7 @@ Her helper arrives with aid far too late. She screams when she sees $slaves[$i]. <<case "attractive lingerie">> <<if $slaves[$i].fetish == "mindbroken">> - Instinctively she begins to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to who may be watching. Her g-string stretches as her baby crowns into it before finally snapping and clearing the way for her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. + Instinctively she begins to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to who may be watching. Her g-string stretches as her baby crowns into it before finally snapping and clearing the way for her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. <<else>> Quickly she spreads her legs apart and shifts her g-string aside before beginning to push out her bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. She can't hide what's happening between her legs, <<if $slaves[$i].fetish == "humiliation">>but that only makes it more exciting<<else>>so she bears with it<</if>>. <</if>> -- GitLab