From 129e12e89c58f7938dabbd1ec2ac2e084cb3c6b4 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Wed, 26 Feb 2020 20:13:19 -0800 Subject: [PATCH] Fix subordinate targeting *again* --- src/facilities/penthouse/penthouseFramework.js | 12 ++++++++++++ src/uncategorized/subordinateTargeting.tw | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/facilities/penthouse/penthouseFramework.js b/src/facilities/penthouse/penthouseFramework.js index 4a0d1bdc863..f53f20fd1d3 100644 --- a/src/facilities/penthouse/penthouseFramework.js +++ b/src/facilities/penthouse/penthouseFramework.js @@ -166,6 +166,18 @@ App.Entity.Facilities.PenthouseJobs = { return `<<run App.Utils.setActiveSlaveByIndex(${i})>>` + (callback !== undefined ? callback(assignment) : ''); }, linkText); } + + assignmentLinkElement(i, passage, callback, linkText) { + linkText = linkText || this.desc.position; + return App.UI.DOM.assignmentLink(V.slaves[i], this.desc.assignment, "Subordinate Targeting", + (slave, assignment) => { + if (callback) { + callback(slave, assignment); + } + App.Utils.setActiveSlaveByIndex(i); + V.returnTo = passage; + }, linkText); + } }, Cow: class extends App.Entity.Facilities.PenthouseJob { checkRequirements(slave) { diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw index b4953ab098e..4bdf2c69c02 100644 --- a/src/uncategorized/subordinateTargeting.tw +++ b/src/uncategorized/subordinateTargeting.tw @@ -1,6 +1,6 @@ :: Subordinate Targeting [nobr] -<<set $nextButton = "Back", $nextLink = "Slave Interact">> +<<set $nextButton = "Back", $nextLink = "AS Dump">> <<setLocalPronouns $activeSlave>> -- GitLab