Skip to content

taunt inspect (wip) #1983

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

Closed
rabscootle wants to merge 4 commits into from
+108 −7
Closed

taunt inspect (wip) #1983

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
410f0e0
[TF2] Show active taunts in inspect panels
rabscootle Jul 25, 2026
57ccebe
[TF2] Refresh freeze panel for late taunts
rabscootle Jul 25, 2026
cba2409
[TF2] Preserve inspect item ordering
rabscootle Jul 25, 2026
5b9a102
[TF2] Prefer taunts when freezecam starts
rabscootle Jul 25, 2026
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
47 changes: 41 additions & 6 deletions src/game/client/tf/c_tf_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4452,11 +4452,6 @@ void C_TFPlayer::OnDataChanged( DataUpdateType_t updateType )
m_nOldMaxHealth = GetMaxHealth();
}

if ( m_nPrevTauntSlot != m_nActiveTauntSlot || m_iPrevTauntItemDefIndex != m_iTauntItemDefIndex )
{
UpdateTauntItem();
}

if ( m_iOldKartHealth != m_iKartHealth )
{
UpdateKartEffects();
Expand All @@ -4468,6 +4463,11 @@ void C_TFPlayer::OnDataChanged( DataUpdateType_t updateType )
}
}

if ( updateType == DATA_UPDATE_CREATED || m_nPrevTauntSlot != m_nActiveTauntSlot || m_iPrevTauntItemDefIndex != m_iTauntItemDefIndex )
{
UpdateTauntItem();
}

GetAttributeManager()->OnDataChanged( updateType );

// Check for full health and remove decals.
Expand Down Expand Up @@ -4898,6 +4898,7 @@ void C_TFPlayer::OnDataChanged( DataUpdateType_t updateType )
//-----------------------------------------------------------------------------
void C_TFPlayer::UpdateTauntItem()
{
bool bUsedInventoryItem = false;
if ( m_nActiveTauntSlot == LOADOUT_POSITION_INVALID )
{
if ( m_iTauntItemDefIndex != INVALID_ITEM_DEF_INDEX )
Expand All @@ -4913,13 +4914,30 @@ void C_TFPlayer::UpdateTauntItem()
{
int iClass = GetPlayerClass()->GetClassIndex();

CEconItemView *pMiscItemView = Inventory() ? Inventory()->GetCacheServerItemInLoadout( iClass, m_nActiveTauntSlot ) : NULL;
CEconItemView *pMiscItemView = Inventory() ? Inventory()->GetItemInLoadout( iClass, m_nActiveTauntSlot ) : NULL;
if ( pMiscItemView )
{
m_TauntEconItemView = *pMiscItemView;
bUsedInventoryItem = true;
}
else if ( m_iTauntItemDefIndex != INVALID_ITEM_DEF_INDEX )
{
m_TauntEconItemView.Init( m_iTauntItemDefIndex, AE_UNIQUE, 1 );
}
else
{
m_TauntEconItemView.Invalidate();
}
}

ConVarRef cl_taunt_inspect_debug( "cl_taunt_inspect_debug" );
if ( cl_taunt_inspect_debug.IsValid() && cl_taunt_inspect_debug.GetBool() )
{
Msg( "[taunt inspect] player=%d slot=%d defindex=%d valid=%d source=%s\n",
entindex(), m_nActiveTauntSlot, m_iTauntItemDefIndex, m_TauntEconItemView.IsValid(),
bUsedInventoryItem ? "inventory" : "network" );
}

if ( m_TauntEconItemView.IsValid() )
{
ParseSharedTauntDataFromEconItemView( &m_TauntEconItemView );
Expand Down Expand Up @@ -10258,6 +10276,7 @@ CEconItemView *C_TFPlayer::GetInspectItem( int *pLastItem )
{
int iItemsFound = 0;
CEconItemView *pFirstItem = NULL;
CEconItemView *pTauntItem = GetTauntEconItemView();
int nCount = WeaponCount();
for ( int i = 0; i < nCount; ++i )
{
Expand Down Expand Up @@ -10313,6 +10332,22 @@ CEconItemView *C_TFPlayer::GetInspectItem( int *pLastItem )
}
}

if ( m_Shared.InCond( TF_COND_TAUNTING ) && pTauntItem &&
( !pTauntItem->GetItemDefinition() || !pTauntItem->GetItemDefinition()->IsHidden() ) )
{
if ( !pFirstItem )
{
pFirstItem = pTauntItem;
}

iItemsFound++;
if ( iItemsFound > *pLastItem )
{
*pLastItem = iItemsFound;
return pTauntItem;
}
}

// If we didn't find an item, go back to the first one
if ( pFirstItem )
{
Expand Down
65 changes: 64 additions & 1 deletion src/game/client/tf/tf_hud_freezepanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ DECLARE_BUILD_FACTORY( CTFFreezePanelHealth );

CTFFreezePanel *CTFFreezePanel::s_pFreezePanel = NULL;

static ConVar cl_taunt_inspect_debug( "cl_taunt_inspect_debug", "0", FCVAR_CHEAT, "Print active taunt inspect diagnostics." );

//-----------------------------------------------------------------------------

CTFFreezePanel *CTFFreezePanel::Instance()
Expand All @@ -99,6 +101,8 @@ CTFFreezePanel::CTFFreezePanel( const char *pElementName )
SetScheme( "ClientScheme" );

m_iKillerIndex = 0;
m_bShowingTaunt = false;
m_bKillerWasTaunting = false;
m_iShowNemesisPanel = SHOW_NO_NEMESIS;
m_iYBase = -1;
m_flShowCalloutsAt = 0;
Expand Down Expand Up @@ -252,6 +256,7 @@ void CTFFreezePanel::FireGameEvent( IGameEvent * event )
}
else if ( Q_strcmp( "freezecam_started", pEventName ) == 0 )
{
ShowActiveTaunt();
ShowCalloutsIn( 1.0 );
ShowSnapshotPanelIn( 1.25 );

Expand Down Expand Up @@ -294,6 +299,8 @@ void CTFFreezePanel::FireGameEvent( IGameEvent * event )
{
// Get the entity who killed us
m_iKillerIndex = event->GetInt( "killer" );
m_bShowingTaunt = false;
m_bKillerWasTaunting = false;
C_BaseEntity *pKiller = ClientEntityList().GetBaseEntity( m_iKillerIndex );
CTFPlayer *pTFPlayerKiller = NULL;
if ( pKiller )
Expand Down Expand Up @@ -443,12 +450,32 @@ void CTFFreezePanel::FireGameEvent( IGameEvent * event )
}
else
{
CEconItemView *pTauntItem = pTFPlayerKiller && pTFPlayerKiller->m_Shared.InCond( TF_COND_TAUNTING )
? pTFPlayerKiller->GetTauntEconItemView() : NULL;
bool bShowTaunt = pTauntItem && ( !pTauntItem->GetItemDefinition() || !pTauntItem->GetItemDefinition()->IsHidden() );
if ( bShowTaunt )
{
m_pItemPanel->SetDialogVariable( "killername", g_PR->GetPlayerName( m_iKillerIndex ) );
m_pItemPanel->SetItem( pTauntItem );
m_pItemPanel->SetVisible( true );
m_bShowingTaunt = true;
}

m_bKillerWasTaunting = pTFPlayerKiller && pTFPlayerKiller->m_Shared.InCond( TF_COND_TAUNTING );
if ( cl_taunt_inspect_debug.GetBool() )
{
Msg( "[taunt inspect] death killer=%d taunting=%d slot=%d item=%d shown=%d\n",
m_iKillerIndex, m_bKillerWasTaunting,
pTFPlayerKiller ? pTFPlayerKiller->GetActiveTauntSlot() : LOADOUT_POSITION_INVALID,
pTauntItem ? pTauntItem->GetItemDefIndex() : INVALID_ITEM_DEF_INDEX, bShowTaunt );
}

// If our killer is using an item, display its stats.
CTFWeaponBase *pWeapon = pTFPlayerKiller ? pTFPlayerKiller->GetActiveTFWeapon() : NULL;
bool bShowItem = false;
if ( pWeapon )
{
bShowItem = pWeapon->GetAttributeContainer()->GetItem()->GetItemQuality() != AE_NORMAL;
bShowItem = !bShowTaunt && pWeapon->GetAttributeContainer()->GetItem()->GetItemQuality() != AE_NORMAL;
if ( bShowItem )
{
CTFStatPanel *pStatPanel = GET_HUDELEMENT( CTFStatPanel );
Expand Down Expand Up @@ -917,6 +944,22 @@ void CTFFreezePanel::OnThink( void )
{
BaseClass::OnThink();

C_TFPlayer *pKiller = ToTFPlayer( UTIL_PlayerByIndex( m_iKillerIndex ) );
bool bKillerIsTaunting = pKiller && pKiller->m_Shared.InCond( TF_COND_TAUNTING );
if ( IsVisible() && !m_bShowingTaunt && bKillerIsTaunting )
{
if ( cl_taunt_inspect_debug.GetBool() && !m_bKillerWasTaunting )
{
CEconItemView *pTauntItem = pKiller->GetTauntEconItemView();
Msg( "[taunt inspect] late taunt killer=%d slot=%d item=%d valid=%d\n",
m_iKillerIndex, pKiller->GetActiveTauntSlot(),
pTauntItem ? pTauntItem->GetItemDefIndex() : INVALID_ITEM_DEF_INDEX, pTauntItem != NULL );
}

ShowActiveTaunt();
}
m_bKillerWasTaunting = bKillerIsTaunting;

if ( m_pItemPanel && m_pItemPanel->IsVisible() )
{
CTFStatPanel *pStatPanel = GET_HUDELEMENT( CTFStatPanel );
Expand Down Expand Up @@ -962,6 +1005,26 @@ void CTFFreezePanel::OnThink( void )
}
}

//-----------------------------------------------------------------------------
// Purpose: Show the killer's active taunt in preference to their weapon.
//-----------------------------------------------------------------------------
bool CTFFreezePanel::ShowActiveTaunt()
{
C_TFPlayer *pKiller = ToTFPlayer( UTIL_PlayerByIndex( m_iKillerIndex ) );
if ( !pKiller || !pKiller->m_Shared.InCond( TF_COND_TAUNTING ) )
return false;

CEconItemView *pTauntItem = pKiller->GetTauntEconItemView();
if ( !pTauntItem || ( pTauntItem->GetItemDefinition() && pTauntItem->GetItemDefinition()->IsHidden() ) )
return false;

m_pItemPanel->SetDialogVariable( "killername", g_PR->GetPlayerName( m_iKillerIndex ) );
m_pItemPanel->SetItem( pTauntItem );
m_pItemPanel->SetVisible( true );
m_bShowingTaunt = true;
return true;
}


//-----------------------------------------------------------------------------
// Purpose:
Expand Down
3 changes: 3 additions & 0 deletions src/game/client/tf/tf_hud_freezepanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ class CTFFreezePanel : public EditablePanel, public CHudElement

void DeleteCalloutPanels();
void ShowNemesisPanel( bool bShow );
bool ShowActiveTaunt();
const char *GetFilesafePlayerName( const char *pszOldName );

CPanelAnimationVar( bool, m_bShouldScreenshotMovePanelToCorner, "screenshot_move_panel_to_corner", "1" );
Expand Down Expand Up @@ -139,6 +140,8 @@ class CTFFreezePanel : public EditablePanel, public CHudElement
int m_iKillerOriginalY;

bool m_bHoldingAfterScreenshot;
bool m_bShowingTaunt;
bool m_bKillerWasTaunting;

enum
{
Expand Down