diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw index 4fa0c863e9e028a14206a878c88c190e3c7e1d2d..f2222c9761bfa04c1fdcf81703b4a16098281770 100644 --- a/src/facilities/nursery/nursery.tw +++ b/src/facilities/nursery/nursery.tw @@ -224,7 +224,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $ <<set _pregWeek = $slaves[_u].pregWeek>> <<set _slaveName = SlaveFullName($slaves[_u])>> <div class="possible" @id="_slaveId" @data-preg-count="_WL" @data-reserved-spots="_reservedNursery" @data-preg-week="_pregWeek" @data-name="_slaveName"> - <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is <<= numberWithPluralOne($slaves[_u].pregWeek, "week")>> pregnant with + <<= App.UI.slaveDescriptionDialog($slaves[_u])>> is <<= numberWithPluralOne($slaves[_u].pregWeek, "week")>> pregnant with <<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>> <<elseif $slaves[_u].pregSource == -1>>your <<elseif $slaves[_u].pregSource == -2>>a citizen's diff --git a/src/facilities/nursery/widgets/utils/nurseryUtils.js b/src/facilities/nursery/widgets/utils/nurseryUtils.js index a189ed588a38b647cfad8655fe7b81ce8547f376..c2e3edb40ac58e61dd3e1ae2a21727fe188e4c39 100644 --- a/src/facilities/nursery/widgets/utils/nurseryUtils.js +++ b/src/facilities/nursery/widgets/utils/nurseryUtils.js @@ -755,7 +755,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() { r += `<div class="possible" @id="${slaveID}" @data-preg-count="${WL}" @data-reserved-spots="${reservedNursery}" @data-preg-week="${pregWeek}" @data-name="${slaveName}">`; - r += `${App.UI.passageLink(`${slaveName}`, "Long Slave Description", `${V.activeSlave = slave}, ${V.nextLink = passage()}`)} is ${pregWeek} weeks pregnant with `; + r += `${App.UI.SlaveDescriptionDialog(slave)} is ${pregWeek} weeks pregnant with `; switch (slave.pregSource) { case 0: diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index c55f0fcccab0610563a335c5103ed679fb71278f..cd8bed8614fee169bc544f58f8682b9767ce38e6 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -85,7 +85,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<set _pregWeek = $slaves[_u].pregWeek>> <<set _slaveName = SlaveFullName($slaves[_u])>> <div class="possible" @id="_slaveId" @data-preg-count="_pregCount" @data-reserved-spots="_reservedIncubator" @data-preg-week="_pregWeek" @data-name="_slaveName"> - <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek week<<if $slaves[_u].pregWeek > 1>>s<</if>> pregnant with + <<= App.UI.slaveDescriptionDialog($slaves[_u])>> is $slaves[_u].pregWeek week<<if $slaves[_u].pregWeek > 1>>s<</if>> pregnant with <<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>> <<elseif $slaves[_u].pregSource == -1>>your <<elseif $slaves[_u].pregSource == -2>>a citizen's