From d70a0cd321d66700862697e810f57b814431cd8d Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Thu, 29 Nov 2018 00:45:58 -0500 Subject: [PATCH] Sanity check --- src/SecExp/secExpOptions.tw | 2 +- src/init/dummy.tw | 2 +- src/init/storyInit.tw | 1 - src/pregmod/sePlayerBirth.tw | 2 +- src/pregmod/widgets/economyWidgets.tw | 14 ++++++-------- src/utility/birthWidgets.tw | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/SecExp/secExpOptions.tw b/src/SecExp/secExpOptions.tw index 122cc3d1270..5824456e48a 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 3f8c617aee6..2c1375fdefc 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -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 36a1cc9ab68..d7db689c132 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -567,7 +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>> diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw index 53d2ae9d8d3..b80b3f57553 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 d0c79be5509..d87830603b3 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/utility/birthWidgets.tw b/src/utility/birthWidgets.tw index f01a74070b7..e2d61721c48 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">> -- GitLab