diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index c1e24468ec148420f485015e6b441bc8532b739a..a971a4f4b798f7d2e8b907da811a232b3626b2a0 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -77,13 +77,13 @@
</span>
</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, 'Financial')" id="tab Financial">Financial</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, 'Location')" id="tab Location">Location</button>
<<if $showWardrobe > 0 && $activeSlave.fuckdoll == 0>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance')" id="tab Appearance">Appearance</button>
<</if>>
<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, 'Location')" id="tab Location">Location</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize')" id="tab Customize">Customize</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab')" id="tab FamilyTab">Family</button>
@@ -117,13 +117,13 @@
<<include "Description Options">>
<</replace>>
<</link>>
+ <span id="hideOptionPages"></span>
|
- [[Hide descriptions|Slave Interact][$seeDetails = 0]]
- |
+ /* [[Hide descriptions|Slave Interact][$seeDetails = 0]]
+ | */
<span style="font-weight:bold">
<<link "Update">><<replace "#LSD">><<include "Long Slave Description">><</replace>><</link>>
</span>
- <span id="hideOptionPages"></span>
<p id="optionPages"></p>
</div>
<span id="LSD"><<include "Long Slave Description">></span>
@@ -217,59 +217,54 @@
<div id="Appearance" class="tabcontent">
<div class="content">
- <<if $showWardrobe == 1>>
- <p>
- __Appearance:__
-
- <<if $activeSlave.fuckdoll == 0>>
- <<if $showMainClothing != 0>>
- <span id="clothes"></span>
- <script>App.UI.Wardrobe.clothes(V.activeSlave)</script>
- <</if>>
+ <p>
+ __Appearance:__
+ <<if $activeSlave.fuckdoll == 0>>
+ <span id="clothes"></span>
+ <script>App.UI.Wardrobe.clothes(V.activeSlave)</script>
- <span id="collar"></span>
- <script>App.UI.Wardrobe.collar(V.activeSlave)</script>
+ <span id="collar"></span>
+ <script>App.UI.Wardrobe.collar(V.activeSlave)</script>
- <span id="armAccessory"></span>
- <script>App.UI.Wardrobe.armAccessory(V.activeSlave)</script>
+ <span id="armAccessory"></span>
+ <script>App.UI.Wardrobe.armAccessory(V.activeSlave)</script>
- <<if hasAnyLegs($activeSlave)>>
- <span id="shoes"></span>
- <script>App.UI.Wardrobe.shoes(V.activeSlave)</script>
+ <<if hasAnyLegs($activeSlave)>>
+ <span id="shoes"></span>
+ <script>App.UI.Wardrobe.shoes(V.activeSlave)</script>
- <span id="legAccessory"></span>
- <script>App.UI.Wardrobe.legAccessory(V.activeSlave)</script>
- <</if>>
+ <span id="legAccessory"></span>
+ <script>App.UI.Wardrobe.legAccessory(V.activeSlave)</script>
+ <</if>>
- <span id="bellyAccessory"></span>
- <script>App.UI.Wardrobe.bellyAccessory(V.activeSlave)</script>
+ <span id="bellyAccessory"></span>
+ <script>App.UI.Wardrobe.bellyAccessory(V.activeSlave)</script>
- <span id="buttplug"></span>
- <script>App.UI.Wardrobe.buttplug(V.activeSlave)</script>
+ <span id="buttplug"></span>
+ <script>App.UI.Wardrobe.buttplug(V.activeSlave)</script>
- <<if isItemAccessible("tail") && $activeSlave.buttplug != "none">>
- <span id="buttplugAttachment"></span>
- <script>App.UI.Wardrobe.buttplugAttachment(V.activeSlave)</script>
- <</if>>
+ <<if isItemAccessible("tail") && $activeSlave.buttplug != "none">>
+ <span id="buttplugAttachment"></span>
+ <script>App.UI.Wardrobe.buttplugAttachment(V.activeSlave)</script>
+ <</if>>
- <<if $activeSlave.vagina > -1>>
- <span id="vaginalAccessory"></span>
- <script>App.UI.Wardrobe.vaginalAccessory(V.activeSlave)</script>
- <span id="vaginalAttachment"></span>
- <script>App.UI.Wardrobe.vaginalAttachment(V.activeSlave)</script>
- <</if>>
+ <<if $activeSlave.vagina > -1>>
+ <span id="vaginalAccessory"></span>
+ <script>App.UI.Wardrobe.vaginalAccessory(V.activeSlave)</script>
+ <span id="vaginalAttachment"></span>
+ <script>App.UI.Wardrobe.vaginalAttachment(V.activeSlave)</script>
+ <</if>>
- <<if $activeSlave.dick > 0>>
- <span id="dickAccessory"></span>
- <script>App.UI.Wardrobe.dickAccessory(V.activeSlave)</script>
- <</if>>
+ <<if $activeSlave.dick > 0>>
+ <span id="dickAccessory"></span>
+ <script>App.UI.Wardrobe.dickAccessory(V.activeSlave)</script>
+ <</if>>
- <span id="chastity"></span>
- <script>App.UI.Wardrobe.chastity(V.activeSlave)</script>
+ <span id="chastity"></span>
+ <script>App.UI.Wardrobe.chastity(V.activeSlave)</script>
- <</if>> /* CLOSES FUCKDOLL CHECK */
- </p>
- <</if>> /* CLOSES WARDROBE CHECK */
+ <</if>> /* CLOSES FUCKDOLL CHECK */
+ </p>
</div>
</div>
@@ -379,10 +374,7 @@
<div id="Rules" class="tabcontent">
<div class="content">
-
- <br><br>__Behavior__:<br>
-
- <p>
+ <p>
<<if $universalRulesImpregnation == "HG" && $seePreg != 0>>
<<if $activeSlave.HGExclude == 0>>
Will be bred by the Head Girl when fertile. <<link "Exempt $him" "Slave Interact">><<set $activeSlave.HGExclude = 1>><</link>>
@@ -543,10 +535,14 @@
<<link "Restrictive">><<set $activeSlave.rules.relationship = "restrictive">><<replace "#relationshipRules">>$activeSlave.rules.relationship<</replace>><</link>> |
<<link "Just friends">><<set $activeSlave.rules.relationship = "just friends">><<replace "#relationshipRules">>$activeSlave.rules.relationship<</replace>><</link>> |
<<link "Permissive">><<set $activeSlave.rules.relationship = "permissive">><<replace "#relationshipRules">>$activeSlave.rules.relationship<</replace>><</link>>
+ </div>
+</div>
+<div id="Financial" class="tabcontent">
+ <div class="content">
+
<<if $studio == 1>>
-
- <br><br>__Media__:<br>
+ <div>__Media__:</div>
<<if $activeSlave.porn.prestige == 3>>
//$He is so prestigious in the realm of $activeSlave.porn.fameType porn that $his fame is self-sustaining.//
<<elseif $activeSlave.porn.feed == 0>>
@@ -599,12 +595,7 @@
<</if>>
<</if>>
<</if>>
- </div>
-</div>
-
-<div id="Financial" class="tabcontent">
- <div class="content">
- __Financial__:
+ <div>__Financial__:</div>
<<SlaveExpenses $activeSlave>>
<br><br>
<<if ($slaveCostFactor > 1)>>
@@ -651,11 +642,7 @@
<p id="family">
<div id="familyTree"></div>
<span id="familyTreeLink">
- <<link "Pull up the file on $his family tree.">>
- <<replace #familyTreeLink>>
- <<run renderFamilyTree($slaves, $activeSlave.ID)>>
- <</replace>>
- <</link>>
+ <script>renderFamilyTree(V.slaves, V.activeSlave.ID)</script>
</span>
</p>
<</if>>