From f9df0a226ddcba02fa504a33862dfe1c1e901b26 Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Mon, 19 Feb 2018 01:22:54 +0200 Subject: [PATCH] missing logic fixed --- src/uncategorized/slaveInteract.tw | 2 +- src/utility/miscWidgets.tw | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 4235f25c90d..1292c4151ed 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1085,7 +1085,7 @@ Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<prin <<set $activeSlave.preg = 0>> <<SetBellySize $activeSlave>> <</if>> - <<elseif $activeSlave.broodmotherCountDown > 0>> + <<elseif $activeSlave.broodmotherOnHold == 1>> //Its pregnancy implant is turned off; it expected to be completely emptied of its remaining brood in $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>// <<elseif ($activeSlave.preg >= -1)>> __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index a656bc3eb5e..93ab6ed5ccb 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -663,8 +663,8 @@ <<set $activeSlave.preg = 0>> <<SetBellySize $activeSlave>> <</if>> - <<elseif $activeSlave.broodmotherCountDown > 0>> - //Her pregnancy implant is shutting down; she will be completely emptied of her remaining brood in $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>// + <<elseif $activeSlave.broodmotherOnHold == 1>> + //Her pregnancy implant is turned off; she expected to be completely emptied of her remaining brood in $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>// <<elseif ($activeSlave.preg >= -1)>> __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. <<if ($activeSlave.preg == 0)>> @@ -704,8 +704,8 @@ <<set $activeSlave.preg = 0>> <<SetBellySize $activeSlave>> <</if>> - <<elseif $activeSlave.broodmotherCountDown > 0>> - //Its pregnancy implant is shutting down; it will be completely emptied of its contained brood in $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>// + <<elseif $activeSlave.broodmotherOnHold == 1>> + //Its pregnancy implant is turned off; it expected to be completely emptied of its remaining brood in $activeSlave.broodmotherCountDown week $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>// <<elseif ($activeSlave.preg >= -1)>> __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>. <<if ($activeSlave.preg == 0)>> -- GitLab