Skip to content

[TF2] AddCond and RemoveCond script hooks #1714

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
Loafiat wants to merge 2 commits into
base: master
Choose a base branch
from
+49 −0
Open

[TF2] AddCond and RemoveCond script hooks #1714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f8457
Added OnAddCond and OnRemoveCond hooks.
Loafiat Dec 17, 2025
062a7f2
Merge branch 'ValveSoftware:master' into master
Loafiat Dec 17, 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
49 changes: 49 additions & 0 deletions src/game/shared/tf/tf_player_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@

// Server specific.
#else
#include "vscript_server.h"
#include "tf_player.h"
#include "te_effect_dispatch.h"
#include "tf_fx.h"
Expand Down Expand Up @@ -1089,6 +1090,31 @@ class CConditionVars
//-----------------------------------------------------------------------------
void CTFPlayerShared::AddCond( ETFCond eCond, float flDuration /* = PERMANENT_CONDITION */, CBaseEntity *pProvider /*= NULL */)
{
#ifndef CLIENT_DLL
if ( ScriptHookEnabled( "OnAddCond" ) )
{
IScriptVM *pVM = g_pScriptVM;

ScriptVariant_t varTable;
pVM->CreateTable( varTable );

pVM->SetValue( varTable, "const_entity", ToHScript( m_pOuter ) );
pVM->SetValue( varTable, "provider", ToHScript( pProvider ) );
pVM->SetValue( varTable, "duration", flDuration );
pVM->SetValue( varTable, "condition", eCond );
pVM->SetValue( varTable, "cancel_condition", false );

if ( RunScriptHook( "OnAddCond", varTable ) )
{
if ( pVM->Get<bool>( varTable, "cancel_condition" ) )
return;
eCond = static_cast<ETFCond>( pVM->Get<int>( varTable, "condition" ) );
flDuration = pVM->Get<float>( varTable, "duration" );
pProvider = ToEnt( pVM->Get<HSCRIPT>( varTable, "provider" ) );
}
}
#endif

Assert( eCond >= 0 && eCond < TF_COND_LAST );
Assert( eCond < m_ConditionData.Count() );

Expand Down Expand Up @@ -1150,6 +1176,29 @@ void CTFPlayerShared::AddCond( ETFCond eCond, float flDuration /* = PERMANENT_CO
//-----------------------------------------------------------------------------
void CTFPlayerShared::RemoveCond( ETFCond eCond, bool ignore_duration )
{
#ifndef CLIENT_DLL
if ( ScriptHookEnabled( "OnRemoveCond" ) )
{
IScriptVM *pVM = g_pScriptVM;

ScriptVariant_t varTable;
pVM->CreateTable( varTable );

pVM->SetValue( varTable, "const_entity", ToHScript( m_pOuter ) );
pVM->SetValue( varTable, "condition", eCond );
pVM->SetValue( varTable, "ignore_duration", ignore_duration );
pVM->SetValue( varTable, "cancel_removal", false );

if ( RunScriptHook( "OnRemoveCond", varTable ) )
{
if ( pVM->Get<bool>( varTable, "cancel_removal" ) )
return;
ignore_duration = pVM->Get<bool>( varTable, "ignoreDuration" );
eCond = static_cast<ETFCond>( pVM->Get<int>( varTable, "condition" ) );
}
}
#endif

Assert( eCond >= 0 && eCond < TF_COND_LAST );
Assert( eCond < m_ConditionData.Count() );

Expand Down