diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index 7e1dfdf4ccd3b5eb9882ef7630a3c12925adbc11..360ac6da838f658060a5eb9c223478a57afd27b8 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -263,7 +263,7 @@ <<if ($activeChild.rivalryTarget != 0) && canWalk($activeChild)>> | <<link "Abuse $his rival with $him">><<replace "#miniscene">><<set $childSex = 1>><<include "FRival">><br> <</replace>><</link>> <</if>> - <<if ($activeChild.fetish != "mindbroken") && ((!isAmputee($activeChild)) || ($activeChild.voice != 0)) && $activeChild.accent != 4>> + <<if ($activeChild.fetish != "mindbroken") && (canTalk($activeChild) || hasAnyArms($activeChild))>> | <<link "Ask $him about $his feelings">><<replace "#miniscene">><<set $childSex = 1>><<include "FFeelings">><br> <</replace>><</link>> <</if>> <<if $activeChild.devotion >= 100 && $activeChild.relationship < 0 && $activeChild.relationship > -3>> diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw index 3f4ec27774bbebbe4bf90b13a0b54f77154f870c..6936baae7734cd744aa0981e8d75d218d445c54c 100644 --- a/src/npc/fFeelings.tw +++ b/src/npc/fFeelings.tw @@ -1,9 +1,14 @@ :: FFeelings [nobr] +/* Slaves are expected to be either able to talk or to sign when entering this passage. */ +<<if !canTalk($activeSlave) && !hasAnyArms($activeSlave)>> + $activeSlave.slaveName is unable to communicate and this place therefore unreachable. Please report this. +<</if>> + <<run Enunciate($activeSlave)>> <<setLocalPronouns $activeSlave>> <<set _lisping = 0>> -<<if hasAnyArms($activeSlave) && canTalk($activeSlave) && SlaveStatsChecker.checkForLisp($activeSlave)>> +<<if canTalk($activeSlave) && SlaveStatsChecker.checkForLisp($activeSlave)>> <<set _lisping = 1>> <</if>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 392d0775d8c6250acec21777b341745bbed4d29f..ae9d5a0e83e0b1ece03411db05fdda6270652fba 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -357,7 +357,7 @@ <<if ($activeSlave.rivalryTarget != 0) && canWalk($activeSlave)>> | <<link "Abuse $his rival with $him">><<replace "#miniscene">><<include "FRival">><br> <</replace>><</link>> <</if>> - <<if ($activeSlave.fetish != "mindbroken") && (($activeSlave.amp != 1) || ($activeSlave.voice != 0)) && $activeSlave.accent != 4>> + <<if ($activeSlave.fetish != "mindbroken") && (canTalk($activeSlave) || hasAnyArms($activeSlave))>> | <<link "Ask $him about $his feelings">><<replace "#miniscene">><<include "FFeelings">><br> <</replace>><</link>> <<if $PC.dick > 0>> | <<link "Make $him beg">><<replace "#miniscene">><<include "FBeg">><br> <</replace>><</link>> @@ -1778,4 +1778,4 @@ __Financial__: | <<link "Export this slave" "Export Slave">><</link>> <<if $cheatMode>> | <<link "Import a slave" "Import Slave">><</link>> -<</if>> \ No newline at end of file +<</if>>