diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 281c9850b559d5744c074836f018ac4a2829e045..567694de0a86b21eef79d867b2e2d6f4d16c961e 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,20 @@
0.10.7.1-1.1.x
+11/29/2018
+
+ 3
+ -more fixes
+
+11/28/2018
+
+ 2
+ -fixed bad string pass
+ -tweaked how slave recruit events are handled
+
+ 1
+ -fixes
+
11/27/2018
0
@@ -10,6 +24,7 @@
-major changes to population tracking + tourism
-chaste release rule added
-added gapped teeth
+ -added ability to rename incubating children
0.10.7.1-1.0.x
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 1f2eebb4eb6377ab79de5c9dd501c990d3c25c12..eb048c937d774b6b29bd1ded3ef6765e3671bbff 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/SecExp/secExpOptions.tw b/src/SecExp/secExpOptions.tw
index 122cc3d12702e3572ec949082fa58f2de91019b9..5824456e48a0d02d9a75edd4b2952d4ad3dbbe98 100644
--- a/src/SecExp/secExpOptions.tw
+++ b/src/SecExp/secExpOptions.tw
@@ -506,7 +506,7 @@ __Debug/cheats:__
<<set $NPCSlaves += 200>>
<</link>> | <<link "Remove slaves" "secExpOptions">> /*Will work to a limited degree*/
<<set $NPCSlaves -= 200>>
- <<if $NPCSLaves < 0>>
+ <<if $NPCSlaves < 0>>
<<set $NPCSlaves = 0>>
<</if>>
<</link>>
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 3f8c617aee60f8c7cb731b893e0eb18b007eccea..f820ed1211b4159563bf6fc6ebe45c798b882b85 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -3,7 +3,7 @@
This is special passage to avoid false positive error in sanityCheck build script.
Do not uncomment anything!
-$nurseryUpgrade
+$nurseryUpgrade, $childToSlave
$ageMode
$youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $matronCareers, $milkmaidCareers, $farmerCareers, $stewardessCareers, $schoolteacherCareers
$whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames, $sammarineseSlaveNames, $marshalleseSlaveNames, $syrianSlaveNames, $bermudianSlaveNames, $uruguayanSlaveNames, $monegasqueSlaveNames, $montenegrinSlaveNames, $cambodianSlaveNames, $cameroonianSlaveNames, $gaboneseSlaveNames, $djiboutianSlaveNames, $greenlandicSlaveNames, $tuvaluanSlaveNames, $zambianSlaveNames, $albanianSlaveNames, $bruneianSlaveNames, $singaporeanSlaveNames
@@ -17,7 +17,7 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames
$ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence
$LurcherSpeed
$$i
-$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.ovaImplant, $activeSlave.premature, $activeSlave.superfetation
+$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory
$drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs
$PC.origRace, $PC.origSkin
$isReady, $fatherID,
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 3d6d652e9dfa9f30ce8fb6d77036fe828531f3ea..7b1f295a1c8eba6ad8675a9712e9ce5dec6f0e1c 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -567,8 +567,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nurseryNameCaps = "The Nursery">>
<<set $reservedChildrenNursery = 0>>
<<set $cribs = []>> /*array of children in the nursery*/
-/*<<set $childIndices = cribs2indices()>>*/
-<<set $minimumChildAge = 0>>
<<set $childToSlave = -1>>
<<set $farmyard = 0>>
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/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 53d2ae9d8d359a5373501210c2885976c6ed449d..b80b3f57553a20a776535e60482989a34e6ace89 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -80,7 +80,7 @@ PC.pregSource documentation
<</for>>
<<set _babiesReduced = removeDuplicates(_babies)>>
-<<if _elite > 0>> /* for simplicity's sake, not going to allow other embryos to be added during a elite pregnancy */
+<<if _elite > 0>> /* for simplicity's sake, not going to allow other embryos to be added during an elite pregnancy */
Since you are heavily pregnant with a child of the Societal Elite, you are quickly taken to the finest clinic the arcology has to offer. After a quick sedation, you awake to find your belly no longer round with child; that and a note stating your next breeding partner and a notice that <<print cashFormat(50000)>> has been added to your account. The Societal Elite are @@.green;very pleased@@ at their new addition to the ranks. You just wish you could have seen your <<if _curBabies == 1>>little <<if _gender == "XX">>girl<<else>>boy<</if>> before they took <<if _gender == "XX">>her<<else>>him<</if>><<else>>babies before they took them<</if>> away to be raised into a proper member of the future world.
<<set $PC.birthElite += _elite>>
<<if $PC.ovaryAge >= 55 && $playerAging != 0>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index d0c79be5509bfe73291f5c7d4b2e948f264a6c73..d87830603b3ef793995e34e9f8c005f6f5465fb1 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -298,14 +298,12 @@
<<else>>
<<set _details = $args[0]>>
<<set _b = $facility.farmyard>>
- <<run
- _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0;
- _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0;
- _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0;
- _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0;
- _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0;
- _b.profit = (def _b.profit) ? _b.profit : 0;
- >>
+ <<set _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0>>
+ <<set _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0>>
+ <<set _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0>>
+ <<set _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0>>
+ <<set _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0>>
+ <<set _b.profit = (def _b.profit) ? _b.profit : 0>>
<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
<tr style="border-bottom: 2px solid white;">
<th>Items</th>
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/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 297ffa4cfabf74d99bf6377881a943f08f872ce1..f06b4a86590c67e6faf700561a37adc4d9594b9f 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -209,6 +209,9 @@
<<if def $limbsComplete>>
<<unset $limbsComplete>>
<</if>>
+<<if def $minimumChildAge>>
+ <<unset $minimumChildAge>>
+<</if>>
/* pregmod stuff */
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/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index e705fe2f1deb969ab03c76625b3a36d82e50b8e2..4b5bee8d6b3f25e4a22c195b7d70556bc04cb657 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -31,7 +31,7 @@
<<else>>
<<silently>>
/* initialize event lists as arrays [], not objects {} */
- <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, $groomSlave = 0, $brideSlave = 0, $recruiterSlave = 0>>
+ <<set $events = [], $RecETSevent = [], $REFIevent = [], $PESSevent = [], $PETSevent = [], $REFSevent = [], $activeSlave = 0, $groomSlave = 0, $brideSlave = 0, $recruiterSlave = 0, _recruitEvents = []>>
<<set $seed = 0>>
@@ -60,7 +60,7 @@
<</if>> /* CLOSES FUCKDOLL CHECK */
- <<if $week >= 10>>
+ <<if $week >= 10>>
<<set $events.push("P associates public slut")>>
<</if>>
<<set $legendaryFacility = 1>>
@@ -520,23 +520,23 @@
/* Acquisition Events */
- <<set $events.push("RE recruit")>>
+ <<set $events.push("RE recruit")>> /* one generic recruit event guaranteed to always be possible */
<<if random(1,100) < $rep/200>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<<if $ProRecruitment == 1>>
<<if random(1,100) < $rep/200>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<</if>>
<<if $AntiEnslavementRep == 0>>
<<if random(1,100) < $rep/300>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<</if>>
<<if $AntiEnslavementCash == 0>>
<<if random(1,100) < $rep/300>>
- <<set $events.push("RE recruit")>>
+ <<set _recruitEvents.push("RE recruit")>>
<</if>>
<</if>>
<<set $recruit = []>>
@@ -614,7 +614,7 @@
<<set $recruit.push("rogue cyborg")>>
<</if>>
<<if $arcologyUpgrade.drones == 1>>
- <<set $events.push("RE malefactor")>>
+ <<set _recruitEvents.push("RE malefactor")>>
<<set $malefactor = ["liberator", "whore", "businesswoman", "addict"]>>
<<if $seePreg != 0>>
<<set $malefactor.push("anchorBaby")>>
@@ -633,7 +633,7 @@
<</if>>
<<set $malefactor = $malefactor.random()>>
<<if ($rep/150) > random(1,100)>>
- <<set $events.push("RE malefactor")>>
+ <<set _recruitEvents.push("RE malefactor")>>
<</if>>
<</if>>
<<if $rep > 16000 && random(1,100) < $rep/1000 && $cash >= 100000>>
@@ -811,176 +811,176 @@
<<set $FSAcquisitionEvents = []>>
<<if $arcologies[0].FSSupremacist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Supremacist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSubjugationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Subjugationist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Radicalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus > random(1,100)>>
<<set $FSAcquisitionEvents.push("Repopulation Efforts")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRestart > random(1,100)>>
<<set $FSAcquisitionEvents.push("Eugenics")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $seePreg != 0>>
<<if $arcologies[0].FSGenderFundamentalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Fundamentalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<</if>>
<<if $arcologies[0].FSPaternalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Paternalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSDegradationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Degradationist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSBodyPurist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Body Purist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSTransformationFetishist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Transformation Fetishist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Youth Preferentialist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Maturity Preferentialist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast > random(1,100)>>
<<set $FSAcquisitionEvents.push("Slimness Enthusiast")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Asset Expansionist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $seePreg != 0>>
<<if $arcologies[0].FSPastoralist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Pastoralist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Physical Idealist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadence > random(1,100)>>
<<set $FSAcquisitionEvents.push("Hedonistic Decadence")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSChattelReligionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Chattel Religionist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSupremacist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Supremacist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSubjugationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Subjugationist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Radicalist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $seePreg != 0>>
<<if $arcologies[0].FSGenderFundamentalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Gender Fundamentalist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<</if>>
<<if $arcologies[0].FSPaternalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Paternalist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSDegradationist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Degradationist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSBodyPurist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Body Purist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSTransformationFetishist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Transformation Fetishist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Youth Preferentialist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Maturity Preferentialist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast > random(1,100)>>
<<set $FSAcquisitionEvents.push("Slimness Enthusiast Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Asset Expansionist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSPastoralist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Pastoralist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Physical Idealist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadence > random(1,100)>>
<<set $FSAcquisitionEvents.push("Hedonistic Decadence Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSChattelReligionist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Chattel Religionist Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus > random(1,100)>>
<<set $FSAcquisitionEvents.push("Repopulation Efforts Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRestart > random(1,100)>>
<<set $FSAcquisitionEvents.push("Eugenics Two")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Roman Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSAztecRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Aztec Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSEdoRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Edo Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSArabianRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Arabian Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSChineseRevivalist > random(1,100)>>
<<set $FSAcquisitionEvents.push("Chinese Revivalist")>>
- <<set $events.push("RE FS acquisition")>>
+ <<set _recruitEvents.push("RE FS acquisition")>>
<</if>>
<<if $arcologies[0].FSEgyptianRevivalist > random(1,100)>>
- <<set $events.push("RE FSEgyptianRevivalist acquisition")>>
+ <<set _recruitEvents.push("RE FSEgyptianRevivalist acquisition")>>
<</if>>
<<if $arcologies[0].FSPaternalistDecoration == 100 && $minimumSlaveAge <= 14 && $week >= 100 && (ndef $swanSong || $swanSong == 0)>>
<<set $recruit.push("paternalist swan song")>>
@@ -1305,7 +1305,7 @@
<</if>>
<</if>>
- <<if $minimumSlaveCost > 3000>>
+ <<if $minimumSlaveCost > 3000 && random(1,2) == 1>>
<<set $events.push("RE shipping container")>>
<</if>>
@@ -1318,8 +1318,11 @@
<</if>>
<<if $mercenaries > 0>>
- <<set $events.push("RE AWOL")>>
- <<set $events.push("RE Poker Night")>>
+ <<if random(1,2) == 1>>
+ <<set $events.push("RE AWOL")>>
+ <<else>>
+ <<set $events.push("RE Poker Night")>>
+ <</if>>
<</if>>
<<if $arcologies[0].prosperity >= 100 && ($rep > random(1,30000))>>
@@ -1392,7 +1395,7 @@
/* EVENT RANDOMIZATION */
<<for $i = 0; $i < $RecETSevent.length; $i++>>
- <<set $events.push("RecETS")>>
+ <<set _recruitEvents.push("RecETS")>>
<</for>>
<<for $i = 0; $i < $REFIevent.length; $i++>>
<<set $events.push("REFI")>>
@@ -1406,6 +1409,12 @@
<<for $i = 0; $i < $REFSevent.length; $i++>>
<<set $events.push("REFS")>>
<</for>>
+ <<set _maxRecruitNumber = Math.min(10, Math.ceil($events.length/4))>>
+ <<if _maxRecruitNumber < _recruitEvents.length>>
+ <<set _recruitEvents.shuffle()>>
+ <<set _recruitEvents.length = _maxRecruitNumber>>
+ <</if>>
+ <<set $events = $events.concat(_recruitEvents)>>
<<if $cheatMode == 1>>
<<goto "random event select">>
<<else>>
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)>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 02ade9670ece794ff66c28147cc708f80542faa4..c94f9db3b8be48999a80fe60c51e9506e803395d 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2925,7 +2925,7 @@
<<set _babyDaddy = findFather($slaves[$i].pregSource)>>
<<if def _babyDaddy>>
<<set _adjust = _babyDaddy.slavesKnockedUp++>>
- <<set adjustFatherProperty(_babyDaddy, slavesKnockedUp, _adjust)>>
+ <<set adjustFatherProperty(_babyDaddy, "slavesKnockedUp", _adjust)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index f01a74070b7193509af64dc25cec7829a6f0fcc3..e2d61721c48020a716a5b8ca627b34e3b17e448c 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -664,7 +664,7 @@
<<case "be a subordinate slave">>
<<set _bw = $slaveIndices[$slaves[$i].subTarget]>>
- <<if _bw != -1
+ <<if _bw != -1>>
<<setLocalPronouns $slaves[_bw] 2>>
<</if>>
<<if $slaves[$i].fetish == "mindbroken">>