diff --git a/sanityCheck b/sanityCheck index 7f1f9c6f19b89ae66d2f3b13e7e01a8a364cf0ba..e8db762bad9e00fca4401687f616ae96ae656e3a 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 fe6d4e77a522d8efd58bd63e337c0663e8a16c42..2f49b4ff3b3d5bade7538209685b8e66beddb617 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 507a66b7c06639040f2cdbc8ddeecf7e5b637419..7f1de38e324a24276936604e7fd64676304f02e1 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> */ diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index 00c0a26253bbc8ed6b010e436eda01f5cd769fd9..8f16f9e4a7c5bbaaccaf5a2071ef7245cb69568d 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -1178,12 +1178,10 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << //...or show $him what it's like here for a slave// -/* TODO: add more scene variants */ - <<if $activeSlave.fetish != "mindbroken">> /* <br> - <<link "Teach $him how to use $his throat">> + <<link "Teach $him how to use $his throat">> TODO: write this <</link>> */ <br>