From c98824162f0cbead5fd2e1375df9ef6a5eacb023 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 13 Jun 2020 22:27:17 -0700
Subject: [PATCH] Remove direct passage links to Long Slave Description,
preferring the Slave Description Dialog for those cases.
---
src/facilities/nursery/nursery.tw | 2 +-
src/facilities/nursery/widgets/utils/nurseryUtils.js | 2 +-
src/pregmod/incubator.tw | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 4fa0c863e9e..f2222c9761b 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 a189ed588a3..c2e3edb40ac 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 c55f0fcccab..cd8bed8614f 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
--
GitLab