From bb74f078bf73ea2a5dad8d3e0ea7ce39a89ca2a9 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 16 Oct 2020 22:24:54 -0400
Subject: [PATCH] fix intro
---
src/npc/generate/newChildIntro.js | 5 ++---
src/npc/generate/newSlaveIntro.js | 6 ++++--
src/pregmod/incubatorRetrievalWorkaround.tw | 3 +--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js
index 5a6dcc75f2e..1795613b600 100644
--- a/src/npc/generate/newChildIntro.js
+++ b/src/npc/generate/newChildIntro.js
@@ -1,8 +1,7 @@
/**
* @param {App.Entity.SlaveState} slave
- * @param {App.Entity.SlaveState} [slave2] recruiter slave, if present in the scene
*/
-App.UI.newChildIntro = function(slave, slave2) {
+App.UI.newChildIntro = function(slave, slave2, hideInspect = true) {
const {
His, He, his, him, he, girl, hers, himself, daughter
} = getPronouns(slave);
@@ -904,7 +903,7 @@ App.UI.newChildIntro = function(slave, slave2) {
}
// Normal intro stuff
- el.append(App.UI.newSlaveIntro(slave));
+ el.append(App.UI.newSlaveIntro(slave, null, hideInspect));
// Unique stuff again
el.append(parentInterest());
diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js
index 174911b1a3d..54dd2d90fb2 100644
--- a/src/npc/generate/newSlaveIntro.js
+++ b/src/npc/generate/newSlaveIntro.js
@@ -3,7 +3,7 @@
* @param {App.Entity.SlaveState} [slave2] recruiter slave, if present in the scene
* @returns {DocumentFragment}
*/
-App.UI.newSlaveIntro = function(slave, slave2) {
+App.UI.newSlaveIntro = function(slave, slave2, hideInspect = false) {
const desc = SlaveTitle(slave);
const {title: Master} = getEnunciation(slave);
const {
@@ -22,7 +22,9 @@ App.UI.newSlaveIntro = function(slave, slave2) {
modSetup();
- el.append(inspect());
+ if (!hideInspect) {
+ el.append(inspect());
+ }
el.append(choices());
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index 8826d551814..057280aba9f 100644
--- a/src/pregmod/incubatorRetrievalWorkaround.tw
+++ b/src/pregmod/incubatorRetrievalWorkaround.tw
@@ -25,8 +25,7 @@
<</if>>
<</for>>
<</if>>
- <<run newSlave($activeSlave)>>
- <<include "New Child Intro">>
+ <<includeDOM App.UI.newChildIntro($activeSlave, null, true)>>
<<else>>
A husk is ready to be used.
<br>
--
GitLab