diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 6918a7b1766e54ea59565d5fd1a13af7a360bd03..406d8d445f2ac4bf8e4c127704f75fbce531b1ac 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -386,7 +386,6 @@ App.UI.SlaveInteract.assignmentBlock = function(slave) {
slave.ID, passage(),
(slave, assignment) => {
assignJob(slave, assignment);
- V.activeSlave = slave;
}
)
);
diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js
index 734ef4abc827c5c0a4ed003c25af860a8f42c5a6..437b79880181cd52f557f33445905def6c5f2ded 100644
--- a/src/markets/marketUI.js
+++ b/src/markets/marketUI.js
@@ -77,6 +77,6 @@ App.UI.buyingFromMarketControls = function(slave, slaveCost) {
);
}
- el.append(App.Desc.longSlave(V.activeSlave, {market: V.slaveMarket}));
+ el.append(App.Desc.longSlave(slave, {market: V.slaveMarket}));
return el;
};
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 6af60640cd79bce7bc11834103ddb9fa5b909232..90d552b63c22c6daec5427e2ad0e8b41b0c6d180 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -3,7 +3,6 @@
<<set $nextButton = "Confirm changes", $nextLink = "Main">>
<<set _SL = $slaves.length, _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
<<set $AS = $activeSlave.ID>>
-<<set $activeSlave = getSlave($AS)>>
<<run App.Utils.setLocalPronouns(getSlave($AS))>>
<<run Enunciate(getSlave($AS))>>
<style>
@@ -81,15 +80,15 @@
</span>
</p>
<div class="tab-bar">
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave(getSlave(V.activeSlave.ID)))" id="tab Description">Description</button>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave(getSlave(V.AS)))" id="tab Description">Description</button>
<button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Modify')" id="tab Modify">Modify</button>
<button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Work')" id="tab Work">Work</button>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.AS))" id="tab Appearance">Appearance</button>
<button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'PhysicalRegimen')" id="tab PhysicalRegimen">Physical Regimen</button>
<button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
<button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'family-tab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab family-tab">Family</button>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.AS))" id="tab Customize">Customize</button>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'family-tab'), renderFamilyTree(V.slaves, V.AS)" id="tab family-tab">Family</button>
</div>
<div id="art-frame">
@@ -146,7 +145,7 @@
<div class="content">
<p id="work"></p>
<script>
- App.UI.SlaveInteract.work(getSlave(V.activeSlave.ID))
+ App.UI.SlaveInteract.work(getSlave(V.AS))
</script>
</div>
</div>
@@ -155,56 +154,56 @@
<div class="content">
<p>
<span id="clothes"></span>
- /*<script>App.UI.Wardrobe.clothes(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.clothes(getSlave(V.AS))</script>*/
<<if getSlave($AS).fuckdoll == 0>>
<span id="collar"></span>
- /*<script>App.UI.Wardrobe.collar(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.collar(getSlave(V.AS))</script>*/
<span id="faceAccessory"></span>
<span id="mouthAccessory"></span>
<span id="armAccessory"></span>
- /*<script>App.UI.Wardrobe.armAccessory(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.armAccessory(getSlave(V.AS))</script>*/
<<if hasAnyLegs(getSlave($AS))>>
<span id="shoes"></span>
- /*<script>App.UI.Wardrobe.shoes(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.shoes(getSlave(V.AS))</script>*/
<span id="legAccessory"></span>
- /*<script>App.UI.Wardrobe.legAccessory(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.legAccessory(getSlave(V.AS))</script>*/
<</if>>
<span id="bellyAccessory"></span>
- /*<script>App.UI.Wardrobe.bellyAccessory(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.bellyAccessory(getSlave(V.AS))</script>*/
<span id="buttplug"></span>
- /*<script>App.UI.Wardrobe.buttplug(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.buttplug(getSlave(V.AS))</script>*/
<<if isItemAccessible.entry("tail", "buttplugAttachment") && getSlave($AS).buttplug != "none">>
<span id="buttplugAttachment"></span>
- /*<script>App.UI.Wardrobe.buttplugAttachment(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.buttplugAttachment(getSlave(V.AS))</script>*/
<</if>>
<<if getSlave($AS).vagina > -1>>
<span id="vaginalAccessory"></span>
- /*<script>App.UI.Wardrobe.vaginalAccessory(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.vaginalAccessory(getSlave(V.AS))</script>*/
<span id="vaginalAttachment"></span>
- /*<script>App.UI.Wardrobe.vaginalAttachment(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.vaginalAttachment(getSlave(V.AS))</script>*/
<</if>>
<<if getSlave($AS).dick > 0>>
<span id="dickAccessory"></span>
- /*<script>App.UI.Wardrobe.dickAccessory(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.dickAccessory(getSlave(V.AS))</script>*/
<</if>>
<span id="chastity"></span>
- /*<script>App.UI.Wardrobe.chastity(getSlave(V.activeSlave.ID))</script>*/
+ /*<script>App.UI.Wardrobe.chastity(getSlave(V.AS))</script>*/
<h3>Shopping</h3>
<span id="shopping"></span>
- <script>App.UI.Wardrobe.shopping(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.Wardrobe.shopping(getSlave(V.AS))</script>
<</if>> /* CLOSES FUCKDOLL CHECK */
</p>
@@ -215,22 +214,22 @@
<div class="content">
<p>
<span id="drugs"></span>
- <script>App.UI.SlaveInteract.drugs(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.drugs(getSlave(V.AS))</script>
<span id="curatives"></span>
- <script>App.UI.SlaveInteract.curatives(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.curatives(getSlave(V.AS))</script>
<span id="aphrodisiacs"></span>
- <script>App.UI.SlaveInteract.aphrodisiacs(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.aphrodisiacs(getSlave(V.AS))</script>
<span id="fertility-block"></span>
- <script>App.UI.SlaveInteract.fertility(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.fertility(getSlave(V.AS))</script>
<span id="incubator"></span>
- <script>App.UI.SlaveInteract.incubator(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.incubator(getSlave(V.AS))</script>
<span id="nursery"></span>
- <script>App.UI.SlaveInteract.nursery(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.nursery(getSlave(V.AS))</script>
<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<<if getSlave($AS).breedingMark == 0 && getSlave($AS).fuckdoll == 0 && getSlave($AS).eggType == "human" && isFertile(getSlave($AS)) && getSlave($AS).preg == 0>>
@@ -240,19 +239,19 @@
<</if>>
<span id="bloating"></span>
- <script>App.UI.SlaveInteract.bloating(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.bloating(getSlave(V.AS))</script>
<span id="hormones"></span>
- <script>App.UI.SlaveInteract.hormones(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.hormones(getSlave(V.AS))</script>
<span id="diet"></span>
- <script>App.UI.SlaveInteract.diet(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.diet(getSlave(V.AS))</script>
<span id="diet-base"></span>
- <script>App.UI.SlaveInteract.dietBase(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.dietBase(getSlave(V.AS))</script>
<span id="snacks"></span>
- <script>App.UI.SlaveInteract.snacks(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.snacks(getSlave(V.AS))</script>
</p>
</div>
</div>
@@ -260,7 +259,7 @@
<div id="Rules" class="tab-content">
<div class="content">
<span id="rules"></span>
- <script>App.UI.SlaveInteract.rules(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.rules(getSlave(V.AS))</script>
</div>
</div>
@@ -324,7 +323,7 @@
<h3>Financial</h3>
<p>
- <<includeDOM slaveExpenses(V.activeSlave)>>
+ <<includeDOM slaveExpenses(getSlave(V.AS))>>
</p>
<p>
@@ -364,7 +363,7 @@
<div id="Customize" class="tab-content">
<div class="content">
<span id="custom"></span>
- <script>App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))</script>
+ <script>App.UI.SlaveInteract.custom(getSlave(V.AS))</script>
/*<<include "Add custom descriptors">>*/
</div>