FinalVehicleSpotted condition

Now requires that the player not be incapacitated. (This concepts fires to all survivors. So someone is going to say it regardless.)
Tsuey · Feb 14, 2022 · 8d6fece · 8d6fece
1 parent 63e82de
commit 8d6fece
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 34 deletions.
diff --git a/root/scripts/talker/biker.txt b/root/scripts/talker/biker.txt
@@ -937,7 +937,6 @@ Rule C6M3_BridgeDownBiker
 	Response C6M3_BridgeDownBiker
 }
 
-
 Response c6m3_outroL4D1Biker
 {
 	scene "scenes/Biker/DLC1_C6M3_L4D1FinaleCinematic13.vcd"  //I hate goodbyes.
@@ -1814,7 +1813,7 @@ Response C7M3PlayerGetToRescueVehicleBiker
 }
 Rule C7M3PlayerGetToRescueVehicleBiker
 {
-	criteria ConceptFinalVehicleSpotted IsBiker ismapc7m3_port IsTalk IsTalkBiker IsWorldTalkBiker _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsBiker ismapc7m3_port IsTalk IsTalkBiker IsWorldTalkBiker IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockBiker:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response C7M3PlayerGetToRescueVehicleBiker
@@ -2976,7 +2975,7 @@ Response L4D1SurvivorFinalVehicleFarmSpottedBiker
 }
 Rule L4D1SurvivorFinalVehicleFarmSpottedBiker
 {
-	criteria ConceptFinalVehicleSpotted IsBiker IsBloodHarvest5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsBiker IsBloodHarvest5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockBiker:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleFarmSpottedBiker
@@ -3038,7 +3037,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatBiker
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatBiker
 {
-	criteria ConceptFinalVehicleSpotted IsBiker IsDeathToll5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsBiker IsDeathToll5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockBiker:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatBiker
@@ -3052,7 +3051,7 @@ Response L4D1SurvivorFinalVehicleSpottedRooftopBiker
 }
 Rule L4D1SurvivorFinalVehicleSpottedRooftopBiker
 {
-	criteria ConceptFinalVehicleSpotted IsBiker IsNoMercy5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsBiker IsNoMercy5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockBiker:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRooftopBiker
@@ -3064,7 +3063,7 @@ Response L4D1SurvivorFinalVehicleSpottedRunwayBiker
 }
 Rule L4D1SurvivorFinalVehicleSpottedRunwayBiker
 {
-	criteria ConceptFinalVehicleSpotted IsBiker IsDeadAir5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsBiker IsDeadAir5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockBiker:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRunwayBiker
@@ -10096,7 +10095,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatC14M2Biker
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatC14M2Biker
 {
-	criteria ConceptFinalVehicleSpotted IsBiker IsLastStand2 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsBiker IsLastStand2 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockBiker:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatC14M2Biker

diff --git a/root/scripts/talker/coach.txt b/root/scripts/talker/coach.txt
@@ -3518,7 +3518,7 @@ Response C5M5RescueStartCoach
 }
 Rule C5M5RescueStartCoach
 {
-	criteria ConceptFinalVehicleSpotted IsCoach IsMapc5m5_bridge _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsCoach IsMapc5m5_bridge IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C5M5RescueStartCoach
@@ -16481,7 +16481,7 @@ Response C13M4SpottedVehicleCoach
 }
 Rule C13M4SpottedVehicleCoach
 {
-	criteria ConceptFinalVehicleSpotted IsCoach ismapc13m4_cutthroatcreek _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsCoach ismapc13m4_cutthroatcreek IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C13M4SpottedVehicleCoach

diff --git a/root/scripts/talker/gambler.txt b/root/scripts/talker/gambler.txt
@@ -3482,7 +3482,7 @@ Response C5M5RescueStartGambler
 }
 Rule C5M5RescueStartGambler
 {
-	criteria ConceptFinalVehicleSpotted IsGambler IsMapc5m5_bridge _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsGambler IsMapc5m5_bridge IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C5M5RescueStartGambler
@@ -16764,7 +16764,7 @@ Response C13M4SpottedVehicleGambler
 }
 Rule C13M4SpottedVehicleGambler
 {
-	criteria ConceptFinalVehicleSpotted IsGambler ismapc13m4_cutthroatcreek _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsGambler ismapc13m4_cutthroatcreek IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C13M4SpottedVehicleGambler

diff --git a/root/scripts/talker/manager.txt b/root/scripts/talker/manager.txt
@@ -1347,7 +1347,7 @@ Response C7M3PlayerGetToRescueVehicleManager
 }
 Rule C7M3PlayerGetToRescueVehicleManager
 {
-	criteria ConceptFinalVehicleSpotted IsManager ismapc7m3_port IsTalk IsTalkManager IsWorldTalkManager _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsManager ismapc7m3_port IsTalk IsTalkManager IsWorldTalkManager IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockManager:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response C7M3PlayerGetToRescueVehicleManager
@@ -2223,7 +2223,7 @@ Response L4D1SurvivorFinalVehicleFarmSpottedManager
 }
 Rule L4D1SurvivorFinalVehicleFarmSpottedManager
 {
-	criteria ConceptFinalVehicleSpotted IsManager IsBloodHarvest5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsManager IsBloodHarvest5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockManager:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleFarmSpottedManager
@@ -2284,7 +2284,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatManager
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatManager
 {
-	criteria ConceptFinalVehicleSpotted IsManager IsDeathToll5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsManager IsDeathToll5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockManager:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatManager
@@ -2298,7 +2298,7 @@ Response L4D1SurvivorFinalVehicleSpottedRooftopManager
 }
 Rule L4D1SurvivorFinalVehicleSpottedRooftopManager
 {
-	criteria ConceptFinalVehicleSpotted IsManager IsNoMercy5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsManager IsNoMercy5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockManager:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRooftopManager
@@ -2310,7 +2310,7 @@ Response L4D1SurvivorFinalVehicleSpottedRunwayManager
 }
 Rule L4D1SurvivorFinalVehicleSpottedRunwayManager
 {
-	criteria ConceptFinalVehicleSpotted IsManager IsDeadAir5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsManager IsDeadAir5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockManager:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRunwayManager
@@ -8713,7 +8713,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatC14M2Manager
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatC14M2Manager
 {
-	criteria ConceptFinalVehicleSpotted IsManager IsLastStand2 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsManager IsLastStand2 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockManager:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatC14M2Manager

diff --git a/root/scripts/talker/mechanic.txt b/root/scripts/talker/mechanic.txt
@@ -3681,7 +3681,7 @@ Response C5M5RescueStartMechanic
 }
 Rule C5M5RescueStartMechanic
 {
-	criteria ConceptFinalVehicleSpotted IsMechanic IsMapc5m5_bridge _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsMechanic IsMapc5m5_bridge IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C5M5RescueStartMechanic
@@ -17607,7 +17607,7 @@ Response C13M4SpottedVehicleMechanic
 }
 Rule C13M4SpottedVehicleMechanic
 {
-	criteria ConceptFinalVehicleSpotted IsMechanic ismapc13m4_cutthroatcreek _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsMechanic ismapc13m4_cutthroatcreek IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C13M4SpottedVehicleMechanic

diff --git a/root/scripts/talker/namvet.txt b/root/scripts/talker/namvet.txt
@@ -1244,7 +1244,7 @@ Response C7M3PlayerGetToRescueVehicleNamVet
 }
 Rule C7M3PlayerGetToRescueVehicleNamVet
 {
-	criteria ConceptFinalVehicleSpotted IsNamVet ismapc7m3_port IsTalk IsTalkNamVet IsWorldTalkNamVet _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsNamVet ismapc7m3_port IsTalk IsTalkNamVet IsWorldTalkNamVet IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockNamVet:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response C7M3PlayerGetToRescueVehicleNamVet
@@ -1729,7 +1729,7 @@ Response L4D1SurvivorFinalVehicleFarmSpottedNamVet
 }
 Rule L4D1SurvivorFinalVehicleFarmSpottedNamVet
 {
-	criteria ConceptFinalVehicleSpotted IsNamVet IsBloodHarvest5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsNamVet IsBloodHarvest5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockNamVet:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleFarmSpottedNamVet
@@ -1795,7 +1795,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatNamVet
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatNamVet
 {
-	criteria ConceptFinalVehicleSpotted IsNamVet IsDeathToll5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsNamVet IsDeathToll5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockNamVet:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatNamVet
@@ -1809,7 +1809,7 @@ Response L4D1SurvivorFinalVehicleSpottedRooftopNamVet
 }
 Rule L4D1SurvivorFinalVehicleSpottedRooftopNamVet
 {
-	criteria ConceptFinalVehicleSpotted IsNamVet IsNoMercy5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsNamVet IsNoMercy5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockNamVet:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRooftopNamVet
@@ -1821,7 +1821,7 @@ Response L4D1SurvivorFinalVehicleSpottedRunwayNamVet
 }
 Rule L4D1SurvivorFinalVehicleSpottedRunwayNamVet
 {
-	criteria ConceptFinalVehicleSpotted IsNamVet IsDeadAir5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsNamVet IsDeadAir5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockNamVet:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRunwayNamVet
@@ -8201,7 +8201,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatC14M2NamVet
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatC14M2NamVet
 {
-	criteria ConceptFinalVehicleSpotted IsNamVet IsLastStand2 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsNamVet IsLastStand2 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockNamVet:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatC14M2NamVet

diff --git a/root/scripts/talker/producer.txt b/root/scripts/talker/producer.txt
@@ -2854,7 +2854,7 @@ Response C5M5RescueStartProducer
 }
 Rule C5M5RescueStartProducer
 {
-	criteria ConceptFinalVehicleSpotted IsProducer IsMapc5m5_bridge _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsProducer IsMapc5m5_bridge IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C5M5RescueStartProducer
@@ -15542,7 +15542,7 @@ Response C13M4SpottedVehicleProducer
 }
 Rule C13M4SpottedVehicleProducer
 {
-	criteria ConceptFinalVehicleSpotted IsProducer ismapc13m4_cutthroatcreek _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsProducer ismapc13m4_cutthroatcreek IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_Finale:2:0,_auto_TimerLockA:1:5"
 	applycontexttoworld
 	Response C13M4SpottedVehicleProducer

diff --git a/root/scripts/talker/teengirl.txt b/root/scripts/talker/teengirl.txt
@@ -1478,7 +1478,7 @@ Response C7M3PlayerGetToRescueVehicleTeenGirl
 }
 Rule C7M3PlayerGetToRescueVehicleTeenGirl
 {
-	criteria ConceptFinalVehicleSpotted IsTeenGirl ismapc7m3_port IsTalk IsTalkTeenGirl IsWorldTalkTeenGirl _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsTeenGirl ismapc7m3_port IsTalk IsTalkTeenGirl IsWorldTalkTeenGirl IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockTeenGirl:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response C7M3PlayerGetToRescueVehicleTeenGirl
@@ -1491,7 +1491,7 @@ Response C7M3PlayerGetToRescueVehicleLouisTeenGirl
 }
 Rule C7M3PlayerGetToRescueVehicleLouisTeenGirl
 {
-	criteria ConceptFinalVehicleSpotted IsTeenGirl ismapc7m3_port IsTalk IsTalkTeenGirl IsWorldTalkTeenGirl IsManagerAlive ChanceToFire20Percent _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsTeenGirl ismapc7m3_port IsTalk IsTalkTeenGirl IsWorldTalkTeenGirl IsNotIncapacitated IsManagerAlive ChanceToFire20Percent _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockTeenGirl:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response C7M3PlayerGetToRescueVehicleLouisTeenGirl
@@ -2405,7 +2405,7 @@ Response L4D1SurvivorFinalVehicleFarmSpottedTeenGirl
 }
 Rule L4D1SurvivorFinalVehicleFarmSpottedTeenGirl
 {
-	criteria ConceptFinalVehicleSpotted IsTeenGirl IsBloodHarvest5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsTeenGirl IsBloodHarvest5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockTeenGirl:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleFarmSpottedTeenGirl
@@ -2470,7 +2470,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatTeenGirl
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatTeenGirl
 {
-	criteria ConceptFinalVehicleSpotted IsTeenGirl IsDeathToll5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsTeenGirl IsDeathToll5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockTeenGirl:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatTeenGirl
@@ -2484,7 +2484,7 @@ Response L4D1SurvivorFinalVehicleSpottedRooftopTeenGirl
 }
 Rule L4D1SurvivorFinalVehicleSpottedRooftopTeenGirl
 {
-	criteria ConceptFinalVehicleSpotted IsTeenGirl IsNoMercy5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsTeenGirl IsNoMercy5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockTeenGirl:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRooftopTeenGirl
@@ -2496,7 +2496,7 @@ Response L4D1SurvivorFinalVehicleSpottedRunwayTeenGirl
 }
 Rule L4D1SurvivorFinalVehicleSpottedRunwayTeenGirl
 {
-	criteria ConceptFinalVehicleSpotted IsTeenGirl IsDeadAir5 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsTeenGirl IsDeadAir5 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockTeenGirl:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedRunwayTeenGirl
@@ -9377,7 +9377,7 @@ Response L4D1SurvivorFinalVehicleSpottedBoatC14M2TeenGirl
 }
 Rule L4D1SurvivorFinalVehicleSpottedBoatC14M2TeenGirl
 {
-	criteria ConceptFinalVehicleSpotted IsTeenGirl IsLastStand2 _auto_IsFinaleStarted
+	criteria ConceptFinalVehicleSpotted IsTeenGirl IsLastStand2 IsNotIncapacitated _auto_IsFinaleStarted
 	ApplyContext "_auto_TimerLockA:1:10,_auto_TimerLockTeenGirl:1:30,_auto_Finale:2:0"
 	applycontexttoworld
 	Response L4D1SurvivorFinalVehicleSpottedBoatC14M2TeenGirl