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 99467cb8cb976ffe9667150223bdc92217b8176e..48128dcc17f2b1f6a6a6069da3562d21d28ba54f 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 4d74b8f8857a880d032a48ab2c2b85365c75beb7..b1be9dc6a07a86dc4a21b2cacd5253e969b1b5a1 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -8,11 +8,6 @@ Populations depend on the 'demand' for them. People flock to the Free City when
More elite citizens require their own slaves and will cause the population of slaves to increase as they move in. FS and policies will impact how many slaves they desire and how productive they are. The PC's menials also compete for labor within the arcology. Slaves can now 'expire', speed depends on FS and policies. Default lifespan for menials is an average of ~4 years. */
<<set $oldACitizens = $ACitizens,
-_oldASlaves = $ASlaves,
-_oldLowerClass = $lowerClass, /*debugging stuff, perhaps worth keeping if polished*/
-_oldMiddleClass = $middleClass,
-_oldUpperClass = $upperClass,
-_oldTopClass = $topClass,
_FSScore = 0, /*FS progress for tourism*/
_slaveDemandU = 1, /*Changes to upperclass slave demand*/
_slaveDemandT = 1, /*Changes to topclass slave demand*/
@@ -576,7 +571,7 @@ $helots -= _expirationPC,
$fuckdolls -= _expirationFD,
$menialBioreactors -= _expirationBR>>
<<if _expiration > 1>>
- @@.red;<<print _expiration>> Slaves died@@ due to the tough working conditions in your arcology.
+ @@.red;<<print _expiration>> slaves died@@ due to the tough working conditions in your arcology.
<<if _expirationPC > 1>>
Of which @@.red;<<print _expirationPC>> were yours.@@
<<elseif _expirationPC > 0>>
@@ -657,31 +652,59 @@ $lowerClass -= _enslaved>>
/*Demand for owning slaves*/
_SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * ($slaveDemandT + _slaveDemandT)))>>
/*More slaves than there is work*/
-<<if $NPCSlaves > _LSCD / $slaveProductivity>>
- <<set $menialDemandFactor -= $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity)),
+<<if $NPCSlaves > (_LSCD / ($slaveProductivity + _slaveProductivity)) - $helots + _SCD>>
+ <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - $helots + _SCD),
+ $menialDemandFactor -= _NPCSlavesSold,
$NPCSlaves = Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity))>>
+ <<if _NPCSlavesSold > 1>>
+ <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. There was so little work that they failed to earn their keep.
+ <<elseif _NPCSlavesSold > 0>>
+ <br>@@.red;One slave was sold by your inhabitants. There was so little work that it failed to earn its keep.
+ <</if>>
/*More slaves than they know what to do with*/
<<elseif $NPCSlaves > _SCD * 1.6>>
- <<set $menialDemandFactor -= $NPCSlaves - Math.trunc(_SCD * 1.6),
+ <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_SCD * 1.6),
+ $menialDemandFactor -= _NPCSlavesSold,
$NPCSlaves = Math.trunc(_SCD * 1.6)>>
+ <<if _NPCSlavesSold > 1>>
+ <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>>
/*Cutting back on slaves*/
<<elseif $NPCSlaves > _SCD * 1.4>>
<<if $slaveCostFactor > 0.95>>
- <<set $menialDemandFactor -= Math.trunc(($NPCSlaves - _SCD) * 0.4),
- $NPCSlaves -= Math.trunc(($NPCSlaves - _SCD) * 0.4)>>
+ <<set _NPCSlavesSold = Math.trunc(($NPCSlaves - _SCD) * 0.4),
+ $menialDemandFactor -= _NPCSlavesSold,
+ $NPCSlaves -= _NPCSlavesSold>>
+ <<if _NPCSlavesSold > 1>>
+ <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>>
/*Selling excess slaves for profit*/
<<elseif $NPCSlaves > _SCD * 1.2>>
<<if $slaveCostFactor > 1.1>>
- <<set $menialDemandFactor -= Math.trunc(($NPCSlaves - _SCD) * 0.4),
- $NPCSlaves -= Math.trunc(($NPCSlaves - _SCD) * 0.4)>>
+ <<set _NPCSlavesSold = Math.trunc(($NPCSlaves - _SCD) * 0.4),
+ $menialDemandFactor -= _NPCSlavesSold,
+ $NPCSlaves -= _NPCSlavesSold>>
+ <<if _NPCSlavesSold > 1>>
+ <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>>
/*Buying slaves because they are really cheap*/
<<if $slaveCostFactor < 0.8>>
<<if $NPCSlaves < _SCD * 1.5>>
- <<set $menialSupplyFactor -= Math.trunc(_SCD * 0.05),
- $NPCSlaves += Math.trunc(_SCD * 0.05)>>
+ <<set _NPCSlavesBought = Math.trunc(_SCD * 0.05),
+ $menialSupplyFactor -= _NPCSlavesBought,
+ $NPCSlaves += _NPCSlavesBought>>
+ <<if _NPCSlavesBought > 1>>
+ <br>@@.green;<<print _NPCSlavesBought>> slaves were bought by your inhabitants. They were too cheap to pass up on.
+ <</if>> /*there's no way this ever ends up needing a 1 slave version*/
<</if>>
<</if>>
@@ -696,7 +719,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<set _LCImmigration = Math.trunc((_LCD - $lowerClass) * (0.3 * _terrain)) + 1,
$lowerClass += _LCImmigration>>
<<if _LCImmigration > 1>>
- <br>@@.green;<<print _LCImmigration>> Lower class citizens@@ moved to your arcology.
+ <br>@@.green;<<print _LCImmigration>> lower class citizens@@ moved to your arcology.
<<elseif _LCImmigration > 0>>
<br>@@.green;One lower class citizen@@ moved to your arcology.
<</if>>
@@ -706,9 +729,9 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
$lowerClass -= _LCEmigration,
_enslaved += _enslavedEmigrants>>
<<if _LCEmigration > 1>>
- <br>@@.red;<<print _LCEmigration>> Lower class citizens@@ had no work and tried to leave your arcology.
+ <br>@@.red;<<print _LCEmigration>> lower class citizens@@ had no work and tried to leave your arcology.
<<if _enslavedEmigrants > 1>>
- @@.green;<<print _enslavedEmigrants>> Of them were enslaved instead.@@
+ @@.green;<<print _enslavedEmigrants>> of them were enslaved instead.@@
<<elseif _enslavedEmigrants > 0>>
@@.green;One of them was enslaved instead.@@
<</if>>
@@ -728,15 +751,21 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
$NPCSlaves += _enslavedNPC>>
<</if>>
<<if _enslaved > 1>>
- <br>In total @@.green;<<print _enslaved>> Lower class citizens@@ were enslaved for failing to pay their debts.
- <br> @@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>.
+ <br>In total @@.green;<<print _enslaved>> lower class citizens@@ were enslaved for failing to pay their debts.
+ <br>@@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>.
<<elseif _enslaved > 0>>
<br>@@.green;As arcology owner you claimed the slave.@@
<</if>>
/*Need more slaves still*/
<<if $NPCSlaves < _SCD>>
- <<set $menialSupplyFactor -= Math.trunc((_SCD - $NPCSlaves) * 0.75) + 1,
- $NPCSlaves += Math.trunc((_SCD - $NPCSlaves) * 0.75) + 1>>
+ <<set _NPCSlavesBought = Math.trunc((_SCD - $NPCSlaves) * 0.75) + 1,
+ $menialSupplyFactor - _NPCSlavesBought,
+ $NPCSlaves += _NPCSlavesBought>>
+ <<if _NPCSlavesBought > 1>>
+ <br>@@.green;<<print _NPCSlavesBought>> slaves@@ were bought by your inhabitants. They did not have enough of them to satisfy their needs.
+ <<elseif _NPCSlavesBought > 0>>
+ <br>@@.green;One slave@@ was bought by your inhabitants. They did not quite have enough of them to satisfy their needs.
+ <</if>>
<</if>>
/*Middle Class Citizens*/
@@ -747,7 +776,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<set _MCImmigration = Math.trunc((_MCD - $middleClass) * (0.3 * _terrain)) + 1,
$middleClass += _MCImmigration>>
<<if _MCImmigration > 1>>
- <br>@@.green;<<print _MCImmigration>> Middle class citizens@@ moved to your arcology.
+ <br>@@.green;<<print _MCImmigration>> middle class citizens@@ moved to your arcology.
<<elseif _MCImmigration > 0>>
<br>@@.green;One middle class citizen@@ moved to your arcology.
<</if>>
@@ -756,7 +785,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<set _MCEmigration = Math.trunc(($middleClass - _MCD) * 0.6),
$middleClass -= _MCEmigration>>
<<if _MCEmigration > 1>>
- <br>@@.red;<<print _MCEmigration>> Middle class citizens@@ left your arcology.
+ <br>@@.red;<<print _MCEmigration>> middle class citizens@@ left your arcology.
<<elseif _MCEmigration > 0>>
<br>@@.red;One middle class citizen@@ left your arcology.
<</if>>
@@ -770,7 +799,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<set _UCImmigration = Math.trunc((_UCD - $upperClass) * (0.3 * _terrain)) + 1,
$upperClass += _UCImmigration>>
<<if _UCImmigration > 1>>
- <br>@@.green;<<print _UCImmigration>> Upper class citizens@@ moved to your arcology.
+ <br>@@.green;<<print _UCImmigration>> upper class citizens@@ moved to your arcology.
<<elseif _UCImmigration > 0>>
<br>@@.green;One upper class citizen@@ moved to your arcology.
<</if>>
@@ -779,7 +808,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<set _UCEmigration = Math.trunc(($upperClass - _UCD) * 0.6),
$upperClass -= _UCEmigration>>
<<if _UCEmigration > 1>>
- <br>@@.red;<<print _UCEmigration>> Upper class citizens@@ left your arcology.
+ <br>@@.red;<<print _UCEmigration>> upper class citizens@@ left your arcology.
<<elseif _UCEmigration > 0>>
<br>@@.red;One upper class citizen@@ left your arcology.
<</if>>
@@ -795,7 +824,7 @@ _TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase)
<<set _TCImmigration = Math.trunc((_TCD - $topClass) * (0.3 * _terrain)) + 1,
$topClass += _TCImmigration>>
<<if _TCImmigration > 1>>
- <br>@@.green;<<print _TCImmigration>> Millionaires@@ moved to your arcology. /*Fat Cat? One-Percenter?*/
+ <br>@@.green;<<print _TCImmigration>> millionaires@@ moved to your arcology. /*Fat Cat? One-Percenter?*/
<<elseif _TCImmigration > 0>>
<br>@@.green;One millionaire@@ moved to your arcology.
<</if>>
@@ -804,7 +833,7 @@ _TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase)
<<set _TCEmigration = Math.trunc(($topClass - _TCD) * 0.6) + 1,
$topClass -= _TCEmigration>>
<<if _TCEmigration > 1>>
- <br>@@.red;<<print _TCEmigration>> Millionaires@@ left your arcology.
+ <br>@@.red;<<print _TCEmigration>> millionaires@@ left your arcology.
<<elseif _TCEmigration > 0>>
<br>@@.red;One millionaire@@ left your arcology.
<</if>>
@@ -935,13 +964,18 @@ This week, rents from $arcologies[0].name came to @@.yellowgreen;<<print cashFor
<<set _earnings = 0>>
You own
<<if $helots > 0>>
- <<set _earnings += $helots*10>>
- <<if $Sweatshops > 0>>
- <<if $Sweatshops*500 <= $helots>>
- <<set _earnings += $Sweatshops*7000>>
- <<set _earnings += ($helots-$Sweatshops*500)*10>>
- <<else>>
- <<set _earnings += $helots*10>>
+ <<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>>
+ <<set _earnings += $helots*10>>
+ <<if $Sweatshops > 0>>
+ <<if $Sweatshops*500 <= $helots>>
+ <<set _earnings += $Sweatshops*7000>>
+ <<set _earnings += ($helots-$Sweatshops*500)*10>>
+ <<else>>
+ <<set _earnings += $helots*10>>
+ <</if>>
<</if>>
<</if>>
<<if $helots > 1>> <<print commaNum($helots)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>>
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 9e33228a7bb31d5b66d11eed72e8a8ca46bce439..88b471d716383215e4ab082e0f5eb4211942c4d9 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)>>