diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index e0a94647e29d71524d1ad2ebd31d01ba806a9808..d6f3c9af2ee9f6468627b90eb226e0c6082d39c2 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -79,13 +79,13 @@
</p>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description')" id="tab Description">Description</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Location')" id="tab Location">Location</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(V.slaves[V.slaveIndices[V.activeSlave.ID]])" id="tab Appearance">Appearance</button>
+<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'PhysicalRegimen')" id="tab PhysicalRegimen">Physical Regimen</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(V.slaves[V.slaveIndices[V.activeSlave.ID]])" id="tab Customize">Customize</button>
+<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
<<if $familyTesting == 1>>
- <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.slaves[V.slaveIndices[V.activeSlave.ID]].ID)" id="tab FamilyTab">Family</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, getSlave(V.activeSlave.ID).ID)" id="tab FamilyTab">Family</button>
<</if>>
<div id="artFrame">
@@ -142,14 +142,14 @@
[[Auto salon|Salon][$activeSlave = $slaves[_i], $degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$primaryEarColor = "",$secondaryEarColor = "",$primaryTailColor = "",$secondaryTailColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
| [[Body mod studio|Body Modification][$activeSlave = $slaves[_i], $degradation = 0, $tattooChoice = undefined]]
| [[Remote surgery|Remote Surgery][$activeSlave = $slaves[_i], $degradation = 0]]
- <<if $prostheticsUpgrade > 0>>| [Configure cybernetics|Prosthetics Configuration][[$activeSlave = $slaves[_i], $prostheticsConfig = "main"]]<</if>>
+ <<if $prostheticsUpgrade > 0>>| [[Configure cybernetics|Prosthetics Configuration][$activeSlave = $slaves[_i], $prostheticsConfig = "main"]]<</if>>
<div id="miniscene"></div>
<span id="useSlave"></span>
<script>
- console.log(V.i, V.slaves[V.slaveIndices[V.activeSlave.ID]]);
- App.UI.SlaveInteract.useSlaveDisplay(V.slaves[V.slaveIndices[V.activeSlave.ID]]);
+ console.log(V.i, getSlave(V.activeSlave.ID));
+ App.UI.SlaveInteract.useSlaveDisplay(getSlave(V.activeSlave.ID));
</script>
</p>
<p>
@@ -189,7 +189,7 @@
/* CAN BE REASSIGNED */
<span id="assignmentLinks"></span>
- <script>App.UI.SlaveInteract.assignmentBlock("assignmentLinks", V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.assignmentBlock("assignmentLinks", getSlave(V.activeSlave.ID))</script>
<<set _numFacilities = $brothel+$club+$dairy+$farmyard+$servantsQuarters+$masterSuite+$spa+$nursery+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
@@ -198,7 +198,7 @@
<</if>> /* closes _numFacilities */
<div id="fucktoypref"></div>
- <script>App.UI.SlaveInteract.fucktoyPref(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.fucktoyPref(getSlave(V.activeSlave.ID))</script>
<</switch>> /* END CAN BE REASSIGNED */
@@ -220,52 +220,52 @@
<h3>Appearance</h3>
<span id="clothes"></span>
- /*<script>App.UI.Wardrobe.clothes(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.clothes(getSlave(V.activeSlave.ID))</script>*/
<<if $slaves[_i].fuckdoll == 0>>
<span id="collar"></span>
- /*<script>App.UI.Wardrobe.collar(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.collar(getSlave(V.activeSlave.ID))</script>*/
<span id="armAccessory"></span>
- /*<script>App.UI.Wardrobe.armAccessory(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.armAccessory(getSlave(V.activeSlave.ID))</script>*/
<<if hasAnyLegs($slaves[_i])>>
<span id="shoes"></span>
- /*<script>App.UI.Wardrobe.shoes(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.shoes(getSlave(V.activeSlave.ID))</script>*/
<span id="legAccessory"></span>
- /*<script>App.UI.Wardrobe.legAccessory(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.legAccessory(getSlave(V.activeSlave.ID))</script>*/
<</if>>
<span id="bellyAccessory"></span>
- /*<script>App.UI.Wardrobe.bellyAccessory(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.bellyAccessory(getSlave(V.activeSlave.ID))</script>*/
<span id="buttplug"></span>
- /*<script>App.UI.Wardrobe.buttplug(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.buttplug(getSlave(V.activeSlave.ID))</script>*/
<<if isItemAccessible("tail") && $slaves[_i].buttplug != "none">>
<span id="buttplugAttachment"></span>
- /*<script>App.UI.Wardrobe.buttplugAttachment(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.buttplugAttachment(getSlave(V.activeSlave.ID))</script>*/
<</if>>
<<if $slaves[_i].vagina > -1>>
<span id="vaginalAccessory"></span>
- /*<script>App.UI.Wardrobe.vaginalAccessory(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.vaginalAccessory(getSlave(V.activeSlave.ID))</script>*/
<span id="vaginalAttachment"></span>
- /*<script>App.UI.Wardrobe.vaginalAttachment(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.vaginalAttachment(getSlave(V.activeSlave.ID))</script>*/
<</if>>
<<if $slaves[_i].dick > 0>>
<span id="dickAccessory"></span>
- /*<script>App.UI.Wardrobe.dickAccessory(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.dickAccessory(getSlave(V.activeSlave.ID))</script>*/
<</if>>
<span id="chastity"></span>
- /*<script>App.UI.Wardrobe.chastity(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>*/
+ /*<script>App.UI.Wardrobe.chastity(getSlave(V.activeSlave.ID))</script>*/
<h3>Shopping</h3>
<span id="shopping"></span>
- <script>App.UI.Wardrobe.shopping(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.Wardrobe.shopping(getSlave(V.activeSlave.ID))</script>
<</if>> /* CLOSES FUCKDOLL CHECK */
</p>
@@ -276,22 +276,22 @@
<div class="content">
<h3>Physical Regimen</h3>
<span id="drugs"></span>
- <script>App.UI.SlaveInteract.drugs(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.drugs(getSlave(V.activeSlave.ID))</script>
<span id="curatives"></span>
- <script>App.UI.SlaveInteract.curatives(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.curatives(getSlave(V.activeSlave.ID))</script>
<span id="aphrodisiacs"></span>
- <script>App.UI.SlaveInteract.aphrodisiacs(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.aphrodisiacs(getSlave(V.activeSlave.ID))</script>
<span id="fertilityblock"></span>
- <script>App.UI.SlaveInteract.fertility(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.fertility(getSlave(V.activeSlave.ID))</script>
<span id="incubator"></span>
- <script>App.UI.SlaveInteract.incubator(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.incubator(getSlave(V.activeSlave.ID))</script>
<span id="nursery"></span>
- <script>App.UI.SlaveInteract.nursery(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.nursery(getSlave(V.activeSlave.ID))</script>
<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<<if $slaves[_i].breedingMark == 0 && $slaves[_i].fuckdoll == 0 && $slaves[_i].eggType == "human" && isFertile($slaves[_i]) && $slaves[_i].preg == 0>>
@@ -301,7 +301,7 @@
<</if>>
<span id="bloating"></span>
- <script>App.UI.SlaveInteract.bloating(V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.bloating(getSlave(V.activeSlave.ID))</script>
Hormones: <strong><span id="hormones">
<<if $slaves[_i].hormones == -2>>intensive male<<elseif $slaves[_i].hormones == -1>>male<<elseif $slaves[_i].hormones == 2>>intensive female<<elseif $slaves[_i].hormones == 1>>female<<else>>none<</if>></span></strong>.
@@ -641,7 +641,7 @@
<div id="Customize" class="tabcontent">
<div class="content">
<span id="custom"></span>
- <script>App.UI.SlaveInteract.custom (V.slaves[V.slaveIndices[V.activeSlave.ID]])</script>
+ <script>App.UI.SlaveInteract.custom (getSlave(V.activeSlave.ID))</script>
/*<<include "Add custom descriptors">>*/
</div>