Skip to content

Fix for RED "Cart moving forward" responses #1168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix for RED "Cart moving forward" responses #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7648447
Create new response concept
Ashetf2 Mar 30, 2025
f995559
Add necessary shareddefs
Ashetf2 Mar 30, 2025
bfe312d
Add vanilla talker files
Ashetf2 Mar 30, 2025
e61f3d9
Update talker files to include the fix
Ashetf2 Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,452 changes: 1,452 additions & 0 deletions game/mod_tf/scripts/talker/demoman.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,890 changes: 1,890 additions & 0 deletions game/mod_tf/scripts/talker/heavy.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,438 changes: 1,438 additions & 0 deletions game/mod_tf/scripts/talker/medic.txt
View file
Open in desktop

Large diffs are not rendered by default.

711 changes: 711 additions & 0 deletions game/mod_tf/scripts/talker/response_rules.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,908 changes: 1,908 additions & 0 deletions game/mod_tf/scripts/talker/scout.txt
View file
Open in desktop

Large diffs are not rendered by default.

2,128 changes: 2,128 additions & 0 deletions game/mod_tf/scripts/talker/sniper.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,858 changes: 1,858 additions & 0 deletions game/mod_tf/scripts/talker/soldier.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,377 changes: 1,377 additions & 0 deletions game/mod_tf/scripts/talker/spy.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/game/server/team_train_watcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,6 +1186,12 @@ void CTeamTrainWatcher::WatcherThink( void )
{
if ( m_hAreaCap->IsTouching( pPlayer ) )
{
// only makes sense for offense
pPlayer->SpeakConceptIfAllowed( MP_CONCEPT_CART_PUSHING );
}
else
{
// for offense and defense, since cart doesn't move when red is touching
pPlayer->SpeakConceptIfAllowed( MP_CONCEPT_CART_MOVING_FORWARD );
}
}
Expand Down
1 change: 1 addition & 0 deletions src/game/shared/mp_shareddefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const char *g_pszMPConcepts[] =
"TLK_DIED", // MP_CONCEPT_DIED
"TLK_PLAYER_THANKS", // MP_CONCEPT_PLAYER_THANKS
"TLK_CART_MOVING_FORWARD", // MP_CONCEPT_CART_MOVING_FORWARD
"TLK_CART_PUSHING", // MP_CONCEPT_CART_PUSHING
"TLK_CART_MOVING_BACKWARD", // MP_CONCEPT_CART_MOVING_BACKWARD
"TLK_CART_STOP", // MP_CONCEPT_CART_STOP
"TLK_ATE_FOOD", // MP_CONCEPT_ATE_FOOD
Expand Down
1 change: 1 addition & 0 deletions src/game/shared/mp_shareddefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ enum
MP_CONCEPT_DIED, // "TLK_DIED"
MP_CONCEPT_PLAYER_THANKS, // "TLK_PLAYER_THANKS"
MP_CONCEPT_CART_MOVING_FORWARD, // "TLK_CART_MOVING_FORWARD"
MP_CONCEPT_CART_PUSHING, // "TLK_CART_PUSHING"
MP_CONCEPT_CART_MOVING_BACKWARD, // "TLK_CART_MOVING_BACKWARD"
MP_CONCEPT_CART_STOP, // "TLK_CART_STOP"
MP_CONCEPT_ATE_FOOD, // "TLK_ATE_FOOD"
Expand Down