From fa289e810b0a7ee09c73cd9b1ffb205da8da118d Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 1 Mar 2020 14:19:10 -0800
Subject: [PATCH] Strip some SC macros from mainLinks.js.
---
src/interaction/main/mainLinks.js | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index 02f08d4f207..c0f9b17fa1a 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -82,7 +82,7 @@ App.UI.View.MainLinks = function() {
}
if (V.PC.health.shortDamage < 30) {
- r += ` <span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> <span class="cyan">[A]</span>`;
+ r += ` <span id="managePA"><strong>${App.UI.passageLink("Change plans", "Personal Attention Select")}</strong></span> <span class="cyan">[A]</span>`;
}
if (V.useSlaveSummaryOverviewTab !== 1) {
@@ -91,30 +91,30 @@ App.UI.View.MainLinks = function() {
if (V.arcologies[0].FSEgyptianRevivalistLaw === 1) {
r += ` and Consort`;
}
- r += `. <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> <span class="cyan">[H]</span>`;
+ r += `. <span id="manageHG"><strong>${App.UI.passageLink("Manage Head Girl", "HG Select")}</strong></span> <span class="cyan">[H]</span>`;
} else if (typeof V.slaveIndices[V.HeadGirl.ID] === 'undefined' && (V.slaves.length > 1)) {
r += `<br>You have not selected a Head Girl`;
if (V.arcologies[0].FSEgyptianRevivalistLaw === 1) {
r += ` and Consort`;
}
- r += `. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> <span class="cyan">[H]</span>`;
+ r += `. <span id="manageHG"><strong>${App.UI.passageLink("Select one", "HG Select")}</strong></span> <span class="cyan">[H]</span>`;
} else if (typeof V.slaveIndices[V.HeadGirl.ID] === 'undefined') {
r += `<br><span class="note">You do not have enough slaves to keep a Head Girl</span>`;
}
r += `<br>`;
if (typeof V.slaveIndices[V.Recruiter.ID] !== 'undefined') {
- r += `<strong><u><span class="pink">${SlaveFullName(V.Recruiter)}</span></u></strong> is working to recruit girls. <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> <span class="cyan">[U]</span>`;
+ r += `<strong><u><span class="pink">${SlaveFullName(V.Recruiter)}</span></u></strong> is working to recruit girls. <span id="manageRecruiter"><strong>${App.UI.passageLink("Manage Recruiter", "Recruiter Select")}</strong></span> <span class="cyan">[U]</span>`;
} else {
- r += `You have not selected a Recruiter. <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> <span class="cyan">[U]</span>`;
+ r += `You have not selected a Recruiter. <span id="manageRecruiter"><strong>${App.UI.passageLink("Select one", "Recruiter Select")}</strong></span> <span class="cyan">[U]</span>`;
}
if (V.dojo) {
r += `<br>`;
if (typeof V.slaveIndices[V.Bodyguard.ID] !== 'undefined') {
- r += `<strong><u><span class="pink">${SlaveFullName(V.Bodyguard)}</span></u></strong> is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> <span class="cyan">[B]</span>`;
+ r += `<strong><u><span class="pink">${SlaveFullName(V.Bodyguard)}</span></u></strong> is serving as your bodyguard. <span id="manageBG"><strong>${App.UI.passageLink("Manage Bodyguard", "BG Select")}</strong></span> <span class="cyan">[B]</span>`;
} else {
- r += `You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> <span class="cyan">[B]</span>`;
+ r += `You have not selected a Bodyguard. <span id="manageBG"><strong>${App.UI.passageLink("Select one", "BG Select")}</strong></span> <span class="cyan">[B]</span>`;
}
}
}
@@ -135,7 +135,7 @@ App.UI.View.MainLinks = function() {
} else {
r += 'an organ';
}
- r += ` for </span><<link "<<print $slaves[${i}].slaveName>>">><<set $activeSlave = $slaves[${i}]>><<goto "Slave Interact">><</link>>, <span class="yellow"> which `;
+ r += ` for </span>${App.UI.link(V.slaves[i].slaveName, () => { V.activeSlave = V.slaves[i]; }, "", "Slave Interact")}<span class="yellow"> which `;
if (slaveOrgans > 1) {
r += 'are';
} else {
@@ -151,7 +151,7 @@ App.UI.View.MainLinks = function() {
if (getSlave(V.adjustProsthetics[j].slaveID) !== undefined) {
const i = V.slaveIndices[V.adjustProsthetics[j].slaveID];
if (V.adjustProsthetics[j].workLeft <= 0) {
- r += `<br><span class="yellow">The lab has completed <<= addA(setup.prosthetics[$adjustProsthetics[${j}].id].name)>> for</span> <span id="name"><<= "[[SlaveFullName($slaves[${i}])|Slave Interact][$activeSlave = $slaves[${i}]]]">>,</span> <span class="yellow"> which is ready to be attached.</span>`;
+ r += `<br><span class="yellow">The lab has completed ${addA(setup.prosthetics[V.adjustProsthetics[j].id].name)} for</span> <span id="name">${App.UI.link(SlaveFullName(V.slaves[i]), () => { V.activeSlave = V.slaves[i]; }, "", "Slave Interact")},</span> <span class="yellow"> which is ready to be attached.</span>`;
}
} else {
V.adjustProsthetics.splice(j, 1);
@@ -161,11 +161,11 @@ App.UI.View.MainLinks = function() {
}
if (V.completedOrgans.length > 0 && V.adjustProstheticsCompleted > 0) {
- r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class="yellow">all organs and prosthetics that are ready.</span>`;
+ r += `<br>${App.UI.passageLink("Implant and Attach", "Multiple Organ Implant")} <span class="yellow">all organs and prosthetics that are ready.</span>`;
} else if (V.completedOrgans.length > 1) {
- r += `<br>[[Implant|Multiple Organ Implant]] <span class="yellow">all organs that are ready for implantation.</span>`;
+ r += `<br>${App.UI.passageLink("Implant", "Multiple Organ Implant")} <span class="yellow">all organs that are ready for implantation.</span>`;
} else if (V.adjustProstheticsCompleted > 1) {
- r += `<br>[[Attach|Multiple Organ Implant]] <span class="yellow">all prosthetics that are ready to be attached.</span>`;
+ r += `<br>${App.UI.passageLink("Attach", "Multiple Organ Implant")} <span class="yellow">all prosthetics that are ready to be attached.</span>`;
}
if (V.slaveCostFactor > 1.05) {
@@ -180,7 +180,7 @@ App.UI.View.MainLinks = function() {
r += `<br>The slave market is stable; the price of slaves is average.`;
}
- r += ` <span id="buySlaves"><strong><<link "Buy Slaves">><<goto "Buy Slaves">><</link>></strong></span> <span class="cyan">[S]</span>`;
+ r += ` <span id="buySlaves"><strong>${App.UI.passageLink("Buy Slaves", "Buy Slaves")}</strong></span> <span class="cyan">[S]</span>`;
if (V.seeDicks !== 100) {
if (V.TSS.schoolSale !== 0) {
r += `<br><span class="yellow">For your first purchase, </span><strong>[[The Slavegirl School][$slavesSeen += 1]]</strong><span class="yellow"> will sell at half price this week.</span>`;
--
GitLab