From e7a56f38b5f51631fcd7d10a4695376d9eb5a9d2 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Tue, 28 Jan 2020 22:35:48 -0800 Subject: [PATCH] Get rid of the Agent Retrieve redirect page and just strip her job directly from Neighbor Interact. --- src/npc/agent/agentRetrieve.tw | 10 ---------- src/uncategorized/neighborInteract.tw | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 src/npc/agent/agentRetrieve.tw diff --git a/src/npc/agent/agentRetrieve.tw b/src/npc/agent/agentRetrieve.tw deleted file mode 100644 index 80b38107192..00000000000 --- a/src/npc/agent/agentRetrieve.tw +++ /dev/null @@ -1,10 +0,0 @@ -:: Agent Retrieve [silently] - -<<set _ID = App.activeArcology().leaderID>> - -<<set _i = $slaveIndices[_ID]>> -<<if def _i>> - <<= removeJob($slaves[_i], "be your agent")>> -<</if>> - -<<goto "Neighbor Interact">> diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw index 37a6a56122f..0a8d74cdbb4 100644 --- a/src/uncategorized/neighborInteract.tw +++ b/src/uncategorized/neighborInteract.tw @@ -289,7 +289,7 @@ You have <<print $arcologies.length-1>> neighbors. <br><br> [[Appoint an agent|Agent Select]] <<set $him = "them">> <<else>> <<setLocalPronouns _Agent>> - Your agent @@.deeppink;<<= SlaveFullName(_Agent)>>@@ is running this arcology. <<link "Recall and reenslave $him" "Agent Retrieve">><</link>> + Your agent @@.deeppink;<<= SlaveFullName(_Agent)>>@@ is running this arcology. <<link "Recall and reenslave $him" "Neighbor Interact">><<run removeJob(_Agent, "be your agent")>><</link>> <</if>> <span id="rename"> | <<link "Instruct $him to rename the arcology">><<replace #rename>> | <<textbox "$arcologies[$activeArcologyIdx].name" $arcologies[$activeArcologyIdx].name>> [[Confirm name|Neighbor Interact]]<</replace>><</link>></span> <<if $arcologies[_currentNeighbor].government === "your agent">> -- GitLab