diff --git a/src/js/slaveInteract.js b/src/js/slaveInteract.js
index 16507727fe10125ad1fdba95426d8b97c9474621..7774eeb83b0b06b63b2d98eb54f6f80721f227f5 100644
--- a/src/js/slaveInteract.js
+++ b/src/js/slaveInteract.js
@@ -1,6 +1,63 @@
/* eslint-disable no-unused-vars */ // TODO: remove after testing
App.UI.SlaveInteract = {};
+App.UI.SlaveInteract.placeInLine = function(slave) {
+ V.slavesInLine = [];
+ let activeSlaveIndex = V.slaveIndices[slave.ID];
+ let SL = V.slaves.length;
+
+ if (assignmentVisible(slave)) {
+ for (let pil = activeSlaveIndex - 1; pil !== activeSlaveIndex; pil--) { /* loops backwards through the V.slaves array */
+ if (pil < 0) {
+ pil = SL;
+ continue;
+ }
+ if (assignmentVisible(V.slaves[pil])) {
+ V.slavesInLine.push(pil); /* index of the previous slave in line */
+ break;
+ }
+ }
+ for (let pil = activeSlaveIndex + 1; pil !== activeSlaveIndex; pil++) { /* this loops forwards through the V.slaves array */
+ if (pil === SL) {
+ pil = -1;
+ continue;
+ }
+ if (assignmentVisible(V.slaves[pil])) {
+ V.slavesInLine.push(pil); /* index of the next slave in line */
+ break;
+ }
+ }
+ } else {
+ for (let pil = activeSlaveIndex - 1; pil !== activeSlaveIndex; pil--) { /* loops backwards through the V.slaves array */
+ if (pil < 0) {
+ pil = SL;
+ continue;
+ }
+ if (V.slaves[pil].assignment === slave.assignment) {
+ V.slavesInLine.push(pil); /* index of the previous slave in line */
+ break;
+ }
+ }
+ for (let pil = activeSlaveIndex + 1; pil !== activeSlaveIndex; pil++) { /* this loops forwards through the V.slaves array */
+ if (pil === SL) {
+ pil = -1;
+ continue;
+ }
+ if (V.slaves[pil].assignment === slave.assignment) {
+ V.slavesInLine.push(pil); /* index of the next slave in line */
+ break;
+ }
+ }
+ }
+
+ if (V.slavesInLine.length === 0) { /* if there are no other slaves available, set previous/next slave to self */
+ V.slavesInLine[0] = activeSlaveIndex;
+ V.slavesInLine[1] = activeSlaveIndex;
+ }
+ return;
+};
+
+
App.UI.SlaveInteract.fucktoyPref = function(slave) {
/** @type {App.Entity.SlaveState} */
const {his} = getPronouns(slave);
@@ -1562,7 +1619,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
<
span id = "bloating" > < /span> <
- script > App.UI.SlaveInteract.bloating(V.activeSlave) < /script>
+ script > App.UI.SlaveInteract.bloating(slave) < /script>
Hormones: < strong > < span id = "hormones" >
if (slave.hormones === -2) {
diff --git a/src/uncategorized/placeInLine.tw b/src/uncategorized/placeInLine.tw
deleted file mode 100644
index ed792a20c50c7476ebad95a35a7d7cb1c8f156ba..0000000000000000000000000000000000000000
--- a/src/uncategorized/placeInLine.tw
+++ /dev/null
@@ -1,58 +0,0 @@
-:: Place In Line
-
-<<silently>>
-
-<<set $slavesInLine = []>>
-<<set _activeSlaveIndex = $slaveIndices[$activeSlave.ID]>>
-<<set _SL = $slaves.length>>
-
-<<if assignmentVisible($activeSlave)>>
- <<for _pil = _activeSlaveIndex - 1; _pil != _activeSlaveIndex; _pil-->> /* loops backwards through the $slaves array */
- <<if _pil < 0>>
- <<set _pil = _SL>>
- <<continue>>
- <</if>>
- <<if assignmentVisible($slaves[_pil])>>
- <<set $slavesInLine.push(_pil)>> /* index of the previous slave in line */
- <<break>>
- <</if>>
- <</for>>
- <<for _pil = _activeSlaveIndex + 1; _pil != _activeSlaveIndex; _pil++>> /* this loops forwards through the $slaves array */
- <<if _pil == _SL>>
- <<set _pil = -1>>
- <<continue>>
- <</if>>
- <<if assignmentVisible($slaves[_pil])>>
- <<set $slavesInLine.push(_pil)>> /* index of the next slave in line */
- <<break>>
- <</if>>
- <</for>>
-<<else>>
- <<for _pil = _activeSlaveIndex - 1; _pil != _activeSlaveIndex; _pil-->> /* loops backwards through the $slaves array */
- <<if _pil < 0>>
- <<set _pil = _SL>>
- <<continue>>
- <</if>>
- <<if ($slaves[_pil].assignment == $activeSlave.assignment)>>
- <<set $slavesInLine.push(_pil)>> /* index of the previous slave in line */
- <<break>>
- <</if>>
- <</for>>
- <<for _pil = _activeSlaveIndex + 1; _pil != _activeSlaveIndex; _pil++>> /* this loops forwards through the $slaves array */
- <<if _pil == _SL>>
- <<set _pil = -1>>
- <<continue>>
- <</if>>
- <<if ($slaves[_pil].assignment == $activeSlave.assignment)>>
- <<set $slavesInLine.push(_pil)>> /* index of the next slave in line */
- <<break>>
- <</if>>
- <</for>>
-<</if>>
-
-<<if $slavesInLine.length == 0>> /* if there are no other slaves available, set previous/next slave to self */
- <<set $slavesInLine[0] = _activeSlaveIndex>>
- <<set $slavesInLine[1] = _activeSlaveIndex>>
-<</if>>
-
-<</silently>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 526916a50c77166b11a64d86d80d241345453c2a..9eab13c4ec957cabaa104731c03c93ff82decb44 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1,10 +1,7 @@
:: Slave Interact [nobr]
-<<if $cheatMode == 1>>
- <center>//[[Cheat Edit Slave|MOD_Edit Slave Cheat][$cheater = 1]] | [[Cheat Edit Slave Alternative|MOD_Edit Slave Cheat New][$cheater = 1]]//</center>
-<</if>>
-
-<<set $nextButton = "Confirm changes", $nextLink = "AS Dump", $returnTo = "Main", _SL = $slaves.length>>
+<<set $nextButton = "Confirm changes", $nextLink = "AS Dump", $returnTo = "Main">>
+<<set _SL = $slaves.length, _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
<<setLocalPronouns $activeSlave>>
<<run Enunciate($activeSlave)>>
@@ -40,39 +37,103 @@
<</if>>
<<set $encyclopedia = either("Costs Summary", "Disease in the Free Cities", "Drugs and Their Effects", "From Rebellious to Devoted", "Gender", "Independent Slaves", "Modern Anal", "Nymphomania", "Slave Couture")>>
-<<if $activeSlave.dick > 0>><<set $showEncyclopedia = 1, $encyclopedia = "Gender">><</if>>
+<<if $activeSlave.dick > 0>>
+ <<set $showEncyclopedia = 1, $encyclopedia = "Gender">>
+<</if>>
-<<set _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
+<<run App.UI.SlaveInteract.placeInLine($activeSlave)>>
-<<include "Place In Line">>
-<center>
-@@.cyan;[â†,Q] @@<span id="prevSlave"><strong><<link "Prev" "Previous Slave In Line">><</link>></strong></span> <span class='slave-name'>$activeSlave.slaveName</span> <span id="nextSlave"><strong><<link "Next" "Next Slave In Line">><</link>></strong></span>@@.cyan; [E,→]@@
-</center>
-<br>
+<p align="center">
+ <<if $cheatMode == 1>>
+ <div style="font-style:italic">
+ [[Cheat Edit Slave|MOD_Edit Slave Cheat][$cheater = 1]] |
+ [[Cheat Edit Slave Alternative|MOD_Edit Slave Cheat New][$cheater = 1]]
+ </div>
+ <</if>>
+ <span class="cyan">
+ [â†,Q]
+ </span>
+ <span id="prevSlave" style="font-weight:bold">
+ <<link "Prev" "Previous Slave In Line">><</link>>
+ </span>
+
+ <span class='slave-name'>
+ $activeSlave.slaveName
+ </span>
+
+ <span id="nextSlave" style="font-weight:bold">
+ <<link "Next" "Next Slave In Line">><</link>>
+ </span>
+ <span class="cyan">
+ [E,→]
+ </span>
+</p>
<<if $seeDetails == 1>>
<<set $saleDescription = 0>>
<span id="LSD"><<include "Long Slave Description">></span>
- <br>//[[Description Options][]] | [[Hide descriptions|Slave Interact][$seeDetails = 0]] | [[Customize|Add custom descriptors]] | ''<<link "Update">><<replace "#LSD">><<include "Long Slave Description">><</replace>><</link>>''//
+ <div style="font-style:italic">
+ <<link "Description Options">>
+ <<replace #hideOptionPages>>
+ |
+ <<link "(hide)">>
+ <<replace #hideOptionPages>>
+ <</replace>>
+ <<replace #optionPages>>
+ /* Hide */
+ <</replace>>
+ <</link>>
+ <</replace>>
+ <<replace #optionPages>>
+ <<include "Description Options">>
+ <</replace>>
+ <</link>>
+ |
+ [[Hide descriptions|Slave Interact][$seeDetails = 0]]
+ |
+ <<link "Customize">>/* TODO: making this a flyout for now, but when we go to tabs it should probably be merged into slaveInteract and just be a tab. -LCD */
+ <<replace #hideOptionPages>>
+ |
+ <<link "(hide)">>
+ <<replace #hideOptionPages>>
+ <</replace>>
+ <<replace #optionPages>>
+ /* Hide */
+ <</replace>>
+ <</link>>
+ <</replace>>
+ <<replace #optionPages>>
+ <<include "Add custom descriptors">>
+ <</replace>>
+ <</link>>
+ |
+ <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>
<<else>>
- //[[Show descriptions|Slave Interact][$seeDetails = 1]]//
+ <div style="font-style:italic">
+ [[Show descriptions|Slave Interact][$seeDetails = 1]]
+ </div>
<</if>>
+<p>
+ __Take slave to another room:__
+ [[Wardrobe|Wardrobe Use][$degradation = 0]]
+ | [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$primaryEarColor = "",$secondaryEarColor = "",$primaryTailColor = "",$secondaryTailColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
+ | [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
+ | [[Remote surgery|Remote Surgery][$degradation = 0]]
+ <<if $prostheticsUpgrade > 0>>| [[Configure cybernetics|Prosthetics Configuration][$prostheticsConfig = "main"]]<</if>>
+
+
+ <div id="miniscene"></div>
+ <span id="useSlave"></span>
+ <script>
+ App.UI.SlaveInteract.useSlaveDisplay(V.activeSlave)
+ </script>
+</p>
-<br><br>__Take slave to another room:__
-[[Wardrobe|Wardrobe Use][$degradation = 0]]
-| [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$primaryEarColor = "",$secondaryEarColor = "",$primaryTailColor = "",$secondaryTailColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
-| [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
-| [[Remote surgery|Remote Surgery][$degradation = 0]]
-<<if $prostheticsUpgrade > 0>>| [[Configure cybernetics|Prosthetics Configuration][$prostheticsConfig = "main"]]<</if>>
-
-
-<div id="miniscene"></div>
-<span id="useSlave"></span>
-<script>
- App.UI.SlaveInteract.useSlaveDisplay(V.activeSlave)
-</script>
-
-/* pregmod start */
<<if $familyTesting == 1>>
<p id="family">
<div id="familyTree"></div>
@@ -87,152 +148,161 @@
<</if>>
<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>>
- <<else>>
- Will not be bred by the Head Girl when fertile. <<link "Include $him" "Slave Interact">><<set $activeSlave.HGExclude = 0>><</link>>
+ <<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>>
+ <<else>>
+ Will not be bred by the Head Girl when fertile. <<link "Include $him" "Slave Interact">><<set $activeSlave.HGExclude = 0>><</link>>
+ <</if>>
<</if>>
-<</if>>
</p>
-/* pregmod end */
-<<if $activeSlave.useRulesAssistant == 0>>
- @@.gray;''Not subject'' to the Rules Assistant.@@
- <<link "Include $him" "Slave Interact">><<set $activeSlave.useRulesAssistant = 1>><</link>>
- <br>
-<<else>>
- __Rules Assistant:__ [[Rules Assistant Options|Rules Assistant]]
+<p>
+ <<if $activeSlave.useRulesAssistant == 0>>
+ <span class="gray">
+ ''Not subject'' to the Rules Assistant.
+ </span>
+ <<link "Include $him" "Slave Interact">>
+ <<set $activeSlave.useRulesAssistant = 1>>
+ <</link>>
+ <<else>>
+ __Rules Assistant:__ [[Rules Assistant Options|Rules Assistant]]
- <<if (def $activeSlave.currentRules) && ($activeSlave.currentRules.length > 0)>>
- <ul>
- <<= $defaultRules.filter(x => ruleApplied($activeSlave, x)).map(x => `<li>Rule "${x.name}" applied</li>`).join(" ") >>
- </ul>
+ <<if (def $activeSlave.currentRules) && ($activeSlave.currentRules.length > 0)>>
+ <ul style="margin:0">
+ <<= $defaultRules.filter(x => ruleApplied($activeSlave, x)).map(x => `<li>Rule "${x.name}" applied</li>`).join(" ") >>
+ </ul>
+ <<else>>
+ |
+ <</if>>
+ <span style="font-style:italic">
+ <<link "Apply rules">>
+ <<run DefaultRules($activeSlave)>>
+ <<goto "Slave Interact">>
+ <</link>>
+ </span>
+ |
+ <<link "Exempt $him" "Slave Interact">>
+ <<set $activeSlave.useRulesAssistant = 0>>
+ <</link>>
<</if>>
- | <<link "//Apply rules//">>
- <<silently>>
- <<run DefaultRules($activeSlave)>>
- <</silently>>
- <<goto "Slave Interact">>
- <</link>>
- | <<link "Exempt $him" "Slave Interact">><<set $activeSlave.useRulesAssistant = 0>><</link>>
-<</if>>
-
-<br>
+</p>
-<<switch $activeSlave.assignment>>
- <<case "recover from surgery">>
- //$He is recovering from surgery this week//
- <<case "guard you">>
- //$He is your Bodyguard and is not available for other work//
- <<case "be the Madam">>
- //$He is the Madam and is not available for other work//
- <<case "be the DJ">>
- //$He is the DJ and is not available for other work//
- <<case "be the Milkmaid">>
- //$He is the Milkmaid and is not available for other work//
- <<case "be the Farmer">>
- //$He is the Farmer and is not available for other work//
- <<case "be the Stewardess">>
- //$He is the Stewardess and is not available for other work//
- <<case "be your Head Girl">>
- //$He is your Head Girl and is not available for other work//
- <<case "recruit girls">>
- //$He is recruiting slaves and is not available for other work//
- <<case "be the Nurse">>
- //$He is the Nurse and is not available for other work//
- <<case "be the Attendant">>
- //$He is the Attendant of the spa and is not available for other work//
- <<case "be the Matron">>
- //$He is the Matron of the nursery and is not available for other work//
- <<case "be the Schoolteacher">>
- //$He is the Schoolteacher and is not available for other work//
- <<case "be your Concubine">>
- //$He is your Concubine and is not available for other work//
- <<case "be the Wardeness">>
- //$He is the Wardeness and is not available for other work//
- <<default>>
-
- /* CAN BE REASSIGNED */
-
- <div id="fucktoypref"></div>
- <script>App.UI.SlaveInteract.fucktoyPref(V.activeSlave)</script>
-
- <span id="assignmentLinks"></span>
- <script>App.UI.SlaveInteract.assignmentBlock("assignmentLinks", V.activeSlave)</script>
-
- <<set _numFacilities = $brothel+$club+$dairy+$farmyard+$servantsQuarters+$masterSuite+$spa+$nursery+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
-
- <<if _numFacilities > 0>>
- Transfer to: <<= App.UI.jobLinks.transfers(-1)>>
- <</if>> /* closes _numFacilities */
-
-<</switch>> /* END CAN BE REASSIGNED */
-
-<<if $activeSlave.assignment == "whore" || $activeSlave.assignment == "work in the brothel">>
- <br>Whoring Target: <strong><span id="whoreClass"><<if !$activeSlave.whoreClass>>auto<<elseif $activeSlave.whoreClass == 1>>the lower class<<elseif $activeSlave.whoreClass == 2>>the middle class<<elseif $activeSlave.whoreClass == 3>>the upper class<<elseif $activeSlave.whoreClass == 4>>millionaires<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>. //This is the highest class they are allowed to service, when eligible//
- <<link "Auto">><<set $activeSlave.whoreClass = 0>><<replace "#whoreClass">>auto<</replace>><</link>> |
- <<link "Lower Class">><<set $activeSlave.whoreClass = 1>><<replace "#whoreClass">>the lower class<</replace>><</link>> |
- <<link "Middle Class">><<set $activeSlave.whoreClass = 2>><<replace "#whoreClass">>the middle class<</replace>><</link>> |
- <<link "Upper Class">><<set $activeSlave.whoreClass = 3>><<replace "#whoreClass">>the upper class<</replace>><</link>> |
- <<link "Millionaires">><<set $activeSlave.whoreClass = 4>><<replace "#whoreClass">>millionaires<</replace>><</link>>
-<</if>>
+<p>
+ <<switch $activeSlave.assignment>>
+ <<case "recover from surgery">>
+ //$He is recovering from surgery this week//
+ <<case "guard you">>
+ //$He is your Bodyguard and is not available for other work//
+ <<case "be the Madam">>
+ //$He is the Madam and is not available for other work//
+ <<case "be the DJ">>
+ //$He is the DJ and is not available for other work//
+ <<case "be the Milkmaid">>
+ //$He is the Milkmaid and is not available for other work//
+ <<case "be the Farmer">>
+ //$He is the Farmer and is not available for other work//
+ <<case "be the Stewardess">>
+ //$He is the Stewardess and is not available for other work//
+ <<case "be your Head Girl">>
+ //$He is your Head Girl and is not available for other work//
+ <<case "recruit girls">>
+ //$He is recruiting slaves and is not available for other work//
+ <<case "be the Nurse">>
+ //$He is the Nurse and is not available for other work//
+ <<case "be the Attendant">>
+ //$He is the Attendant of the spa and is not available for other work//
+ <<case "be the Matron">>
+ //$He is the Matron of the nursery and is not available for other work//
+ <<case "be the Schoolteacher">>
+ //$He is the Schoolteacher and is not available for other work//
+ <<case "be your Concubine">>
+ //$He is your Concubine and is not available for other work//
+ <<case "be the Wardeness">>
+ //$He is the Wardeness and is not available for other work//
+ <<default>>
+
+ /* CAN BE REASSIGNED */
+
+ <div id="fucktoypref"></div>
+ <script>App.UI.SlaveInteract.fucktoyPref(V.activeSlave)</script>
+
+ <span id="assignmentLinks"></span>
+ <script>App.UI.SlaveInteract.assignmentBlock("assignmentLinks", V.activeSlave)</script>
+
+ <<set _numFacilities = $brothel+$club+$dairy+$farmyard+$servantsQuarters+$masterSuite+$spa+$nursery+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
+
+ <<if _numFacilities > 0>>
+ Transfer to: <<= App.UI.jobLinks.transfers(-1)>>
+ <</if>> /* closes _numFacilities */
+
+ <</switch>> /* END CAN BE REASSIGNED */
+
+ <<if $activeSlave.assignment == "whore" || $activeSlave.assignment == "work in the brothel">>
+ <br>Whoring Target: <strong><span id="whoreClass"><<if !$activeSlave.whoreClass>>auto<<elseif $activeSlave.whoreClass == 1>>the lower class<<elseif $activeSlave.whoreClass == 2>>the middle class<<elseif $activeSlave.whoreClass == 3>>the upper class<<elseif $activeSlave.whoreClass == 4>>millionaires<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>. //This is the highest class they are allowed to service, when eligible//
+ <<link "Auto">><<set $activeSlave.whoreClass = 0>><<replace "#whoreClass">>auto<</replace>><</link>> |
+ <<link "Lower Class">><<set $activeSlave.whoreClass = 1>><<replace "#whoreClass">>the lower class<</replace>><</link>> |
+ <<link "Middle Class">><<set $activeSlave.whoreClass = 2>><<replace "#whoreClass">>the middle class<</replace>><</link>> |
+ <<link "Upper Class">><<set $activeSlave.whoreClass = 3>><<replace "#whoreClass">>the upper class<</replace>><</link>> |
+ <<link "Millionaires">><<set $activeSlave.whoreClass = 4>><<replace "#whoreClass">>millionaires<</replace>><</link>>
+ <</if>>
+</p>
<<if $showWardrobe == 1>>
+ <p>
+ __Appearance:__
-<br><br>__Appearance:__
-
-<<if $activeSlave.fuckdoll == 0>>
- <<if $showMainClothing != 0>>
- <span id="clothes"></span>
- <script>App.UI.Wardrobe.clothes(V.activeSlave)</script>
- <</if>>
-
- <span id="collar"></span>
- <script>App.UI.Wardrobe.collar(V.activeSlave)</script>
+ <<if $activeSlave.fuckdoll == 0>>
+ <<if $showMainClothing != 0>>
+ <span id="clothes"></span>
+ <script>App.UI.Wardrobe.clothes(V.activeSlave)</script>
+ <</if>>
- <span id="armAccessory"></span>
- <script>App.UI.Wardrobe.armAccessory(V.activeSlave)</script>
+ <span id="collar"></span>
+ <script>App.UI.Wardrobe.collar(V.activeSlave)</script>
- <<if hasAnyLegs($activeSlave)>>
- <span id="shoes"></span>
- <script>App.UI.Wardrobe.shoes(V.activeSlave)</script>
+ <span id="armAccessory"></span>
+ <script>App.UI.Wardrobe.armAccessory(V.activeSlave)</script>
- <span id="legAccessory"></span>
- <script>App.UI.Wardrobe.legAccessory(V.activeSlave)</script>
- <</if>>
+ <<if hasAnyLegs($activeSlave)>>
+ <span id="shoes"></span>
+ <script>App.UI.Wardrobe.shoes(V.activeSlave)</script>
- <span id="bellyAccessory"></span>
- <script>App.UI.Wardrobe.bellyAccessory(V.activeSlave)</script>
+ <span id="legAccessory"></span>
+ <script>App.UI.Wardrobe.legAccessory(V.activeSlave)</script>
+ <</if>>
- <span id="buttplug"></span>
- <script>App.UI.Wardrobe.buttplug(V.activeSlave)</script>
+ <span id="bellyAccessory"></span>
+ <script>App.UI.Wardrobe.bellyAccessory(V.activeSlave)</script>
- <<if isItemAccessible("tail") && $activeSlave.buttplug != "none">>
- <span id="buttplugAttachment"></span>
- <script>App.UI.Wardrobe.buttplugAttachment(V.activeSlave)</script>
- <</if>>
+ <span id="buttplug"></span>
+ <script>App.UI.Wardrobe.buttplug(V.activeSlave)</script>
- <<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 isItemAccessible("tail") && $activeSlave.buttplug != "none">>
+ <span id="buttplugAttachment"></span>
+ <script>App.UI.Wardrobe.buttplugAttachment(V.activeSlave)</script>
+ <</if>>
- <<if $activeSlave.dick > 0>>
- <span id="dickAccessory"></span>
- <script>App.UI.Wardrobe.dickAccessory(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>>
- <span id="chastity"></span>
- <script>App.UI.Wardrobe.chastity(V.activeSlave)</script>
+ <<if $activeSlave.dick > 0>>
+ <span id="dickAccessory"></span>
+ <script>App.UI.Wardrobe.dickAccessory(V.activeSlave)</script>
+ <</if>>
-<</if>> /* CLOSES FUCKDOLL CHECK */
+ <span id="chastity"></span>
+ <script>App.UI.Wardrobe.chastity(V.activeSlave)</script>
+ <</if>> /* CLOSES FUCKDOLL CHECK */
+ </p>
<</if>> /* CLOSES WARDROBE CHECK */
-<br>__Physical Regimen:__
+__Physical Regimen:__
<span id="drugs"></span>
<script>App.UI.SlaveInteract.drugs(V.activeSlave)</script>
@@ -516,9 +586,9 @@ __Financial__:
<<SlaveExpenses $activeSlave>>
<br><br>
<<if ($slaveCostFactor > 1)>>
- @@.yellow;The slave market is bullish; the price of slaves is high.@@
+ <span class="yellow">The slave market is bullish; the price of slaves is high.</span>
<<elseif ($slaveCostFactor < 1)>>
- @@.yellow;The slave market is bearish; the price of slaves is low.@@
+ <span class="yellow">The slave market is bearish; the price of slaves is low.</span>
<</if>>
<<if (_SL > 1)>>