Skip to content
Snippets Groups Projects
Commit 12c2da99 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'tweaks' into 'pregmod-master'

Quick Scroll Tweaks

See merge request !1993
parents 6c9dd883 444548f6
Branches
Tags
2 merge requests!2047RA rework,!1993Quick Scroll Tweaks
...@@ -90,94 +90,75 @@ ...@@ -90,94 +90,75 @@
<<capture _ssi>> <<capture _ssi>>
<<if $useSlaveListInPageJSNavigation == 1>> <<if $useSlaveListInPageJSNavigation == 1>>
<<set _Count = _indexSlavesIdxs.length>> <<set _Count = _indexSlavesIdxs.length>>
<<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag)) || ($Flag == 1)))>> <<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag)) || ($Flag == 1)))>>
<<set _indexed = 1, _counter = 0, _buttons = []>> <<set _indexed = 1, _counter = 0, _buttons = []>>
<style> <style>
.hidden { display:none; } .hidden {display:none;}
table.quicklist {
table.quicklist { table-layout: fixed;
table-layout: fixed; text-align: center;
text-align: center; border-collapse: separate;
border-collapse: separate; border-spacing: 2px;
border-spacing: 2px; border-style: hidden;
border-style: hidden; empty-cells: hide;
empty-cells: hide; width: 70%;
width: 70%; }
} table.quicklist td { margin: 1px; }
table.quicklist td { margin: 1px; } table.quicklist col { width: 8%; }
table.quicklist col { width: 8%; } </style>
table.quicklist td { border: 5px solid blue; } <br />
</style> <button data-quick-index="1">Quick Index</button>
<br /> <div id="list_index" class="hidden">
<button data-quick-index="1">Quick Index</button> <<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
<div id="list_index" class="hidden"> <<set _IndexSlave = $slaves[_ssii]>>
<<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>> <<if $surnameOrder != 1>>
<<set _IndexSlave = $slaves[_ssii]>> <<if ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(_Slave.nationality)>>
<<if $surnameOrder != 1>> <<set _indexSlaveName = [_IndexSlave.slaveSurname || "", _IndexSlave.slaveName].join(" ").trim()>>
<<if ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(_Slave.nationality)>> <<else>>
<<set _indexSlaveName = [_IndexSlave.slaveSurname || "", _IndexSlave.slaveName].join(" ").trim()>> <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
<<else>> <</if>>
<<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>> <<else>>
<</if>> <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
<<else>> <</if>>
<<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>> <<set _buttons.push('<button data-scroll-to="#slave-' + _IndexSlave.ID + '" data-scroll-offset="300">' + _indexSlaveName + '</button>'); >>
<</if>> <</for>>
<<set _buttons.push('<button data-scroll-to="#slave-' + _IndexSlave.ID + '" data-scroll-offset="300">' + _indexSlaveName + '</button>'); >> <<if !_.isUndefined(_buttons[0])>>
<</for>> <table class="quicklist">
<<set _button = _buttons.shift()>> <<for !_.isUndefined(_buttons[0])>>
<<if !_.isUndefined(_button)>> <tr>
<<set _buttons.unshift(_button);>> <<for _cols = 0; _cols <= 4; _cols++>>
<table class="quicklist"> <<set _button = _buttons.shift()>>
<<for !_.isUndefined(_button = _buttons.shift())>> <<if !_.isUndefined(_button)>>
<<set _buttons.unshift(_button);>> <td></td>
<tr> <td colspan="10">
<<for _cols = 0; _cols <= 4; _cols++>> <<print _button>>
<<set _button = _buttons.shift()>> </td>
<<if !_.isUndefined(_button)>> <</if>>
<td></td> <</for>>
<td colspan="2"> <td></td>
<<print _button>> </tr>
</td> <</for>>
<</if>> </table>
<</for>> <script>
<td></td> /*
</tr> * Use javascript scrollTop animation for in page navigation.
<</for>> */
</table> $("[data-quick-index]").click(function() {
<script> var $quick = $('div#list_index');
/* $quick.toggleClass("hidden");
* Use javascript scrollTop animation for in page navigation. });
*/ $("[data-scroll-to]").click(function() {
$("[data-quick-index]") var $this = $(this);
.click( var $toElement = $this.attr('data-scroll-to'), $offset = $this.attr('data-scroll-offset') || 0, $speed = $this.attr('data-scroll-speed') || 900;
function () $('html, body').animate( {
{ scrollTop: $($toElement).offset().top + $offset
var $quick = $('div#list_index') }, $speed);
; });
$quick.toggleClass("hidden"); </script>
} <</if>>
); </div>
$("[data-scroll-to]") <</if>>
.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>> <</if>>
<<switch _Pass>> <<switch _Pass>>
<<case "Main">> <<case "Main">>
...@@ -232,7 +213,7 @@ ...@@ -232,7 +213,7 @@
<<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@'' <<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@''
<</if>> <</if>>
<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Slave.ID; }) != -1>>''@@.lightcoral;PA@@''<</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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
<<case "Personal Attention Select">> <<case "Personal Attention Select">>
...@@ -268,11 +249,10 @@ ...@@ -268,11 +249,10 @@
<<case "Head Girl Suite">> <<case "Head Girl Suite">>
<<if $Flag == 0>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Subordinate Targeting">> <<case "Subordinate Targeting">>
...@@ -284,7 +264,6 @@ ...@@ -284,7 +264,6 @@
<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish == "mindbroken") || _Slave.sexualFlaw !== "none" || _Slave.behavioralFlaw !== "none">> <<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">> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName cannot be trusted in the spa// <br>//_Slave.slaveName cannot be trusted in the spa//
...@@ -296,10 +275,11 @@ ...@@ -296,10 +275,11 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<<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 ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Attendant Select">> <<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>> <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>>
...@@ -310,7 +290,6 @@ ...@@ -310,7 +290,6 @@
<<if _Slave.breedingMark != 1>> <<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you// <br>//_Slave.slaveName must be either more fearful of you or devoted to you//
...@@ -322,10 +301,11 @@ ...@@ -322,10 +301,11 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<<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 ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Madam Select">> <<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>> <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>>
...@@ -336,8 +316,7 @@ ...@@ -336,8 +316,7 @@
<<if _Slave.breedingMark != 1>> <<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>> <<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>> <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]]]
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you// <br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>> <<continue>>
...@@ -348,11 +327,10 @@ ...@@ -348,11 +327,10 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "DJ Select">> <<case "DJ Select">>
...@@ -363,7 +341,6 @@ ...@@ -363,7 +341,6 @@
<<if $clinic <= $clinicSlaves>><<continue>><</if>> <<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")))>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName cannot benefit from the clinic// <br>//_Slave.slaveName cannot benefit from the clinic//
...@@ -371,12 +348,11 @@ ...@@ -371,12 +348,11 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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]]]
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Nurse Select">> <<case "Nurse 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>> <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>>
...@@ -387,8 +363,7 @@ ...@@ -387,8 +363,7 @@
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>> <<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))>> <<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>> <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]]]
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName already has a basic education// <br>//_Slave.slaveName already has a basic education//
<<continue>> <<continue>>
...@@ -399,11 +374,10 @@ ...@@ -399,11 +374,10 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Schoolteacher Select">> <<case "Schoolteacher Select">>
...@@ -432,7 +406,6 @@ ...@@ -432,7 +406,6 @@
<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>> <<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName's vagina cannot accommodate current machine settings// <br>//_Slave.slaveName's vagina cannot accommodate current machine settings//
...@@ -456,11 +429,10 @@ ...@@ -456,11 +429,10 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Milkmaid Select">> <<case "Milkmaid Select">>
...@@ -471,7 +443,6 @@ ...@@ -471,7 +443,6 @@
<<if $servantsQuarters <= $servantsQuartersSlaves>><<continue>><</if>> <<if $servantsQuarters <= $servantsQuartersSlaves>><<continue>><</if>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you// <br>//_Slave.slaveName must be either more fearful of you or devoted to you//
...@@ -479,11 +450,10 @@ ...@@ -479,11 +450,10 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Stewardess Select">> <<case "Stewardess Select">>
...@@ -493,8 +463,7 @@ ...@@ -493,8 +463,7 @@
<<if $Flag == 0>> <<if $Flag == 0>>
<<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>> <<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>>
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName is not sufficiently broken for the master suite// <br>//_Slave.slaveName is not sufficiently broken for the master suite//
...@@ -502,11 +471,10 @@ ...@@ -502,11 +471,10 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Concubine Select">> <<case "Concubine Select">>
...@@ -518,7 +486,6 @@ ...@@ -518,7 +486,6 @@
<<if $cellblock <= $cellblockSlaves>><<continue>><</if>> <<if $cellblock <= $cellblockSlaves>><<continue>><</if>>
<<if (_Slave.devotion < -20 && _Slave.trust >= -20) || (_Slave.devotion < -50 && _Slave.trust >= -50)>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName is sufficiently broken in so that the cellblock would have no effect// <br>//_Slave.slaveName is sufficiently broken in so that the cellblock would have no effect//
...@@ -526,11 +493,10 @@ ...@@ -526,11 +493,10 @@
<</if>> <</if>>
<<elseif $Flag == 1>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Wardeness Select">> <<case "Wardeness Select">>
...@@ -543,7 +509,6 @@ ...@@ -543,7 +509,6 @@
<<if _Slave.breedingMark != 1>> <<if _Slave.breedingMark != 1>>
<<if (_Slave.indentureRestrictions <= 0)>> <<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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>> <<else>>
<br>//_Slave.slaveName's indenture forbids arcade service.// <br>//_Slave.slaveName's indenture forbids arcade service.//
...@@ -555,7 +520,7 @@ ...@@ -555,7 +520,7 @@
<</if>> <</if>>
<<else>> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>> <</if>>
<<case "Pit">> <<case "Pit">>
...@@ -570,8 +535,8 @@ ...@@ -570,8 +535,8 @@
<br>//_Slave.slaveName may not participate in combat// <br>//_Slave.slaveName may not participate in combat//
<<continue>> <<continue>>
<<else>> <<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>> <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>>
[[_slaveName|Assign][$i = _ssi]] [[_slaveName|Assign][$i = _ssi]]
<</if>> <</if>>
<<else>> <<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>> <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>>
...@@ -609,7 +574,7 @@ ...@@ -609,7 +574,7 @@
<</if>> <</if>>
<<case "Matchmaking">> <<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>> <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>'>> <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</switch>> <</switch>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment