diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 2b7ae2160a5f849140e61ef8a16cc03e4e7850e7..884cc64382d2defd02733e3de3ca28db43bc27b5 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1046,9 +1046,7 @@ Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<prin [[Induce mass childbirth|BirthStorm]] <<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50) && $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>> //You are forbidden from aborting an elite child// -<<elseif ($activeSlave.preg < 4) && ($activeSlave.pregType < 50)>> - [[Abort her potential pregnancy|Abort]] -<<elseif ($activeSlave.preg >= 4) && ($activeSlave.pregType < 50)>> +<<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50)>> [[Abort her pregnancy|Abort]] <</if>> <</if>> @@ -1071,10 +1069,8 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><< <</link>> <<elseif ($activeSlave.pregType == 50) && ($activeSlave.preg > 38)>> [[Induce mass childbirth|BirthStorm]] -<<elseif ($activeSlave.preg < 4) && ($activeSlave.pregType < 50)>> - [[Abort her potential pregnancy|Abort]] -<<elseif ($activeSlave.preg >= 4) && ($activeSlave.pregType < 50)>> - [[Abort her pregnancy|Abort]] +<<elseif ($activeSlave.preg > 0) && ($activeSlave.pregType < 50)>> + [[Abort her pregnancy|Abort]] <</if>> <</if>> <</if>> diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw index 00f3725de389ab43aef1c4dd79418942e1cf3c48..a665bad1d4c69a92d1e17ff1e60d0329d954f26a 100644 --- a/src/uncategorized/walkPast.tw +++ b/src/uncategorized/walkPast.tw @@ -363,11 +363,9 @@ <<break>> <</if>> <</for>> - /* <<if _partnerSlave == null>> <<goto "Main">> <</if>> - */ Meanwhile, <<if $activeSlave.rivalry >= 3>> @@ -541,11 +539,9 @@ <<break>> <</if>> <</for>> - /* <<if _partnerSlave == null>> <<goto "Main">> <</if>> - */ $activeSlave.slaveName and _partnerSlave.slaveName are <<set _seed = random(1,3)>> @@ -885,12 +881,10 @@ <</if>> <</for>> <</if>> - /* <<if _partnerSlave == null>> <<goto "Main">> <</if>> - */ - + Her <<if ($partner == "relation")>><<if $familyTesting == 1>>$relationType<<else>>_partnerSlave.relation<</if>><<else>>_activeSlaveRel<</if>> _partnerSlave.slaveName <<switch _partnerSlave.assignment>> <<case "be your agent">>