From e2ee1dff7eeddf4cb7d4ecbd5c7e8beb545df47c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 21 Nov 2018 23:00:53 -0500
Subject: [PATCH] fixes, application of surrogacy to slaves and a catch to
newChildIntro.tw to keep it from breaking over surrogate mothers and
incubated fathers.
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 ++
devNotes/twine JS.txt | 2 +-
src/pregmod/analyzePlayerPregnancy.tw | 24 +++++++++-------
src/pregmod/analyzePregnancy.tw | 4 +++
src/pregmod/managePersonalAffairs.tw | 2 +-
src/pregmod/newChildIntro.tw | 30 ++++++++++++--------
src/pregmod/personalNotes.tw | 2 +-
src/pregmod/sePlayerBirth.tw | 14 +++++----
src/pregmod/surrogacy.tw | 18 ++++++------
src/pregmod/surrogacyWorkaround.tw | 8 +++---
src/pregmod/widgets/seBirthWidgets.tw | 4 +--
src/uncategorized/slaveInteract.tw | 3 ++
12 files changed, 68 insertions(+), 46 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 67830587990..013401f1078 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,9 @@
-WIP content added to nursery/farmyard
-genetic sequencing moved out of dispensary
-added advanced pregnancy tracking
+ -ability to name developing babies
+ -ability to terminate unwanted ova early in pregnancy
+ -added surrogacy
-genetics now determined at conception, rather than birth
-pregSource normalization
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 797fe053c4a..da55f78bf76 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -37171,7 +37171,6 @@ window.Beauty = (function() {
beauty += slave.clit;
beauty += (slave.height-160)/10;
beauty += 2*slave.hips;
- beauty -= 3*slave.visualAge;
if (slave.anus > 3) {
beauty -= 10 + (slave.anus*2); /*-20*/
}
@@ -37380,6 +37379,7 @@ window.Beauty = (function() {
beauty += (slave.intelligence + slave.intelligenceImplant)/10;
beauty += slave.entertainSkill/10;
beauty += slave.whoreSkill/10;
+ beauty -= 3*slave.visualAge;
if (setup.entertainmentCareers.includes(slave.career)) {
beauty += 20;
} else if (V.week - slave.weekAcquired >= 20 && slave.entertainSkill >= 100) {
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index ff1a0cbee13..7b13882c047 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -19,13 +19,13 @@ Furthest developed pregnancy:
<br><br>
<<if $incubator > 0>>
<<if _incubatorReservations > 0>>
- <<link "Remove all of your children from $incubatorName" "Analyze Pregnancy">>
+ <<link "Remove all of your children from $incubatorName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "incubator", "")>>
<<set $reservedChildren -= _incubatorReservations>>
<</link>> |
<</if>>
<<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= $freeTanks)>>
- <<link "Keep all of your children in $incubatorName" "Analyze Pregnancy">>
+ <<link "Keep all of your children in $incubatorName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "nursery", "incubator")>>
<<run WombChangeReserveType($PC, "", "incubator")>>
<<set $reservedChildrenNursery -= _nurseryReservations>>
@@ -38,13 +38,13 @@ Furthest developed pregnancy:
<br>
<<if $nursery > 0>>
<<if _nurseryReservations > 0>>
- <<link "Remove all of your children from $nurseryName" "Analyze Pregnancy">>
+ <<link "Remove all of your children from $nurseryName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "nursery", "")>>
<<set $reservedChildrenNursery -= _nurseryReservations>>
<</link>> |
<</if>>
<<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= $freeCribs)>>
- <<link "Keep all of your children in $nurseryName" "Analyze Pregnancy">>
+ <<link "Keep all of your children in $nurseryName" "Analyze PC Pregnancy">>
<<run WombChangeReserveType($PC, "incubator", "nursery")>>
<<run WombChangeReserveType($PC, "", "nursery")>>
<<set $reservedChildren -= _incubatorReservations>>
@@ -174,23 +174,27 @@ Deep scan:
Mother Name: $PC.womb[_ap].genetics.motherName
<</if>>
<</if>>
+ <<if $incubator > 0 || $nursery > 0>>
+ <br>
+ Reserved: $PC.womb[_ap].reserve
+ <</if>>
<br><br>
- Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
+ Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
<<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>>
<br>
- <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
+ <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
<</if>>
<<if $incubator > 0>>
<br>
<<if $PC.womb[_ap].reserve === "incubator">>
- <<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">>
+ <<link "Don't keep this child in $incubatorName" "Analyze PC Pregnancy">>
<<set $PC.womb[_ap].reserve = "">>
<<set $reservedChildren-->>
<</link>>
<<elseif $freeTanks - $reservedChildren > 0>>
- <<link "Keep this child in $incubatorName" "Analyze Pregnancy">>
+ <<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">>
<<if $PC.womb[_ap].reserve === "nursery">>
<<set $reservedChildrenNursery-->>
<</if>>
@@ -204,12 +208,12 @@ Deep scan:
<<if $nursery > 0>>
<br>
<<if $PC.womb[_ap].reserve === "nursery">>
- <<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">>
+ <<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">>
<<set $PC.womb[_ap].reserve = "">>
<<set $reservedChildrenNursery-->>
<</link>>
<<elseif $freeCribs - $reservedChildrenNursery > 0>>
- <<link "Keep this child in $nurseryName" "Analyze Pregnancy">>
+ <<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">>
<<if $PC.womb[_ap].reserve === "incubator">>
<<set $reservedChildren-->>
<</if>>
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index fa2cd3a65d0..fb8c37da142 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -178,6 +178,10 @@ Deep scan:
Mother Name: $activeSlave.womb[_ap].genetics.motherName
<</if>>
<</if>>
+ <<if $incubator > 0 || $nursery > 0>>
+ <br>
+ Reserved: $activeSlave.womb[_ap].reserve
+ <</if>>
<br><br>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 579c438c0e3..2d035f0ce78 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -466,7 +466,7 @@ In total, you have given birth to:
<<if ($PC.preg > 1 && $pregnancyMonitoringUpgrade == 1)>>
<br>[[Inspect pregnancy|Analyze PC Pregnancy]]
<</if>>
-<<if $PC.preg >= 0>>
+<<if $PC.preg >= 0 && $PC.vagina == 1>>
<br>[[Harvest and implant an egg|Surrogacy Workaround][$donatrix = $PC, $impregnatrix = "Undecided", $receptrix = "Undecided", $nextLink = "Manage Personal Affairs"]]
<</if>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 3849df43afc..ddd6ff25aba 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1,15 +1,21 @@
:: New Child Intro [nobr]
-<<set $showEncyclopedia = 0>>
+<<set $showEncyclopedia = 0, _tempMom = 0, _tempDad = 0>>
<<set $desc = SlaveTitle($activeSlave)>>
<<setLocalPronouns $activeSlave>>
<<if $activeSlave.mother > 0>>
<<set _tempMom = getSlave($activeSlave.mother)>>
+ <<if ndef _tempMom>>
+ <<set _tempMom = 0>>
+ <</if>>
<</if>>
<<if $activeSlave.father > 0>>
<<set _tempDad = getSlave($activeSlave.father)>>
+ <<if ndef _tempDad>>
+ <<set _tempDad = 0>>
+ <</if>>
<</if>>
You completed the legalities before heading to $incubatorName, knowing the tank will release $him on your approach, and instruct $assistantName to notify the new girl's parents to meet you in your office. As the tank exhumes the disoriented girl, you help $him to $his feet<<if $incubatorReproductionSetting > 1>>, making sure to feel-up $his overdeveloped body,<</if>> and walk $him to your penthouse. Though first you must decide upon a name for the new girl; it won't take long to reach your office, so you have only @@.orange;one chance to name $him@@ before you arrive.
@@ -116,7 +122,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<</replace>>
<</link>>
<</if>>
-<<if $activeSlave.mother > 0>>
+<<if _tempMom != 0>>
<<setLocalPronouns _tempMom 2>>
<<if _tempMom.ID == $Concubine.ID>>
<br><<link "Permit your Concubine to name _his2 daughter">>
@@ -175,7 +181,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<</link>>
<</if>>
<</if>>
-<<if $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>>
+<<if _tempDad != 0 && $activeSlave.father != $activeSlave.mother>>
<<setLocalPronouns _tempDad 2>>
<<if _tempDad.ID == $Concubine.ID>>
<br><<link "Permit your Concubine to name _his2 daughter">>
@@ -238,16 +244,16 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<br><br>
<span id="newName">''__@@.pink;$activeSlave.slaveName@@__''</span> now stands before your desk
-<<if $activeSlave.mother > 0 && $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>>
+<<if _tempMom != 0 && _tempDad != 0 && $activeSlave.father != $activeSlave.mother>>
alongside $his mother _tempMom.slaveName and father _tempDad.slaveName.
-<<elseif $activeSlave.mother > 0>>
+<<elseif _tempMom != 0>>
alongside $his mother _tempMom.slaveName.
-<<elseif $activeSlave.father > 0>>
+<<elseif _tempDad != 0>>
alongside $his father _tempDad.slaveName.
<<else>>
alone, having no family<<if $activeSlave.mother == -1 || $activeSlave.father == -1>>, other than you,<</if>> in your stock.
<</if>>
-<<if $arcologies[0].FSRestartDecoration == 100 && def _tempMom>>
+<<if $arcologies[0].FSRestartDecoration == 100 && _tempMom != 0>>
<<if _tempMom.breedingMark == 1 && $propOutcome == 1>>
The Societal Elite are waiting to inspect the child of their eugenics programs.
<<if $arcologies[0].FSSupremacist > 20 && $activeSlave.race != $arcologies[0].FSSupremacistRace>>
@@ -263,7 +269,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<</if>>
<</if>>
-<<if $activeSlave.mother > 0>>
+<<if _tempMom != 0>>
<<setLocalPronouns _tempMom 2>>
$He glances at $his mother
<<if _tempMom.relationship == -3>>
@@ -348,7 +354,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<</if>>
<</if>>
-<<if $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>>
+<<if _tempDad != 0 && $activeSlave.father != $activeSlave.mother>>
<<setLocalPronouns _tempDad 2>>
$He glances at $his father
<<if _tempDad.relationship == -3>>
@@ -435,12 +441,12 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<br><br>
-<<if $activeSlave.mother > 0 && $activeSlave.father > 0 && $activeSlave.father != $activeSlave.mother>>
+<<if _tempMom != 0 && _tempDad != 0 && $activeSlave.father != $activeSlave.mother>>
You dismiss _tempMom.slaveName and _tempDad.slaveName so that you may conduct a more intimate inspection of their daughter.
-<<elseif $activeSlave.mother > 0>>
+<<elseif _tempMom != 0>>
<<setLocalPronouns _tempMom 2>>
You dismiss _tempMom.slaveName so that you may conduct a more intimate inspection of _his2 daughter.
-<<elseif $activeSlave.father > 0>>
+<<elseif _tempDad != 0>>
<<setLocalPronouns _tempDad 2>>
You dismiss _tempDad.slaveName so that you may conduct a more intimate inspection of _his2 daughter.
<</if>>
diff --git a/src/pregmod/personalNotes.tw b/src/pregmod/personalNotes.tw
index 315165bb21f..ec348303cbd 100644
--- a/src/pregmod/personalNotes.tw
+++ b/src/pregmod/personalNotes.tw
@@ -42,7 +42,7 @@
<</if>>
<</if>>
<</if>>
-<<if $PC.preg > 0
+<<if $PC.preg > 0>>
<<set _oldCount = $PC.pregType>>
<<if $PC.preg <= 2>>
<<run fetalSplit($PC, 1000)>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 2ecdfed62ff..c649bbc355a 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -501,19 +501,19 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<set _PCDegree++>>
<</if>>
- <<if _p == 0>>Your first<<else>>The next<</if>> little <<if _gender == "XX">>girl<<else>>boy<</if>>
+ <<if _p == 0>>Your first<<else>>The next<</if>> little <<if $activeSlave.genes == "XX">>girl<<else>>boy<</if>>
<<if _identicalChildGen == 1>>
looks exactly like the previous; they're identical twins.
<<elseif $PC.pregSource == -6>>
- looks exactly like you<<if _p == 0>>, in fact, the resemblance seems uncanny. Since <<if _gender == "XX">>she<<else>>he<</if>> has the exact same genetics as you, <<if _gender == "XX">>she<<else>>he<</if>>'ll likely look almost identical to you when <<if _gender == "XX">>she<<else>>he<</if>>'s your age<</if>>. Every one of your children look this way; it's kind of hard to tell them apart.
+ looks exactly like you<<if _p == 0>>, in fact, the resemblance seems uncanny. Since <<if $activeSlave.genes == "XX">>she<<else>>he<</if>> has the exact same genetics as you, <<if $activeSlave.genes == "XX">>she<<else>>he<</if>>'ll likely look almost identical to you when <<if $activeSlave.genes == "XX">>she<<else>>he<</if>>'s your age<</if>>. Every one of your children look this way; it's kind of hard to tell them apart.
<<elseif _PCDegree == 4>>
- looks just like you; <<if _gender == "XX">>she<<else>>he<</if>> will likely grow up to closely resemble yourself.
+ looks just like you; <<if $activeSlave.genes == "XX">>she<<else>>he<</if>> will likely grow up to closely resemble yourself.
<<elseif $activeSlave.eyeColor == $PC.origEye>>
has your lovely $PC.origEye eyes.
<<elseif _PCDegree > 0>>
- looks a little like you, enough that <<if _gender == "XX">>she<<else>>he<</if>>'ll be recognizable as yours.
+ looks a little like you, enough that <<if $activeSlave.genes == "XX">>she<<else>>he<</if>>'ll be recognizable as yours.
<<else>>
- looks nothing like you; it's hard to believe <<if _gender == "XX">>she's your daughter<<else>>he's you son<</if>>
+ looks nothing like you; it's hard to believe <<if $activeSlave.genes == "XX">>she's your daughter<<else>>he's you son<</if>>
<</if>>
<<if $PC.curBabies[_p].reserve == "incubator">>
You set <<if $PC.curBabies[_p].genetics.gender == "XX">>her<<else>>him<</if>> aside for incubation.
@@ -539,8 +539,10 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
and _babiesReduced[_spb]'s
<</if>>
<</for>>
- <<else>>
+ <<elseif _babiesReduced.length > 1>>
_babiesReduced[0] and _babiesReduced[1]'s
+ <<else>>
+ _babiesReduced[0]'s
<</if>>
babies into the world.
diff --git a/src/pregmod/surrogacy.tw b/src/pregmod/surrogacy.tw
index db023b7452a..b091b740ba6 100644
--- a/src/pregmod/surrogacy.tw
+++ b/src/pregmod/surrogacy.tw
@@ -17,36 +17,36 @@
<<run WombUpdatePregVars($receptrix)>>
<<setLocalPronouns $receptrix>>
<<if $receptrix.fetish == "mindbroken">>
- $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
<<elseif ($receptrix.fetish == "pregnancy") && ($receptrix.fetishStrength > 60) && ($receptrix.fetishKnown == 1)>>
<<if canSee($receptrix)>>
- Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. $He was overjoyed at the sight of the syringe containing $his future child emptying into $his womb.
+ Since the surgery required only a local anesthetic, $receptrix.slaveName remained fully aware throughout the procedure. $He was overjoyed at the sight of the syringe containing $his future child emptying into $his womb.
<<else>>
- $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
<</if>>
$He is @@.hotpink; filled with joy@@ over the life settling into $his womb and can't wait to see the result. $He's so pleased that $he now @@.mediumaquamarine;trusts@@ your plans for $his body.
<<set $receptrix.trust += 4, $receptrix.devotion += 10>>
<<elseif ($receptrix.devotion > 50)>>
<<if canSee($receptrix)>>
- Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. $He watched the syringe containing $his new pregnancy empty into $his womb with rapt attention.
+ Since the surgery required only a local anesthetic, $receptrix.slaveName remained fully aware throughout the procedure. $He watched the syringe containing $his new pregnancy empty into $his womb with rapt attention.
<<else>>
- $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
<</if>>
$He's @@.hotpink;grateful@@ that you think $him worthy of carrying this child, and a little nervous about how $he'll perform as a surrogate.
<<set $receptrix.devotion += 4>>
<<elseif ($receptrix.devotion >= -20)>>
<<if canSee($receptrix)>>
- Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. From the syringe making contact with $his skin, to the egg's delivery into $his womb and $his subsequent impregnation, $he couldn't look away.
+ Since the surgery required only a local anesthetic, $receptrix.slaveName remained fully aware throughout the procedure. From the syringe making contact with $his skin, to the egg's delivery into $his womb and $his subsequent impregnation, $he couldn't look away.
<<else>>
- $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
<</if>>
$He understands the realities of $his life as a slave, so it isn't much of a shock. $He is @@.gold;sensibly fearful@@ of your total power over $his body.
<<set $receptrix.trust -= 10>>
<<else>>
<<if canSee($receptrix)>>
- Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. The moment $he realized what was happening, $he shut $his eyes tight, only opening them again as $he feels the slight tingle of the injector exiting $his lower abdomen.
+ Since the surgery required only a local anesthetic, $receptrix.slaveName remained fully aware throughout the procedure. The moment $he realized what was happening, $he shut $his eyes tight, only opening them again as $he feels the slight tingle of the injector exiting $his lower abdomen.
<<else>>
- $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ $receptrix.slaveName leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
<</if>>
$He does not understand the realities of $his life as a slave at a core level, so $he's @@.mediumorchid;terrified and angry@@ that you have forced $him to bear this child, even more so as $he realizes $he doesn't know who the father is. $He is @@.gold;sensibly fearful@@ of your total power over $his body and the future of the life $he now harbors within $him.
<<set $receptrix.trust -= 15, $receptrix.devotion -= 15>>
diff --git a/src/pregmod/surrogacyWorkaround.tw b/src/pregmod/surrogacyWorkaround.tw
index 10cab8752e7..4e99ba5de83 100644
--- a/src/pregmod/surrogacyWorkaround.tw
+++ b/src/pregmod/surrogacyWorkaround.tw
@@ -15,7 +15,7 @@
_impreg will provide the seed and _recieve shall carry it.
-[[Implant fertilized ovum|Surrogacy][$cash -= $surgeryCost, $surgeryType = 'surrogacy']]
+[[Implant fertilized ovum|Surrogacy][$cash -= ($surgeryCost*2), $surgeryType = 'surrogacy']]
<br><br>
@@ -68,9 +68,9 @@ __Chosen surrogate: _recieve __
<<for _sw1 = 0; _sw1 < $slaves.length; _sw1++>>
<<capture _sw1>>
- <<if ($slaves[_sw1].ovaries > 0 || $slaves[_sw1].mpreg > 0) && isSlaveAvailable($slaves[_sw1]) && $slaves[_sw1].preg >= 0 && $slaves[_sw1].preg < 4 && $slaves[_sw1].pregWeek >= 0 && $slaves[_sw1].pubertyXX == 1 && $slaves[_sw1].bellyImplant != -1 && $slaves[_sw1].broodmother == 0 && $slaves[_sw1].inflation <= 2 && $slaves[_sw1].ovaryAge < 47>>
+ <<if ($slaves[_sw1].ovaries > 0 || $slaves[_sw1].mpreg > 0) && isSlaveAvailable($slaves[_sw1]) && $slaves[_sw1].preg >= 0 && $slaves[_sw1].preg < 4 && $slaves[_sw1].pregWeek >= 0 && $slaves[_sw1].pubertyXX == 1 && $slaves[_sw1].pregType < 12 && $slaves[_sw1].bellyImplant == -1 && $slaves[_sw1].broodmother == 0 && $slaves[_sw1].inflation <= 2 && $slaves[_sw1].physicalAge < 70>>
<<set _name2 = SlaveFullName($slaves[_sw1])>>
- <br><<print "[[_name2|Surrogacy Workaround][$receptrix = $slaves[" + _sw1 + "]]]">>
+ <br><<print "[[_name2|Surrogacy Workaround][$receptrix = $slaves[" + _sw1 + "]]]">> <<if $slaves[_sw1].pregType >= 4>>//Using a slave carrying multiples is unadvisable//<</if>>
<<set _eligibility2 = 1>>
<</if>>
<</capture>>
@@ -79,7 +79,7 @@ __Chosen surrogate: _recieve __
<br>//You have no slaves capable of acting as a surrogate.//
<</if>>
-<<if $PC.vagina == 1 && $PC.preg >= 0 && $PC.preg < 4>>
+<<if $PC.vagina == 1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
<br>
[[Use your own womb|Surrogacy Workaround][$receptrix = $PC]]
<</if>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 439f7091816..e93ecf8c29c 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -863,12 +863,12 @@ All in all,
<<if _cToIncub + _cToNursery > 0>>
<<for _cb = 0; _cb < _curBabies; _cb++>> /* if there is no reserved children, code in loop will not trigger */
<<if $slaves[$i].curBabies[_cb].reserve == "incubator">>
- <<set $activeSlave = applyGenetics($slaves[$i], $slaves[$i].curBabies[_cb])>>
+ <<set $activeSlave = generateChild($slaves[$i], $slaves[$i].curBabies[_cb])>>
<<include "Incubator Workaround">>
<<run $slaves[$i].curBabies.splice($slaves[$i].curBabies[_cb], 1)>>
<<set _cb--, _curBabies-->>
<<elseif $slaves[$i].curBabies[_cb].reserve == "nursery">>
- <<set $activeSlave = applyGenetics($slaves[$i], $slaves[$i].curBabies[_cb])>>
+ <<set $activeSlave = generateChild($slaves[$i], $slaves[$i].curBabies[_cb])>>
<<include "Nursery Workaround">>
<<run $slaves[$i].curBabies.splice($slaves[$i].curBabies[_cb], 1)>>
<<set _cb--, _curBabies-->>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 74bda916a1f..718897338b3 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1324,6 +1324,9 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<<elseif ($activeSlave.preg > 0)>>
<<link "Abort $his pregnancy" "Abort">><</link>>
<</if>>
+ <<if $activeSlave.preg >= 0 && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $activeSlave.eggType == "human" && $activeSlave.ovaryAge < 47>>
+ | [[Harvest and implant an egg|Surrogacy Workaround][$donatrix = $activeSlave, $impregnatrix = "Undecided", $receptrix = "Undecided", $nextLink = "Slave Interact"]]
+ <</if>>
<</if>>
<</if>>
<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
--
GitLab