From cf8bf659cd0fbf9c521a8fdabb38f5d971f45830 Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Mon, 19 Feb 2018 02:00:51 +0200 Subject: [PATCH] switching fixed --- src/uncategorized/slaveInteract.tw | 10 ++++------ src/utility/miscWidgets.tw | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 1292c4151ed..c0a36498f8f 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1039,7 +1039,8 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1 <<SetBellySize $activeSlave>> <</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>>// + //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>>// + [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <<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)>> @@ -1060,8 +1061,6 @@ Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<prin <<elseif ($activeSlave.broodmother > 0)>> <<if $activeSlave.broodmotherOnHold != 1>> [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = $activeSlave.womb[$activeSlave.womb.length-1].age]] - <<else>> - [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <</if>> <<if ($activeSlave.preg > 37)>> | [[Induce mass childbirth|BirthStorm]] @@ -1086,7 +1085,8 @@ Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<prin <<SetBellySize $activeSlave>> <</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<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>// + //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>>// + [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <<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)>> @@ -1105,8 +1105,6 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><< <<elseif ($activeSlave.broodmother > 0)>> <<if $activeSlave.broodmotherOnHold != 1>> [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = $activeSlave.womb[$activeSlave.womb.length-1].age]] - <<else>> - [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <</if>> <<if ($activeSlave.preg > 37)>> | [[Induce mass childbirth|BirthStorm]] diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 93ab6ed5ccb..435692f73db 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -664,7 +664,8 @@ <<SetBellySize $activeSlave>> <</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>>// + //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>>// + [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <<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)>> @@ -679,8 +680,6 @@ <<elseif ($activeSlave.broodmother > 0)>> <<if $activeSlave.broodmotherOnHold != 1>> [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = $activeSlave.womb[$activeSlave.womb.length-1].age]] - <<else>> - [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <</if>> <<if ($activeSlave.preg > 37)>> | [[Induce mass childbirth|BirthStorm]] @@ -705,7 +704,8 @@ <<SetBellySize $activeSlave>> <</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>>// + //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>>// + [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <<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)>> @@ -724,8 +724,6 @@ <<elseif ($activeSlave.broodmother > 0)>> <<if $activeSlave.broodmotherOnHold != 1>> [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = $activeSlave.womb[$activeSlave.womb.length-1].age]] - <<else>> - [[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]] <</if>> <<if ($activeSlave.preg > 37)>> | [[Induce mass childbirth|BirthStorm]] -- GitLab