From d0a9665cd1da63e562b527bd4e4059186f4f0532 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 24 Jul 2017 15:29:37 -0400 Subject: [PATCH] Fixes --- src/{uncategorized => npc}/familyPanic.tw | 0 src/uncategorized/main.tw | 21 --------------------- src/uncategorized/slaveSummary.tw | 1 + 3 files changed, 1 insertion(+), 21 deletions(-) rename src/{uncategorized => npc}/familyPanic.tw (100%) diff --git a/src/uncategorized/familyPanic.tw b/src/npc/familyPanic.tw similarity index 100% rename from src/uncategorized/familyPanic.tw rename to src/npc/familyPanic.tw diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index 73a714b5102..41b48409e62 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -12,27 +12,6 @@ <br><br> <</if>> -<<if ndef $defaultRules>> - <<include "Init Rules">> -<</if>> -<<if ndef $prostateImplants>> - <<set $prostateImplants = 0>> -<</if>> -<<if ndef $aphrodisiacUpgradeRefine>> - <<set $aphrodisiacUpgradeRefine = 0>> -<</if>> -<<if ndef $dietCleanse>> - <<set $dietCleanse = 0>> -<</if>> -<<if ndef $PC.birthSelf>> - <<set $PC.birthSelf = 0>> -<</if>> -<<if ndef $PC.balls>> - <<set $PC.balls = 0>> -<</if>> -<<if ndef $universalRulesImmobileSlavesMaintainMuscles>> - <<set $universalRulesImmobileSlavesMaintainMuscles = 0>> -<</if>> <<set $currentRule = $defaultRules[0]>> <<SlaveSort $slaves>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 41cc7184cdc..692651149cc 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -29,6 +29,7 @@ <<if $personalAttention == _Slave.ID>>''@@.lightcoral;PA@@''<</if>> <<print "[[_slaveName|Slave Interact][$activeSlave = $slaves["+_ssi+"]]]">> <<case "Personal Attention Select">> + <<if (_Slave.assignmentVisible != 1) || (_Slave.fuckdoll > 0)>><<continue>><</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 _Slave 1>></div><</if>> <<print "[[_slaveName|Personal Attention Select][$personalAttention = $slaves["+_ssi+"].ID, $activeSlave = $slaves["+_ssi+"], $personalAttentionChanged = 1]]">> <<case "Agent Select">> -- GitLab