The Passing outro lines.

Blocked from manual vocalization. They can clearly be heard from far away.
Tsuey · Feb 13, 2022 · ef1e69b · ef1e69b
1 parent 948cdbe
commit ef1e69b
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 37 deletions.
diff --git a/root/scripts/talker/biker.txt b/root/scripts/talker/biker.txt
@@ -956,7 +956,7 @@ Response c6m3_outroL4D1Biker
 }
 Rule c6m3_outroL4D1Biker
 {
-	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent
+	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	forceweight 1
 	Response c6m3_outroL4D1Biker
 }
@@ -967,7 +967,7 @@ Response c6m3_outroL4D1010aBiker
 }
 Rule c6m3_outroL4D1010aBiker
 {
-	criteria Conceptc6m3_outroL4D1010a IsBiker
+	criteria Conceptc6m3_outroL4D1010a IsBiker HasAFrom
 	Response c6m3_outroL4D1010aBiker
 }
 
@@ -977,7 +977,7 @@ Response c6m3_outroL4D104bBiker
 }
 Rule c6m3_outroL4D104bBiker
 {
-	criteria Conceptc6m3_outroL4D104b IsBiker
+	criteria Conceptc6m3_outroL4D104b IsBiker HasAFrom
 	Response c6m3_outroL4D104bBiker
 }
 
@@ -987,7 +987,7 @@ Response c6m3_outroL4D108aBiker
 }
 Rule c6m3_outroL4D108aBiker
 {
-	criteria Conceptc6m3_outroL4D108a IsBiker
+	criteria Conceptc6m3_outroL4D108a IsBiker HasAFrom
 	Response c6m3_outroL4D108aBiker
 }
 
@@ -998,7 +998,7 @@ Response c6m3_outroL4D1AllBiker
 }
 Rule c6m3_outroL4D1AllBiker
 {
-	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsEveryoneAlive ChanceToFire20Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsEveryoneAlive ChanceToFire20Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 8
 	Response c6m3_outroL4D1AllBiker
 }
@@ -1009,7 +1009,7 @@ Response c6m3_outroL4D1CoachBiker
 }
 Rule c6m3_outroL4D1CoachBiker
 {
-	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsCoachAlive ChanceToFire40Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsCoachAlive ChanceToFire40Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 6
 	Response c6m3_outroL4D1CoachBiker
 }
@@ -1023,7 +1023,7 @@ Response c6m3_outroL4D1CopGibbsBiker
 }
 Rule c6m3_outroL4D1CopGibbsBiker
 {
-	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsFrancisIntroActor ChanceToFire10Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsFrancisIntroActor ChanceToFire10Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 10
 	Response c6m3_outroL4D1CopGibbsBiker
 }
@@ -1034,7 +1034,7 @@ Response c6m3_outroL4D1GamblerBiker
 }
 Rule c6m3_outroL4D1GamblerBiker
 {
-	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsGamblerAlive ChanceToFire50Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsGamblerAlive ChanceToFire50Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 5
 	Response c6m3_outroL4D1GamblerBiker
 }
@@ -1046,7 +1046,7 @@ Response c6m3_outroL4D1MechanicBiker
 }
 Rule c6m3_outroL4D1MechanicBiker
 {
-	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsMechanicAlive ChanceToFire60Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsMechanicAlive ChanceToFire60Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 4
 	Response c6m3_outroL4D1MechanicBiker
 }
@@ -1061,7 +1061,7 @@ Response c6m3_outroL4D1ProducerBiker
 }
 Rule c6m3_outroL4D1ProducerBiker
 {
-	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsProducerAlive ChanceToFire30Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsBiker isC6m3_port IsProducerAlive ChanceToFire30Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 7
 	Response c6m3_outroL4D1ProducerBiker
 }

diff --git a/root/scripts/talker/coach.txt b/root/scripts/talker/coach.txt
@@ -4366,7 +4366,7 @@ Response c6m3_outroCoach
 }
 Rule c6m3_outroCoach
 {
-	criteria Conceptc6m3_outro3 IsCoach isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent FromIsBiker
+	criteria Conceptc6m3_outro3 IsCoach isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	forceweight 1
 	Response c6m3_outroCoach
 }

diff --git a/root/scripts/talker/gambler.txt b/root/scripts/talker/gambler.txt
@@ -4473,7 +4473,7 @@ Response c6m3_outroGambler
 }
 Rule c6m3_outroGambler
 {
-	criteria Conceptc6m3_outro3 IsGambler isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent FromIsBiker
+	criteria Conceptc6m3_outro3 IsGambler isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	forceweight 1
 	Response c6m3_outroGambler
 }
@@ -4484,7 +4484,7 @@ Response c6m3_outroEllisGambler
 }
 Rule c6m3_outroEllisGambler
 {
-	criteria Conceptc6m3_outro3 IsGambler IsMechanicAlive ChanceToFire50Percent IsNotIncapacitated isC6m3_port IsNotVersus FromIsBiker
+	criteria Conceptc6m3_outro3 IsGambler IsMechanicAlive ChanceToFire50Percent IsNotIncapacitated isC6m3_port IsNotVersus HasAFrom
 	forceweight 5
 	Response c6m3_outroEllisGambler
 }
@@ -4496,7 +4496,7 @@ Response c6m3_outroZoeyOutroGambler
 }
 Rule c6m3_outroZoeyOutroGambler
 {
-	criteria Conceptc6m3_outroL4D1011a IsGambler IsNotIncapacitated FromIsMechanic
+	criteria Conceptc6m3_outroL4D1011a IsGambler IsNotIncapacitated HasAFrom
 	Response c6m3_outroZoeyOutroGambler
 }
 

diff --git a/root/scripts/talker/manager.txt b/root/scripts/talker/manager.txt
@@ -540,7 +540,7 @@ Response c6m3_outroL4D1Manager
 }
 Rule c6m3_outroL4D1Manager
 {
-	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent
+	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	applycontexttoworld
 	forceweight 1
 	Response c6m3_outroL4D1Manager
@@ -553,7 +553,7 @@ Response c6m3_outroL4D102aManager
 }
 Rule c6m3_outroL4D102aManager
 {
-	criteria Conceptc6m3_outroL4D102a IsManager
+	criteria Conceptc6m3_outroL4D102a IsManager HasAFrom
 	Response c6m3_outroL4D102aManager
 }
 
@@ -563,7 +563,7 @@ Response c6m3_outroL4D106aManager
 }
 Rule c6m3_outroL4D106aManager
 {
-	criteria Conceptc6m3_outroL4D106a IsManager
+	criteria Conceptc6m3_outroL4D106a IsManager HasAFrom
 	Response c6m3_outroL4D106aManager
 }
 
@@ -577,7 +577,7 @@ Response c6m3_outroL4D1AllManager
 }
 Rule c6m3_outroL4D1AllManager
 {
-	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsEveryoneAlive ChanceToFire20Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsEveryoneAlive ChanceToFire20Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 8
 	Response c6m3_outroL4D1AllManager
 }
@@ -589,7 +589,7 @@ Response c6m3_outroL4D1CoachManager
 }
 Rule c6m3_outroL4D1CoachManager
 {
-	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsCoachAlive ChanceToFire30Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsCoachAlive ChanceToFire30Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 7
 	Response c6m3_outroL4D1CoachManager
 }
@@ -601,7 +601,7 @@ Response c6m3_outroL4D1GamblerManager
 }
 Rule c6m3_outroL4D1GamblerManager
 {
-	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsGamblerAlive ChanceToFire40Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsGamblerAlive ChanceToFire40Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 6
 	Response c6m3_outroL4D1GamblerManager
 }
@@ -612,7 +612,7 @@ Response c6m3_outroL4D1MechanicManager
 }
 Rule c6m3_outroL4D1MechanicManager
 {
-	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsMechanicAlive ChanceToFire50Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsManager isC6m3_port IsMechanicAlive ChanceToFire50Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 5
 	Response c6m3_outroL4D1MechanicManager
 }

diff --git a/root/scripts/talker/mechanic.txt b/root/scripts/talker/mechanic.txt
@@ -5068,7 +5068,7 @@ Response c6m3_outroMechanic
 }
 Rule c6m3_outroMechanic
 {
-	criteria Conceptc6m3_outro3 IsMechanic isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent FromIsBiker
+	criteria Conceptc6m3_outro3 IsMechanic isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	forceweight 1
 	Response c6m3_outroMechanic
 }
@@ -5088,7 +5088,7 @@ Response c6m3_outroZoeyOutroMechanic
 }
 Rule c6m3_outroZoeyOutroMechanic
 {
-	criteria Conceptc6m3_outro3 IsMechanic isC6m3_port IsZoeyIntroActor IsNotVersus IsNotIncapacitated ChanceToFire100Percent FromIsBiker
+	criteria Conceptc6m3_outro3 IsMechanic isC6m3_port IsZoeyIntroActor IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	forceweight 2
 	Response c6m3_outroZoeyOutroMechanic
 }
@@ -5100,7 +5100,7 @@ Response c6m3_outroRochelleOutroMechanic
 }
 Rule c6m3_outroRochelleOutroMechanic
 {
-	criteria Conceptc6m3_outroL4D1012a IsMechanic IsNotIncapacitated FromIsProducer
+	criteria Conceptc6m3_outroL4D1012a IsMechanic IsNotIncapacitated HasAFrom
 	Response c6m3_outroRochelleOutroMechanic
 }
 

diff --git a/root/scripts/talker/producer.txt b/root/scripts/talker/producer.txt
@@ -4119,7 +4119,7 @@ Response c6m3_outroProducer
 }
 Rule c6m3_outroProducer
 {
-	criteria Conceptc6m3_outro3 IsProducer isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent FromIsBiker
+	criteria Conceptc6m3_outro3 IsProducer isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	forceweight 1
 	Response c6m3_outroProducer
 }
@@ -12116,7 +12116,7 @@ Response SurvivorPickupGunC1M2Producer
 }
 Rule SurvivorPickupGunC1M2Producer
 {
-	criteria ConceptPlayerPickup IsNotCoughing IsProducer IsNotSpeaking IsTalk IsSaidC1M2InsideGunShop IsNotPickedUpFirstAidKit IsNotPickedUpAdrenaline IsNotPickedUpPainPills IsNotPickedUpAmmo IsNotPickedUpVomitJar IsNotPickedUpLaserSights IsNotPickedUpMolotov IsNotPickedUpPipeBomb IsNotCarriedProp IsWorldTalkProducer _auto_NotButton1
+	criteria ConceptPlayerPickup IsNotCoughing IsProducer IsNotSpeaking IsTalk IsSaidC1M2InsideGunShop IsNotPickedUpFirstAidKit IsNotPickedUpAdrenaline IsNotPickedUpPainPills IsNotPickedUpAmmo IsNotPickedUpVomitJar IsNotPickedUpLaserSights IsNotPickedUpMolotov IsNotPickedUpPipeBomb IsNotCarriedProp IsWorldTalkProducer ismap_c1m2_streets _auto_NotButton1
 	Response SurvivorPickupGunC1M2Producer
 }
 

diff --git a/root/scripts/talker/teengirl.txt b/root/scripts/talker/teengirl.txt
@@ -895,7 +895,7 @@ Response c6m3_outroL4D1TeenGirl
 }
 Rule c6m3_outroL4D1TeenGirl
 {
-	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent
+	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsNotVersus IsNotIncapacitated ChanceToFire100Percent HasAFrom
 	forceweight 1
 	Response c6m3_outroL4D1TeenGirl
 }
@@ -906,7 +906,7 @@ Response c6m3_outroL4D101aTeenGirl
 }
 Rule c6m3_outroL4D101aTeenGirl
 {
-	criteria Conceptc6m3_outroL4D101a IsTeenGirl
+	criteria Conceptc6m3_outroL4D101a IsTeenGirl HasAFrom
 	Response c6m3_outroL4D101aTeenGirl
 }
 
@@ -916,7 +916,7 @@ Response c6m3_outroL4D102bTeenGirl
 }
 Rule c6m3_outroL4D102bTeenGirl
 {
-	criteria Conceptc6m3_outroL4D102b IsTeenGirl
+	criteria Conceptc6m3_outroL4D102b IsTeenGirl HasAFrom
 	Response c6m3_outroL4D102bTeenGirl
 }
 
@@ -926,7 +926,7 @@ Response c6m3_outroL4D103aTeenGirl
 }
 Rule c6m3_outroL4D103aTeenGirl
 {
-	criteria Conceptc6m3_outroL4D103a IsTeenGirl
+	criteria Conceptc6m3_outroL4D103a IsTeenGirl HasAFrom
 	Response c6m3_outroL4D103aTeenGirl
 }
 
@@ -936,7 +936,7 @@ Response c6m3_outroL4D104aTeenGirl
 }
 Rule c6m3_outroL4D104aTeenGirl
 {
-	criteria Conceptc6m3_outroL4D104a IsTeenGirl
+	criteria Conceptc6m3_outroL4D104a IsTeenGirl HasAFrom
 	Response c6m3_outroL4D104aTeenGirl
 }
 
@@ -946,7 +946,7 @@ Response c6m3_outroL4D105aTeenGirl
 }
 Rule c6m3_outroL4D105aTeenGirl
 {
-	criteria Conceptc6m3_outroL4D105a IsTeenGirl
+	criteria Conceptc6m3_outroL4D105a IsTeenGirl HasAFrom
 	Response c6m3_outroL4D105aTeenGirl
 }
 
@@ -956,7 +956,7 @@ Response c6m3_outroL4D107aTeenGirl
 }
 Rule c6m3_outroL4D107aTeenGirl
 {
-	criteria Conceptc6m3_outroL4D107a IsTeenGirl
+	criteria Conceptc6m3_outroL4D107a IsTeenGirl HasAFrom
 	Response c6m3_outroL4D107aTeenGirl
 }
 
@@ -966,7 +966,7 @@ Response c6m3_outroL4D109aTeenGirl
 }
 Rule c6m3_outroL4D109aTeenGirl
 {
-	criteria Conceptc6m3_outroL4D109a IsTeenGirl
+	criteria Conceptc6m3_outroL4D109a IsTeenGirl HasAFrom
 	Response c6m3_outroL4D109aTeenGirl
 }
 
@@ -976,7 +976,7 @@ Response c6m3_outroL4D1AllTeenGirl
 }
 Rule c6m3_outroL4D1AllTeenGirl
 {
-	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsEveryoneAlive ChanceToFire20Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsEveryoneAlive ChanceToFire20Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 8
 	Response c6m3_outroL4D1AllTeenGirl
 }
@@ -987,7 +987,7 @@ Response c6m3_outroL4D1MechanicTeenGirl
 }
 Rule c6m3_outroL4D1MechanicTeenGirl
 {
-	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsMechanicAlive ChanceToFire30Percent IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsMechanicAlive ChanceToFire30Percent IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 7
 	Response c6m3_outroL4D1MechanicTeenGirl
 }
@@ -1002,7 +1002,7 @@ Response c6m3_outroL4D1MechanicZoeyTeenGirl
 }
 Rule c6m3_outroL4D1MechanicZoeyTeenGirl
 {
-	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsZoeyIntroActor ChanceToFire100Percent IsMechanicAlive IsNotVersus IsNotIncapacitated
+	criteria Conceptc6m3_outro3 IsTeenGirl isC6m3_port IsZoeyIntroActor ChanceToFire100Percent IsMechanicAlive IsNotVersus IsNotIncapacitated HasAFrom
 	forceweight 2
 	Response c6m3_outroL4D1MechanicZoeyTeenGirl
 }

diff --git a/root/scripts/talker/terror_player_dlc1.txt b/root/scripts/talker/terror_player_dlc1.txt
@@ -100,6 +100,20 @@ criterion "FromIsNotNamVet"        "From"     "!=NamVet"        required
 criterion "FromIsNotTeenGirl"        "From"     "!=TeenGirl"        required
 criterion "FromIsNotManager"        "From"     "!=Manager"        required
 
+criterion "FromIsExteriorBombing"        "From"     "ds_ext-c5m4BombingExterior"        required
+criterion "FromIsInteriorBombing"        "From"     "ds_int-c5m4BombingInterior"        required
+criterion "FromIsPapaGator"        "From"     "papa_gator"        required
+criterion "FromIsRescue7"        "From"     "orator_chopper"        required
+criterion "FromIsPilot"        "From"     "pilot"        required
+criterion "FromIsChurchguy"        "From"     "churchguy"        required
+criterion "FromIsJohnSlater"        "From"     "orator_boat_radio"        required
+criterion "FromIsBarricadeOrator"        "From"     "barricade_orator"        required
+criterion "FromIsAC130"        "From"     "orator_plane_radio"        required
+criterion "FromIsMillhaven"        "From"     "orator_farm_radio"        required
+criterion "FromIsL4D1Louis"        "From"     "L4D1_Louis"        required
+
+criterion "HasAFrom" { FromIsCoach FromIsGambler FromIsMechanic FromIsProducer FromIsBiker FromIsNamVet FromIsTeenGirl FromIsManager FromIsUnknown FromIsAnOrator FromIsExteriorBombing FromIsInteriorBombing FromIsPapaGator FromIsRescue7 FromIsPilot FromIsChurchguy FromIsJohnSlater FromIsBarricadeOrator FromIsAC130 FromIsMillhaven FromIsL4D1Louis } required
+
 criterion "FromSet1" { FromIsCoach FromIsAnOrator } required
 
 criterion "Iswitch_aggro_onManager"	"witch_aggro_on"     "Manager"		required