diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 85ab7867d6cf2b9a455e4a31e7d6cb77672759ec..794053b3271e0372fc794d0cafa66c63a904341a 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -94,16 +94,9 @@
<<if $seeFCNN == 1>><center>FCNN: <<print $fcnn.random()>> [[Hide|Main][$seeFCNN = 0]]</center><</if>>
<<if ($seeDesk == 1) && ($seeFCNN == 0)>><br><</if>>
-<<if $lowercaseDonkey == 1>>
-
-<br>
-
-<<if $positionMainLinks >= 0>>
- <<MainLinks>>
-<</if>>
-<br>
+__''MAIN MENU''__ //[[Summary Options]]//
<<if $rulesAssistantMain != 0>>
- //<span id="RAButton"><<link "Rules Assistant Options">><<goto "Rules Assistant">><</link>></span>// @@.cyan;[R]@@
+ | //<span id="RAButton"><<link "Rules Assistant Options">><<goto "Rules Assistant">><</link>></span>// @@.cyan;[R]@@
<<if $rulesAssistantAuto != 1>>
| //<<link "Apply Rules Assistant at week end">><<set $rulesAssistantAuto = 1>><<goto "Main">><</link>>//
<<else>>
@@ -112,52 +105,18 @@
| //<<link "Re-apply Rules Assistant now (this will only check slaves in the Penthouse)">><<for _i = 0;_i < _SL;_i++>><<if $slaves[_i].assignmentVisible == 1 && $slaves[_i].useRulesAssistant == 1>><<CheckAutoRulesActivate $slaves[_i]>><<DefaultRules $slaves[_i]>><</if>><</for>><<goto "Main">><</link>>//
<</if>>
-/* variables used in "use someone" links*/
-<<set _j = "Back", _k = "AS Dump", _l = "Main">>
-
-
-<<if $useTabs == 0>>
-//<<OptionsSortAsAppearsOnMain>>//
- <<include "Slave Summary">>
-
- <<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>
- <<if $positionMainLinks <= 0>>
- <br><<MainLinks>>
+<<if $useSlaveSummaryTabs == 1>>
+ <<if $positionMainLinks >= 0>>
+ <<MainLinks>>
<</if>>
- <<if (_BG > -1) && ($slaves[_BG].assignment == "guard you")>>
- <<set $i = _BG>>
- <<set _GO = "idiot ball">>
- <<include "Use Guard">>
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoVaginal($slaves[_BG])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <<if canDoAnal($slaves[_BG])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+_BG+"],$nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <</if>>
- /*check*/
- <<if canPenetrate($slaves[_BG])>>
- | <<print "[[Ride her|FDick][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- <<if canDoAnal($slaves[_BG])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
- <</if>>
- | <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
- <</if>>
-
- <<set $activeSlave = Array.random($slaves)>>
- <<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>>
- <br><<include "Walk Past">>
- <</if>>
-
-<<else>>
<<CreateSimpleTabs>>
<body>
<div class="tab">
- <button class="tablinks" onclick="opentab(event, 'overview')" id="defaultButton">Overview</button>
+ <<if $useSlaveSummaryOverviewTab == 1>>
+ <button class="tablinks" onclick="opentab(event, 'overview')">Overview</button>
+ <</if>>
<button class="tablinks" onclick="opentab(event, 'Resting')">Resting</button>
<button class="tablinks" onclick="opentab(event, 'stay confined')">Confined</button>
<button class="tablinks" onclick="opentab(event, 'take classes')">Students</button>
@@ -168,7 +127,7 @@
<button class="tablinks" onclick="opentab(event, 'get milked')">Cows</button>
<button class="tablinks" onclick="opentab(event, 'work a glory hole')">Gloryhole</button>
<button class="tablinks" onclick="opentab(event, 'be a subordinate slave')">Subordinate slaves</button>
- <button class="tablinks" onclick="opentab(event, 'All')">All</button>
+ <button class="tablinks" onclick="opentab(event, 'All')" id="defaultButton">All</button>
</div>
<div id="overview" class="tabcontent">
@@ -444,20 +403,9 @@
<<if $positionMainLinks <= 0>>
<br><<MainLinks>>
<</if>>
-<</if>>
-<<else>>
+<<else>> /*Display traditionally, without tabs*/
-__''MAIN MENU''__ //[[Summary Options]]//
-<<if $rulesAssistantMain != 0>>
- | //<span id="RAButton"><<link "Rules Assistant Options">><<goto "Rules Assistant">><</link>></span>// @@.cyan;[R]@@
- <<if $rulesAssistantAuto != 1>>
- | //<<link "Apply Rules Assistant at week end">><<set $rulesAssistantAuto = 1>><<goto "Main">><</link>>//
- <<else>>
- | //<<link "Stop applying Rules Assistant at week end">><<set $rulesAssistantAuto = 0>><<goto "Main">><</link>>//
- <</if>>
- | //<<link "Re-apply Rules Assistant now (this will only check slaves in the Penthouse)">><<for _i = 0;_i < _SL;_i++>><<if $slaves[_i].assignmentVisible == 1 && $slaves[_i].useRulesAssistant == 1>><<CheckAutoRulesActivate $slaves[_i]>><<DefaultRules $slaves[_i]>><</if>><</for>><<goto "Main">><</link>>//
-<</if>>
//<<if $sortSlavesMain != 0>>
<br>
Sort by:
@@ -551,8 +499,9 @@ Filter by assignment: |
<</if>>
<</if>>
<</for>>
+<</if>>
-<<if (_BG > -1) && ($slaves[_BG].assignment == "guard you")>>
+<<if (_BG > -1) && ($slaves[_BG].assignment == "guard you") && ($useSlaveSummaryOverviewTab != 1)>>
<<set $i = _BG>>
<<set _GO = "idiot ball">>
<br><<include "Use Guard">>
@@ -574,7 +523,6 @@ Filter by assignment: |
| <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
<</if>>
-<</if>> /* closes lowercase_donkey's fuckery */
<<set $activeSlave = $slaves.random()>>
<<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 9bf470ea1a5021c82cbfd591dbe72a9fc585a8e7..0c71b78da36602949adfb87cadb5d0ad9873b312 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -151,6 +151,27 @@ Main menu leadership controls displayed
[[Below|Options][$positionMainLinks = -1]]
<</if>>
+<br>
+
+Main menu slave tabs are
+<<if $useSlaveSummaryTabs != 1>>
+@@.red;DISABLED@@. [[Enable|Options][$useSlaveSummaryTabs = 1]]
+<<else>>
+@@.cyan;ENABLED@@. [[Disable|Options][$useSlaveSummaryTabs = 0, $useSlaveSummaryOverviewTab = 0]]
+<</if>>
+
+
+<<if $useSlaveSummaryTabs == 1>>
+ <br>
+
+ Condense special slaves into an overview tab
+ <<if $useSlaveSummaryOverviewTab != 1>>
+ @@.red;DISABLED@@. [[Enable|Options][$useSlaveSummaryOverviewTab = 1]]
+ <<else>>
+ @@.cyan;ENABLED@@. [[Disable|Options][$useSlaveSummaryOverviewTab = 0]]
+ <</if>>
+<</if>>
+
<br>
Slave summary caching is <<if $useSummaryCache>>@@.cyan;ENABLED@@. [[Disable|Options][$useSummaryCache = false]]<<else>>@@.red;DISABLED@@. [[Enable|Options][$useSummaryCache = true]]<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 31837a07a9cbfdcf7ec9b733534e3405293c9d71..1a4e0d5adb3e9cef8db7c153dc3cd75f5871d025 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -173,32 +173,31 @@
<<goto "RES Failure">>
<<elseif ($TFS.schoolPresent == 1) && ($organFarmUpgrade != 0) && ($TFS.farmUpgrade == 0)>>
<<goto "TFS Farm Upgrade">>
+
+/* Nicea */
<<elseif ($nicaea == 1) && ($organFarmUpgrade != 0) && ($TFS.farmUpgrade == 0)>>
<<goto "TFS Farm Upgrade">>
-<<elseif $arcologies[0].FSChattelReligionist != "unset">>
- <<if $nicaeaHeld == 1>>
- <<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>>
- <<elseif ($nicaeaAnnounceable == 1) && ($nicaeaAnnounced != 1)>>
- <<goto "SE nicaea announcement">>
- <<elseif $nicaeaPreparation == 1>>
- <<if $nicaeaInvolvement != 0>>
- <<goto "SE nicaea preparation">>
- <<else>>
- <<set $nicaeaPreparation = 0>>
- <<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>>
- <</if>>
- <<elseif $nicaeaInvolvement >= 0>>
- <<set $nicaeaRollA = random(-1,0), $nicaeaRollB = random(-1,0), $nicaeaRollC = random(-1,0)>>
- <<set $nicaeaFocus = either("owners", "slaves")>>
- <<set $nicaeaAssignment = either("whore", "serve the public", "please you")>>
- <<set $nicaeaAchievement = either("devotion", "trust", "slaves")>>
- <<goto "SE nicaea council">>
+<<elseif ($nicaeaHeld != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaeaAnnounceable == 1) && ($nicaeaAnnounced != 1)>>
+ <<goto "SE nicaea announcement">>
+<<elseif ($nicaeaHeld != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaeaPreparation == 1)>>
+ <<if $nicaeaInvolvement != 0>>
+ <<goto "SE nicaea preparation">>
<<else>>
- <<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>>
+ <<set $nicaeaPreparation = 0>>
<</if>>
+<<elseif ($nicaeaHeld != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaeaInvolvement >= 0)>>
+ <<set $nicaeaRollA = random(-1,0), $nicaeaRollB = random(-1,0), $nicaeaRollC = random(-1,0)>>
+ <<set $nicaeaFocus = either("owners", "slaves")>>
+ <<set $nicaeaAssignment = either("whore", "serve the public", "please you")>>
+ <<set $nicaeaAchievement = either("devotion", "trust", "slaves")>>
+ <<goto "SE nicaea council">>
+
<<elseif (Math.trunc($week/24) == ($week/24)) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>
<<goto "securityForceTradeShow">>
-<<elseif $plot == 1>>
+<</if>>
+
+/* Nobody else to take us home? */
+<<if $plot == 1>>
<<goto "Nonrandom Event">>
<<else>>
<<goto "Random Nonindividual Event">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index a16d5aec219c1e28d4796a09191591cd370b3192..1241e938317df83c81fa124e3247e1b230ea6b47 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -86,7 +86,7 @@
<<switch _Pass>>
<<case "Main">>
- /*
+
<<if $slaveAssignmentTab == "overview">>
<<if $showOneSlave == "Head Girl">>
<<if (_Slave.assignment != "be your Head Girl")>><<continue>><</if>>
@@ -121,7 +121,7 @@
|| (_Slave.assignment == "recruit girls")
|| (_Slave.assignment == "guard you")>><<continue>><</if>>
<</if>>
- */
+
<<if (_Slave.choosesOwnClothes == 1) && (_Slave.clothes == "choosing her own clothes")>>
<<set $i = _ssi, _oldDevotion = _Slave.devotion>>
<<silently>><<include "SA chooses own clothes">><</silently>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 26b2a0c3c6c29cacb5e110cc0dbfc8e52915bf41..0825615d1ebeab107aba4598e185b3350d45b28a 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -31,82 +31,37 @@
<</switch>>
<</if>> /* closes wound check */
-<<if $lowercaseDonkey == 1>>
<<if $PCWounded != 1>><span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@<</if>>
-<<if $useTabs == 0>>
+<<if $useSlaveSummaryOverviewTab != 1>> /* Hide this block if it will be shown on the overview tab */
<br>
<<if _HG > -1>>
''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
<span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
- <<set $showOneSlave = "Head Girl">>
<<elseif (_HG == -1) && ($slaves.length > 1)>>
- You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
+ You have not selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<elseif (_HG == -1)>>
//You do not have enough slaves to keep a Head Girl//
<</if>>
<br>
<<if _RC > -1>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working
- <<if $recruiterTarget != "other arcologies">>
- to recruit girls.
- <<else>>
- as a Sexual
- <<if $arcologies[0].influenceTarget == -1>>
- Ambassador, but @@.red;she has no target to influence.@@
- <<else>>
- Ambassador to <<for $i = 0; $i < $arcologies.length; $i++>><<if $arcologies[$i].direction == $arcologies[0].influenceTarget>>$arcologies[$i].name<<break>><</if>><</for>>.
- <</if>>
- <</if>>
+ ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working to recruit girls.
<span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
- <<set $showOneSlave = "recruit girls">>
<<else>>
- You have @@.red;not@@ selected a Recruiter.
+ You have not selected a Recruiter.
<span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<</if>>
<<if ($dojo != 0)>>
<br>
<<if _BG > -1>>
''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
- <<set $showOneSlave = "guard you">>
<<else>>
- You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<</if>>
<</if>>
<</if>>
-<<else>>
-
-<<if $PCWounded != 1>><span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@<</if>>
-<br>
-<<if _HG > -1>>
- ''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
- <span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
-<<elseif (_HG == -1) && ($slaves.length > 1)>>
- You have not selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
-<<elseif (_HG == -1)>>
- //You do not have enough slaves to keep a Head Girl//
-<</if>>
-<br>
-<<if _RC > -1>>
- ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working to recruit girls.
- <span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
-<<else>>
- You have not selected a Recruiter.
- <span id="manageRecruiter"><strong><<link "Select one">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
-<</if>>
-<<if ($dojo != 0)>>
- <br>
- <<if _BG > -1>>
- ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
- <<else>>
- You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
- <</if>>
-<</if>>
-
-<</if>> /* closes lowercase_donkey's BS */
-
/* cycle through slaves, for each slave cycle through completed organs and track how many are of the interrogated slave (and if organs have a slaves to be implanted on) */
<<if $completedOrgans.length > 0>>
<<set _validOrgans = 0>>