From c8680256fc48d30ebbcab200ba9ef3e5fe088b73 Mon Sep 17 00:00:00 2001
From: Induced NCS <kidkinster@gmail.com>
Date: Mon, 7 May 2018 20:15:04 -0600
Subject: [PATCH] induced NCS -> quick list
Adds a game option to enable a jQuery in page scrolling link box for
navigation to specific slaves (by name) in slave lists.
Adds backwards compatibility for our option variable.
Update the slave Summary to, if enabled, build a quick slave in-page
jQuery scrollto navigation for getting to individual slaves quickly.
While this may be overkill for facitlities with 1 to 5 slaves, more
than that it becomes very useful.
- modified: src/uncategorized/BackwardsCompatibility.tw
- modified: src/uncategorized/options.tw
- modified: src/uncategorized/slaveSummary.tw
---
src/uncategorized/BackwardsCompatibility.tw | 3 +
src/uncategorized/options.tw | 21 +++-
src/uncategorized/slaveSummary.tw | 130 +++++++++++++++++++-
3 files changed, 144 insertions(+), 10 deletions(-)
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 4f4986dc424..b835506f631 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -830,6 +830,9 @@
<<if ndef $useSlaveSummaryOverviewTab>>
<<set $useSlaveSummaryOverviewTab = 0>>
<</if>>
+<<if ndef $useSlaveListInPageJSNavigation>>
+ <<set $useSlaveListInPageJSNavigation = 0>>
+<</if>>
<<if ndef $arcologies[0].FSAztecRevivalist>>
<<for _bci = 0; _bci < $arcologies.length; _bci++>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index c162ef1f847..f90f6251751 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -158,9 +158,9 @@ Main menu leadership controls displayed
Main menu slave tabs are
<<if $useSlaveSummaryTabs != 1>>
-@@.red;DISABLED@@. [[Enable|Options][$useSlaveSummaryTabs = 1]]
+ @@.red;DISABLED.@@ [[Enable|Options][$useSlaveSummaryTabs = 1]]
<<else>>
-@@.cyan;ENABLED@@. [[Disable|Options][$useSlaveSummaryTabs = 0, $useSlaveSummaryOverviewTab = 0]]
+ @@.cyan;ENABLED.@@ [[Disable|Options][$useSlaveSummaryTabs = 0, $useSlaveSummaryOverviewTab = 0]]
<</if>>
@@ -169,21 +169,30 @@ Main menu slave tabs are
Condense special slaves into an overview tab
<<if $useSlaveSummaryOverviewTab != 1>>
- @@.red;DISABLED@@. [[Enable|Options][$useSlaveSummaryOverviewTab = 1]]
+ @@.red;DISABLED.@@ [[Enable|Options][$useSlaveSummaryOverviewTab = 1]]
<<else>>
- @@.cyan;ENABLED@@. [[Disable|Options][$useSlaveSummaryOverviewTab = 0]]
+ @@.cyan;ENABLED.@@ [[Disable|Options][$useSlaveSummaryOverviewTab = 0]]
<</if>>
<</if>>
+<br />
+
+The slave Quick list in-page scroll-to is
+<<if $useSlaveListInPageJSNavigation != 1>>
+ @@.red;DISABLED.@@ [[Enable|Options][$useSlaveListInPageJSNavigation = 1]]
+<<else>>
+ @@.cyan;ENABLED.@@ [[Disable|Options][$useSlaveListInPageJSNavigation = 0]]
+<</if>>
+
<br>
Slave summary caching is <<if $useSummaryCache>>@@.cyan;ENABLED@@. [[Disable|Options][$useSummaryCache = false]]<<else>>@@.red;DISABLED@@. [[Enable|Options][$useSummaryCache = true]]<</if>>
<br>
Tips from the Encyclopedia are
<<if ($showTipsFromEncy == 0)>>
- @@.red;DISABLED@@. [[Enable|Options][$showTipsFromEncy = 1]]
+ @@.red;DISABLED.@@ [[Enable|Options][$showTipsFromEncy = 1]]
<<else>>
- @@.cyan;ENABLED@@. [[Disable|Options][$showTipsFromEncy = 0]]
+ @@.cyan;ENABLED.@@ [[Disable|Options][$showTipsFromEncy = 0]]
<</if>>
<br><br>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index dff36a042b0..81db57aae40 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -70,9 +70,10 @@
"Rules Slave Exclude": s => (($Flag == 0 && !ruleSlaveExcluded(s, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(s, $currentRule))),
"Matchmaking": s => (s.devotion >= 100 && s.relationship == $activeSlave.relationship && s.ID != $activeSlave.ID),
}>>
-<<set _Pass = passage(), _SL = $slaves.length, $assignTo = _Pass,
+<<set _Pass = passage(), _SL = $slaves.length, $assignTo = _Pass, _indexed = 0,
_passagePreFilter = (s => s.assignment != "be your agent" && s.assignment != "live with your agent" && (!setup.passagePreFilters.hasOwnProperty(_Pass) || setup.passagePreFilters[_Pass](s))),
- _filteredSlaveIdxs = $slaves.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx !== null; })>>
+ _filteredSlaveIdxs = $slaves.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx !== null; }),
+ _indexSlavesIdxs = $slaves.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx !== null; })>>
<<for !_.isUndefined(_ssi = _filteredSlaveIdxs.shift())>>
<<set _Slave = $slaves[_ssi]>>
<<if $surnameOrder != 1>>
@@ -88,6 +89,96 @@
<<capture _ssi>>
+<<if $useSlaveListInPageJSNavigation == 1>>
+ <<set _Count = _indexSlavesIdxs.length>>
+ <<if (($Flag == 1) && (_Count > 1) && (_indexed == 0))>>
+ <<set _indexed = 1, _counter = 0, _buttons = []>>
+<style>
+ .hidden { display:none; }
+
+ table.quicklist {
+ table-layout: fixed;
+ text-align: center;
+ border-collapse: separate;
+ border-spacing: 2px;
+ border-style: hidden;
+ empty-cells: hide;
+ width: 70%;
+ }
+ table.quicklist td { margin: 1px; }
+ table.quicklist col { width: 8%; }
+ table.quicklist td { border: 5px solid blue; }
+</style>
+<br />
+<button data-quick-index="1">Quick Index</button>
+<div id="list_index" class="hidden">
+ <<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
+ <<set _IndexSlave = $slaves[_ssii]>>
+ <<if $surnameOrder != 1>>
+ <<if ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(_Slave.nationality)>>
+ <<set _indexSlaveName = [_IndexSlave.slaveSurname || "", _IndexSlave.slaveName].join(" ").trim()>>
+ <<else>>
+ <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
+ <</if>>
+ <<else>>
+ <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
+ <</if>>
+ <<set _buttons.push('<button data-scroll-to="#slave-' + _IndexSlave.ID + '" data-scroll-offset="300">' + _indexSlaveName + '</button>'); >>
+ <</for>>
+ <<set _button = _buttons.shift()>>
+ <<if !_.isUndefined(_button)>>
+ <<set _buttons.unshift(_button);>>
+ <table class="quicklist">
+ <<for !_.isUndefined(_button = _buttons.shift())>>
+ <<set _buttons.unshift(_button);>>
+ <tr>
+ <<for _cols = 0; _cols <= 4; _cols++>>
+ <<set _button = _buttons.shift()>>
+ <<if !_.isUndefined(_button)>>
+ <td></td>
+ <td colspan="2">
+ <<print _button>>
+ </td>
+ <</if>>
+ <</for>>
+ <td></td>
+ </tr>
+ <</for>>
+ </table>
+ <script>
+ /*
+ * Use javascript scrollTop animation for in page navigation.
+ */
+ $("[data-quick-index]")
+ .click(
+ function ()
+ {
+ var $quick = $('div#list_index')
+ ;
+ $quick.toggleClass("hidden");
+ }
+ );
+ $("[data-scroll-to]")
+ .click(
+ function ()
+ {
+ var $this = $(this);
+ var $toElement = $this.attr('data-scroll-to')
+ , $offset = $this.attr('data-scroll-offset') * 1 || 0
+ , $speed = $this.attr('data-scroll-speed') * 1 || 900
+ ;
+ $('html, body')
+ .animate(
+ { scrollTop: $($toElement).offset().top + $offset },
+ $speed
+ );
+ }
+ );
+ </script>
+ <</if>>
+</div>
+ <</if>>
+<</if>>
<<switch _Pass>>
<<case "Main">>
@@ -141,6 +232,7 @@
<<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@''
<</if>>
<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Slave.ID; }) != -1>>''@@.lightcoral;PA@@''<</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
<<case "Personal Attention Select">>
@@ -176,9 +268,11 @@
<<case "Head Girl Suite">>
<<if $Flag == 0>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Subordinate Targeting">>
@@ -190,6 +284,7 @@
<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish == "mindbroken") || _Slave.sexualFlaw !== "none" || _Slave.behavioralFlaw !== "none">>
<<if _Slave.devotion >= -20 || _Slave.fetish == "mindbroken">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName cannot be trusted in the spa//
@@ -201,9 +296,10 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Attendant Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -214,6 +310,7 @@
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
@@ -225,9 +322,10 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
- <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Madam Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -238,6 +336,7 @@
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
@@ -249,9 +348,11 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "DJ Select">>
@@ -262,6 +363,7 @@
<<if $clinic <= $clinicSlaves>><<continue>><</if>>
<<if (_Slave.health < 20) || ($Nurse != 0 && (_Slave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && _Slave.bellyImplant > -1) || (_Slave.pregKnown == 1 && ($clinicSpeedGestation >= 0 || _Slave.pregControl == "speed up")))>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName cannot benefit from the clinic//
@@ -269,9 +371,11 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Nurse Select">>
@@ -283,6 +387,7 @@
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
<<if (_Slave.intelligenceImplant < 1) || (_Slave.voice != 0 && _Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.whoreSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.entertainSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.analSkill < 10+$schoolroomUpgradeSkills*20) || ((_Slave.vagina >= 0) && (_Slave.vaginalSkill < 10+$schoolroomUpgradeSkills*20))>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName already has a basic education//
@@ -294,9 +399,11 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Schoolteacher Select">>
@@ -325,6 +432,7 @@
<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($dairyPrepUpgrade == 1)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName's vagina cannot accommodate current machine settings//
@@ -348,9 +456,11 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Milkmaid Select">>
@@ -361,6 +471,7 @@
<<if $servantsQuarters <= $servantsQuartersSlaves>><<continue>><</if>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
@@ -368,9 +479,11 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Stewardess Select">>
@@ -381,6 +494,7 @@
<<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>>
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName is not sufficiently broken for the master suite//
@@ -388,9 +502,11 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Concubine Select">>
@@ -402,6 +518,7 @@
<<if $cellblock <= $cellblockSlaves>><<continue>><</if>>
<<if (_Slave.devotion < -20 && _Slave.trust >= -20) || (_Slave.devotion < -50 && _Slave.trust >= -50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName is sufficiently broken in so that the cellblock would have no effect//
@@ -409,9 +526,11 @@
<</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Wardeness Select">>
@@ -424,6 +543,7 @@
<<if _Slave.breedingMark != 1>>
<<if (_Slave.indentureRestrictions <= 0)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<br>//_Slave.slaveName's indenture forbids arcade service.//
@@ -435,6 +555,7 @@
<</if>>
<<else>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Pit">>
@@ -488,6 +609,7 @@
<</if>>
<<case "Matchmaking">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+ <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</switch>>
--
GitLab