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 36a1cc9ab68dc0d8a00cf185d2b794c975514aa5..dde5f8948af3d0b737969e187958f2e4fd563c5a 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/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/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">>