From bbd359bf863183c76b977ad8319ab1539ac3d6c7 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Mon, 22 Apr 2019 21:45:46 -0400
Subject: [PATCH] Change name of Flag variable to SlaveSummaryFiler
---
src/facilities/farmyard/farmyard.tw | 6 +-
src/facilities/nursery/childSummary.tw | 28 ++---
src/facilities/nursery/nursery.tw | 8 +-
src/js/slaveSummaryWidgets.js | 116 +++++++++---------
src/pregmod/widgets/assignmentFilterWidget.tw | 30 ++---
src/uncategorized/BackwardsCompatibility.tw | 4 +
src/uncategorized/arcade.tw | 4 +-
src/uncategorized/brothel.tw | 8 +-
src/uncategorized/cellblock.tw | 6 +-
src/uncategorized/clinic.tw | 6 +-
src/uncategorized/club.tw | 6 +-
src/uncategorized/coursingAssociation.tw | 4 +-
src/uncategorized/dairy.tw | 6 +-
src/uncategorized/headGirlSuite.tw | 4 +-
src/uncategorized/main.tw | 2 +-
src/uncategorized/masterSuite.tw | 6 +-
src/uncategorized/matchmaking.tw | 2 +-
src/uncategorized/newGamePlus.tw | 6 +-
src/uncategorized/pit.tw | 4 +-
src/uncategorized/rulesSlaveExclude.tw | 6 +-
src/uncategorized/rulesSlaveSelect.tw | 6 +-
src/uncategorized/schoolroom.tw | 6 +-
src/uncategorized/servantsQuarters.tw | 6 +-
src/uncategorized/spa.tw | 6 +-
24 files changed, 145 insertions(+), 141 deletions(-)
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index fa2afef1a02..e9f0786f109 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -463,7 +463,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<br><hr><br>
<<if $Farmer != 0>>
-<<set $Flag = 2>>
+<<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a Farmer. [[Appoint one|Farmer Select]]
@@ -483,7 +483,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
''$farmyardNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $farmyardSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
@@ -493,7 +493,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<div class="content">
<<if $farmyardSlaves > 0>>
<<farmyardAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index cb3b48b4025..f9de8386b2d 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -4,12 +4,12 @@
"Main": c => (c.assignmentVisible == 1),
"Nursery": c => (c.assignmentVisible == 1 && c.fuckdoll == 0),
"Personal Attention Select": c => (c.assignmentVisible == 1 && c.fuckdoll <= 0) && (
- ($Flag == 0 && c.assignment != "be a child")
- || ($Flag == 1 && c.assignment == "be a child")
+ ($SlaveSummaryFiler == 0 && c.assignment != "be a child")
+ || ($SlaveSummaryFiler == 1 && c.assignment == "be a child")
),
- "New Game Plus": c => (($Flag == 0 && c.assignment != "be imported") || ($Flag != 0 && c.assignment == "be imported")),
- "Rules Slave Select": c => (($Flag == 0 && !ruleSlaveSelected(s, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(s, $currentRule))),
- "Rules Slave Exclude": c => (($Flag == 0 && !ruleSlaveExcluded(s, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(s, $currentRule))),
+ "New Game Plus": c => (($SlaveSummaryFiler == 0 && c.assignment != "be imported") || ($SlaveSummaryFiler != 0 && c.assignment == "be imported")),
+ "Rules Slave Select": c => (($SlaveSummaryFiler == 0 && !ruleSlaveSelected(s, $currentRule)) || ($SlaveSummaryFiler != 0 && ruleSlaveSelected(s, $currentRule))),
+ "Rules Slave Exclude": c => (($SlaveSummaryFiler == 0 && !ruleSlaveExcluded(s, $currentRule)) || ($SlaveSummaryFiler != 0 && ruleSlaveExcluded(s, $currentRule))),
}>>
<<set _Pass = passage(), _CL = $cribs.length, $assignTo = _Pass, _indexed = 0,
_passagePreFilter = (c => c.assignment != "be your agent" && c.assignment != "live with your agent" && (!setup.passagePreFilters.hasOwnProperty(_Pass) || setup.passagePreFilters[_Pass](c))),
@@ -24,9 +24,9 @@
<<if $useSlaveListInPageJSNavigation == 1>>
<<set _Count = _indexSlavesIdxs.length>>
/* Useful for finding weird combinations — usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $SlaveSummaryFiler + ']'>>
*/
- <<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag) && (($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))) || ($Flag == 1)))>>
+ <<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $SlaveSummaryFiler) && (($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))) || ($SlaveSummaryFiler == 1)))>>
<<set _indexed = 1, _counter = 0, _buttons = [], _offset = -50>>
<<if (/Select/i.test(_Pass))>>
<<set _offset = -25>>
@@ -129,13 +129,13 @@
<</link>>
<<case "New Game Plus">>
- <<if $Flag == 0>>
+ <<if $SlaveSummaryFiler == 0>>
<br>__''@@.pink;_Child.slaveName@@''__
<<else>>
<br>__''@@.pink;_Child.slaveName@@''__
<</if>>
<<case "Rules Slave Select">>
- <<if $Flag == 0>>
+ <<if $SlaveSummaryFiler == 0>>
<br>__''
[[_childName|Rules Slave Select Workaround][$activeSlave = $cribs[_csi]]]''__
<<else>>
@@ -143,7 +143,7 @@
[[_childName|Rules Slave Deselect Workaround][$activeSlave = $cribs[_csi]]]''__
<</if>>
<<case "Rules Slave Exclude">>
- <<if $Flag == 0>>
+ <<if $SlaveSummaryFiler == 0>>
<br>__''
[[_childName|Rules Slave Exclude Workaround][$activeSlave = $cribs[_csi]]]''__
<<else>>
@@ -208,7 +208,7 @@ will
<</if>> /* closes _numFacilities */
-<<if ((_Pass != 'Main') || (def $Flag) || ($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))>>
+<<if ((_Pass != 'Main') || (def $SlaveSummaryFiler) || ($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))>>
<<print '<span id="slave-' + $cribs[_csi].ID + '"> </span>'>>
<</if>>
<br>
@@ -225,14 +225,14 @@ will
<<continue>>
<<case "New Game Plus">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
- <<if $Flag === 0>>
+ <<if $SlaveSummaryFiler === 0>>
<<link "Add to import list" "New Game Plus">>
- <<set $cribsToImport += 1,$Flag = 1>>
+ <<set $cribsToImport += 1,$SlaveSummaryFiler = 1>>
<<= assignJob($cribs[_csi], "be imported")>>
<</link>>
<<else>>
<<link "Remove from import list" "New Game Plus">>
- <<set $cribsToImport -= 1,$Flag = 0>>
+ <<set $cribsToImport -= 1,$SlaveSummaryFiler = 0>>
<<= removeJob($cribs[_csi], $cribs[_csi].assignment)>>
<</link>>
<</if>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index b8b2810635d..b0fe21def0d 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -1,6 +1,6 @@
:: Nursery [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Nursery", $showEncyclopedia = 1, $encyclopedia = "Nursery", $nurserySlaves = $NurseryiIDs.length, $Flag = 0>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Nursery", $showEncyclopedia = 1, $encyclopedia = "Nursery", $nurserySlaves = $NurseryiIDs.length, $SlaveSummaryFiler = 0>>
<<set $targetAgeNursery = Number($targetAgeNursery) || $minimumSlaveAge>>
<<set $targetAgeNursery = Math.clamp($targetAgeNursery, $minimumSlaveAge, 42)>>
@@ -118,7 +118,7 @@ $nurseryNameCaps
<br><br>
<<if $Matron != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a Matron. [[Appoint one|Matron Select]]
@@ -137,7 +137,7 @@ $nurseryNameCaps
<div class="content">
<<if $nurserySlaves > 0>>
<<nurseryAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -152,7 +152,7 @@ $nurseryNameCaps
''$nurseryNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $nurserySlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index b7b14df26be..049c3ffbd2a 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4829,76 +4829,76 @@ App.UI.PassageSlaveFilers = {
"Recruiter Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.assignment !== "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)),
"HG Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.assignment !== "be your Head Girl" && canWalk(s) && canHear(s) && canSee(s) && canTalk(s)),
"Head Girl Suite": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark !== 1 || State.variables.propOutcome === 0)) ||
- (State.variables.Flag !== 0 && s.assignment === "live with your Head Girl"))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark !== 1 || State.variables.propOutcome === 0)) ||
+ (State.variables.SlaveSummaryFiler !== 0 && s.assignment === "live with your Head Girl"))),
"Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll === 0 && State.variables.activeSlave.ID !== s.ID && (State.variables.activeSlave.amp !== 1 || s.amp !== 1)),
"Spa": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "rest in the spa") ||
- (State.variables.Flag === 1 && s.assignment === "rest in the spa") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Attendant.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "rest in the spa") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "rest in the spa") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Attendant.ID))),
"Attendant Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Nursery": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (s.devotion > 20 || s.trust > 20) && (
- (State.variables.Flag === 0 && s.assignment !== "work as a nanny") ||
- (State.variables.Flag === 1 && s.assignment === "work as a nanny") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Matron.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "work as a nanny") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "work as a nanny") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Matron.ID))),
"Matron Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canHear(s)),
"Brothel": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "work in the brothel") ||
- (State.variables.Flag === 1 && s.assignment === "work in the brothel") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Madam.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "work in the brothel") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "work in the brothel") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Madam.ID))),
"Madam Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.intelligence + s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s) && (s.breedingMark !== 1 || State.variables.propOutcome === 0)),
"Club": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "serve in the club") ||
- (State.variables.Flag === 1 && s.assignment === "serve in the club") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.DJ.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "serve in the club") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "serve in the club") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.DJ.ID))),
"DJ Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.intelligence + s.intelligenceImplant >= -50 && canTalk(s) && canHear(s) && canWalk(s) && (s.breedingMark !== 1 || State.variables.propOutcome === 0)),
"Clinic": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "get treatment in the clinic") ||
- (State.variables.Flag === 1 && s.assignment === "get treatment in the clinic") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Nurse.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "get treatment in the clinic") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "get treatment in the clinic") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Nurse.ID))),
"Nurse Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
"Schoolroom": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.fetish !== "mindbroken" && s.assignment !== "learn in the schoolroom") ||
- (State.variables.Flag === 1 && s.assignment === "learn in the schoolroom") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Schoolteacher.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.fetish !== "mindbroken" && s.assignment !== "learn in the schoolroom") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "learn in the schoolroom") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Schoolteacher.ID))),
"Schoolteacher Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)),
"Dairy": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "work in the dairy") ||
- (State.variables.Flag === 1 && s.assignment === "work in the dairy") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Milkmaid.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "work in the dairy") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "work in the dairy") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Milkmaid.ID))),
"Milkmaid Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 20 && canWalk(s) && canSee(s) && canHear(s)),
"Farmyard": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "work as a farmhand") ||
- (State.variables.Flag === 1 && s.assignment === "work as a farmhand") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Farmer.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "work as a farmhand") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "work as a farmhand") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Farmer.ID))),
"Farmer Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Servants' Quarters": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "work as a servant") ||
- (State.variables.Flag === 1 && s.assignment === "work as a servant") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Stewardess.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "work as a servant") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "work as a servant") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Stewardess.ID))),
"Stewardess Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.intelligence + s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s)),
"Master Suite": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
- (State.variables.Flag === 0 && s.assignment !== "serve in the master suite") ||
- (State.variables.Flag === 1 && s.assignment === "serve in the master suite") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Concubine.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "serve in the master suite") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "serve in the master suite") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Concubine.ID))),
"Concubine Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.amp !== 1),
"Cellblock": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && s.fetish !== "mindbroken" && (
- (State.variables.Flag === 0 && s.assignment !== "be confined in the cellblock") ||
- (State.variables.Flag === 1 && s.assignment === "be confined in the cellblock") ||
- (State.variables.Flag !== 0 && State.variables.Flag !== 1 && s.ID === State.variables.Wardeness.ID))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "be confined in the cellblock") ||
+ (State.variables.SlaveSummaryFiler === 1 && s.assignment === "be confined in the cellblock") ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.SlaveSummaryFiler !== 1 && s.ID === State.variables.Wardeness.ID))),
"Wardeness Select": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)),
"Arcade": s => (s.assignmentVisible === 1 && (State.variables.arcade >= State.variables.arcadeSlaves || State.variables.arcadeUpgradeFuckdolls === 1) && (
- (State.variables.Flag === 0 && s.assignment !== "be confined in the arcade") ||
- (State.variables.Flag !== 0 && s.assignment === "be confined in the arcade"))),
+ (State.variables.SlaveSummaryFiler === 0 && s.assignment !== "be confined in the arcade") ||
+ (State.variables.SlaveSummaryFiler !== 0 && s.assignment === "be confined in the arcade"))),
"Pit": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && (
- (State.variables.Flag === 0 && !State.variables.fighterIDs.includes(s.ID) && canWalk(s) && (s.assignment !== "guard you") && (s.assignment !== "work in the dairy" || State.variables.dairyRestraintsSetting < 2)) ||
- (State.variables.Flag !== 0 && State.variables.fighterIDs.includes(s.ID)))),
+ (State.variables.SlaveSummaryFiler === 0 && !State.variables.fighterIDs.includes(s.ID) && canWalk(s) && (s.assignment !== "guard you") && (s.assignment !== "work in the dairy" || State.variables.dairyRestraintsSetting < 2)) ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.fighterIDs.includes(s.ID)))),
"Coursing Association": s => (s.assignmentVisible === 1 && s.fuckdoll === 0 && (
- (State.variables.Flag === 0 && canWalk(s) && State.variables.Lurcher.ID !== s.ID) ||
- (State.variables.Flag !== 0 && State.variables.Lurcher.ID === s.ID))),
- "New Game Plus": s => ((State.variables.Flag === 0 && s.assignment !== "be imported") || (State.variables.Flag !== 0 && s.assignment === "be imported")),
- "Rules Slave Select": s => ((State.variables.Flag === 0 && !ruleSlaveSelected(s, State.variables.currentRule)) || (State.variables.Flag !== 0 && ruleSlaveSelected(s, State.variables.currentRule))),
- "Rules Slave Exclude": s => ((State.variables.Flag === 0 && !ruleSlaveExcluded(s, State.variables.currentRule)) || (State.variables.Flag !== 0 && ruleSlaveExcluded(s, State.variables.currentRule))),
+ (State.variables.SlaveSummaryFiler === 0 && canWalk(s) && State.variables.Lurcher.ID !== s.ID) ||
+ (State.variables.SlaveSummaryFiler !== 0 && State.variables.Lurcher.ID === s.ID))),
+ "New Game Plus": s => ((State.variables.SlaveSummaryFiler === 0 && s.assignment !== "be imported") || (State.variables.SlaveSummaryFiler !== 0 && s.assignment === "be imported")),
+ "Rules Slave Select": s => ((State.variables.SlaveSummaryFiler === 0 && !ruleSlaveSelected(s, State.variables.currentRule)) || (State.variables.SlaveSummaryFiler !== 0 && ruleSlaveSelected(s, State.variables.currentRule))),
+ "Rules Slave Exclude": s => ((State.variables.SlaveSummaryFiler === 0 && !ruleSlaveExcluded(s, State.variables.currentRule)) || (State.variables.SlaveSummaryFiler !== 0 && ruleSlaveExcluded(s, State.variables.currentRule))),
"Matchmaking": s => (s.devotion >= 100 && s.relationship === State.variables.activeSlave.relationship && s.ID !== State.variables.activeSlave.ID),
"Dinner Party Preparations": s => (s.assignmentVisible === 1 && s.fuckdoll === 0),
};
@@ -4995,10 +4995,10 @@ App.UI.slaveSummaryList = function (passageName) {
if (V.useSlaveListInPageJSNavigation === 1) {
const _Count = _indexSlavesIdxs.length;
/* Useful for finding weird combinations — usages of this passage that don't yet generate the quick index.
- * <<print 'pass/count/indexed/flag::[' + passageName + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>>
+ * <<print 'pass/count/indexed/flag::[' + passageName + '/' + _Count + '/' + _indexed + '/' + $SlaveSummaryFiler + ']'>>
*/
- if (((_Count > 1) && (_indexed === 0) && (((passageName === "Main") && (V.Flag === undefined) && ((V.useSlaveSummaryTabs === 0) || (V.slaveAssignmentTab === "all"))) || (V.Flag === 1)))) {
+ if (((_Count > 1) && (_indexed === 0) && (((passageName === "Main") && (V.SlaveSummaryFiler === undefined) && ((V.useSlaveSummaryTabs === 0) || (V.slaveAssignmentTab === "all"))) || (V.SlaveSummaryFiler === 1)))) {
const _buttons = [];
let _offset = -50;
if (/Select/i.test(passageName)) {
@@ -5132,7 +5132,7 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(`<div id="slave_${ _Slave.ID }" style="clear:both">`);
if (passageFacility !== undefined) {
- if (V.Flag === 0) {
+ if (V.SlaveSummaryFiler === 0) {
if (!passageFacility.hasFreeSpace) {
res.pop();
continue;
@@ -5148,7 +5148,7 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(dividerAndImage(_Slave));
res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`);
}
- } else if (V.Flag === 1) {
+ } else if (V.SlaveSummaryFiler === 1) {
res.push(dividerAndImage(_Slave));
res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`);
} else {
@@ -5187,7 +5187,7 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(`[[${_slaveName}|Subordinate Targeting][$activeSlave.subTarget = $slaves[${_ssi}].ID]]`);
break;
case "Coursing Association":
- if (V.Flag === 0) {
+ if (V.SlaveSummaryFiler === 0) {
res.push(dividerAndImage(_Slave));
res.push(`[[${_slaveName}|Assign][$i = ${_ssi}]]`);
} else {
@@ -5197,7 +5197,7 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "New Game Plus":
res.push(dividerAndImage(_Slave));
- if (V.Flag === 0) {
+ if (V.SlaveSummaryFiler === 0) {
res.push(`__''@@.pink;${_Slave.slaveName}@@''__`);
} else {
res.push(`__''@@.pink;${_Slave.slaveName}@@''__`);
@@ -5205,7 +5205,7 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Rules Slave Select":
slaveImagePrinted = false;
- if (V.Flag === 0) {
+ if (V.SlaveSummaryFiler === 0) {
res.push(`__''[[${_slaveName}|Rules Slave Select Workaround][$activeSlave = $slaves[${_ssi}]]]''__`);
} else {
res.push(`__''[[${_slaveName}|Rules Slave Deselect Workaround][$activeSlave = $slaves[${_ssi}]]]''__`);
@@ -5213,7 +5213,7 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "Rules Slave Exclude":
slaveImagePrinted = false;
- if (V.Flag === 0) {
+ if (V.SlaveSummaryFiler === 0) {
res.push(`__''[[${_slaveName}|Rules Slave Exclude Workaround][$activeSlave = $slaves[${_ssi}]]]''__`);
} else {
res.push(`__''[[${_slaveName}|Rules Slave NoExclude Workaround][$activeSlave = $slaves[${_ssi}]]]''__`);
@@ -5268,7 +5268,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
} /* closes _numFacilities */
- if ((passageName !== 'Main') || (V.Flag !== undefined) || (V.useSlaveSummaryTabs === 0) || (tabName === "all")) {
+ if ((passageName !== 'Main') || (V.SlaveSummaryFiler !== undefined) || (V.useSlaveSummaryTabs === 0) || (tabName === "all")) {
res.push(`<span id="slave-${slaves[_ssi].ID}"> </span>`);
}
res.push('<br/>');
@@ -5285,9 +5285,9 @@ App.UI.slaveSummaryList = function (passageName) {
if (passageFacility !== undefined) {
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
- if (V.Flag === 0) {
+ if (V.SlaveSummaryFiler === 0) {
res.push(`<<link "Send ${_Slave.object} to ${passageFacility.name}" "Assign">><<set $i = ${_ssi}>><</link>>`);
- } else if (V.Flag === 1) {
+ } else if (V.SlaveSummaryFiler === 1) {
res.push(`<<link "Remove ${_Slave.object} from ${passageFacility.name}" "Retrieve">><<set $i = ${_ssi}>><</link>>`);
} else if (passageFacility.desc.manager !== null){
const managerCapName = capFirstChar(passageFacility.desc.manager.position);
@@ -5310,14 +5310,14 @@ App.UI.slaveSummaryList = function (passageName) {
break;
case "New Game Plus":
res.push(`<br>${ V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1}` ? ' ' : '');
- if (V.Flag === 0) {
+ if (V.SlaveSummaryFiler === 0) {
res.push(`<<link "Add to import list" "New Game Plus">>
- <<set $slavesToImport += 1,$Flag = 1>>
+ <<set $slavesToImport += 1,$SlaveSummaryFiler = 1>>
<<= assignJob($slaves[${_ssi}], "be imported")>>
<</link>>`);
} else {
res.push(`<<link "Remove from import list" "New Game Plus">>
- <<set $slavesToImport -= 1,$Flag = 0>>
+ <<set $slavesToImport -= 1,$SlaveSummaryFiler = 0>>
<<= removeJob($slaves[${_ssi}], $slaves[${_ssi}].assignment)>>
<</link>>`);
}
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index 87ce972f2e3..f078ae3ccab 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -78,23 +78,23 @@
/*
* Checks from which Facility its get called and removes it from the list
* this is the Main Filter widget used on all Passages atm
- * sets Flag = zero so slave summary provides send-to-facility links
+ * sets SlaveSummaryFiler = zero so slave summary provides send-to-facility links
*/
<<widget "assignmentFilter">>
- <<link All>><<showallAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>>
- <<if passage() != "Arcade">><<print " | ">><<link Arcade>><<arcadeAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Brothel">><<print " | ">><<link Brothel>><<brothelAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Cellblock">><<print " | ">><<link Cellblock>><<cellblockAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Clinic">><<print " | ">><<link Clinic>><<clinicAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Club">><<print " | ">><<link Club>><<clubAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Dairy">><<print " | ">><<link Dairy>><<dairyAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Farmyard">><<print " | ">><<link Farmyard>><<farmyardAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<print " | ">><<link Penthouse>><<penthouseAssignmentFilter>><<replace #ComingGoing>><<include 'Slave Summary'>><<set $Flag = 0>><<resetAssignmentFilter>><</replace>><</link>>
- <<if passage() != "Schoolroom">><<print " | ">><<link Schoolroom>><<schoolAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Spa">><<print " | ">><<link Spa>><<spaAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Nursery">><<print " | ">><<link Nursery>><<nurseryAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Master Suite">><<print " | ">><<link Suite>><<suiteAssignmentFilter>><<replace #ComingGoing>><<set $Flag = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
- <<if passage() != "Servants' Quarters">><<print " | ">><<link Quarters>><<quartersAssignmentFilter>><<set $Flag = 0>><<replace #ComingGoing>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<link All>><<showallAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>>
+ <<if passage() != "Arcade">><<print " | ">><<link Arcade>><<arcadeAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Brothel">><<print " | ">><<link Brothel>><<brothelAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Cellblock">><<print " | ">><<link Cellblock>><<cellblockAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Clinic">><<print " | ">><<link Clinic>><<clinicAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Club">><<print " | ">><<link Club>><<clubAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Dairy">><<print " | ">><<link Dairy>><<dairyAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Farmyard">><<print " | ">><<link Farmyard>><<farmyardAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<print " | ">><<link Penthouse>><<penthouseAssignmentFilter>><<replace #ComingGoing>><<include 'Slave Summary'>><<set $SlaveSummaryFiler = 0>><<resetAssignmentFilter>><</replace>><</link>>
+ <<if passage() != "Schoolroom">><<print " | ">><<link Schoolroom>><<schoolAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Spa">><<print " | ">><<link Spa>><<spaAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Nursery">><<print " | ">><<link Nursery>><<nurseryAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Master Suite">><<print " | ">><<link Suite>><<suiteAssignmentFilter>><<replace #ComingGoing>><<set $SlaveSummaryFiler = 0>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
+ <<if passage() != "Servants' Quarters">><<print " | ">><<link Quarters>><<quartersAssignmentFilter>><<set $SlaveSummaryFiler = 0>><<replace #ComingGoing>><<include 'Slave Summary'>><<resetAssignmentFilter>><</replace>><</link>><</if>>
<</widget>>
/*
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 55d4558b096..6c37d6a049d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -33,6 +33,10 @@
<<unset $drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs>>
<</if>>
+<<if def $Flag>>
+ <<unset $Flag>>
+<</if>>
+
<<if def $servantMilkersJobs>>
<<unset $servantMilkersJobs>>
<</if>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index f0b0ff337ea..ebe945145d5 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -149,7 +149,7 @@ $arcadeNameCaps
<div class="content">
<<if $arcadeSlaves > 0>>
<<arcadeAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -164,7 +164,7 @@ $arcadeNameCaps
''$arcadeNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $arcadeSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index d5fbc18b57f..a3959e8a44c 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -1,6 +1,6 @@
:: Brothel [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Brothel", $brothelSlaves = $BrothiIDs.length, $Flag = 0>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Brothel", $brothelSlaves = $BrothiIDs.length, $SlaveSummaryFiler = 0>>
<<if $brothelName != "the Brothel">>
<<set $brothelNameCaps = $brothelName.replace("the ", "The ")>>
@@ -207,7 +207,7 @@ Last week this
<br><br>
<<if $Madam != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a Madam. [[Appoint one|Madam Select]]
@@ -226,7 +226,7 @@ Last week this
<div class="content">
<<if $brothelSlaves > 0>>
<<brothelAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -241,7 +241,7 @@ Last week this
''$brothelNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $brothelSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 1e396b40a2e..2e0dc76542b 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -112,7 +112,7 @@ $cellblockNameCaps
<br><br>
<<if $Wardeness != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a Wardeness. [[Appoint one|Wardeness Select]]
@@ -131,7 +131,7 @@ $cellblockNameCaps
<div class="content">
<<if $cellblockSlaves > 0>>
<<cellblockAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -146,7 +146,7 @@ $cellblockNameCaps
''$cellblockNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $cellblockSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index ddb516b27b9..2fdd76c61bd 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -134,7 +134,7 @@ $clinicNameCaps
<br><br>
<<if $Nurse != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a clinical Nurse. [[Appoint one|Nurse Select]]
@@ -153,7 +153,7 @@ $clinicNameCaps
<div class="content">
<<if $clinicSlaves > 0>>
<<clinicAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -168,7 +168,7 @@ $clinicNameCaps
''$clinicNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $clinicSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 2350808bbda..51e44619d37 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -251,7 +251,7 @@ $clubNameCaps
<br><br>
<<if $DJ != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a DJ. [[Appoint one|DJ Select]]
@@ -270,7 +270,7 @@ $clubNameCaps
<div class="content">
<<if $clubSlaves > 0>>
<<clubAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -285,7 +285,7 @@ $clubNameCaps
''$clubNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $clubSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/coursingAssociation.tw b/src/uncategorized/coursingAssociation.tw
index e6d13b8d162..4f8b4cca021 100644
--- a/src/uncategorized/coursingAssociation.tw
+++ b/src/uncategorized/coursingAssociation.tw
@@ -20,7 +20,7 @@ The chasing slaves are known as lurchers, the term once used for the sighthounds
<<if $Lurcher != 0>>
<br><br>''Fire your Lurcher:''
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<</if>>
@@ -28,7 +28,7 @@ The chasing slaves are known as lurchers, the term once used for the sighthounds
<br><br>
<<assignmentFilter>>
<span id="ComingGoing">
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<showallAssignmentFilter>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index e5e43cfcc61..cb98058ea67 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -501,7 +501,7 @@ $dairyNameCaps
<br><br>
<<if ($Milkmaid != 0)>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<if canAchieveErection($Milkmaid) && $Milkmaid.pubertyXY == 1>>
<<setLocalPronouns $Milkmaid>>
@@ -539,7 +539,7 @@ $dairyNameCaps
<div class="content">
<<if $dairySlaves > 0>>
<<dairyAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -554,7 +554,7 @@ $dairyNameCaps
''$dairyNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $dairySlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index 474c4d5e2a4..7c814073e0b 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -57,7 +57,7 @@
<div class="content">
<<if $HGSuiteSlaves > 0>>
<<headgirlSuiteAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<</if>>
@@ -69,7 +69,7 @@
<<if ($slaves.length > $HGSuiteSlaves) && ($HGSuiteSlaves < 1)>>
<<assignmentFilter>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<<else>>
''Head Girl already has a girl.''
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 43657866041..4aec940dc92 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -1,6 +1,6 @@
:: Main [nobr]
-<<unset $Flag>>
+<<unset $SlaveSummaryFiler>>
<<resetAssignmentFilter>>
<<if $releaseID >= 1000 || $ver.includes("0.9") || $ver.includes("0.8") || $ver.includes("0.7") || $ver.includes("0.6")>>
<<if $releaseID >= 1031>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 12689c1814b..2c3894ac575 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -346,7 +346,7 @@ $masterSuiteNameCaps is furnished
<br><br>
<<if $Concubine != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as your Concubine. [[Appoint one|Concubine Select]]
@@ -365,7 +365,7 @@ $masterSuiteNameCaps is furnished
<div class="content">
<<if $masterSuiteSlaves > 0>>
<<suiteAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -380,7 +380,7 @@ $masterSuiteNameCaps is furnished
''$masterSuiteNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $masterSuiteSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index dd884f98f2f..3f0c45c381c 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -381,7 +381,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
<<if $seeImages == 1>><br style="clear:both"><</if>>
<br><br>__Put $him with another worshipful <<if $eventSlave.relationship == -2>>emotionally bonded slave<<else>>emotional slut<</if>>:__
-<<set $Flag = 1>>
+<<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
</span>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 3eb8bf2e8ce..d87a3a367d0 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -1,6 +1,6 @@
:: New Game Plus [nobr]
-<<set $ui = "start">> <<unset $Flag>>
+<<set $ui = "start">> <<unset $SlaveSummaryFiler>>
<<if ndef $slavesToImport>><<set $slavesToImport = 0>><</if>>
<<if ndef $slavesToImportMax>><<set $slavesToImportMax = 5>><</if>>
@@ -70,7 +70,7 @@ Select up to $slavesToImportMax slaves to be imported into a new game and then c
<<if $slavesToImport >= $slavesToImportMax>>
//Current slave import capacity exceded.//
<</if>>
- <<set $Flag = 1>> <<include "Slave Summary">>
+ <<set $SlaveSummaryFiler = 1>> <<include "Slave Summary">>
<</if>>
</div>
</div>
@@ -81,7 +81,7 @@ Select up to $slavesToImportMax slaves to be imported into a new game and then c
<<else>>
<<if $slaves.length > $slavesToImport>>
''These slaves are available to be imported into the new game:''
- <<set $Flag = 0>> <<include "Slave Summary">>
+ <<set $SlaveSummaryFiler = 0>> <<include "Slave Summary">>
<</if>>
<</if>>
</div>
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index ca941710bea..86520aa4456 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -343,7 +343,7 @@ $pitNameCaps is clean and ready,
<div id="remove" class="tabcontent">
<div class="content">
<<if _DL > 0>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<else>>
<br><br>//$pitNameCaps is empty for the moment//
@@ -354,7 +354,7 @@ $pitNameCaps is clean and ready,
<div id="assign" class="tabcontent">
<div class="content">
<<if (_SL > _DL)>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/rulesSlaveExclude.tw b/src/uncategorized/rulesSlaveExclude.tw
index 3bda3fbbe8e..b0da9308295 100644
--- a/src/uncategorized/rulesSlaveExclude.tw
+++ b/src/uncategorized/rulesSlaveExclude.tw
@@ -7,15 +7,15 @@
<</if>>
<<if ($currentRule.excludedSlaves.length < 1)>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
Select slaves to exclude from Rule $r:
<<include "Slave Summary">>
<<else>>
Slaves currently excluded from Rule $r: [[Clear list|Rules Slave Exclude][$currentRule.excludedSlaves = []]]
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<br><br>
Select more slaves to exclude from Rule $r:
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
diff --git a/src/uncategorized/rulesSlaveSelect.tw b/src/uncategorized/rulesSlaveSelect.tw
index 4f234f4a079..734cdcb01e2 100644
--- a/src/uncategorized/rulesSlaveSelect.tw
+++ b/src/uncategorized/rulesSlaveSelect.tw
@@ -7,15 +7,15 @@
<</if>>
<<if ($currentRule.selectedSlaves.length < 1)>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
Choose specific slaves to limit Rule $r:
<<include "Slave Summary">>
<<else>>
Rule $r currently limited to specific slaves: [[Clear list|Rules Slave Select][$currentRule.selectedSlaves = []]]
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<br><br>
Choose more specific slaves:
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 0e5804136ef..43f4cba39f4 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -117,7 +117,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<br><br>
<<if $Schoolteacher != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a Schoolteacher. [[Appoint one|Schoolteacher Select]]
@@ -135,7 +135,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<div class="content">
<<if $schoolroomSlaves > 0>>
<<schoolAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -150,7 +150,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
''$schoolroomNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $schoolroomSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 879198bd2f3..2b6de01359a 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -105,7 +105,7 @@ $servantsQuartersNameCaps
<br><br>
<<if $Stewardess != 0>>
<<setLocalPronouns $Stewardess>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<if canAchieveErection($Stewardess) && $Stewardess.pubertyXY == 1>>
<br>
@@ -132,7 +132,7 @@ $servantsQuartersNameCaps
<div class="content">
<<if $servantsQuartersSlaves > 0>>
<<quartersAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -147,7 +147,7 @@ $servantsQuartersNameCaps
''$servantsQuartersNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $servantsQuartersSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 365de16c726..2d60156c2a0 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -119,7 +119,7 @@ $spaNameCaps
<br><br>
<<if $Attendant != 0>>
- <<set $Flag = 2>>
+ <<set $SlaveSummaryFiler = 2>>
<<include "Slave Summary">>
<<else>>
You do not have a slave serving as a spa Attendant. [[Appoint one|Attendant Select]]
@@ -139,7 +139,7 @@ $spaNameCaps
<div class="content">
<<if $spaSlaves > 0>>
<<spaAssignmentFilter>>
- <<set $Flag = 1>>
+ <<set $SlaveSummaryFiler = 1>>
<<include "Slave Summary">>
<<resetAssignmentFilter>>
<<else>>
@@ -154,7 +154,7 @@ $spaNameCaps
''$spaNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $spaSlaves)>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $SlaveSummaryFiler = 0>>
<<include "Slave Summary">>
<</if>>
</div>
--
GitLab