diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 281c9850b559d5744c074836f018ac4a2829e045..dd35aad3fbb9be3e8157f750a42a397bb3f8092f 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,14 @@
0.10.7.1-1.1.x
+11/28/2018
+
+ 2
+ -fixed bad string pass
+
+ 1
+ -fixes
+
11/27/2018
0
@@ -10,6 +18,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/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 ea37c0239c64ac12a6d272b72ff71ded90ba455c..dde5f8948af3d0b737969e187958f2e4fd563c5a 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -306,7 +306,6 @@ You should have received a copy of the GNU General Public License along with thi
/* Pregmod specific */
<<set $economy = 100>>
- <<set $econRate = 2>>
<<set $antiWeatherFreeze = 0>>
<<set $difficultySwitch = 0>>
<<set $econWeatherDamage = 0>>
@@ -568,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/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
index 7d8ff3d4573d23ed019b42ada84c8cf687ad2904..28186b76929fddeec391cdddd0c641c38618689d 100644
--- a/src/pregmod/manageEconomy.tw
+++ b/src/pregmod/manageEconomy.tw
@@ -91,9 +91,9 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<elseif $MCRent > 25>>
//Average// | [[Increase|Manage Economy][$MCRent = 75, $rentEffectM = 0.94]] | [[Decrease|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]]
<<elseif $MCRent > 0>>
- //Low// | [[Increase|Manage Economy][$MCRent = 20, $rentEffectM = 1]] | [[Free Rent|Manage Economy][$MCRent = 0, $rentEffectM = 1.1]]
+ //Low// | [[Increase|Manage Economy][$MCRent = 50, $rentEffectM = 1]] | [[Free Rent|Manage Economy][$MCRent = 0, $rentEffectM = 1.1]]
<<else>>
- //Free// | [[Increase|Manage Economy][$MCRent = 10, $rentEffectM = 1.04]]
+ //Free// | [[Increase|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]]
<</if>>
<br>Upper Class Citizens | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat($UCRent)>>@@
<<if $UCRent > 270>>
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/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 3c70f1940e2a8199f1e409820f53d982b93d6fa1..733cf1c03c6b30e2a2effc163e5c2a1a2d1e2d95 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 b20340d39e24a5c36f1214f9e509ab0a9bbfc531..b1be9dc6a07a86dc4a21b2cacd5253e969b1b5a1 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -747,9 +747,9 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<<set _enslavedPC = Math.trunc(_enslaved / 4),
_enslavedNPC = _enslaved - _enslavedPC>>
<</if>>
+ <<set $helots += _enslavedPC,
+ $NPCSlaves += _enslavedNPC>>
<</if>>
-<<set $helots += _enslavedPC,
-$NPCSlaves += _enslavedNPC>>
<<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>>.
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/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">>