diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw index 617469096500ffcf3b604fab92cd7466be2b9069..2d9a62cdeb043b03ab2caacab269138510bf5d96 100644 --- a/src/facilities/nursery/childSummary.tw +++ b/src/facilities/nursery/childSummary.tw @@ -1,15 +1,15 @@ :: Child Summary [nobr] <<set setup.passagePreFilters = setup.passagePreFilters || { - "Main": c => (c.assignmentVisible == 1), - "Nursery" c => (c.assignmentVisible == 1 && c.fuckdoll == 0), + "Main": c => (c.assignmentVisible == 1), + "Nursery" c => (c.assignmentVisible == 1 && c.fuckdoll == 0), "Personal Attention Select": c => (c.assignmentVisible == 1 && c.fuckdoll <= 0) && ( ($Flag == 0 && c.assignment != "be a child") || ($Flag == 1 && c.assignment == "be a child") ), "New Game Plus": c => (($Flag == 0 && c.assignment != "be imported") || ($Flag != 0 && c.assignment == "be imported")), - "Rules Slave Select": c => (($Flag == 0 && !ruleSlaveSelected(s, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(s, $currentRule))), - "Rules Slave Exclude": c => (($Flag == 0 && !ruleSlaveExcluded(s, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(s, $currentRule))), + "Rules Slave Select": c => (($Flag == 0 && !ruleSlaveSelected(c, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(c, $currentRule))), + "Rules Slave Exclude": c => (($Flag == 0 && !ruleSlaveExcluded(c, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(c, $currentRule))), }>> <<set _Pass = passage(), _CL = $cribs.length, $assignTo = _Pass, _indexed = 0, _passagePreFilter = (c => c.assignment != "be your agent" && c.assignment != "live with your agent" && (!setup.passagePreFilters.hasOwnProperty(_Pass) || setup.passagePreFilters[_Pass](c))), diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw index 891048297c2955b86886c76c17091c70fd2b31c7..96e44d0ad3427caa205d803f2a1603f784056387 100644 --- a/src/pregmod/analyzePregnancy.tw +++ b/src/pregmod/analyzePregnancy.tw @@ -30,7 +30,7 @@ <<link "Remove all of $his children from $incubatorName" "Analyze Pregnancy">> <<run WombChangeReserveType($activeSlave, "incubator", "")>> <<set $reservedChildren -= _incubatorReservations>> - <</link>> | + <</link>> <</if>> <<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= $freeTanks)>> <<link "Keep all of $his children in $incubatorName" "Analyze Pregnancy">> @@ -43,16 +43,15 @@ There is not enough free space in $incubatorName for the rest of $his children. <</if>> <</if>> - <br> <<if $nursery > 0>> <<if _nurseryReservations > 0>> - <<link "Remove all of $his children from $nurseryName" "Analyze Pregnancy">> + | <<link "Remove all of $his children from $nurseryName" "Analyze Pregnancy">> <<run WombChangeReserveType($activeSlave, "nursery", "")>> <<set $reservedChildrenNursery -= _nurseryReservations>> - <</link>> | + <</link>> <</if>> <<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= $freeCribs)>> - <<link "Keep all of $his children in $nurseryName" "Analyze Pregnancy">> + | <<link "Keep all of $his children in $nurseryName" "Analyze Pregnancy">> <<run WombChangeReserveType($activeSlave, "incubator", "nursery")>> <<run WombChangeReserveType($activeSlave, "", "nursery")>> <<set $reservedChildren -= _incubatorReservations>> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 02dec838ce46faf5f2bf9ba5b95b61b223205de7..92b2a224f39cd10e28fa8f0f6abe41d25f61d8dc 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -858,7 +858,7 @@ All in all, <<if (_cToIncub + _cToNursery > 0) && _curBabies > 0>> /*Do we need keep child checks?*/ <br><br> - Of $his _curBabies child<<if _curBabies > 1>>ren<</if>>, _cToIncub <<if _cToIncub === 1>>was<<else>>were<</if>> taken to $incubatorName<<if $nursery > 0>>, and _cToNursery <<if _cToNursery === 1>>was<<else>>were<</if>> taken to $nurseryName<</if>>. + <<if _curBabies > 1>>Of $his _curBabies child<<if _curBabies > 1>>ren<</if>>,<<else>>$His child<</if>> <<if _cToIncub > 0>><<if _curBabies > 1>>_cToIncub <</if>><<if _cToIncub === 1>>was<<else>>were<</if>> taken to $incubatorName<<if $nursery > 0>> and <</if>><</if>><<if $nursery > 0>><<if _curBabies > 1>>_cToNursery <</if>><<if _cToNursery === 1>>was<<else>>were<</if>> taken to $nurseryName<</if>>. <<if _cToIncub + _cToNursery > 0>> <<for _cb = 0; _cb < _curBabies; _cb++>> /* if there is no reserved children, code in loop will not trigger */ <<if $slaves[$i].curBabies[_cb].reserve == "incubator">>