From 554b34a1c19fcb40260a3c16c6b18d0f4b93512f Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 5 Jul 2018 14:10:36 -0400 Subject: [PATCH] gestation control drugs added to swapper widget --- src/uncategorized/slaveInteract.tw | 12 ++++++------ src/utility/miscWidgets.tw | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 17c8606c311..5c97ff37267 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1081,24 +1081,24 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1 <</if>> <<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>> <br> - __Pregnancy control__: <span id="pregControl"><<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation<<elseif $activeSlave.pregControl == "speed up">>Faster gestation<<else>>Normal gestation<</if>></span> + __Pregnancy control__: <<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation speed<<elseif $activeSlave.pregControl == "speed up">>Faster gestation speed, staffed clinic recommended<<else>>Normal gestation and birth<</if>>. <<if ($activeSlave.preg >= 38)>> <br> <<if $activeSlave.pregControl == "labor supressors">> - <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>natural birth<</replace>><</link>> + <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>> <<else>> - <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be suppressed<</replace>><</link>> + <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<SlaveInteractImpreg>><</link>> <</if>> <<elseif ($activeSlave.preg < 40)>> <br> <<if $activeSlave.pregControl != "none">> - <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</link>> | + <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>> | <</if>> <<if $activeSlave.pregControl != "slow Gestation">> - <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed gestation speed<</replace>><</link>> | + <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<SlaveInteractImpreg>><</link>> | <</if>> <<if $activeSlave.pregControl != "speed up">> - <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>fast gestation speed, staffed clinic recommended<</replace>><</link>> + <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<SlaveInteractImpreg>><</link>> <</if>> <</if>> <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index f7ff2965ae7..4ad269ac6d0 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -535,26 +535,26 @@ <</if>> <</if>> <</if>> -<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0)>> +<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>> <br> - __Pregnancy control__: <span id="pregControl"><<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation<<elseif $activeSlave.pregControl == "speed up">>Faster gestation<<else>>Normal gestation<</if>></span> + __Pregnancy control__: <<if $activeSlave.pregControl == "labor supressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation speed<<elseif $activeSlave.pregControl == "speed up">>Faster gestation speed, staffed clinic recommended<<else>>Normal gestation and birth<</if>>. <<if ($activeSlave.preg >= 38)>> <br> <<if $activeSlave.pregControl == "labor supressors">> - <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>natural birth<</replace>><</link>> + <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>> <<else>> - <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<replace "#pregControl">>labor will be suppressed<</replace>><</link>> + <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<SlaveInteractImpreg>><</link>> <</if>> <<elseif ($activeSlave.preg < 40)>> <br> <<if $activeSlave.pregControl != "none">> - <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<replace "#pregControl">>normal gestation speed<</replace>><</link>> | + <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<SlaveInteractImpreg>><</link>> | <</if>> <<if $activeSlave.pregControl != "slow Gestation">> - <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<replace "#pregControl">>slowed gestation speed<</replace>><</link>> | + <<link "Slow Gestation">><<set $activeSlave.pregControl = "slow gestation">><<SlaveInteractImpreg>><</link>> | <</if>> <<if $activeSlave.pregControl != "speed up">> - <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<replace "#pregControl">>fast gestation speed, staffed clinic recommended<</replace>><</link>> + <<link "Fast Gestation">><<set $activeSlave.pregControl = "speed up">><<SlaveInteractImpreg>><</link>> <</if>> <</if>> <</if>> -- GitLab