Skip to content
Snippets Groups Projects
Commit c29938e0 authored by Blank's avatar Blank
Browse files

slaveInteractTabReset

parent 55c2ca46
No related branches found
No related tags found
1 merge request!6298slaveInteractTabReset
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
}); });
<</script>> <</script>>
<<if $tabChoice.SlaveInteract != 'Description'>>
<<set $tabChoice.SlaveInteract = 'Description'>>
<</if>>
<<set _visibleSlaves = $slaves.filter(s => assignmentVisible(s) && (s.assignment != "be your Head Girl" || $HGSuite != 1) && (s.assignment != "guard you" || $dojo <= 1)), <<set _visibleSlaves = $slaves.filter(s => assignmentVisible(s) && (s.assignment != "be your Head Girl" || $HGSuite != 1) && (s.assignment != "guard you" || $dojo <= 1)),
$slavesVisible = _visibleSlaves.length, $slavesVisible = _visibleSlaves.length,
$dormitoryPopulation = _visibleSlaves.filter(s => s.rules.living != "luxurious").length, $dormitoryPopulation = _visibleSlaves.filter(s => s.rules.living != "luxurious").length,
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} }
</style> </style>
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.slaveInteract)>> <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.SlaveInteract)>>
<<if !assignmentVisible($slaves[_i])>> <<if !assignmentVisible($slaves[_i])>>
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
<p align="center"> <p align="center">
<<if $cheatMode == 1>> <<if $cheatMode == 1>>
<div style="font-style:italic"> <div style="font-style:italic">
[[Cheat Edit Slave|MOD_Edit Slave Cheat][$cheater = 1]] | [[Cheat Edit Slave|MOD_Edit Slave Cheat][$cheater = 1]] |
[[Cheat Edit Slave Alternative|MOD_Edit Slave Cheat New][$cheater = 1]] [[Cheat Edit Slave Alternative|MOD_Edit Slave Cheat New][$cheater = 1]]
</div> </div>
<</if>> <</if>>
<span class="cyan"> <span class="cyan">
[←,Q] [←,Q]
</span> </span>
<span id="prevSlave" style="font-weight:bold"> <span id="prevSlave" style="font-weight:bold">
<<link "Prev" "Previous Slave In Line">><</link>> <<link "Prev" "Previous Slave In Line">><</link>>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<</replace>> <</replace>>
<<replace #optionPages>> <<replace #optionPages>>
<<include "Description Options">> <<include "Description Options">>
<</replace>> <</replace>>
<</link>> <</link>>
<span id="hideOptionPages"></span> <span id="hideOptionPages"></span>
| |
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<span id="clothes"></span> <span id="clothes"></span>
/*<script>App.UI.Wardrobe.clothes(getSlave(V.activeSlave.ID))</script>*/ /*<script>App.UI.Wardrobe.clothes(getSlave(V.activeSlave.ID))</script>*/
<<if $slaves[_i].fuckdoll == 0>> <<if $slaves[_i].fuckdoll == 0>>
<span id="collar"></span> <span id="collar"></span>
/*<script>App.UI.Wardrobe.collar(getSlave(V.activeSlave.ID))</script>*/ /*<script>App.UI.Wardrobe.collar(getSlave(V.activeSlave.ID))</script>*/
...@@ -542,7 +542,7 @@ ...@@ -542,7 +542,7 @@
<div id="Financial" class="tabcontent"> <div id="Financial" class="tabcontent">
<div class="content"> <div class="content">
<<if $studio == 1>> <<if $studio == 1>>
<h3>Media</h3> <h3>Media</h3>
<<if $slaves[_i].porn.prestige == 3>> <<if $slaves[_i].porn.prestige == 3>>
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
<</if>> <</if>>
<</if>> <</if>>
<</if>> <</if>>
<h3>Financial</h3> <h3>Financial</h3>
<p> <p>
<<SlaveExpenses $slaves[_i]>> <<SlaveExpenses $slaves[_i]>>
...@@ -641,7 +641,7 @@ ...@@ -641,7 +641,7 @@
<div class="content"> <div class="content">
<span id="custom"></span> <span id="custom"></span>
<script>App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))</script> <script>App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))</script>
/*<<include "Add custom descriptors">>*/ /*<<include "Add custom descriptors">>*/
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment