From 03ce1dcef569c8f2d91978d5246c8876bd8fd1e8 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 15 Feb 2018 01:50:20 -0500 Subject: [PATCH] postpartum state --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 ++++++ slave variables documentation - Pregmod.txt | 2 +- src/npc/abort.tw | 1 + src/pregmod/birthStorm.tw | 1 + src/pregmod/widgets/slaveSummaryWidgets.tw | 4 ++++ src/uncategorized/saDevotion.tw | 2 +- src/uncategorized/saDrugs.tw | 6 +++++- src/uncategorized/saLongTermEffects.tw | 12 +++++++++--- src/uncategorized/seBirth.tw | 10 +++++----- src/uncategorized/sellSlave.tw | 3 +++ src/uncategorized/slaveAssignmentsReport.tw | 3 +++ src/uncategorized/slaveInteract.tw | 12 ++++++++---- src/utility/assayWidgets.tw | 8 +++++++- src/utility/descriptionWidgetsFlesh.tw | 2 ++ src/utility/miscWidgets.tw | 9 ++++++--- 15 files changed, 62 insertions(+), 19 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index dca4fa9d917..301a308bf76 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.0/1 +2/15/18 + + 353 + -slaves now experience a postpartum state post pregnancy + It takes four weeks normally to end and during which they suffer a percentage reduction to FResult that deminishes each week until their normal cycle begins anew. + 2/14/18 352 diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index f7caaedbd1d..7d9eea62a18 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -2260,7 +2260,7 @@ Do you and the slave know she is pregnant. pregWeek: -How long she has been pregnant (used in place of .preg when pregnancy speed up and slow down are used on a slave) +How long she has been pregnant (used in place of .preg when pregnancy speed up and slow down are used on a slave) (if negative, designates postpartum.) accepts int belly: diff --git a/src/npc/abort.tw b/src/npc/abort.tw index 3b953d7d1d5..bea1a9cb386 100644 --- a/src/npc/abort.tw +++ b/src/npc/abort.tw @@ -35,4 +35,5 @@ The remote surgery makes aborting a pregnancy quick and efficient. $activeSlave. <<set $activeSlave.pregType = 0>> <<set $activeSlave.pregSource = 0>> <<set $activeSlave.pregKnown = 0>> +<<set $activeSlave.pregWeek = -2>> <<SetBellySize $activeSlave>> diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw index fd99202af0e..22a548c5776 100644 --- a/src/pregmod/birthStorm.tw +++ b/src/pregmod/birthStorm.tw @@ -58,6 +58,7 @@ The remote surgery allows the removal of the pregnancy generator through convent <<set $birthsTotal += 8>> <</if>> <<set $activeSlave.preg = -3>> +<<set $activeSlave.pregWeek = -4>> <<set $activeSlave.pregType = 0>> <<set $activeSlave.pregSource = 0>> <<set $activeSlave.pregKnown = 0>> diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw index e5f6027fba5..551e8e1868d 100644 --- a/src/pregmod/widgets/slaveSummaryWidgets.tw +++ b/src/pregmod/widgets/slaveSummaryWidgets.tw @@ -483,6 +483,8 @@ Release rules: _Slave.releaseRules. ''Prepub'' <<elseif _Slave.ovaryAge >= 47 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>> ''Meno'' + <<elseif _Slave.pregWeek < 0>> + ''Postpartum'' <<elseif _Slave.preg == -1>> ''CC'' <<elseif _Slave.preg == 0 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>> @@ -546,6 +548,8 @@ Release rules: _Slave.releaseRules. Not ovulating yet. <<elseif _Slave.ovaryAge >= 47 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>> Menopausal. + <<elseif _Slave.pregWeek < 0>> + Postpartum. <<elseif _Slave.preg == -1>> On contraceptives. <<elseif _Slave.preg == 0 && (_Slave.ovaries == 1 || _Slave.mpreg == 1)>> diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw index e50ea0de987..12a5e5e14fb 100644 --- a/src/uncategorized/saDevotion.tw +++ b/src/uncategorized/saDevotion.tw @@ -106,7 +106,7 @@ <<set $slaves[$i].devotion -= _pregCountFactor>> <<if $slaves[$i].PCChildrenFathered > 0>> Even better; you gave birth to her child<<if $slaves[$i].PCChildrenFathered > 1>>ren<</if>>. To her, she is the dominant force and you are just a bitch to be bred. She could create a scandal if she started running her mouth, something she lords over you every chance she gets under the assumption that @@.mediumaquamarine;you'll try to appease her to keep her quiet.@@ - <<set $slaves[$i].devotion -= _pregCountFactor, $slaves[$i].trust += _pregCountFactor>> + <<set $slaves[$i].devotion -= 5+_pregCountFactor, $slaves[$i].trust += 5+_pregCountFactor>> <</if>> <</if>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 010bd9bc89a..483ee6b86a3 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -700,7 +700,9 @@ <<case "super fertility drugs">> <<if $slaves[$i].pregKnown == 1>> - $pronounCap's already pregnant, so the fertility drugs $pronoun's on do $possessive no good. + $pronounCap's already pregnant, so the fertility drugs $pronoun's on do $possessive no good. + <<elseif $slaves[$i].pregWeek < 0>> + $pronounCap's still recovering from a recent pregnancy, so the fertility drugs $pronoun's on do $possessive little good. <<elseif ($slaves[$i].preg > 1)>> Despite being on intense fertility drugs, $pronoun shows no signs of increased fertility. Cursory tests reveal that @@.lime;$pronoun has a bun already in the oven.@@ <<set $slaves[$i].pregKnown = 1>> @@ -737,6 +739,8 @@ <<case "fertility drugs">> <<if $slaves[$i].pregKnown == 1>> $pronounCap's already pregnant, so the fertility drugs $pronoun's on do $possessive no good. + <<elseif $slaves[$i].pregWeek < 0>> + $pronounCap's still recovering from a recent pregnancy, so the fertility drugs $pronoun's on do $possessive little good. <<elseif ($slaves[$i].preg > 1)>> Despite being on intense fertility drugs, $pronoun shows no signs of increased fertility. Cursory tests reveal that @@.lime;$pronoun has a bun already in the oven.@@ <<set $slaves[$i].pregKnown = 1>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index f1650e7e7d6..b7fccf097a6 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -483,7 +483,7 @@ The tight corseting has @@.orange;caused her to miscarry,@@ which @@.red;damages her health.@@ <<set $slaves[$i].health -= 20>> <<if lastPregRule($slaves[$i],$defaultRules)>><<set $slaves[$i].preg = -1>><<else>><<set $slaves[$i].preg = 0>><</if>> - <<set $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0, $slaves[$i].pregWeek = 0>> + <<set $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0, $slaves[$i].pregWeek = -4>> <<SetBellySize $slaves[$i]>> <<if $slaves[$i].reservedChildren > 0>><<set $reservedChildren -= $slaves[$i].reservedChildren>><<set $slaves[$i].reservedChildren = 0>><</if>> She is @@ -795,7 +795,7 @@ The dildo penetrating her womb @@.orange;caused her to miscarry,@@ which @@.red;damages her health.@@ <<set $slaves[$i].health -= 20>> <<if lastPregRule($slaves[$i],$defaultRules)>><<set $slaves[$i].preg = -1>><<else>><<set $slaves[$i].preg = 0>><</if>> - <<set $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0, $slaves[$i].pregWeek = 0>> + <<set $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0, $slaves[$i].pregWeek = -4>> <<SetBellySize $slaves[$i]>> She is <<if $slaves[$i].devotion < -50>> @@ -2237,6 +2237,9 @@ She @@.mediumorchid;loathes@@ being forced to carry a fake pregnancy. <<set _para = -1>> <<set $slaves[$i].devotion -= 3>> + <<elseif $slaves[$i].pregWeek < 0>> + Her paraphilia is temporarily sated by her recent pregnancy, though she anxiously counts the days until she can get pregnant again. + <<set _para = 1>> <<else>> She isn't pregnant, leaving the breeder slut @@.mediumorchid;depressed and anxious.@@ <<set _para = -1>> @@ -2363,7 +2366,7 @@ <<elseif $slaves[$i].pregControl == "speed up">> Her life used to revolve around being pregnant all the time and nothing has changed. She @@.gold;watches in horror@@ as her middle visibly swells before her eyes. She @@.hotpink;slips more into submission@@ as the pressure in her womb increases. <<set $slaves[$i].trust -= 10, $slaves[$i].devotion += 5>> - <<elseif $slaves[$i].pregKnown == 1>> + <<elseif $slaves[$i].pregKnown == 1 || $slaves[$i].pregWeek < 0>> Her life used to revolve around being pregnant all the time and nothing has changed. She @@.gold;fears@@ that her entire life will revolve around pregnancy and @@.hotpink;slips more into submission@@ of her fate. <<set $slaves[$i].trust -= 1, $slaves[$i].devotion += 1>> <<else>> @@ -5041,6 +5044,9 @@ <<elseif setup.fakeBellies.includes($bellyAccessory)>> Society is @@.green;placated@@ by $slaves[$i].slaveName's fake belly. <<set $repGain += 0.01*$FSSingleSlaveRep>> + <<elseif $slaves[$i].pregWeek < 0>> + Society is @@.green;pleased@@ by $slaves[$i].slaveName's recent birth. + <<FSChangePorn "Repopulationist" 2>> <<elseif ($slaves[$i].ovaries == 0 && $slaves[$i].mpreg == 0) || ($slaves[$i].preg < -1) || ($slaves[$i].pubertyXX == 0)>> Society is @@.red;mildly disappointed@@ that $slaves[$i].slaveName is unable to become pregnant. <<FSChangePorn "Repopulationist" -1>> diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index 161a8bf206a..f9b97baa098 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -336,7 +336,7 @@ As a human cow, $pronoun @@.orange;gave birth@@<<if $slaves[$i].broodmother > 1> <<set $slaves[$i].pregType = 0>> <<set $slaves[$i].pregSource = 0>> <<set $slaves[$i].pregKnown = 0>> - <<set $slaves[$i].pregWeek = 0>> + <<set $slaves[$i].pregWeek = -4>> <<set $slaves[$i].broodmother = 0>> <</if>> <</if>> @@ -352,7 +352,7 @@ As a human cow, $pronoun @@.orange;gave birth@@<<if $slaves[$i].broodmother > 1> <<set $slaves[$i].pregType = 0>> <<set $slaves[$i].pregSource = 0>> <<set $slaves[$i].pregKnown = 0>> - <<set $slaves[$i].pregWeek = 0>> + <<set $slaves[$i].pregWeek = -4>> <<SetBellySize $slaves[$i]>> <</if>> @@ -601,7 +601,7 @@ Since $possessive <<if $slaves[$i].mpreg == 1>>ass<<else>>vagina<</if>> was spar <<set $slaves[$i].pregType = 0>> <<set $slaves[$i].pregSource = 0>> <<set $slaves[$i].pregKnown = 0>> -<<set $slaves[$i].pregWeek = 0>> +<<set $slaves[$i].pregWeek = -4>> <<SetBellySize $slaves[$i]>> <<set $csec = 0>> @@ -1042,7 +1042,7 @@ Childbirth has @@.lime;stretched out $possessive vagina.@@ <<set $slaves[$i].pregType = 0>> <<set $slaves[$i].pregSource = 0>> <<set $slaves[$i].pregKnown = 0>> - <<set $slaves[$i].pregWeek = 0>> + <<set $slaves[$i].pregWeek = -4>> <<set $slaves[$i].broodmother = 0>> <</if>> <</if>> @@ -1063,7 +1063,7 @@ Childbirth has @@.lime;stretched out $possessive vagina.@@ <<set $slaves[$i].pregType = 0>> <<set $slaves[$i].pregSource = 0>> <<set $slaves[$i].pregKnown = 0>> - <<set $slaves[$i].pregWeek = 0>> + <<set $slaves[$i].pregWeek = -4>> <<SetBellySize $slaves[$i]>> <<if $slaves[$i].mpreg == 1>> <<if $slaves[$i].anus < 3>> diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw index eae7a0ef70b..eef5961155f 100644 --- a/src/uncategorized/sellSlave.tw +++ b/src/uncategorized/sellSlave.tw @@ -351,6 +351,9 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual <<if $activeSlave.mpreg == 1>> What's this strange organ listed here? She can become anally pregnant? That will certainly interest some buyers. <</if>> +<<if $activeSlave.pregWeek < 0>> + She seems a little uncomfortable with her holes being touched. By the feel of it, she is a new mother, no? A lack of receptivity will not go over well with buyers, it may more profitable to let her recover first. +<</if>> <<if $activeSlave.intelligence >= 3>> Her genius is probably going to bring in very generous bids. <<if $activeSlave.intelligenceImplant == 1>> diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index c4de059f668..d247417e87a 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -335,6 +335,9 @@ <<set $slaves[$i].pregKnown = 1>> <</if>> /* end of preg speed control changes*/ +<<if $slaves[$i].pregWeek < 0>> + <<set $slaves[$i].pregWeek++>> +<</if>> <<if $slaves[$i].devotion >= -50>> <<if $slaves[$i].energy > 20>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 91d48616ad8..5f02558b541 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1032,7 +1032,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1 //She is sterile// <<elseif ($activeSlave.pubertyXX == 0) && $activeSlave.preg < 1>> //She is not yet fertile// -<<elseif $activeSlave.physicalAge >= 47 && $activeSlave.preg < 1>> +<<elseif $activeSlave.ovaryAge >= 47 && $activeSlave.preg < 1>> //She is too old to become pregnant// <<if $activeSlave.preg == -1>> <<set $activeSlave.preg = 0>> @@ -1041,7 +1041,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1 <<elseif $activeSlave.broodmotherCountDown > 0>> //Her pregnancy implant is shutting down; she will be completely emptied of her remaining brood in $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>// <<elseif $activeSlave.preg >= -1>> -Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. +Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. <<if ($activeSlave.preg == 0)>> <<link "Use contraceptives">><<set $activeSlave.preg = -1>> <<SlaveInteractFertility>> @@ -1069,10 +1069,14 @@ Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<prin //It is sterile// <<elseif ($activeSlave.pubertyXX == 0)>> //It is not yet fertile// -<<elseif $activeSlave.physicalAge >= 47>> +<<elseif $activeSlave.ovaryAge >= 47 && $activeSlave.preg < 1>> //It is too old to become pregnant// + <<if $activeSlave.preg == -1>> + <<set $activeSlave.preg = 0>> + <<SetBellySize $activeSlave>> + <</if>> <<elseif ($activeSlave.preg >= -1)>> -__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. +__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. <<if ($activeSlave.preg == 0)>> <<link "Use contraceptives">><<set $activeSlave.preg = -1>> <<SlaveInteractFertility>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 864926d1551..2144a93719c 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -759,6 +759,8 @@ <<else>> <<set $beauty += 5*($arcologies[0].FSRepopulationFocus/50)>> /*10*/ <</if>> +<<elseif $args[0].pregWeek < 0>> + <<set $beauty += $arcologies[0].FSRepopulationFocus/10>> /*10*/ <<else>> <<set $beauty -= 2*($arcologies[0].FSRepopulationFocus/5)>> /*-40*/ <</if>> @@ -1035,7 +1037,7 @@ <</if>> <</if>> -<<if canTalk($args[0]) == false>> +<<if !canTalk($args[0])>> <<set $beauty -= 2>> <<else>> <<if ($args[0].accent >= 3)>> @@ -1383,6 +1385,10 @@ <<set $FResult = Math.trunc($FResult*0.7)>> <</if>> +<<if $args[0].pregWeek < 0>> + <<set $FResult = Math.trunc($FResult*((10+($args[0].pregWeek))*.10))>> /* should be reduced the msot just after birth and increase until normal */ +<</if>> + <<if $args[0].amp == 0>> <<elseif $args[0].amp == 1>> <<set $FResult -= 2>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index d7d939cb1d4..98b14b42d99 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -8005,6 +8005,8 @@ $pronounCap has <<if ($activeSlave.preg == -2) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0)>> <<elseif ($activeSlave.preg <= -2) && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>> $pronounCap is sterile. +<<elseif ($activeSlave.pregWeek < 0) && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>> + $pronounCap is recovering from $possessive recent pregnancy. <<elseif $activeSlave.preg == 0 && $activeSlave.vagina > -1>> <<if $activeSlave.pregType > 30>> $possessiveCap lower belly is noticeably bloated, $possessive breasts bigger and more sensitive, and $possessive pussy swollen and leaking fluids. $pronoun desperately needs a dick in $object and reminds you of a bitch in heat. diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index ae40e293d4e..02fada5553c 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -662,8 +662,8 @@ <<if $activeSlave.preg == -1>> <<set $activeSlave.preg = 0, $activeSlave.bellyPreg = 0>> <</if>> - <<elseif ($activeSlave.preg >= -1)>> - __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. + <<elseif ($activeSlave.preg >= -1)>> + __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. <<if ($activeSlave.preg == 0)>> <<link "Use contraceptives">><<set $activeSlave.preg = -1>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> <<elseif ($activeSlave.preg == -1)>> @@ -687,8 +687,11 @@ //It is not yet fertile// <<elseif $activeSlave.ovaryAge >= 47>> //It is too old to become pregnant// + <<if $activeSlave.preg == -1>> + <<set $activeSlave.preg = 0, $activeSlave.bellyPreg = 0>> + <</if>> <<elseif ($activeSlave.preg >= -1)>> - __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. + __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. <<if ($activeSlave.preg == 0)>> <<link "Use contraceptives">><<set $activeSlave.preg = -1>><<SlaveInteractFertility>><</link>> <<elseif ($activeSlave.preg == -1)>> -- GitLab