From fff190b19a8eb4fb093fe74816f9fdda8f547a9a Mon Sep 17 00:00:00 2001 From: pregmodfan <pregmodfan@cock.li> Date: Fri, 30 Nov 2018 19:08:36 +0200 Subject: [PATCH] third part of .preg > x cases finding. all? --- src/utility/miscWidgets.tw | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index ebd52708d89..59e9047e2a7 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -316,7 +316,7 @@ <<link "Let her get pregnant">><<set $activeSlave.preg = 0>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> <<elseif $activeSlave.induce == 1>> //Hormones are being slipped into her food, she will give birth suddenly and rapidly this week// - <<elseif ($activeSlave.preg > 38) && ($activeSlave.broodmother == 0) && ($activeSlave.labor == 0)>> + <<elseif ($activeSlave.preg > $activeSlave.pregData.normalBirth-2 && $activeSlave.preg > $activeSlave.pregData.minLiveBirth) && ($activeSlave.broodmother == 0) && ($activeSlave.labor == 0)>> [[Induce labor|Slave Interact][$activeSlave.labor = 1,$activeSlave.induce = 1,$birthee = 1]] | [[Give her a cesarean section|csec]] <<elseif ($activeSlave.broodmother > 0)>> @@ -326,7 +326,7 @@ <<if ($activeSlave.preg > 37)>> | [[Induce mass childbirth|BirthStorm]] <</if>> - <<elseif ($activeSlave.preg > 35)>> + <<elseif ($activeSlave.preg > $activeSlave.pregData.minLiveBirth)>> [[Give her a cesarean section|csec]] <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>> //You are forbidden from aborting an elite child// @@ -362,7 +362,7 @@ <</link>> <<elseif $activeSlave.induce == 1>> //Hormones are being slipped into its food, it will give birth suddenly and rapidly this week// - <<elseif ($activeSlave.preg > 38) && ($activeSlave.broodmother == 0) && ($activeSlave.labor == 0)>> + <<elseif ($activeSlave.preg > $activeSlave.pregData.normalBirth-2 && $activeSlave.preg > $activeSlave.pregData.minLiveBirth) && ($activeSlave.broodmother == 0) && ($activeSlave.labor == 0)>> [[Induce labor|Slave Interact][$activeSlave.labor = 1,$activeSlave.induce = 1,$birthee = 1]] | [[Give it a cesarean section|csec]] <<elseif ($activeSlave.broodmother > 0)>> @@ -372,7 +372,7 @@ <<if ($activeSlave.preg > 37)>> | [[Induce mass childbirth|BirthStorm]] <</if>> - <<elseif ($activeSlave.preg > 35)>> + <<elseif ($activeSlave.preg > $activeSlave.pregData.minLiveBirth)>> [[Give it a cesarean section|csec]] <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>> //You are forbidden from aborting an elite child// @@ -384,14 +384,14 @@ <<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>> <br> __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)>> + <<if ($activeSlave.preg >= $activeSlave.pregData.minLiveBirth)>> <br> <<if $activeSlave.pregControl == "labor supressors">> <<link "Normal Birth">><<set $activeSlave.pregControl = "none">><<SlaveInteractFertility>><</link>> <<else>> <<link "Supress Labor">><<set $activeSlave.pregControl = "labor supressors">><<SlaveInteractFertility>><</link>> <</if>> - <<elseif ($activeSlave.preg < 40)>> + <<elseif ($activeSlave.preg < $activeSlave.pregData.normalBirth)>> <br> <<if $activeSlave.pregControl != "none">> <<link "Normal Gestation">><<set $activeSlave.pregControl = "none">><<SlaveInteractFertility>><</link>> | -- GitLab