diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 2793c258b7a2c9448440b5908e69a288919ae055..301a308bf76718a83d5c01c477e8c11895f046f1 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,8 +2,26 @@
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
+ -unbroken slaves' deovtion loss due to knocking you up now increases in severity the more times it happens
+ -fixed minor text issues
+ -spellchecked the patch notes this time
+
+ 351
+ -minor text fixes
+ -slaver background now starts with discounted starting girls
+
+ 350
+ -player pregnancy postpartum state active
+
349
-minor text fixes
diff --git a/devTools/BuildAndIPFSify.sh b/devTools/BuildAndIPFSify.sh
index 09a3be7d79f6e65cbfad3d3c8f6c887873e694f9..337b3e429d5d6e73ccf3fad849a0e9050ca7010b 100755
--- a/devTools/BuildAndIPFSify.sh
+++ b/devTools/BuildAndIPFSify.sh
@@ -4,6 +4,10 @@
# add this to crontab:
# */15 * * * * cd ~/FC/fc-pregmod && git pull --ff-only origin pregmod-master > ~/FC/git_pull.log 2>&1
# and do "ln -s ~/FC/fc-pregmod/devTools/BuildAndIPFSify.sh .git/hooks/post-merge"
+# NOTE: you may need to define XDG_RUNTIME_DIR in your crontab
+
+# TODO: add logic to figure out if we should use ipfs-cluster instead of using the local instance directly.
+# if we use ipfs-cluster we probably don't need to warm ipfs.io's cache.
rm bin/*.html
@@ -33,15 +37,29 @@ sed -Ei -e '/^ \* Built on .+$/d' bin/*.html
# add the date of the last commit to the file, but don't use colons because Windows (still?) doesn't like them
mv bin/*.html "bin/FC pregmod $(git log -1 --format='%cd' --date='format:%F %H-%M').html"
-# add the vector art if it is available
-ipfs_hash="nothing"
-if [ -e ../resources ]; then
- ipfs_hash="$(ipfs add -w -Q -r bin/*.html ../resources)"
-else
- ipfs_hash="$(ipfs add -w -Q bin/*.html)"
-fi
+# include the unembedded vector art
+ipfs_hash="$(ipfs add -w -Q -r bin/*.html resources)"
echo "IPFS Folder Hash: ${ipfs_hash}" > ../IPFS_hash.txt
ipfs name publish "$ipfs_hash"
# when it's done it will print something like "Published to $your_pubkey: /ipfs/$ipfs_hash"
# You can view the folder at http://127.0.0.1:8080/ipns/$your_pubkey
+
+# make ipfs.io cache the files
+# $XDG_RUNTIME_DIR SHOULD be defined, but there are cases where it wouldn't be
+if [ -z "${XDG_RUNTIME_DIR+x}" ]; then
+ echo "\$XDG_RUNTIME_DIR is unset, bailing"
+ exit 2
+fi
+
+# throw it into a file so we can loop over lines, not "strings delimited by whitespace"
+find resources bin -print | grep -ve '.gitignore' | sed -e 's|bin/||' | grep -Ee '.+\.svg' -e '.html' > "${XDG_RUNTIME_DIR}/files.list"
+
+# ipfs PeerID, it's user specific
+PeerID="$(ipfs config show | grep -e 'PeerID' | cut -d: -f 2 | tr -d ' "')"
+while IFS= read -r item
+do
+ echo "https://ipfs.io/ipns/${PeerID}/${item}"
+done < "${XDG_RUNTIME_DIR}/files.list" | xargs --max-procs=10 --max-args=1 --replace curl --silent --show-error --range 0-499 --output /dev/null '{}'
+
+rm "${XDG_RUNTIME_DIR}/files.list"
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index f7caaedbd1d2cbac54a80f41af0ceb4003900967..7d9eea62a1874d1166f728c3ee8ad70c1bc74d88 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 3b953d7d1d520bc962ae987f371d494f8170e6b6..bea1a9cb386989f6cd4d3e43e5f84da373504713 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/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 1f50366f554b7d3f0a3340ad967bc63dc98321e7..5f9cdca3a6b74f284f9997a241eff8a8448c4cd4 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -5,6 +5,9 @@
<<if ($PC.dick == 1) && ($PC.vagina == 1) && ($seeDicks != 0 || $makeDicks == 1)>>
Since you have both a penis and a vagina yourself, you've obviously had access to a source of advanced surgery and organ farming. @@.springgreen;Slaves get a smaller cost increase here for having both penises and vaginas, and for having both testicles and ovaries.@@
<</if>>
+ <<if $PC.career == "slaver">>
+ Since you personally saw to the capture, breaking and or training of these slaves, @@.springgreen;they cost half of what they normally would have here.@@
+ <</if>>
<<if $slaves.length == 1>>
You have one slave already committed.
<<elseif $slaves.length > 1>>
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index fd99202af0e71f675c706239120fcdcfdb5ac3ac..22a548c5776fdf1992892e1a2b06924c2f2afdb8 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/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 8bb50c9e5daed433b79bbdfc956c146827e4bd44..1d97c06bba8c0e9c32ac2de9990c33f816855e46 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -320,7 +320,7 @@ __Contraceptives and Fertility__
<<elseif $PC.preg >= 39>>
Your due date is looming, but your child doesn't seem to be interested in coming out just yet. [[Induce childbirth|Manage Personal Affairs][$PC.labor = 1]]
<<elseif $PC.pregKnown == 1 && $PC.pregSource != -1>>
- You're pregnant, something rather unbecoming for an arcology owner. <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregType = 0, $PC.pregSource = 0, $PC.belly = 0, $PC.pregKnown = 0>><<print "You take a syringe filled with abortifacients and make your self comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
+ You're pregnant, something rather unbecoming for an arcology owner. <<link "Abort your child">><<replace "#miniscene">><<set $PC.preg = 0, $PC.pregWeek == -2, $PC.pregType = 0, $PC.pregSource = 0, $PC.belly = 0, $PC.pregKnown = 0>><<print "You take a syringe filled with abortifacients and make your self comfortable. Injecting the vial through your belly into your womb, your close your eyes and wait for what is coming. Once you feel it is over, you clean yourself up and go on your way, child free.">><br> <</replace>><</link>>
<</if>>
</span>
@@ -382,7 +382,9 @@ In total, you have given birth to:
<<elseif $PC.preg > 1>>
You've missed your period. This could be bad.
<<elseif $PC.preg > 0 && $PC.pregSource != -1>>
- Your fertile pussy has been thoroughly seeded, there is a chance you are pregnant. [[Pop some morning after pills|Manage Personal Affairs][$PC.preg = 0, $PC.pregKnown = 0, $PC.pregType = 0]]
+ Your fertile pussy has been thoroughly seeded, there is a chance you are pregnant. [[Pop some morning after pills|Manage Personal Affairs][$PC.preg = 0, $PC.pregWeek == 0, $PC.pregKnown = 0, $PC.pregType = 0]]
+<<elseif $PC.pregWeek < 0>>
+ You're still recovering from your recent pregnancy.
<<elseif $PC.preg == -2>>
You're menopausal. Your time to bear children has passed.
<<elseif $PC.preg == -1>>
@@ -414,7 +416,7 @@ In total, you have given birth to:
<</if>>
<</if>>
-<<if $PC.preg == 0>>
+<<if $PC.preg == 0 && $PC.pregWeek == 0>>
<<if $dairyPiping == 1 && ($cumSlaves > 0 || $arcologies[0].FSPastoralistLaw == 1)>>
<<if $PC.cumTap == 0>>
diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw
index d7cf9491bb1d21ce07b94ac8ace505155bd42102..1951330fce7222b4cd85666c1fbd91d938a4d64c 100644
--- a/src/pregmod/saAgent.tw
+++ b/src/pregmod/saAgent.tw
@@ -362,10 +362,10 @@
<</if>>
<<if ($slaves[$i].preg > 37) && ($slaves[$i].broodmother == 0) && (random(1,100) > 90)>>
- <<set $slaves[$i].birthsTotal += $slaves[$i].pregType, $slaves[$i].preg = 0, $slaves[$i].pregWeek = 0, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0>>
+ <<set $slaves[$i].birthsTotal += $slaves[$i].pregType, $slaves[$i].preg = 0, $slaves[$i].pregWeek = -4, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0>>
<<SetBellySize $slaves[$i]>>
<<elseif ($slaves[$i].preg > 41) && ($slaves[$i].broodmother == 0)>>
- <<set $slaves[$i].birthsTotal += $slaves[$i].pregType, $slaves[$i].preg = 0, $slaves[$i].pregWeek = 0, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0>>
+ <<set $slaves[$i].birthsTotal += $slaves[$i].pregType, $slaves[$i].preg = 0, $slaves[$i].pregWeek = -4, $slaves[$i].pregSource = 0, $slaves[$i].pregType = 0, $slaves[$i].pregKnown = 0>>
<<SetBellySize $slaves[$i]>>
<<elseif ($slaves[$i].preg > 37) && ($slaves[$i].broodmother > 0)>>
<<if $slaves[$i].broodmother > 2>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 2f579c3e61215ffb5e575b2ac7673a58bba96f2a..4a40289c02fb13078b428fa189a274abd23c06b3 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -565,6 +565,9 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<</if>> /*closes gaveBirth*/
<</if>> /*closes SE*/
-
-
<<set $badBirth = 0, $PC.pregSource = 0, $PC.pregType = 0, $seed = 0, $babyGender = 0, $PC.belly = 2000>>
+<<if $PC.career == "servant">>
+ <<set $PC.pregWeek = -3>>
+<<else>>
+ <<set $PC.pregWeek = -4>>
+<</if>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 5129322cd669f7c045f0c4a2a6a2357d1330be0d..7ee7df538576896d0c786e252079d919be68c3ef 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1369,7 +1369,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<<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 $reservedChildren -= $slaves[$i].reservedChildren>>
<<set $slaves[$i].reservedChildren = 0>>
@@ -1806,7 +1806,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<<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 $reservedChildren -= $slaves[$i].reservedChildren>>
<<set $slaves[$i].reservedChildren = 0>>
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index e5f6027fba5716c5c9c76015d0859eb9277d1d16..551e8e1868ddd1a3af4a805fa3e42983b2a39aa2 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/RESS.tw b/src/uncategorized/RESS.tw
index 3078e4d1dd18a06d0c3131b2a2a679a28efa41ce..cdcbdfe6ce0c2418fe1e21f6f8de50b57ac6dcbf 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -6195,7 +6195,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<</link>>
<</if>>
<<if ($activeSlave.toyHole == "dick" || $sexualOpeness == 1) && canPenetrate($activeSlave)>>
-<<link "Invite her 'in'">>
+<br><<link "Invite her 'in'">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
There's a glint <<if !canSee($activeSlave)>>on her face as she hears<<else>>in her eyes as she sees<</if>> you stand up from your desk and saunter over;
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index e70748a404de29d94d1e2408f7aac805f027c315..64ae1aaa0d20eb2326777f6e6ae3eb62d9740993 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -439,7 +439,7 @@ $dairyNameCaps
Cows will not undergo surgical procedures to maximize production.
[[Maximize production in all cattle|Dairy][$dairyImplantsSetting = 1]] | [[Maximize production in only milkable cows|Dairy][$dairyImplantsSetting = 0]]
<<else>>
- Natuarally lactating cows, cows with non-lactating breasts, and cows incapable of producing cum will undergo lactation implant surgery to increase their milk output.
+ Naturally lactating cows, cows with non-lactating breasts, and cows incapable of producing cum will undergo lactation implant surgery to increase their milk output.
[[Maximize lactation in all cattle|Dairy][$dairyImplantsSetting = 1]] | [[Restrict maximization surgery on cattle|Dairy][$dairyImplantsSetting = 2]]
<</if>>
<<else>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 5999e06504ac8730e81e8289d356a4843fa37004..2b91c0ca55d41bbe07a6dc32e862f221eea095c9 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -136,7 +136,7 @@
<<set $PC.sexualEnergy += 2>>
<</if>>
<<if $PC.preg > 0>>
- <<set $PC.preg++>>
+ <<set $PC.preg++, $PC.pregWeek = $PC.preg>>
<<set _newBelly = getPregBellySize($PC)>>
<<if _newBelly >= $PC.belly>>
<<set $PC.belly = _newBelly>>
@@ -153,6 +153,9 @@
<<set $PC.belly *= .75>>
<</if>>
<</if>>
+<<if $PC.pregWeek < 0>>
+ <<set $PC.pregWeek++>>
+<</if>>
<<set $HGEnergy = 0, $HGCum = 0, $HGSlaveSuccess = 0, $HeadGirl = 0, $Recruiter = 0, $Madam = 0, $madamCashBonus = 0, $DJ = 0, $DJRepBonus = 0, $Milkmaid = 0, $Collectrix = 0, $Stewardess = 0, $Schoolteacher = 0, $Wardeness = 0, $Concubine = 0, $Attendant = 0, $Nurse = 0, $Bodyguard = 0, $fuckSlaves = 0, $freeSexualEnergy = 0, $publicServants = 0, $cumSlaves = 0, $averageDick = 0, $slavesWithWorkingDicks = 0>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index e9b06491aaf1e8268c2a0829d164585f00e91b87..b34c35b67b87e15d63dd954ba87132c5ca02854d 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -1024,7 +1024,7 @@
<<if $goodImageCampaign == 0>>
<br>''Good Image Campaign:'' positive rumors will be spread throughout the arcology regarding you.
[[Implement|Policies][$goodImageCampaign = 1, $cash -=5000, $rep -= 1000]]
- <br> //Will cost <<print cashFormat($policyCost)>> weekly to maintain, and lesson any potential rumors about you while giving a small boost to your reputation//
+ <br> //Will cost <<print cashFormat($policyCost)>> weekly to maintain, and lessen any potential rumors about you while giving a small boost to your reputation//
<</if>>
<<if $seePreg != 0>>
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index 60175a32cfaa69da4f0f45d9f44caea7a31450c1..12a5e5e14fbaecd00ca6311d06d963e23e1f5d90 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -101,11 +101,12 @@
<</if>>
<<if $slaves[$i].PCKnockedUp > 0 && $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0 && $slaves[$i].devotion < -20>>
- She got you pregnant and she knows it. This is a @@.mediumorchid;huge boost@@ to her ego and gives her a slight edge on you.
- <<set $slaves[$i].devotion -= 10>>
+ <<set _pregCountFactor = $slaves[$i].PCKnockedUp*5>>
+ She got you pregnant<<if $slaves[$i].PCKnockedUp > 1>> more than once<</if>> and she knows it. This is a @@.mediumorchid;huge boost@@ to her ego and gives her a slight edge on you.
+ <<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 -= 10, $slaves[$i].trust += 10>>
+ <<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 010bd9bc89a21bdff2aa8415c0aaf7522ff9c101..63ace2b8fba10a7f42528b5eb7ca16e8e3b18e22 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -549,7 +549,7 @@
$pronounCap has potent sperm. @@.yellow;$possessiveCap drug regimen has been ended.@@
<<set $slaves[$i].drugs = "no drugs">>
<<else>>
- The intense hormonal injections leave $possessive @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system.
+ The intense hormonal injections leave $object @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system.
<<set $slaves[$i].chem += 20>>
<<set $slaves[$i].health -= 10>>
<<if $slaves[$i].energy > 5>>
@@ -562,7 +562,7 @@
$pronounCap has begun ovulating. @@.yellow;$possessiveCap drug regimen has been ended.@@
<<set $slaves[$i].drugs = "no drugs">>
<<else>>
- The intense hormonal injections leave $possessive @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system.
+ The intense hormonal injections leave $object @@.red;sickened and weak@@ as $possessive body struggles to adapt to the overwhelming chemicals flooding $possessive system.
<<set $slaves[$i].chem += 20>>
<<set $slaves[$i].health -= 10>>
<<if $slaves[$i].energy > 5>>
@@ -681,18 +681,18 @@
$possessiveCap outward age has regressed to the point that the creams will have little effect. Since they can't be improved with further drug treatment, @@.yellow;$possessive drug regimen has been ended.@@
<<set $slaves[$i].drugs = "no drugs">>
<<else>>
- The skin creams @@.lime;soothe $possessive aging skin@@ leaving $possessive looking younger, though the effects are only skin deep.
+ The skin creams @@.lime;soothe $possessive aging skin@@ leaving $object looking younger, though the effects are only skin deep.
<<set $slaves[$i].visualAge -= 1>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialist != "unset">>
<<if $slaves[$i].visualAge > 30>>
- $pronounCap @@.mediumaquamarine;trusts you more@@ for allowing $possessive to fit in better with society and not be singled out for $possessive looks.
+ $pronounCap @@.mediumaquamarine;trusts you more@@ for allowing $object to fit in better with society and not be singled out for $possessive looks.
<<set $slaves[$i].trust += 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
<<if $slaves[$i].visualAge > 30>>
- $pronounCap is @@.gold;terrified@@ that $possessive fading age will single $possessive out for abuse in your society.
+ $pronounCap is @@.gold;terrified@@ that $possessive fading age will single $object out for abuse in your society.
<<set $slaves[$i].trust -= 2>>
<</if>>
<</if>>
@@ -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 $object no good.
+ <<elseif $slaves[$i].pregWeek < 0>>
+ $pronounCap's still recovering from a recent pregnancy, so the fertility drugs $pronoun's on do $object 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>>
@@ -711,13 +713,13 @@
The fertility drugs $pronoun's on are pointless, since $pronoun's already lactating and it's impossible to impregnate $possessive butthole. That's no reason not to try, of course.
<</if>>
<<elseif ($slaves[$i].preg < -1)>>
- $pronounCap's sterile, so the fertility drugs $pronoun's on do $possessive no good.
+ $pronounCap's sterile, so the fertility drugs $pronoun's on do $object no good.
<<elseif ($slaves[$i].ovaries == 0) && ($slaves[$i].mpreg != 1)>>
- $pronounCap's barren, so the fertility drugs $pronoun's on do $possessive no good.
+ $pronounCap's barren, so the fertility drugs $pronoun's on do $object no good.
<<elseif ($slaves[$i].pubertyXX == 0) && (($slaves[$i].ovaries == 1) || ($slaves[$i].mpreg == 1))>>
- $pronounCap's prepubescent, so the fertility drugs $pronoun's on do $possessive no good.
+ $pronounCap's prepubescent, so the fertility drugs $pronoun's on do $object no good.
<<elseif ($slaves[$i].preg == -1)>>
- $pronounCap's on contraceptives, so the fertility drugs $pronoun's on do $possessive no good.
+ $pronounCap's on contraceptives, so the fertility drugs $pronoun's on do $object no good.
<<else>>
$pronounCap's on super fertility drugs, so $pronoun is more likely to conceive, and will have multiple pregnancy.
<</if>>
@@ -726,17 +728,19 @@
<<set $slaves[$i].lactation = 1>>
<</if>>
<<if $slaves[$i].attrXY < 100 && random(0,10) < $slaves[$i].health>>
- The hormonal changes produced by the fertility drugs cause $possessive to begin @@.green;finding men more attractive.@@
+ The hormonal changes produced by the fertility drugs cause $object to begin @@.green;finding men more attractive.@@
<<set $slaves[$i].attrXY += random(5,10)>>
<</if>>
<<if $slaves[$i].energy < 85 && random(0,10) < $slaves[$i].health>>
- The hormonal changes produced by the fertility drugs cause $possessive to @@.green;begin craving sex more.@@
+ The hormonal changes produced by the fertility drugs cause $object to @@.green;begin craving sex more.@@
<<set $slaves[$i].energy += 2>>
<</if>>
<<case "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 $object no good.
+ <<elseif $slaves[$i].pregWeek < 0>>
+ $pronounCap's still recovering from a recent pregnancy, so the fertility drugs $pronoun's on do $object 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>>
@@ -966,7 +970,7 @@
<<if $slaves[$i].health <= -100>>
$possessiveCap critically poor health @@.orange;caused her to miscarry.@@
<<if lastPregRule($slaves[$i],$defaultRules)>><<set $slaves[$i].preg = -1>><<else>><<set $slaves[$i].preg = 0>><</if>>
- <<set $slaves[$i].pregType = 0, $slaves[$i].pregSource = 0, $slaves[$i].pregWeek = 0, $slaves[$i].pregKnown = 0>><<SetBellySize $slaves[$i]>>
+ <<set $slaves[$i].pregType = 0, $slaves[$i].pregSource = 0, $slaves[$i].pregWeek = -4, $slaves[$i].pregKnown = 0>><<SetBellySize $slaves[$i]>>
<<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
$pronounCap is
<<if $slaves[$i].devotion < -50>>
@@ -1019,7 +1023,7 @@
<</if>>
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].fetish != "mindbroken">>
- $pronounCap @@.mediumaquamarine;trusts you more@@ for giving $possessive access to expensive modern medicine.
+ $pronounCap @@.mediumaquamarine;trusts you more@@ for giving $object access to expensive modern medicine.
<<set $slaves[$i].trust += 1>>
<</if>>
<</if>>
@@ -1207,14 +1211,14 @@
<</if>>
<<case "testicle enhancement" "intensive testicle enhancement">>
<<if ($slaves[$i].balls >= 10)>>
- $possessiveCap balls are now so huge that further drug enhancement will not increase their size. However, leaving $possessive on them will still stimulate cum production.
+ $possessiveCap balls are now so huge that further drug enhancement will not increase their size. However, leaving $object on them will still stimulate cum production.
<<elseif ($slaves[$i].balls >= 2) && ($slaves[$i].scrotum == 0)>>
$possessiveCap balls are now functionally sized, and cannot sustainably grow larger hidden within $possessive abdomen. @@.yellow;$possessiveCap drug regimen has been ended.@@
<<set $slaves[$i].balls = Math.clamp($slaves[$i].balls,0,2), $slaves[$i].drugs = "no drugs">>
<</if>>
<<case "psychosuppressants">>
<<if ($slaves[$i].intelligence <= -2)>>
- $pronounCap is so moronic that drug treatment can't really make $possessive more willing to obey others than $pronoun already is. @@.yellow;$possessiveCap drug regimen has been ended.@@
+ $pronounCap is so moronic that drug treatment can't really make $object more willing to obey others than $pronoun already is. @@.yellow;$possessiveCap drug regimen has been ended.@@
<<set $slaves[$i].drugs = "no drugs">>
<</if>>
<</switch>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index f1650e7e7d68099acd97b20f5dccfcda9b740084..b7fccf097a628a77fa8f1c20cbf6c724c8e362f5 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 161a8bf206acbd863101d8e6a028d1a84d554f8d..f9b97baa098dcdd91bb0de02bd35e8e0a66accc1 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 eae7a0ef70b0e5e03c4e496553de9052b7a8b473..eef5961155f48dcf53af609e89f1aabeebb477a5 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 c4de059f668151fe10e8636cf5bc50c040f021af..d247417e87ab0142e207f7e992804946e5abe608 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 91d48616ad8631ab8d9666dbb8f3c7fca2e555bd..5f02558b54160a3af12bbec40921880de0182be1 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 318702dc96c7d6b5a6616b0764c85908ed570cff..2144a93719c56f9f1344e444067356473a40a440 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>>
@@ -2312,4 +2318,8 @@
<<set $slaveCost = 500*Math.trunc($slaveCost/500)>>
<</if>>
+<<if $PC.career == "slaver">>
+ <<set $slaveCost = $slaveCost*.5>>
+<</if>>
+
<</widget>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index d7d939cb1d4d5c8b4bc567b797d08bf263b2578d..98b14b42d9933b49da201a460a596a37df5ba852 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 ae40e293d4ed38cdcdf90419bcbf9fba89dffc47..02fada5553c301b8c3ca2856ccb15c00cbc29879 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)>>