From c34ebfdb22958ec286e8afc785256a5f74c79be1 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sat, 22 Dec 2018 18:59:46 -0500
Subject: [PATCH] Bugfixes
---
sanityCheck | 2 ++
src/facilities/nursery/childSummary.tw | 8 +-------
src/facilities/nursery/nursery.tw | 5 ++++-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sanityCheck b/sanityCheck
index 7f1f9c6f19b..e8db762bad9 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -94,6 +94,8 @@ $GREP 'if $ ' -- 'src/*' | myprint "missing ; before statement"
$GREP 'elseif $ ' -- 'src/*' | myprint "missing ; before statement"
# Check for a . inside a <<>>
$GREP "<<[a-zA-Z]\([^\"'>]\|[^\"'>]>[^\"'>]\)*[a-zA-Z][.][^a-zA-Z]" | myprint "StrangeCharacterAfterDot"
+# Check for @@. instead of .@@ TODO: get this to work
+$GREP "@@(\.|,|;)\s" | myprint "WrongSelectorPunctuation"
# Check that we do not have any variables that we use only once. e.g. $onlyUsedOnce
# Ignore *Nationalities
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index fe6d4e77a52..2f49b4ff3b3 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -131,13 +131,7 @@
<</if>>
<<goto "Personal Attention Select">>
<</link>>
-<<elseif $Flag == 1>>
- <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>>
- [[_childName|Child Interact][$activeSlave = $cribs[_csi]]]
-<<else>>
- <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>>
- [[_childName|Child Interact][$activeSlave = $cribs[_csi]]]
-<</if>>
+
<<case "New Game Plus">>
<<if $Flag == 0>>
<br>__''@@.pink;_Child.slaveName@@''__
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 507a66b7c06..7f1de38e324 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -377,6 +377,10 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<</link>>
<</if>>
+@@.hotpink;test@@.
+@@.@@,
+@@.@@;
+
<br><br>
Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery">>
[[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]]
@@ -625,7 +629,6 @@ Filter by assignment: |
<</if>>
<</if>>
<</for>>
-<</if>>
<</if>> /* closes $nurseryBabies check *//*
<br>
*/
--
GitLab