From 84c3d210d89810974a623441ae50a46b5902f41e Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Sun, 3 Feb 2019 12:15:46 -0500 Subject: [PATCH] Removed childSummary for now --- src/facilities/nursery/childSummary.tw | 33 +++++++------------------- src/facilities/nursery/nursery.tw | 2 ++ 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw index 1f0742ab1b2..e9f081964ff 100644 --- a/src/facilities/nursery/childSummary.tw +++ b/src/facilities/nursery/childSummary.tw @@ -1,5 +1,6 @@ :: Child Summary [nobr] +/* <<set setup.passagePreFilters = setup.passagePreFilters || { "Main": c => (c.assignmentVisible == 1), "Nursery" c => (c.assignmentVisible == 1 && c.fuckdoll == 0), @@ -20,12 +21,12 @@ <<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. * <<print 'pass/count/indexed/flag::[' + _Pass + '/' + _Count + '/' + _indexed + '/' + $Flag + ']'>> - */ + *//* <<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag) && (($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))) || ($Flag == 1)))>> <<set _indexed = 1, _counter = 0, _buttons = [], _offset = -50>> <<if (/Select/i.test(_Pass))>> @@ -36,12 +37,12 @@ <<set _tableCount++>> /* * we want <button data-quick-index="<<= _tableCount>>"> ... - */ + *//* <<set _buttonAttributes = { 'data-quick-index': _tableCount }>> <<htag _buttonAttributes 'button'>>Quick Index<</htag>> /* * we want <div id="list_index3" class=" hidden">... - */ + *//* <<set _divAttributes = { id: 'list_index' + _tableCount, class: 'hidden'}>> <<htag _divAttributes>> <<for !_.isUndefined(_csii = _indexSlavesIdxs.shift())>> @@ -92,6 +93,7 @@ <</htag>> <</if>> <</if>> +*/ <<switch _Pass>> <<case "Main">> @@ -111,27 +113,7 @@ <</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 */ - -/* TODO: will the PC be able to give children PA? */ -<<case "Personal Attention Select">> - <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>> - <<link _childName>> - <<if !Array.isArray($personalAttention)>> /* first PA target */ - <<set $personalAttention = [{ID: $cribs[_csi].ID, trainingRegimen: "undecided"}]>> - <<else>> - <<set _pai = $personalAttention.findIndex(function(s) { return s.ID == $cribs[_csi].ID; })>> - <<if _pai == -1>> /* not already a PA target; add */ - <<set $activeSlave = $cribs[_csi], $personalAttention.push({ID: $cribs[_csi].ID, trainingRegimen: "undecided"})>> - <<else>> /* already a PA target; remove */ - <<set $personalAttention.deleteAt(_pai)>> - <<if $personalAttention.length == 0>> - <<set $personalAttention = "sex">> - <</if>> - <</if>> - <</if>> - <<goto "Personal Attention Select">> - <</link>> - +/* may potentially be added down the line <<case "New Game Plus">> <<if $Flag == 0>> <br>__''@@.pink;_Child.slaveName@@''__ @@ -154,6 +136,7 @@ <br>__'' [[_childName|Rules Slave NoExclude Workaround][$activeSlave = $cribs[_csi]]]''__ <</if>> +*/ <</switch>> <<run SlaveStatClamp(_Child)>> diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw index 1b9d83f9706..2fb8642c03b 100644 --- a/src/facilities/nursery/nursery.tw +++ b/src/facilities/nursery/nursery.tw @@ -467,7 +467,9 @@ 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