From 75ff35a388ed80672956caed28e0e3031e53de48 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sat, 9 Feb 2019 18:55:55 -0500
Subject: [PATCH] I don't know what I'm doing anymore
---
src/facilities/nursery/childSummary.tw | 43 ++++++++++++++------------
src/facilities/nursery/nursery.tw | 2 --
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index e9f081964ff..97277d88714 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -1,7 +1,6 @@
:: Child Summary [nobr]
-/*
-<<set setup.passagePreFilters = setup.passagePreFilters || {
+/*<<set setup.passagePreFilters = setup.passagePreFilters || {
"Main": c => (c.assignmentVisible == 1),
"Nursery" c => (c.assignmentVisible == 1 && c.fuckdoll == 0),
"Personal Attention Select": c => (c.assignmentVisible == 1 && c.fuckdoll <= 0) && (
@@ -10,8 +9,8 @@
),
"New Game Plus": c => (($Flag == 0 && c.assignment != "be imported") || ($Flag != 0 && c.assignment == "be imported")),
"Rules Slave Select": c => (($Flag == 0 && !ruleSlaveSelected(c, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(c, $currentRule))),
- "Rules Slave Exclude": c => (($Flag == 0 && !ruleSlaveExcluded(c, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(c, $currentRule))),
-}>>
+ "Rules Slave Exclude": c => (($Flag == 0 && !ruleSlaveExcluded(c, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(c, $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))),
_filteredSlaveIdxs = $cribs.map(function(slave, idx) { return _passagePreFilter(slave) ? idx : null; }).filter(function(idx) { return idx !== null; }),
@@ -21,7 +20,7 @@
<<set _childName = SlaveFullName(_Child);>>
<<capture _csi>>
-*//*
+/*
<<if $useSlaveListInPageJSNavigation == 1>>
<<set _Count = _indexSlavesIdxs.length>>
/* Useful for finding weird combinations — usages of this passage that don't yet generate the quick index.
@@ -95,23 +94,25 @@
<</if>>
*/
<<switch _Pass>>
-<<case "Main">>
-
+<<case "Nursery">>
+ /*
<<if $useSlaveSummaryTabs == 1>>
<<if $childAssignmentTab == "overview">>
<</if>>
-
+ */
<<if (_Child.choosesOwnClothes == 1) && (_Child.clothes == "choosing her own clothes")>>
<<set _oldDevotion = _Child.devotion>>
<<set _chosenClothes = saChoosesOwnClothes(_Child)>>
<<set $cribs[_csi].devotion = _oldDevotion, _Child = $cribs[_csi]>> /* restore devotion value so repeatedly changing clothes isn't an exploit */
<</if>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Child 1>></div><</if>>
+ /*
<<if "be your Head Girl" == _Child.assignment>>''@@.lightcoral;HG@@''
<<elseif "recruit girls" == _Child.assignment>>''@@.lightcoral;RC@@''
<<elseif "guard you" == _Child.assignment>>''@@.lightcoral;BG@@''
<</if>>
<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Child.ID; }) != -1>>''@@.lightcoral;PA@@''<</if>>
+ */
[[_childName|Child Interact][$activeSlave = $cribs[_csi]]] /* lists their names */
/* may potentially be added down the line
<<case "New Game Plus">>
@@ -146,6 +147,7 @@
<<set $cribs[_csi] = _Child>>
will
+
<<if (_Child.assignment == "rest") && (_Child.health >= -20)>>
''__@@.lawngreen;rest.@@__''
<<elseif (_Child.assignment == "stay confined") && ((_Child.devotion > 20) || ((_Child.trust < -20) && (_Child.devotion >= -20)) || ((_Child.trust < -50) && (_Child.devotion >= -50)))>>
@@ -153,14 +155,14 @@ will
<<else>>
<<if _Child.choosesOwnAssignment == 1>>choose her own job<<else>>_Child.assignment<<if _Child.sentence > 0>> (_Child.sentence weeks)<</if>><</if>>.
<</if>>
-
-<<if ($displayAssignments == 1) && (_Pass == "Main") && (_Child.ID != $HeadGirl.ID) && (_Child.ID != $Recruiter.ID) && (_Child.ID != $Bodyguard.ID)>>
+/*
+<<if ($displayAssignments == 1) && (_Pass == "Nursery") && (_Child.ID != $HeadGirl.ID) && (_Child.ID != $Recruiter.ID) && (_Child.ID != $Bodyguard.ID)>>
<<if _Child.assignment != "rest">>
- <<link "Rest" "Main">><<= removeJob($cribs[_csi], $cribs[_csi].assignment)>><</link>>
+ <<link "Rest" "Nursery">><<= removeJob($cribs[_csi], $cribs[_csi].assignment)>><</link>>
<<else>>
Rest
<</if>>
- <<if _Child.fuckdoll == 0>> /* NON-FUCKDOLL ASSIGNMENTS */
+ <<if _Child.fuckdoll == 0>> /* NON-FUCKDOLL ASSIGNMENTS *//*
<<if (_Child.assignment != "take classes")>>
<<if (_Child.intelligenceImplant < 15) && ((_Child.devotion >= -20) || ((_Child.trust < -20) && (_Child.devotion >= -50)) || (_Child.trust < -50)) && (_Child.fetish != "mindbroken")>>
| <<link "Classes" "Main">><<= assignJob($cribs[_csi], "take classes")>><</link>>
@@ -173,11 +175,11 @@ will
<<else>>
| Let _Child.object choose
<</if>>
- <</if>> /* CLOSES FUCKDOLL CHECK */
+ <</if>> /* CLOSES FUCKDOLL CHECK *//*
<</if>>
-
+*//*
<<set _numFacilities = $nursery>> /* more subfacilities may be added down the line */
-
+/*
<<if _numFacilities > 0>>
<<if _Pass == "Main">>
@@ -191,10 +193,10 @@ will
Nursery
<</if>>
- <</if>> /* Closes transfer options check */
-
-<</if>> /* closes _numFacilities */
+ <</if>> /* Closes transfer options check *//*
+<</if>> /* closes _numFacilities *//*
+*/
<<if ((_Pass != 'Main') || (def $Flag) || ($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))>>
<<print '<span id="slave-' + $cribs[_csi].ID + '"> </span>'>>
<</if>>
@@ -207,8 +209,9 @@ will
<<set $cribs[_csi] = _Child>>
+/*
<<switch _Pass>>
-<<case "Main">>
+<<case "Nursery">>
<<continue>>
<<case "New Game Plus">>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
@@ -224,7 +227,7 @@ will
<</link>>
<</if>>
<</switch>>
-
+*/
<</capture>>
<</for>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 71e64abdaed..5a819f0bd67 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -467,9 +467,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
/* FOR TESTING */
<<for _c = 0; _c <$cribs.length; _c++>>
<<link "$cribs[_c].slaveName" "Long Child Description">>
-/*
<<include "Child Summary">>
-*/
<</link>>
<br>
<</for>>
--
GitLab