diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw index 8b635c59a1071257f43dca529d68a8749157e422..5e155292ee04a67b2e715acf0d9837de135e56f0 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw @@ -49,6 +49,9 @@ <<set $activeSlave.vaginaLube = Number($activeSlave.vaginaLube) || 0>> <<set $activeSlave.vaginalSkill = Number($activeSlave.vaginalSkill) || 0>> <<set $activeSlave.preg = Number($activeSlave.preg) || 0>> +<<if $activeSlave.preg < 0>> + <<set $activeSlave.pregKnown = 0>> +<</if>> <<set $activeSlave.dick = Number($activeSlave.dick) || 0>> <<set $activeSlave.clit = Number($activeSlave.clit) || 0>> <<set $activeSlave.labia = Number($activeSlave.labia) || 0>> diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw index 45318642df5ba63c2c4e1b787cd830ee0e5347e7..7409ad81f305f630771336f4c8f5ab7098666152 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw @@ -67,6 +67,9 @@ <<set $tempSlave.preg = Number($tempSlave.preg) || 0>> <<set $tempSlave.pregType = Number($tempSlave.pregType) || 0>> <<set $tempSlave.pregSource = Number($tempSlave.pregSource) || 0>> +<<if $tempSlave.preg < 0>> + <<set $tempSlave.pregKnown = 0>> +<</if>> <<set $tempSlave.dick = Number($tempSlave.dick) || 0>> <<set $tempSlave.clit = Number($tempSlave.clit) || 0>> <<set $tempSlave.labia = Number($tempSlave.labia) || 0>> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index 7efc42061692a9b14c14aa9c31faf7ac650d70cf..0212d6cc047437e637b2fc2ffd591730f52868b2 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -32,7 +32,7 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the <br><br> Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $incubator tanks, <<print $freeTanks>> <<if $freeTanks == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildren <<if $reservedChildren == 1>>tank is<<else>>tanks are<</if>> reserved. <<for _u = 0; _u < _SL; _u++>> - <<if $slaves[_u].pregType < 50 && $slaves[_u].pregKnown == 1 && $slaves[_u].eggType == "human">> + <<if $slaves[_u].preg > 0 && $slaves[_u].pregType < 50 && $slaves[_u].pregKnown == 1 && $slaves[_u].eggType == "human">> <<if $slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0>> <<else>> <br><<print "[[$slaves[" + _u + "].slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek weeks pregnant with @@ -49,7 +49,17 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <<if $slaves[_u].pregType > 1>>$slaves[_u].pregType babies<<else>>baby<</if>>. <<if $slaves[_u].reservedChildren > 0>> - $slaves[_u].reservedChildren of her children will be placed in $incubatorName. + <<if $slaves[_u].pregType == 1>> + Her child will be placed in $incubatorName. + <<elseif $slaves[_u].reservedChildren < $slaves[_u].pregType>> + $slaves[_u].reservedChildren of her children will be placed in $incubatorName. + <<else>> + <<if $slaves[_u].pregType == 2>> + Both of her children will be placed in $incubatorName. + <<else>> + All $slaves[_u].reservedChildren of her children will be placed in $incubatorName. + <</if>> + <</if>> <<if ($slaves[_u].reservedChildren < $slaves[_u].pregType) && ($reservedChildren < $freeTanks)>> <br> <<print "[[Keep another child|Incubator][$slaves[" + _u + "].reservedChildren += 1, $reservedChildren += 1]]">> @@ -109,7 +119,17 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ octuplets. <</switch>> <<if $PC.reservedChildren > 0>> - $PC.reservedChildren of your children will be placed in $incubatorName. + <<if $PC.pregType == 1>> + Your child will be placed in $incubatorName. + <<elseif $PC.reservedChildren < $PC.pregType>> + $PC.reservedChildren of your children will be placed in $incubatorName. + <<else>> + <<if $PC.pregType == 2>> + Both of your children will be placed in $incubatorName. + <<else>> + All $PC.reservedChildren of your children will be placed in $incubatorName. + <</if>> + <</if>> <<if ($PC.reservedChildren < $PC.pregType) && ($reservedChildren < $freeTanks)>> <br> <<print "[[Keep another child|Incubator][$PC.reservedChildren += 1, $reservedChildren += 1]]">> @@ -355,6 +375,14 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu Reproduction management systems are offline; she will undergo normal puberty. <</if>> <</if>> + <<if $cheatMode == 1>> + <br>''Cheatmode:'' + <<link "Retrieve immediately">> + <<set $incubatorOldID = $tanks[$i].ID>> + <<set $readySlave = $tanks.pluck([$i], [$i])>> + <<goto "Incubator Retrieval Workaround">> + <</link>> + <</if>> <<if $incubatorUpgradeOrgans == 1>> <br> You can extract a sample and prepare a new organ for her to be implanted once she exits her tank. diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 2d7b03a5c2294d16bb903da823585c17c872d153..aa60c14533bdd4bb47fbe44ed2ed612d32a2fe20 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1087,13 +1087,23 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><< <</if>> </span> <<if $incubator > 0>> -<<if $activeSlave.pregType < 50 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">> +<<if $activeSlave.preg > 0 && $activeSlave.pregType < 50 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">> <<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>> <<else>> <br> <<set $freeTanks = ($incubator-$tanks.length)>> <<if $activeSlave.reservedChildren > 0>> - $activeSlave.reservedChildren of her children will be placed in $incubatorName. + <<if $activeSlave.pregType == 1>> + Her child will be placed in $incubatorName. + <<elseif $activeSlave.reservedChildren < $activeSlave.pregType>> + $activeSlave.reservedChildren of her children will be placed in $incubatorName. + <<else>> + <<if $activeSlave.pregType == 2>> + Both of her children will be placed in $incubatorName. + <<else>> + All $activeSlave.reservedChildren of her children will be placed in $incubatorName. + <</if>> + <</if>> <<if ($activeSlave.reservedChildren < $activeSlave.pregType) && ($reservedChildren < $freeTanks)>> [[Keep another child|Slave Interact][$activeSlave.reservedChildren += 1, $reservedChildren += 1]] <<if $activeSlave.reservedChildren > 0>>