Skip to content

[TF2] Updated armory controls to mimic December 2021 Workshop dialog QOL update #1498

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 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Updated armory controls to mimic December 2021 Workshop dialog QOL update #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 51 additions & 21 deletions src/game/client/tf/vgui/charinfo_armory_subpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <tier0/memdbgon.h>

ConVar tf_explanations_charinfo_armory_panel( "tf_explanations_charinfo_armory_panel", "0", FCVAR_ARCHIVE, "Whether the user has seen explanations for this panel." );
ConVar tf_armory_page_skip( "tf_armory_page_skip", "10", FCVAR_ARCHIVE, "Number of pages to skip in the Mann Co. Catalogue.", true, 1, true, 100 );

const char *g_szArmoryFilterStrings[ARMFILT_TOTAL] =
{
Expand Down Expand Up @@ -60,8 +61,6 @@ CArmoryPanel::CArmoryPanel(Panel *parent, const char *panelName) : vgui::Editabl
m_CurrentFilter = ARMFILT_ALL_ITEMS;
m_OldFilter = ARMFILT_ALL_ITEMS;
m_iFilterPage = 0;
m_pNextPageButton = NULL;
m_pPrevPageButton = NULL;
m_pViewSetButton = NULL;
m_pStoreButton = NULL;
m_bAllowGotoStore = false;
Expand Down Expand Up @@ -109,8 +108,6 @@ void CArmoryPanel::ApplySchemeSettings( vgui::IScheme *pScheme )
m_pMouseOverItemPanel->SetBorder( pScheme->GetBorder("LoadoutItemPopupBorder") );

m_pDataTextRichText = dynamic_cast<CEconItemDetailsRichText*>( m_pDataPanel->FindChildByName( "Data_TextRichText" ) );
m_pNextPageButton = dynamic_cast<CExButton*>( FindChildByName("NextPageButton") );
m_pPrevPageButton = dynamic_cast<CExButton*>( FindChildByName("PrevPageButton") );
m_pViewSetButton = dynamic_cast<CExButton*>( FindChildByName("ViewSetButton") );
m_pStoreButton = dynamic_cast<CExButton*>( FindChildByName("StoreButton") );

Expand Down Expand Up @@ -311,26 +308,63 @@ void CArmoryPanel::OnClosing()
//-----------------------------------------------------------------------------
void CArmoryPanel::OnCommand( const char *command )
{
if ( !Q_strnicmp( command, "prevpage", 8 ) )
if (!Q_stricmp(command, "prevpage"))
{
if ( m_iFilterPage > 0 )
if (m_iFilterPage > 0)
{
m_iFilterPage--;
UpdateItemList();
UpdateSelectedItem();
}
return;
else
{
m_iFilterPage = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1;
}
UpdateItemList();
UpdateSelectedItem();
}
else if ( !Q_strnicmp( command, "nextpage", 8 ) )
if (!Q_stricmp(command, "prevpageskip"))
{
int nMaxPages = MAX( 1, ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) );
if ( m_iFilterPage < (nMaxPages-1) )
for (int i = 0; i < tf_armory_page_skip.GetInt(); i++)
{
m_iFilterPage++;
UpdateItemList();
UpdateSelectedItem();
if (m_iFilterPage > 0)
{
m_iFilterPage--;
}
else
{
m_iFilterPage = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1;
}
}
return;
UpdateItemList();
UpdateSelectedItem();
}
if (!Q_stricmp(command, "skiptostart"))
{
m_iFilterPage = 0;
UpdateItemList();
UpdateSelectedItem();
}
else if (!Q_stricmp(command, "nextpage"))
{
m_iFilterPage++;
if (m_iFilterPage > ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1)
{
m_iFilterPage = 0;
}
UpdateItemList();
UpdateSelectedItem();
}
else if (!Q_stricmp(command, "nextpageskip"))
{
uint32 unNumPages = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns));
m_iFilterPage = ((m_iFilterPage + tf_armory_page_skip.GetInt()) % unNumPages);
UpdateItemList();
UpdateSelectedItem();
}
else if (!Q_stricmp(command, "skiptoend"))
{
m_iFilterPage = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1;
UpdateItemList();
UpdateSelectedItem();
}
else if ( !Q_strnicmp( command, "back", 4 ) )
{
Expand Down Expand Up @@ -366,7 +400,7 @@ void CArmoryPanel::OnCommand( const char *command )
ELanguage iLang = PchLanguageToELanguage( uilanguage );

char szURL[512];
Q_snprintf( szURL, sizeof(szURL), "http://wiki.teamfortress.com/scripts/itemredirect.php?id=%d&lang=%s", m_SelectedItem.GetItemDefIndex(), GetLanguageICUName( iLang ) );
Q_snprintf( szURL, sizeof(szURL), "https://wiki.teamfortress.com/scripts/itemredirect.php?id=%d&lang=%s", m_SelectedItem.GetItemDefIndex(), GetLanguageICUName( iLang ) );
steamapicontext->SteamFriends()->ActivateGameOverlayToWebPage( szURL );

C_CTF_GameStats.Event_Catalog( IE_ARMORY_BROWSE_WIKI, NULL, &m_SelectedItem );
Expand Down Expand Up @@ -682,10 +716,6 @@ void CArmoryPanel::UpdateItemList( void )
int nMaxPages = MAX( 1, ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) );
Q_snprintf(szTmp, 16, "%d/%d", m_iFilterPage+1, nMaxPages );
SetDialogVariable( "thumbnailpage", szTmp );

bool bNextEnabled = m_iFilterPage < (nMaxPages-1);
m_pNextPageButton->SetEnabled( bNextEnabled );
m_pPrevPageButton->SetEnabled( m_iFilterPage > 0 );
}

//-----------------------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions src/game/client/tf/vgui/charinfo_armory_subpanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ class CArmoryPanel : public vgui::EditablePanel
armory_filters_t m_CurrentFilter;
armory_filters_t m_OldFilter;
int m_iFilterPage;
CExButton *m_pNextPageButton;
CExButton *m_pPrevPageButton;
CUtlVector<item_definition_index_t> m_FilteredItemList;
CUtlVector<item_definition_index_t> m_CustomFilteredList;

Expand Down