From 8ce4febf89953c3d5ea52a8b782dcb4a8cfccbeb Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 24 Feb 2020 20:10:33 -0500
Subject: [PATCH] rough parity
---
src/uncategorized/longSlaveDescription.tw | 14 --
src/uncategorized/slaveInteract.tw | 215 ++++++++++++----------
2 files changed, 117 insertions(+), 112 deletions(-)
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index dc27f6fd135..003ff8272a7 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -3,20 +3,6 @@
<<run SlaveStatClamp($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<span id="artFrame">
-/* 000-250-006 */
-<<if $seeImages == 1 && $eventDescription != 1>>
- <<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
- <<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
- <</if>>
-<</if>>
-/* 000-250-006 */
-</span>
-
-
-
<span style="font-weight:bold"><span class="pink"><<= SlaveFullName($activeSlave)>></span></span>
<<if $activeSlave.custom.label>> (<span class="yellow"><span style="font-weight:bold"><<print $activeSlave.custom.label>></span></span>)<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index c8b81ec2deb..c1e24468ec1 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -10,17 +10,6 @@
}
</style>
-<span id="artFrame">
-/* 000-250-006 */
-<<if $seeImages == 1 && $eventDescription != 1>>
- <<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
- <<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
- <</if>>
-<</if>>
-/* 000-250-006 */
-</span>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.slaveInteract)>>
@@ -95,7 +84,21 @@
<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, 'Customize')" id="tab Customize">Customize</button>
+<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab')" id="tab FamilyTab">Family</button>
+
+<div id="artFrame">
+ <<if $seeImages == 1 && $eventDescription != 1>>
+ <<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
+ <<else>>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
+ <</if>>
+ <</if>>
+</div>
+<div id="Description" class="tabcontent">
+ <div class="content">
<<if $seeDetails == 1>>
<<set $saleDescription = 0>>
<div style="font-style:italic">
@@ -117,22 +120,6 @@
|
[[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>
@@ -145,77 +132,11 @@
[[Show descriptions|Slave Interact][$seeDetails = 1]]
</div>
<</if>>
+ </div>
+</div>
- <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>
-
- <<if $familyTesting == 1>>
- <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>>
- </span>
- </p>
- <</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>>
- <</if>>
- </p>
-
- <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 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>>
- </p>
-
+<div id="Location" class="tabcontent">
+ <div class="content">
<p>
<<switch $activeSlave.assignment>>
<<case "recover from surgery">>
@@ -275,7 +196,27 @@
<<link "Millionaires">><<set $activeSlave.whoreClass = 4>><<replace "#whoreClass">>millionaires<</replace>><</link>>
<</if>>
</p>
+
+ <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>
+ </div>
+</div>
+<div id="Appearance" class="tabcontent">
+ <div class="content">
<<if $showWardrobe == 1>>
<p>
__Appearance:__
@@ -329,7 +270,11 @@
<</if>> /* CLOSES FUCKDOLL CHECK */
</p>
<</if>> /* CLOSES WARDROBE CHECK */
+ </div>
+</div>
+<div id="PhysicalRegimen" class="tabcontent">
+ <div class="content">
__Physical Regimen:__
<span id="drugs"></span>
<script>App.UI.SlaveInteract.drugs(V.activeSlave)</script>
@@ -429,8 +374,54 @@
<<link "No access">><<set $activeSlave.onDiet = 1>><<replace "#snacks">>On a strict diet.<</replace>><</link>> |
<<link "Full access">><<set $activeSlave.onDiet = 0>><<replace "#snacks">>Free to stuff $himself.<</replace>><</link>>
<</if>>
+ </div>
+</div>
+
+<div id="Rules" class="tabcontent">
+ <div class="content">
<br><br>__Behavior__:<br>
+
+ <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>>
+ <</if>>
+ </p>
+
+ <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 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>>
+ </p>
<<if $activeSlave.fuckdoll > 0>>
//Rules have little meaning for living sex toys//
<<else>>
@@ -608,8 +599,11 @@
<</if>>
<</if>>
<</if>>
+ </div>
+</div>
- <br><br>
+<div id="Financial" class="tabcontent">
+ <div class="content">
__Financial__:
<<SlaveExpenses $activeSlave>>
<br><br>
@@ -642,3 +636,28 @@
<<if $cheatMode>>
| <<link "Import a slave" "Import Slave">><</link>>
<</if>>
+ </div>
+</div>
+
+<div id="Customize" class="tabcontent">
+ <div class="content">
+ <<include "Add custom descriptors">>
+ </div>
+</div>
+
+<div id="FamilyTab" class="tabcontent">
+ <div class="content">
+ <<if $familyTesting == 1>>
+ <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>>
+ </span>
+ </p>
+ <</if>>
+ </div>
+</div>
\ No newline at end of file
--
GitLab