Refinements

Using "Look!" to ask for a first aid kit will require that the subject not be "None". Or else you will be using the default look rules. In vanilla, you need to be looking at a L4D1 survivor. This is to prevent "Look!" from not triggering anything.
Tsuey · Nov 23, 2021 · 7123c3e · 7123c3e
1 parent 3309f4c
commit 7123c3e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/root/scripts/talker/biker.txt b/root/scripts/talker/biker.txt
@@ -3179,15 +3179,15 @@ Response L4D1SurvivorAskForHealthBiker
 }
 Rule L4D1SurvivorAskForHealthBiker
 {
-	criteria ConceptPlayerLookHere IsNotCoughing IsBiker IsTalk IsTalkBiker IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkBiker
+	criteria ConceptPlayerLookHere IsNotCoughing IsBiker IsTalk IsTalkBiker IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkBiker
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthBiker
 }
 
 Rule L4D1SurvivorAskForHealthV2Biker
 {
-	criteria ConceptPlayerLook IsNotCoughing IsBiker IsTalk IsTalkBiker IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkBiker
+	criteria ConceptPlayerLook IsNotCoughing IsBiker IsTalk IsTalkBiker IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkBiker
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthBiker

diff --git a/root/scripts/talker/manager.txt b/root/scripts/talker/manager.txt
@@ -2398,15 +2398,15 @@ Response L4D1SurvivorAskForHealthManager
 }
 Rule L4D1SurvivorAskForHealthManager
 {
-	criteria ConceptPlayerLookHere IsNotCoughing IsManager IsTalk IsTalkManager IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkManager
+	criteria ConceptPlayerLookHere IsNotCoughing IsManager IsTalk IsTalkManager IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkManager
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthManager
 }
 
 Rule L4D1SurvivorAskForHealthV2Manager
 {
-	criteria ConceptPlayerLook IsNotCoughing IsManager IsTalk IsTalkManager IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkManager
+	criteria ConceptPlayerLook IsNotCoughing IsManager IsTalk IsTalkManager IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkManager
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthManager

diff --git a/root/scripts/talker/namvet.txt b/root/scripts/talker/namvet.txt
@@ -1887,15 +1887,15 @@ Response L4D1SurvivorAskForHealthNamVet
 }
 Rule L4D1SurvivorAskForHealthNamVet
 {
-	criteria ConceptPlayerLookHere IsNotCoughing IsNamVet IsTalk IsTalkNamVet IsNotSmartLookAuto  IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkNamVet
+	criteria ConceptPlayerLookHere IsNotCoughing IsNamVet IsTalk IsTalkNamVet IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkNamVet
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthNamVet
 }
 
 Rule L4D1SurvivorAskForHealthV2NamVet
 {
-	criteria ConceptPlayerLook IsNotCoughing IsNamVet IsTalk IsTalkNamVet IsNotSmartLookAuto  IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkNamVet
+	criteria ConceptPlayerLook IsNotCoughing IsNamVet IsTalk IsTalkNamVet IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkNamVet
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthNamVet

diff --git a/root/scripts/talker/teengirl.txt b/root/scripts/talker/teengirl.txt
@@ -2581,15 +2581,15 @@ Response L4D1SurvivorAskForHealthTeenGirl
 }
 Rule L4D1SurvivorAskForHealthTeenGirl
 {
-	criteria ConceptPlayerLookHere IsNotCoughing IsTeenGirl IsTalk IsTalkTeenGirl IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkTeenGirl
+	criteria ConceptPlayerLookHere IsNotCoughing IsTeenGirl IsTalk IsTalkTeenGirl IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkTeenGirl
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthTeenGirl
 }
 
 Rule L4D1SurvivorAskForHealthV2TeenGirl
 {
-	criteria ConceptPlayerLook IsNotCoughing IsTeenGirl IsTalk IsTalkTeenGirl IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkTeenGirl
+	criteria ConceptPlayerLook IsNotCoughing IsTeenGirl IsTalk IsTalkTeenGirl IsNotSmartLookAuto HasASubject IsSubjectNear400 NoHasPainPills  NoHasFirstAidKit IsNotHealthy NotInCombat IsNotSaidAskForHealth IsWorldTalkTeenGirl
 	ApplyContext "SaidAskForHealth:1:10"
 	applycontexttoworld
 	Response L4D1SurvivorAskForHealthTeenGirl

diff --git a/root/scripts/talker/terror_player.txt b/root/scripts/talker/terror_player.txt
@@ -372,6 +372,7 @@ Criterion "ConceptAynRandResponse" "concept" "AynRandResponse" required
 criterion "IsSmartLookAuto"	"smartlooktype"	"auto"	required
 criterion "IsNotSmartLookAuto"	"smartlooktype"	"!=auto"	required
 criterion "IsSubjectNone"	"subject"	"None"	required
+criterion "HasASubject"	"subject"	"!=None"	required
 
 criterion "IsInCheckpoint"	"InCheckpoint"	"1"	required
 criterion "IsNotInCheckpoint"	"InCheckpoint"	"!=1"	required