From 1108b72d74362c0d9bb270622002b904f9c5b280 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 23 Dec 2017 22:00:55 -0500 Subject: [PATCH] cleanup --- src/pregmod/incubator.tw | 16 ++++++---------- src/uncategorized/slaveInteract.tw | 8 +++----- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index 0212d6cc047..570152d3d2b 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -53,12 +53,10 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ Her child will be placed in $incubatorName. <<elseif $slaves[_u].reservedChildren < $slaves[_u].pregType>> $slaves[_u].reservedChildren of her children will be placed in $incubatorName. + <<elseif $slaves[_u].pregType == 2>> + Both of her children will be placed in $incubatorName. <<else>> - <<if $slaves[_u].pregType == 2>> - Both of her children will be placed in $incubatorName. - <<else>> - All $slaves[_u].reservedChildren of her children will be placed in $incubatorName. - <</if>> + All $slaves[_u].reservedChildren of her children will be placed in $incubatorName. <</if>> <<if ($slaves[_u].reservedChildren < $slaves[_u].pregType) && ($reservedChildren < $freeTanks)>> <br> @@ -123,12 +121,10 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ Your child will be placed in $incubatorName. <<elseif $PC.reservedChildren < $PC.pregType>> $PC.reservedChildren of your children will be placed in $incubatorName. + <<elseif $PC.pregType == 2>> + Both of your children will be placed in $incubatorName. <<else>> - <<if $PC.pregType == 2>> - Both of your children will be placed in $incubatorName. - <<else>> - All $PC.reservedChildren of your children will be placed in $incubatorName. - <</if>> + All $PC.reservedChildren of your children will be placed in $incubatorName. <</if>> <<if ($PC.reservedChildren < $PC.pregType) && ($reservedChildren < $freeTanks)>> <br> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index aa60c14533b..951af3bc782 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1097,12 +1097,10 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><< Her child will be placed in $incubatorName. <<elseif $activeSlave.reservedChildren < $activeSlave.pregType>> $activeSlave.reservedChildren of her children will be placed in $incubatorName. + <<else $activeSlave.pregType == 2>> + Both of her children will be placed in $incubatorName. <<else>> - <<if $activeSlave.pregType == 2>> - Both of her children will be placed in $incubatorName. - <<else>> - All $activeSlave.reservedChildren of her children will be placed in $incubatorName. - <</if>> + All $activeSlave.reservedChildren of her children will be placed in $incubatorName. <</if>> <<if ($activeSlave.reservedChildren < $activeSlave.pregType) && ($reservedChildren < $freeTanks)>> [[Keep another child|Slave Interact][$activeSlave.reservedChildren += 1, $reservedChildren += 1]] -- GitLab