diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index dd35aad3fbb9be3e8157f750a42a397bb3f8092f..4ade08a892c85fddf4a024cfc22afe04c5714d04 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,10 +2,17 @@
0.10.7.1-1.1.x
+11/29/2018
+
+ 3
+ -more fixes
+ -uncommented incubator semen donations
+
11/28/2018
2
-fixed bad string pass
+ -tweaked how slave recruit events are handled
1
-fixes
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index ef41ccc177c39aec59acb6eff9985ae03950cce4..c53fb06f7cc5cab4566e4178580c5713d339f5b3 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10694,7 +10694,7 @@ window.generateChild = function(mother, ova, destination) {
let V = State.variables;
let genes = ova.genetics; //maybe just argument this? We'll see.
let pregUpgrade = V.pregnancyMonitoringUpgrade;
- let child;
+ let child = {};
if (!destination) { //does extra work for the incubator if defined, otherwise builds a simple object
if (genes.gender == "XX") {
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 03b999980852e0117085f25cd3fda6b3653e6fa7..b574f256aa1f24871dce6e29e1cbf102be22f574 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -514,7 +514,7 @@ window.generateChild = function(mother, ova, destination) {
let V = State.variables;
let genes = ova.genetics; //maybe just argument this? We'll see.
let pregUpgrade = V.pregnancyMonitoringUpgrade;
- let child;
+ let child = {};
if (!destination) { //does extra work for the incubator if defined, otherwise builds a simple object
if (genes.gender == "XX") {
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index d4d2680a192daa078a121d06b9645eaea8e5cb33..e9c4beae5aafdaffb8d59844c365233dcb87a191 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -21,8 +21,13 @@
<<set _one = relativeTerm($activeSlave, $sissy)>> /* sissy is active's blank */
<<set _other = relativeTerm($sissy, $activeSlave)>> /* active is sissy's blank */
<<else>>
- <<set _one = $sissy.relation >>
- <<set _other = $activeSlave.relation >>
+ <<if $sissy.actualAge == $activeSlave.actualAge>>
+ <<set _one = "twin">>
+ <<set _other = "twin">>
+ <<else>>
+ <<set _one = $sissy.relation >>
+ <<set _other = $activeSlave.relation >>
+ <</if>>
<</if>>
/* gender relation descriptions */
diff --git a/src/pregmod/artificialInsemination.tw b/src/pregmod/artificialInsemination.tw
index 023d8a1996587c1dda43de8b6e8f0772144c1ca1..1c2bdc2aa70e67b08c5cb037e3836cb43c4a327a 100644
--- a/src/pregmod/artificialInsemination.tw
+++ b/src/pregmod/artificialInsemination.tw
@@ -21,7 +21,6 @@ __Select an eligible slave to serve as the semen donatrix:__
<br>//You have no slaves with potent sperm.//
<</if>>
-/*
<<if $incubatorSlaves > 0 && $incubatorReproductionSetting == 2>>
<br><br>
@@ -38,7 +37,6 @@ __Select an eligible slave to serve as the semen donatrix:__
<br>//You have no growing slaves producing sperm.//
<</if>>
<</if>>
-*/
<<if $PC.dick == 1>>
<br>
diff --git a/src/pregmod/surrogacyWorkaround.tw b/src/pregmod/surrogacyWorkaround.tw
index a9287835d1fc77a9124060cdd7c1bc00091d20a7..fa4482b808df6b9439050af101265b9a22dee727 100644
--- a/src/pregmod/surrogacyWorkaround.tw
+++ b/src/pregmod/surrogacyWorkaround.tw
@@ -37,7 +37,6 @@ __Semen donatrix: _impreg __
<br>//You have no slaves with potent sperm.//
<</if>>
-/*
<<if $incubatorSlaves > 0 && $incubatorReproductionSetting == 2>>
<br><br>
@@ -57,7 +56,6 @@ __Semen donatrix: _impreg __
<br>//You have no growing slaves producing sperm.//
<</if>>
<</if>>
-*/
<<if $PC.dick == 1>>
<br>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index 879259fede1136f915962f194510aeb63dfb5f38..08752ca0125cfbd738c1a2392d705420067463d8 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -371,9 +371,13 @@
Something startling happened this week; while enjoying a slave, your belly button popped out!
<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
<<set _babyDaddy = findFather($PC.pregSource)>>
- <<set _babyDaddy.PCKnockedUp++>>
+ <<if def _babyDaddy>>
+ <<set _adjust = _babyDaddy.PCKnockedUp++>>
+ <<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
+ <</if>>
<<if def $slaveIndices[$PC.pregSource]>>
- Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <<setLocalpronouns _babyDaddy>>
+ Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
<</if>>
<</if>>
<</if>>
@@ -440,9 +444,13 @@
Something startling happened this week; while enjoying a slave, your belly button popped out!
<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
<<set _babyDaddy = findFather($PC.pregSource)>>
- <<set _babyDaddy.PCKnockedUp++>>
+ <<if def _babyDaddy>>
+ <<set _adjust = _babyDaddy.PCKnockedUp++>>
+ <<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
+ <</if>>
<<if def $slaveIndices[$PC.pregSource]>>
- Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <<setLocalpronouns _babyDaddy>>
+ Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
<</if>>
<</if>>
<</if>>
@@ -509,9 +517,13 @@
Something startling happened this week; while enjoying a slave, your belly button popped out!
<<elseif $PC.preg == 8 && $PC.pregSource > 0>>
<<set _babyDaddy = findFather($PC.pregSource)>>
- <<set _babyDaddy.PCKnockedUp++>>
+ <<if def _babyDaddy>>
+ <<set _adjust = _babyDaddy.PCKnockedUp++>>
+ <<set adjustFatherProperty(_babyDaddy, "PCKnockedUp", _adjust)>>
+ <</if>>
<<if def $slaveIndices[$PC.pregSource]>>
- Rumors spread among your slaves that your middle is swollen with $slaves[_babyDaddy].slaveName's child. They're not wrong, though <<if $slaves[_babyDaddy].devotion > 20>>$slaves[_babyDaddy].slaveName is broken enough to not try and use it against you. In fact, it might even draw her closer to you<<else>>you'd have liked it to have kept that from $slaves[_babyDaddy].slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
+ <<setLocalpronouns _babyDaddy>>
+ Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>.
<</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index de2bec8f2ed23898707212fee2f6dc45c87a13b3..7ccb9ce4dc2d4811a003e3ed4e778794a426d31d 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -860,7 +860,7 @@ All in all,
<<set $slaves[$i].reservedChildren -= _cToIncub>>
<<set $slaves[$i].reservedChildrenNursery -= _cToNursery>>
<br><br>
- Of $his _curBabies child<<if _curBabies > 1>>ren<</if>>, _cToIncub <<if _curBabies === 1>>was<<else>>were<</if>> taken to $incubatorName<<if $nursery > 0>>, and _cToNursery <<if _cToNursery === 1>>was<<else>>were<</if>> taken to $nurseryName<</if>>.
+ Of $his _curBabies child<<if _curBabies > 1>>ren<</if>>, _cToIncub <<if _cToIncub === 1>>was<<else>>were<</if>> taken to $incubatorName<<if $nursery > 0>>, and _cToNursery <<if _cToNursery === 1>>was<<else>>were<</if>> taken to $nurseryName<</if>>.
<<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">>
@@ -888,7 +888,7 @@ All in all,
<<else>>
$nurseryName,
<</if>>
- it's time to decide the fate of the other<<if _curBabies > 0>><</if>>.
+ it's time to decide the fate of the other<<if _curBabies > 0>>s<</if>>.
<</if>>
<</if>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 4b927c4020536e12aefbbc709c392a87b73a3098..b1be9dc6a07a86dc4a21b2cacd5253e969b1b5a1 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -681,7 +681,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<br>@@.red;<<print _NPCSlavesSold>> slaves were sold by your inhabitants. They've got more than enough of them already.
<<elseif _NPCSlavesSold > 0>>
<br>@@.red;One slave was sold by your inhabitants. They've got more than enough of them already.
- </if>
+ <</if>>
<</if>>
/*Selling excess slaves for profit*/
<<elseif $NPCSlaves > _SCD * 1.2>>
@@ -693,7 +693,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<br>@@.red;<<print _NPCSlavesSold>> slaves were sold by your inhabitants. They saw an opportunity for profit.
<<elseif _NPCSlavesSold > 0>>
<br>@@.red;One slave was sold by your inhabitants. They saw an opportunity for profit.
- </if>
+ <</if>>
<</if>>
<</if>>
/*Buying slaves because they are really cheap*/
@@ -964,7 +964,7 @@ This week, rents from $arcologies[0].name came to @@.yellowgreen;<<print cashFor
<<set _earnings = 0>>
You own
<<if $helots > 0>>
- <<if $helots > Math.trunc((_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD)>>
+ <<if $helots > Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD)>>
<<set _earnings += Math.trunc((_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD) * 10>>
<br>@@.red;more menial slaves than there was work@@, consider selling some. You own
<<else>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 408c735408945d9c1c825ac8ddf1fc366fc95a09..0084e0742fa9ccca9fdaa6dba197a66e8edf16ca 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -247,7 +247,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<</if>>
<<for _pca = 0; _pca < $slaves.length; _pca++>>
<<run WombChangeID($slaves[_pca], $traitor.missingParentTag, $traitor.ID)>>
- <<run WombChangeGeneID(slave, $traitor.missingParentTag, $traitor.ID)>>
+ <<run WombChangeGeneID($slaves[_pca], $traitor.missingParentTag, $traitor.ID)>>
<</for>>
<<set $traitor.health = random(-80,-60)>>
<<set $traitor.origin = "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 6b79d7220b7c04a0c5a8fec342248fd1e41df29c..5f015e8a5decf65ae5f7869e841deaf72b8ed604 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -455,7 +455,7 @@ It isn't obvious how she managed to escape, though no doubt you could review the
<</if>>
<<for _reb = 0; _reb < $slaves.length; _reb++>>
<<run WombChangeID($slaves[_reb], $activeSlave.missingParentTag, $activeSlave.ID)>>
- <<run WombChangeGeneID(slave, $activeSlave.missingParentTag, $activeSlave.ID)>>
+ <<run WombChangeGeneID($slaves[_reb], $activeSlave.missingParentTag, $activeSlave.ID)>>
<</for>>
<<set $boomerangStats = 0>>
<<replace "#result">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index d6133c1ebd19cc93b6d217376e28719082be156e..7119ce06a2285819dff5d6db4820d9585b91d1a5 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1728,12 +1728,12 @@
<<case "held POW">>
-<<set $activeSlave.PLimb = 1>>
<<set $activeSlaveOneTimeMinAge = Math.max($fertilityAge, 8)>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XX Slave">>
+<<set $activeSlave.PLimb = 1>>
<<set $activeSlave.origin = "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
<<set $activeSlave.trust = random(0,20)>>