Skip to content

Commit

Permalink
Overhaul for L4D1, fix for Producer and Biker
Browse files Browse the repository at this point in the history
- Fixed one of Francis' final intro lines not triggering the IntroEnd concept.

- Asking for a health kit will now require from instead of the subject. (Will also use IssuerClose) It will more accurately pinpoint the first target.

- Along with the second change, there will be generic variants of the rules thereof for b/w only. In the case of the specific responses, they will not trigger when b/w.

- Fixed Rochelle using gunshop pickup lines in cases of carried props. (Gas cans, propane tanks, etc)
  • Loading branch information
xanaguy committed Nov 21, 2021
1 parent 906fecb commit 9286e1b
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 18 deletions.
21 changes: 17 additions & 4 deletions root/scripts/talker/biker.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2627,7 +2627,7 @@ Rule IntroCrashR06Biker

Response IntroCrashR08Biker
{
scene "scenes/Biker/DLC2Intro21.vcd" //Whoah. Musta hit my head in the crash. I'm okay now. I hate helicopters.
scene "scenes/Biker/DLC2Intro21.vcd" then self IntroEnd foo:0 0.1 //Whoah. Musta hit my head in the crash. I'm okay now. I hate helicopters.
}
Rule IntroCrashR08Biker
{
Expand Down Expand Up @@ -3148,6 +3148,19 @@ Rule L4D1ResponseSoftDispleasureSwearBiker
//--------------------------------------------------------------------------------------------------------------
// Item Spotted
//--------------------------------------------------------------------------------------------------------------
Response L4D1SurvivorAskForHealthThirdStrikeBiker
{
scene "scenes/Biker/GoingToDieAskForHeal01.vcd" //Anyone have some first aid, I'm about to die.
scene "scenes/Biker/GoingToDieAskForHeal02.vcd" //Sure could use a medkit. Just sayin'.
scene "scenes/Biker/GoingToDieAskForHeal03.vcd" //Can anyone patch me up?
scene "scenes/Biker/GoingToDieAskForHeal04.vcd" //Ahh. Hey. Someone wanna patch me up?
}
Rule L4D1SurvivorAskForHealthThirdStrikeBiker
{
criteria ConceptAskForHealth2 IsBiker IssuerClose IsNotSpeaking IsOnThirdStrike
Response L4D1SurvivorAskForHealthThirdStrikeBiker
}

Response L4D1SurvivorAskBillForHealthBiker
{
scene "scenes/Biker/PlayerSuggestHealthSpecific05.vcd" odds 5 //Bill, could I borrow your med kit? I just wanna look at it.
Expand All @@ -3156,7 +3169,7 @@ Response L4D1SurvivorAskBillForHealthBiker
}
Rule L4D1SurvivorAskBillForHealthBiker
{
criteria ConceptAskForHealth2 IsBiker SubjectIsNamVet IsSubjectNear400
criteria ConceptAskForHealth2 IsBiker FromIsNamVet IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskBillForHealthBiker
}

Expand All @@ -3181,7 +3194,7 @@ Response L4D1SurvivorAskLouisForHealthBiker
}
Rule L4D1SurvivorAskLouisForHealthBiker
{
criteria ConceptAskForHealth2 IsBiker SubjectIsManager IsSubjectNear400
criteria ConceptAskForHealth2 IsBiker FromIsManager IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskLouisForHealthBiker
}

Expand All @@ -3192,7 +3205,7 @@ Response L4D1SurvivorAskZoeyForHealthBiker
}
Rule L4D1SurvivorAskZoeyForHealthBiker
{
criteria ConceptAskForHealth2 IsBiker SubjectIsTeenGirl IsSubjectNear400
criteria ConceptAskForHealth2 IsBiker FromIsTeenGirl IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskZoeyForHealthBiker
}

Expand Down
21 changes: 17 additions & 4 deletions root/scripts/talker/manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2368,14 +2368,27 @@ Rule L4D1ResponseSoftDispleasureSwearManager
//--------------------------------------------------------------------------------------------------------------
// Item Spotted
//--------------------------------------------------------------------------------------------------------------
Response L4D1SurvivorAskForHealthThirdStrikeManager
{
scene "scenes/Manager/GoingToDieAskForHeal01.vcd" //Someone got a first aid kit?
scene "scenes/Manager/GoingToDieAskForHeal02.vcd" //Can anybody spare a kit?
scene "scenes/Manager/GoingToDieAskForHeal03.vcd" //I can use a first aid kit.
scene "scenes/Manager/GoingToDieAskForHeal04.vcd" //I can use some first aid.
}
Rule L4D1SurvivorAskForHealthThirdStrikeManager
{
criteria ConceptAskForHealth2 IsManager IssuerClose IsNotSpeaking IsOnThirdStrike
Response L4D1SurvivorAskForHealthThirdStrikeManager
}

Response L4D1SurvivorAskBillForHealthManager
{
scene "scenes/Manager/PlayerSuggestHealthSpecific06.vcd" //Bill, Bill... first aid kit?
scene "scenes/Manager/PlayerSuggestHealthSpecific07.vcd" //Bill, could I get some first aid?
}
Rule L4D1SurvivorAskBillForHealthManager
{
criteria ConceptAskForHealth2 IsManager SubjectIsNamVet IsSubjectNear400
criteria ConceptAskForHealth2 IsManager FromIsNamVet IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskBillForHealthManager
}

Expand All @@ -2385,7 +2398,7 @@ Response L4D1SurvivorAskForHealthManager
}
Rule L4D1SurvivorAskForHealthManager
{
criteria ConceptPlayerLookHere IsNotCoughing IsManager IsTalk IsTalkManager IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills NoHasFirstAidKit IsNotHealthyHalf NotInCombat IsNotSaidAskForHealth IsWorldTalkManager
criteria ConceptPlayerLookHere IsNotCoughing IsManager IsTalk IsTalkManager IsNotSmartLookAuto IsSubjectNear400 NoHasPainPills NoHasFirstAidKit IsNotHealthyHalf NotInCombat IsNotSaidAskForHealth IsWorldTalkManager
ApplyContext "SaidAskForHealth:1:10"
applycontexttoworld
Response L4D1SurvivorAskForHealthManager
Expand All @@ -2399,7 +2412,7 @@ Response L4D1SurvivorAskFrancisForHealthManager
}
Rule L4D1SurvivorAskFrancisForHealthManager
{
criteria ConceptAskForHealth2 IsManager SubjectIsBiker IsSubjectNear400
criteria ConceptAskForHealth2 IsManager FromIsBiker IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskFrancisForHealthManager
}

Expand All @@ -2410,7 +2423,7 @@ Response L4D1SurvivorAskZoeyForHealthManager
}
Rule L4D1SurvivorAskZoeyForHealthManager
{
criteria ConceptAskForHealth2 IsManager SubjectIsTeenGirl IsSubjectNear400
criteria ConceptAskForHealth2 IsManager FromIsTeenGirl IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskZoeyForHealthManager
}

Expand Down
25 changes: 19 additions & 6 deletions root/scripts/talker/namvet.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1893,13 +1893,26 @@ Rule L4D1SurvivorAskForHealthNamVet
Response L4D1SurvivorAskForHealthNamVet
}

Response L4D1SurvivorAskForHealthThirdStrikeNamVet
{
scene "scenes/NamVet/GoingToDieAskForHeal01.vcd" //Anybody have some first aid? I ain't feelin' right...
scene "scenes/NamVet/GoingToDieAskForHeal02.vcd" //Someone gonna heal the old guy about to die?
scene "scenes/NamVet/GoingToDieAskForHeal03.vcd" //Sure could use some patching up.
scene "scenes/NamVet/GoingToDieAskForHeal04.vcd" //Anyone spare a medkit?
}
Rule L4D1SurvivorAskForHealthThirdStrikeNamVet
{
criteria ConceptAskForHealth2 IsNamVet IssuerClose IsNotSpeaking IsOnThirdStrike
Response L4D1SurvivorAskForHealthThirdStrikeNamVet
}

Response L4D1SurvivorAskFrancisForHealthNamVet
{
scene "scenes/NamVet/PlayerSuggestHealthSpecific01.vcd" //Francis, buddy, you gonna use that health kit?
}
Rule L4D1SurvivorAskFrancisForHealthNamVet
{
criteria ConceptAskForHealth2 IsNamVet SubjectIsBiker IsSubjectNear400
criteria ConceptAskForHealth2 IsNamVet FromIsBiker IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskFrancisForHealthNamVet
}

Expand All @@ -1909,7 +1922,7 @@ Response L4D1SurvivorAskLouisForHealthNamVet
}
Rule L4D1SurvivorAskLouisForHealthNamVet
{
criteria ConceptAskForHealth2 IsNamVet SubjectIsManager IsSubjectNear400
criteria ConceptAskForHealth2 IsNamVet FromIsManager IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskLouisForHealthNamVet
}

Expand All @@ -1919,18 +1932,18 @@ Response L4D1SurvivorAskZoeyForHealthNamVet
}
Rule L4D1SurvivorAskZoeyForHealthNamVet
{
criteria ConceptAskForHealth2 IsNamVet SubjectIsTeenGirl IsSubjectNear400
criteria ConceptAskForHealth2 IsNamVet FromIsTeenGirl IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskZoeyForHealthNamVet
}

Response L4D1SurvivorFrancisHealthHereNamVet
Response L4D1SurvivorHealthHereNamVet
{
print " " then From AskForHealth2 foo:0 0 //
}
Rule L4D1SurvivorFrancisHealthHereNamVet
Rule L4D1SurvivorHealthHereNamVet
{
criteria ConceptAskForHealth IsNotCoughing IsNamVet IsTalk IsTalkNamVet YesHasFirstAidKit IsRocking IsWorldTalkNamVet
Response L4D1SurvivorFrancisHealthHereNamVet
Response L4D1SurvivorHealthHereNamVet
}

Response L4D1SurvivorSpottedFrancisCloseNamVet
Expand Down
2 changes: 1 addition & 1 deletion root/scripts/talker/producer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12116,7 +12116,7 @@ Response SurvivorPickupGunC1M2Producer
}
Rule SurvivorPickupGunC1M2Producer
{
criteria ConceptPlayerPickup IsNotCoughing IsProducer IsNotSpeaking IsTalk IsSaidC1M2InsideGunShop IsNotPickedUpFirstAidKit IsNotPickedUpAdrenaline IsNotPickedUpPainPills IsNotPickedUpAmmo IsNotPickedUpVomitJar IsNotPickedUpLaserSights IsNotPickedUpMolotov IsNotPickedUpPipeBomb IsWorldTalkProducer _auto_NotButton1
criteria ConceptPlayerPickup IsNotCoughing IsProducer IsNotSpeaking IsTalk IsSaidC1M2InsideGunShop IsNotPickedUpFirstAidKit IsNotPickedUpAdrenaline IsNotPickedUpPainPills IsNotPickedUpAmmo IsNotPickedUpVomitJar IsNotPickedUpLaserSights IsNotPickedUpMolotov IsNotPickedUpPipeBomb IsNotCarriedProp IsWorldTalkProducer _auto_NotButton1
Response SurvivorPickupGunC1M2Producer
}

Expand Down
20 changes: 17 additions & 3 deletions root/scripts/talker/teengirl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2551,13 +2551,27 @@ Rule L4D1ResponseSoftDispleasureSwearTeenGirl
//--------------------------------------------------------------------------------------------------------------
// Item Spotted
//--------------------------------------------------------------------------------------------------------------
Response L4D1SurvivorAskForHealthThirdStrikeTeenGirl
{
scene "scenes/TeenGirl/GoingToDieAskForHeal01.vcd" //Anyone have some first aid?
scene "scenes/TeenGirl/GoingToDieAskForHeal02.vcd" //I need some first aid now.
scene "scenes/TeenGirl/GoingToDieAskForHeal04.vcd" //Anyone have some first aid? I'm gonna die.
scene "scenes/TeenGirl/GoingToDieAskForHeal05.vcd" //I need some first aid now.
scene "scenes/TeenGirl/GoingToDieAskForHeal13.vcd" //I can't make it without some help.
}
Rule L4D1SurvivorAskForHealthThirdStrikeTeenGirl
{
criteria ConceptAskForHealth2 IsTeenGirl IssuerClose IsNotSpeaking IsOnThirdStrike
Response L4D1SurvivorAskForHealthThirdStrikeTeenGirl
}

Response L4D1SurvivorAskBillForHealthTeenGirl
{
scene "scenes/TeenGirl/PlayerSuggestHealthSpecific10.vcd" //Bill, if you aren't gonna use that first aid kit, can I have it?
}
Rule L4D1SurvivorAskBillForHealthTeenGirl
{
criteria ConceptAskForHealth2 IsTeenGirl SubjectIsNamVet IsSubjectNear400
criteria ConceptAskForHealth2 IsTeenGirl FromIsNamVet IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskBillForHealthTeenGirl
}

Expand All @@ -2579,7 +2593,7 @@ Response L4D1SurvivorAskFrancisForHealthTeenGirl
}
Rule L4D1SurvivorAskFrancisForHealthTeenGirl
{
criteria ConceptAskForHealth2 IsTeenGirl SubjectIsBiker IsSubjectNear400
criteria ConceptAskForHealth2 IsTeenGirl FromIsBiker IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskFrancisForHealthTeenGirl
}

Expand All @@ -2589,7 +2603,7 @@ Response L4D1SurvivorAskLouisForHealthTeenGirl
}
Rule L4D1SurvivorAskLouisForHealthTeenGirl
{
criteria ConceptAskForHealth2 IsTeenGirl SubjectIsManager IsSubjectNear400
criteria ConceptAskForHealth2 IsTeenGirl FromIsManager IssuerClose IsNotSpeaking IsNotOnThirdStrike
Response L4D1SurvivorAskLouisForHealthTeenGirl
}

Expand Down

0 comments on commit 9286e1b

Please sign in to comment.