From f79d4230b495b26a0805779514a78c54a5a9f4de Mon Sep 17 00:00:00 2001 From: rabscootle Date: Tue, 25 Feb 2025 08:05:42 -0600 Subject: [PATCH 01/10] Fixed custom names + war paint design names appearing in several pickup UI --- src/game/client/tf/tf_hud_playerstatus.cpp | 5 +++-- src/game/client/tf/tf_hud_target_id.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/game/client/tf/tf_hud_playerstatus.cpp b/src/game/client/tf/tf_hud_playerstatus.cpp index 12bcf4376ae..2e8d4ce1dee 100644 --- a/src/game/client/tf/tf_hud_playerstatus.cpp +++ b/src/game/client/tf/tf_hud_playerstatus.cpp @@ -320,11 +320,12 @@ void CTFHudPlayerClass::OnThink() locchar_t wszLocString [128]; // Construct and set the weapon's name - g_pVGuiLocalize->ConstructString_safe( wszLocString, L"%s1", 1, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pItem->GetItemDefinition(), pItem->GetItemQuality() ).GetFullName() ); + //g_pVGuiLocalize->ConstructString_safe( wszLocString, L"%s1", 1, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pItem->GetItemDefinition(), pItem->GetItemQuality() ).GetFullName() ); + g_pVGuiLocalize->ConstructString_safe( wszLocString, L"%s1", 1, pItem->GetItemName()); // FIX: Weapons will now display custom names & war paint weapons will display design name m_pCarryingWeaponPanel->SetDialogVariable( "carrying", wszLocString ); // Get and set the rarity color of the weapon - const char* pszColorName = GetItemSchema()->GetRarityColor( pItem->GetItemDefinition()->GetRarity() ); + const char* pszColorName = GetItemSchema()->GetRarityColor( pItem->GetRarity() ); // Fix for War Paint weapons missing rarity color on ground pszColorName = pszColorName ? pszColorName : "TanLight"; if ( pszColorName ) { diff --git a/src/game/client/tf/tf_hud_target_id.cpp b/src/game/client/tf/tf_hud_target_id.cpp index 9f9a2db6b6d..f41d3233f77 100644 --- a/src/game/client/tf/tf_hud_target_id.cpp +++ b/src/game/client/tf/tf_hud_target_id.cpp @@ -950,11 +950,13 @@ void CTargetID::UpdateID( void ) _snwprintf( wszChargeLevel, ARRAYSIZE( wszChargeLevel ) - 1, L"%.0f", pDroppedWeapon->GetChargeLevel() * 100 ); wszChargeLevel[ARRAYSIZE( wszChargeLevel ) - 1] = '\0'; - g_pVGuiLocalize->ConstructString_safe( sIDString, L"%s1 (%s2%)", 2, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pDroppedEconItem->GetItemDefinition(), pDroppedEconItem->GetItemQuality() ).GetFullName(), wszChargeLevel ); + //g_pVGuiLocalize->ConstructString_safe( sIDString, L"%s1 (%s2%)", 2, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pDroppedEconItem->GetItemDefinition(), pDroppedEconItem->GetItemQuality() ).GetFullName(), wszChargeLevel ); + g_pVGuiLocalize->ConstructString_safe(sIDString, L"%s1 (%s2%)", 2, pDroppedEconItem->GetItemName(), wszChargeLevel); //FIX; The previous version of code would only pull data from static schema, which doesn't work with War Paint weapons. Weapons will now display custom names & war paint weapons will display design name } else { - g_pVGuiLocalize->ConstructString_safe( sIDString, L"%s1", 1, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pDroppedEconItem->GetItemDefinition(), pDroppedEconItem->GetItemQuality() ).GetFullName() ); + //g_pVGuiLocalize->ConstructString_safe( sIDString, L"%s1", 1, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pDroppedEconItem->GetItemDefinition(), pDroppedEconItem->GetItemQuality() ).GetFullName() ); + g_pVGuiLocalize->ConstructString_safe(sIDString, L"%s1", 1, pDroppedEconItem->GetItemName()); // FIX: Weapons will now display custom names & war paint weapons will display design name } locchar_t wszPlayerName [128]; @@ -969,7 +971,7 @@ void CTargetID::UpdateID( void ) vgui::IScheme *pScheme = vgui::scheme()->GetIScheme( GetScheme() ); if ( pScheme ) { - const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetItemDefinition()->GetRarity() ); + const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetRarity() ); // Fix for War Paint weapons missing rarity color on ground pszColorName = pszColorName ? pszColorName : "TanLight"; colorName = pScheme->GetColor( pszColorName, Color( 255, 255, 255, 255 ) ); } From 7fd273722b2674db52dda34f79734d210acef103 Mon Sep 17 00:00:00 2001 From: rabscootle Date: Tue, 25 Feb 2025 10:34:57 -0600 Subject: [PATCH 02/10] Updated item select screen to support rarity borders for War Paint weapons --- game/mod_tf/GameState.txt | 3 + game/mod_tf/cfg/local_loadout.txt | 908 ++++++++++++++++++++ game/mod_tf/cfg/server_blacklist.txt | 3 + game/mod_tf/downloadlists/itemtest.lst | 0 game/mod_tf/media/viewed.res | 7 + game/mod_tf/stats.txt | 0 game/mod_tf/voice_ban.dt | Bin 0 -> 1156 bytes src/game/client/econ/base_loadout_panel.cpp | 2 +- 8 files changed, 922 insertions(+), 1 deletion(-) create mode 100644 game/mod_tf/GameState.txt create mode 100644 game/mod_tf/cfg/local_loadout.txt create mode 100644 game/mod_tf/cfg/server_blacklist.txt create mode 100644 game/mod_tf/downloadlists/itemtest.lst create mode 100644 game/mod_tf/media/viewed.res create mode 100644 game/mod_tf/stats.txt create mode 100644 game/mod_tf/voice_ban.dt diff --git a/game/mod_tf/GameState.txt b/game/mod_tf/GameState.txt new file mode 100644 index 00000000000..b33ea6a5fc8 --- /dev/null +++ b/game/mod_tf/GameState.txt @@ -0,0 +1,3 @@ +"GameState" +{ +} diff --git a/game/mod_tf/cfg/local_loadout.txt b/game/mod_tf/cfg/local_loadout.txt new file mode 100644 index 00000000000..536602c7179 --- /dev/null +++ b/game/mod_tf/cfg/local_loadout.txt @@ -0,0 +1,908 @@ +"local_loadout" +{ + "active_preset" + { + "scout" "0" + "sniper" "0" + "soldier" "0" + "demoman" "0" + "medic" "0" + "heavy" "0" + "pyro" "0" + "spy" "0" + "engineer" "0" + "Civilian" "0" + } + "0" + { + "scout" + { + "0" "0x00000002839F5C05" + "1" "0x0000000398FD5A7E" + "2" "0x0000000369B50CD0" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000011DBF58E6" + "8" "0x000000031B767CA3" + "9" "0x0000000000000000" + "10" "0x000000031C33970B" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000001EB7DC498" + "14" "0x0000000282E56F93" + "15" "0x000000004924A37E" + "16" "0x0000000332451925" + "17" "0x000000033244C8E8" + "18" "0x0000000399C7C1A5" + } + "sniper" + { + "0" "0x0000000377EBDA86" + "1" "0x000000035572446B" + "2" "0x0000000267536C98" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000010B1E14B0" + "8" "0x00000002CE47CD1F" + "9" "0x0000000000000000" + "10" "0x00000000D95130E8" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000001EB7DC498" + "14" "0x00000003240B502C" + "15" "0x000000004924A37E" + "16" "0x00000000E98D1302" + "17" "0x00000000334A3004" + "18" "0x00000003438C9F15" + } + "soldier" + { + "0" "0x000000026D279CFC" + "1" "0x00000002CE12FF6E" + "2" "0x000000034E705B14" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000026D5A13F5" + "8" "0x000000026A3D1C6D" + "9" "0x0000000000000000" + "10" "0x000000026D5AF35C" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x0000000281114E27" + "14" "0x00000001EB7DC498" + "15" "0x000000004924A37E" + "16" "0x0000000297B1E2C5" + "17" "0x00000000D6D4ECAE" + "18" "0x00000003438C9F15" + } + "demoman" + { + "0" "0x00000002FC47C5F0" + "1" "0x000000030B060B9B" + "2" "0x0000000267536C98" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000356163A8F" + "8" "0x00000001AFF41B76" + "9" "0x0000000000000000" + "10" "0x00000003561B0F23" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000002F5F3678C" + "14" "0x00000002B1046991" + "15" "0x000000004924A37E" + "16" "0x00000001EB7DC498" + "17" "0x00000000A0BB1CBA" + "18" "0x00000000334A3004" + } + "medic" + { + "0" "0x0000000297F27ECA" + "1" "0x000000021EF777BA" + "2" "0x00000002779E49EB" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000220A1A913" + "8" "0x00000002779CA6CD" + "9" "0x0000000000000000" + "10" "0x000000036CE8C4C3" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000002D5D98109" + "14" "0x00000001EB7DC498" + "15" "0x000000004924A37E" + "16" "0x0000000093CBE194" + "17" "0x00000002867D078B" + "18" "0x00000003438C9F15" + } + "heavy" + { + "0" "0x000000031AD8CD26" + "1" "0x0000000301EFD9B0" + "2" "0x0000000128004200" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x00000002693E99AD" + "8" "0x000000001BC719A5" + "9" "0x0000000000000000" + "10" "0x000000022107D660" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x000000036C3FC65A" + "14" "0x00000001EB7DC498" + "15" "0x000000004924A37E" + "16" "0x0000000105390E6B" + "17" "0x000000026755DB14" + "18" "0x00000000E98D1302" + } + "pyro" + { + "0" "0x0000000356C3C68E" + "1" "0x00000002CE12FF6E" + "2" "0x0000000356C3C9AC" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000028681C4EA" + "8" "0x000000026D5A13F5" + "9" "0x0000000000000000" + "10" "0x000000034E700F22" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000001EB7DC498" + "14" "0x0000000281114E27" + "15" "0x000000004924A37E" + "16" "0x00000000E98D1302" + "17" "0x00000000334A3004" + "18" "0x00000003438C9F15" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x00000002ACD3900A" + "2" "0x000000026C123BB5" + "3" "0x0000000000000000" + "4" "0x000000021B902222" + "5" "0x0000000000000000" + "6" "0x00000001FB5D5F93" + "7" "0xFFFFFFFFFFFFFFFF" + "8" "0xFFFFFFFFFFFFFFFF" + "9" "0x0000000000000000" + "10" "0xFFFFFFFFFFFFFFFF" + "11" "0x00000001C2F04CCB" + "12" "0x00000003800808C7" + "13" "0x00000001EB7DC498" + "14" "0x00000000D6D4F736" + "15" "0x000000004924A37E" + "16" "0x00000000D6D4ECAE" + "17" "0x0000000281114E27" + "18" "0x00000003438C9F15" + } + "engineer" + { + "0" "0x000000031AD8D73A" + "1" "0x0000000398FD5A7E" + "2" "0x0000000267536C98" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x00000001F88ADFA4" + "6" "0x0000000000000000" + "7" "0x00000002DB0661CA" + "8" "0x000000026D5A13F5" + "9" "0x0000000000000000" + "10" "0x00000002412FF111" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x0000000281114E27" + "14" "0x00000001DA3106B7" + "15" "0x000000004924A37E" + "16" "0x00000003438C9F15" + "17" "0x00000000D6D4ECAE" + "18" "0x00000000334A3004" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } + "1" + { + "scout" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "sniper" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "soldier" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "demoman" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "medic" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "heavy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "pyro" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "engineer" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } + "2" + { + "scout" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "sniper" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "soldier" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "demoman" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "medic" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "heavy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "pyro" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "engineer" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } + "3" + { + "scout" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "sniper" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "soldier" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "demoman" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "medic" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "heavy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "pyro" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "engineer" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } +} diff --git a/game/mod_tf/cfg/server_blacklist.txt b/game/mod_tf/cfg/server_blacklist.txt new file mode 100644 index 00000000000..fda684a3302 --- /dev/null +++ b/game/mod_tf/cfg/server_blacklist.txt @@ -0,0 +1,3 @@ +"serverblacklist" +{ +} diff --git a/game/mod_tf/downloadlists/itemtest.lst b/game/mod_tf/downloadlists/itemtest.lst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/game/mod_tf/media/viewed.res b/game/mod_tf/media/viewed.res new file mode 100644 index 00000000000..88c497f9fb6 --- /dev/null +++ b/game/mod_tf/media/viewed.res @@ -0,0 +1,7 @@ +"viewed.res" +{ + "itemtest" + { + "viewed" "3" + } +} diff --git a/game/mod_tf/stats.txt b/game/mod_tf/stats.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/game/mod_tf/voice_ban.dt b/game/mod_tf/voice_ban.dt new file mode 100644 index 0000000000000000000000000000000000000000..8ca0112d5ce095c50fe71790d32027e1716a32fa GIT binary patch literal 1156 zcmZ{j%W(rS3`3oc2>#(da>}ItHp1DpFOj*oohO162z@;skDu=+o`eGyzw`h9yLf11 z6+a!gI1CU8wNv5ZYA%)@SU41noHGkIffa492bsX$zgsHBWYMQk#SC0Hl7T?!#zUl; zz3JPu9}m2i`fjL>{KhTD+j6e{!Mt-uSoA50u^>Jy@ZP_8p($H`m~^ot7k%@plFm(E z)oIMycpIf7R{y8gtS2H%|Ecdx=jK0?WVvkpkv1C?|FFP2-=Y?t;%5MEuE-b%q>lk_ zo;~4m$2s7;K9ub^2YmH+kFv_GKM>uTat7e8hp^`X_-Wvqw{UiJ2H@tdlP?h4{laLT Po#z97%|HI<roJ@fU literal 0 HcmV?d00001 diff --git a/src/game/client/econ/base_loadout_panel.cpp b/src/game/client/econ/base_loadout_panel.cpp index 2813c03d753..5f606e672f2 100644 --- a/src/game/client/econ/base_loadout_panel.cpp +++ b/src/game/client/econ/base_loadout_panel.cpp @@ -137,7 +137,7 @@ void CBaseLoadoutPanel::SetBorderForItem( CItemModelPanel *pItemPanel, bool bMou { iRarity = pItemPanel->GetItem()->GetItemQuality() ; - uint8 nRarity = pItemPanel->GetItem()->GetItemDefinition()->GetRarity(); + uint8 nRarity = pItemPanel->GetItem()->GetRarity(); // FIX: This will ensure that border colors are drawn for War Painted weapons. Item rarities are not stored on base paintkit weapon schema entries if ( ( nRarity != k_unItemRarity_Any ) && ( iRarity != AE_SELFMADE ) && ( iRarity != AE_UNUSUAL ) ) { // translate this quality to rarity From fc53070eb8263e64277210dede98ed9789d86808 Mon Sep 17 00:00:00 2001 From: rabscootle Date: Tue, 25 Feb 2025 10:38:48 -0600 Subject: [PATCH 03/10] Revert "Updated item select screen to support rarity borders for War Paint weapons" This reverts commit 7fd273722b2674db52dda34f79734d210acef103. --- game/mod_tf/GameState.txt | 3 - game/mod_tf/cfg/local_loadout.txt | 908 -------------------- game/mod_tf/cfg/server_blacklist.txt | 3 - game/mod_tf/downloadlists/itemtest.lst | 0 game/mod_tf/media/viewed.res | 7 - game/mod_tf/stats.txt | 0 game/mod_tf/voice_ban.dt | Bin 1156 -> 0 bytes src/game/client/econ/base_loadout_panel.cpp | 2 +- 8 files changed, 1 insertion(+), 922 deletions(-) delete mode 100644 game/mod_tf/GameState.txt delete mode 100644 game/mod_tf/cfg/local_loadout.txt delete mode 100644 game/mod_tf/cfg/server_blacklist.txt delete mode 100644 game/mod_tf/downloadlists/itemtest.lst delete mode 100644 game/mod_tf/media/viewed.res delete mode 100644 game/mod_tf/stats.txt delete mode 100644 game/mod_tf/voice_ban.dt diff --git a/game/mod_tf/GameState.txt b/game/mod_tf/GameState.txt deleted file mode 100644 index b33ea6a5fc8..00000000000 --- a/game/mod_tf/GameState.txt +++ /dev/null @@ -1,3 +0,0 @@ -"GameState" -{ -} diff --git a/game/mod_tf/cfg/local_loadout.txt b/game/mod_tf/cfg/local_loadout.txt deleted file mode 100644 index 536602c7179..00000000000 --- a/game/mod_tf/cfg/local_loadout.txt +++ /dev/null @@ -1,908 +0,0 @@ -"local_loadout" -{ - "active_preset" - { - "scout" "0" - "sniper" "0" - "soldier" "0" - "demoman" "0" - "medic" "0" - "heavy" "0" - "pyro" "0" - "spy" "0" - "engineer" "0" - "Civilian" "0" - } - "0" - { - "scout" - { - "0" "0x00000002839F5C05" - "1" "0x0000000398FD5A7E" - "2" "0x0000000369B50CD0" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000011DBF58E6" - "8" "0x000000031B767CA3" - "9" "0x0000000000000000" - "10" "0x000000031C33970B" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000001EB7DC498" - "14" "0x0000000282E56F93" - "15" "0x000000004924A37E" - "16" "0x0000000332451925" - "17" "0x000000033244C8E8" - "18" "0x0000000399C7C1A5" - } - "sniper" - { - "0" "0x0000000377EBDA86" - "1" "0x000000035572446B" - "2" "0x0000000267536C98" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000010B1E14B0" - "8" "0x00000002CE47CD1F" - "9" "0x0000000000000000" - "10" "0x00000000D95130E8" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000001EB7DC498" - "14" "0x00000003240B502C" - "15" "0x000000004924A37E" - "16" "0x00000000E98D1302" - "17" "0x00000000334A3004" - "18" "0x00000003438C9F15" - } - "soldier" - { - "0" "0x000000026D279CFC" - "1" "0x00000002CE12FF6E" - "2" "0x000000034E705B14" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000026D5A13F5" - "8" "0x000000026A3D1C6D" - "9" "0x0000000000000000" - "10" "0x000000026D5AF35C" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x0000000281114E27" - "14" "0x00000001EB7DC498" - "15" "0x000000004924A37E" - "16" "0x0000000297B1E2C5" - "17" "0x00000000D6D4ECAE" - "18" "0x00000003438C9F15" - } - "demoman" - { - "0" "0x00000002FC47C5F0" - "1" "0x000000030B060B9B" - "2" "0x0000000267536C98" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000356163A8F" - "8" "0x00000001AFF41B76" - "9" "0x0000000000000000" - "10" "0x00000003561B0F23" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000002F5F3678C" - "14" "0x00000002B1046991" - "15" "0x000000004924A37E" - "16" "0x00000001EB7DC498" - "17" "0x00000000A0BB1CBA" - "18" "0x00000000334A3004" - } - "medic" - { - "0" "0x0000000297F27ECA" - "1" "0x000000021EF777BA" - "2" "0x00000002779E49EB" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000220A1A913" - "8" "0x00000002779CA6CD" - "9" "0x0000000000000000" - "10" "0x000000036CE8C4C3" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000002D5D98109" - "14" "0x00000001EB7DC498" - "15" "0x000000004924A37E" - "16" "0x0000000093CBE194" - "17" "0x00000002867D078B" - "18" "0x00000003438C9F15" - } - "heavy" - { - "0" "0x000000031AD8CD26" - "1" "0x0000000301EFD9B0" - "2" "0x0000000128004200" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x00000002693E99AD" - "8" "0x000000001BC719A5" - "9" "0x0000000000000000" - "10" "0x000000022107D660" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x000000036C3FC65A" - "14" "0x00000001EB7DC498" - "15" "0x000000004924A37E" - "16" "0x0000000105390E6B" - "17" "0x000000026755DB14" - "18" "0x00000000E98D1302" - } - "pyro" - { - "0" "0x0000000356C3C68E" - "1" "0x00000002CE12FF6E" - "2" "0x0000000356C3C9AC" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000028681C4EA" - "8" "0x000000026D5A13F5" - "9" "0x0000000000000000" - "10" "0x000000034E700F22" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000001EB7DC498" - "14" "0x0000000281114E27" - "15" "0x000000004924A37E" - "16" "0x00000000E98D1302" - "17" "0x00000000334A3004" - "18" "0x00000003438C9F15" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x00000002ACD3900A" - "2" "0x000000026C123BB5" - "3" "0x0000000000000000" - "4" "0x000000021B902222" - "5" "0x0000000000000000" - "6" "0x00000001FB5D5F93" - "7" "0xFFFFFFFFFFFFFFFF" - "8" "0xFFFFFFFFFFFFFFFF" - "9" "0x0000000000000000" - "10" "0xFFFFFFFFFFFFFFFF" - "11" "0x00000001C2F04CCB" - "12" "0x00000003800808C7" - "13" "0x00000001EB7DC498" - "14" "0x00000000D6D4F736" - "15" "0x000000004924A37E" - "16" "0x00000000D6D4ECAE" - "17" "0x0000000281114E27" - "18" "0x00000003438C9F15" - } - "engineer" - { - "0" "0x000000031AD8D73A" - "1" "0x0000000398FD5A7E" - "2" "0x0000000267536C98" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x00000001F88ADFA4" - "6" "0x0000000000000000" - "7" "0x00000002DB0661CA" - "8" "0x000000026D5A13F5" - "9" "0x0000000000000000" - "10" "0x00000002412FF111" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x0000000281114E27" - "14" "0x00000001DA3106B7" - "15" "0x000000004924A37E" - "16" "0x00000003438C9F15" - "17" "0x00000000D6D4ECAE" - "18" "0x00000000334A3004" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } - "1" - { - "scout" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "sniper" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "soldier" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "demoman" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "medic" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "heavy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "pyro" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "engineer" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } - "2" - { - "scout" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "sniper" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "soldier" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "demoman" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "medic" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "heavy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "pyro" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "engineer" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } - "3" - { - "scout" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "sniper" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "soldier" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "demoman" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "medic" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "heavy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "pyro" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "engineer" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } -} diff --git a/game/mod_tf/cfg/server_blacklist.txt b/game/mod_tf/cfg/server_blacklist.txt deleted file mode 100644 index fda684a3302..00000000000 --- a/game/mod_tf/cfg/server_blacklist.txt +++ /dev/null @@ -1,3 +0,0 @@ -"serverblacklist" -{ -} diff --git a/game/mod_tf/downloadlists/itemtest.lst b/game/mod_tf/downloadlists/itemtest.lst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/game/mod_tf/media/viewed.res b/game/mod_tf/media/viewed.res deleted file mode 100644 index 88c497f9fb6..00000000000 --- a/game/mod_tf/media/viewed.res +++ /dev/null @@ -1,7 +0,0 @@ -"viewed.res" -{ - "itemtest" - { - "viewed" "3" - } -} diff --git a/game/mod_tf/stats.txt b/game/mod_tf/stats.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/game/mod_tf/voice_ban.dt b/game/mod_tf/voice_ban.dt deleted file mode 100644 index 8ca0112d5ce095c50fe71790d32027e1716a32fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmZ{j%W(rS3`3oc2>#(da>}ItHp1DpFOj*oohO162z@;skDu=+o`eGyzw`h9yLf11 z6+a!gI1CU8wNv5ZYA%)@SU41noHGkIffa492bsX$zgsHBWYMQk#SC0Hl7T?!#zUl; zz3JPu9}m2i`fjL>{KhTD+j6e{!Mt-uSoA50u^>Jy@ZP_8p($H`m~^ot7k%@plFm(E z)oIMycpIf7R{y8gtS2H%|Ecdx=jK0?WVvkpkv1C?|FFP2-=Y?t;%5MEuE-b%q>lk_ zo;~4m$2s7;K9ub^2YmH+kFv_GKM>uTat7e8hp^`X_-Wvqw{UiJ2H@tdlP?h4{laLT Po#z97%|HI<roJ@fU diff --git a/src/game/client/econ/base_loadout_panel.cpp b/src/game/client/econ/base_loadout_panel.cpp index 5f606e672f2..2813c03d753 100644 --- a/src/game/client/econ/base_loadout_panel.cpp +++ b/src/game/client/econ/base_loadout_panel.cpp @@ -137,7 +137,7 @@ void CBaseLoadoutPanel::SetBorderForItem( CItemModelPanel *pItemPanel, bool bMou { iRarity = pItemPanel->GetItem()->GetItemQuality() ; - uint8 nRarity = pItemPanel->GetItem()->GetRarity(); // FIX: This will ensure that border colors are drawn for War Painted weapons. Item rarities are not stored on base paintkit weapon schema entries + uint8 nRarity = pItemPanel->GetItem()->GetItemDefinition()->GetRarity(); if ( ( nRarity != k_unItemRarity_Any ) && ( iRarity != AE_SELFMADE ) && ( iRarity != AE_UNUSUAL ) ) { // translate this quality to rarity From b76bb005ff740ccaf3470c256603715d0a021ba0 Mon Sep 17 00:00:00 2001 From: rabscootle Date: Tue, 25 Feb 2025 10:39:50 -0600 Subject: [PATCH 04/10] Updated item select screen to support rarity borders for War Paint weapons --- src/game/client/econ/base_loadout_panel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/client/econ/base_loadout_panel.cpp b/src/game/client/econ/base_loadout_panel.cpp index 2813c03d753..5f606e672f2 100644 --- a/src/game/client/econ/base_loadout_panel.cpp +++ b/src/game/client/econ/base_loadout_panel.cpp @@ -137,7 +137,7 @@ void CBaseLoadoutPanel::SetBorderForItem( CItemModelPanel *pItemPanel, bool bMou { iRarity = pItemPanel->GetItem()->GetItemQuality() ; - uint8 nRarity = pItemPanel->GetItem()->GetItemDefinition()->GetRarity(); + uint8 nRarity = pItemPanel->GetItem()->GetRarity(); // FIX: This will ensure that border colors are drawn for War Painted weapons. Item rarities are not stored on base paintkit weapon schema entries if ( ( nRarity != k_unItemRarity_Any ) && ( iRarity != AE_SELFMADE ) && ( iRarity != AE_UNUSUAL ) ) { // translate this quality to rarity From b9dd3febfda1bb12a3a82d2d6b3e08a04efe2228 Mon Sep 17 00:00:00 2001 From: rabscootle Date: Tue, 25 Feb 2025 17:26:19 -0600 Subject: [PATCH 05/10] cleanup --- src/game/client/tf/tf_hud_playerstatus.cpp | 3 +-- src/game/client/tf/tf_hud_target_id.cpp | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/game/client/tf/tf_hud_playerstatus.cpp b/src/game/client/tf/tf_hud_playerstatus.cpp index 2e8d4ce1dee..ab5c65746de 100644 --- a/src/game/client/tf/tf_hud_playerstatus.cpp +++ b/src/game/client/tf/tf_hud_playerstatus.cpp @@ -320,12 +320,11 @@ void CTFHudPlayerClass::OnThink() locchar_t wszLocString [128]; // Construct and set the weapon's name - //g_pVGuiLocalize->ConstructString_safe( wszLocString, L"%s1", 1, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pItem->GetItemDefinition(), pItem->GetItemQuality() ).GetFullName() ); g_pVGuiLocalize->ConstructString_safe( wszLocString, L"%s1", 1, pItem->GetItemName()); // FIX: Weapons will now display custom names & war paint weapons will display design name m_pCarryingWeaponPanel->SetDialogVariable( "carrying", wszLocString ); // Get and set the rarity color of the weapon - const char* pszColorName = GetItemSchema()->GetRarityColor( pItem->GetRarity() ); // Fix for War Paint weapons missing rarity color on ground + const char* pszColorName = GetItemSchema()->GetRarityColor( pItem->GetRarity() ); // FIX: War Paint weapons will display color on ground pszColorName = pszColorName ? pszColorName : "TanLight"; if ( pszColorName ) { diff --git a/src/game/client/tf/tf_hud_target_id.cpp b/src/game/client/tf/tf_hud_target_id.cpp index f41d3233f77..9cdf4b97ad3 100644 --- a/src/game/client/tf/tf_hud_target_id.cpp +++ b/src/game/client/tf/tf_hud_target_id.cpp @@ -950,12 +950,10 @@ void CTargetID::UpdateID( void ) _snwprintf( wszChargeLevel, ARRAYSIZE( wszChargeLevel ) - 1, L"%.0f", pDroppedWeapon->GetChargeLevel() * 100 ); wszChargeLevel[ARRAYSIZE( wszChargeLevel ) - 1] = '\0'; - //g_pVGuiLocalize->ConstructString_safe( sIDString, L"%s1 (%s2%)", 2, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pDroppedEconItem->GetItemDefinition(), pDroppedEconItem->GetItemQuality() ).GetFullName(), wszChargeLevel ); g_pVGuiLocalize->ConstructString_safe(sIDString, L"%s1 (%s2%)", 2, pDroppedEconItem->GetItemName(), wszChargeLevel); //FIX; The previous version of code would only pull data from static schema, which doesn't work with War Paint weapons. Weapons will now display custom names & war paint weapons will display design name } else { - //g_pVGuiLocalize->ConstructString_safe( sIDString, L"%s1", 1, CEconItemLocalizedFullNameGenerator( GLocalizationProvider(), pDroppedEconItem->GetItemDefinition(), pDroppedEconItem->GetItemQuality() ).GetFullName() ); g_pVGuiLocalize->ConstructString_safe(sIDString, L"%s1", 1, pDroppedEconItem->GetItemName()); // FIX: Weapons will now display custom names & war paint weapons will display design name } @@ -971,7 +969,7 @@ void CTargetID::UpdateID( void ) vgui::IScheme *pScheme = vgui::scheme()->GetIScheme( GetScheme() ); if ( pScheme ) { - const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetRarity() ); // Fix for War Paint weapons missing rarity color on ground + const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetRarity() ); // FIX: War Paint weapons now display color on ground pszColorName = pszColorName ? pszColorName : "TanLight"; colorName = pScheme->GetColor( pszColorName, Color( 255, 255, 255, 255 ) ); } From 4c51eb3d419f2ec9e0016f991a8a6af3eb726ec8 Mon Sep 17 00:00:00 2001 From: rabscootle Date: Tue, 25 Feb 2025 17:46:58 -0600 Subject: [PATCH 06/10] Updated huds to accomodate for Self-Made quality items --- src/game/client/tf/tf_hud_playerstatus.cpp | 2 ++ src/game/client/tf/tf_hud_target_id.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/game/client/tf/tf_hud_playerstatus.cpp b/src/game/client/tf/tf_hud_playerstatus.cpp index ab5c65746de..6fc45a9b8f8 100644 --- a/src/game/client/tf/tf_hud_playerstatus.cpp +++ b/src/game/client/tf/tf_hud_playerstatus.cpp @@ -325,6 +325,8 @@ void CTFHudPlayerClass::OnThink() // Get and set the rarity color of the weapon const char* pszColorName = GetItemSchema()->GetRarityColor( pItem->GetRarity() ); // FIX: War Paint weapons will display color on ground + if (pItem->GetItemQuality() == AE_SELFMADE) pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI + pszColorName = pszColorName ? pszColorName : "TanLight"; if ( pszColorName ) { diff --git a/src/game/client/tf/tf_hud_target_id.cpp b/src/game/client/tf/tf_hud_target_id.cpp index 9cdf4b97ad3..f575160503e 100644 --- a/src/game/client/tf/tf_hud_target_id.cpp +++ b/src/game/client/tf/tf_hud_target_id.cpp @@ -970,6 +970,8 @@ void CTargetID::UpdateID( void ) if ( pScheme ) { const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetRarity() ); // FIX: War Paint weapons now display color on ground + if (pDroppedEconItem->GetItemQuality() == AE_SELFMADE) pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI + pszColorName = pszColorName ? pszColorName : "TanLight"; colorName = pScheme->GetColor( pszColorName, Color( 255, 255, 255, 255 ) ); } From 0edfcaa04d32b82e6f56e5e53e820cfab0f330bd Mon Sep 17 00:00:00 2001 From: rabscootle Date: Wed, 26 Feb 2025 09:53:40 -0600 Subject: [PATCH 07/10] Update tf_hud_playerstatus.cpp --- src/game/client/tf/tf_hud_playerstatus.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/client/tf/tf_hud_playerstatus.cpp b/src/game/client/tf/tf_hud_playerstatus.cpp index 6fc45a9b8f8..ea8c01d4f88 100644 --- a/src/game/client/tf/tf_hud_playerstatus.cpp +++ b/src/game/client/tf/tf_hud_playerstatus.cpp @@ -325,7 +325,8 @@ void CTFHudPlayerClass::OnThink() // Get and set the rarity color of the weapon const char* pszColorName = GetItemSchema()->GetRarityColor( pItem->GetRarity() ); // FIX: War Paint weapons will display color on ground - if (pItem->GetItemQuality() == AE_SELFMADE) pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI + if (pItem->GetItemQuality() == AE_SELFMADE) + pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI pszColorName = pszColorName ? pszColorName : "TanLight"; if ( pszColorName ) From cca69c193f9d6f5dbb394847cb0241562f662488 Mon Sep 17 00:00:00 2001 From: rabscootle Date: Wed, 26 Feb 2025 10:48:57 -0600 Subject: [PATCH 08/10] Smol fix for Self-Made check --- game/mod_tf/GameState.txt | 3 + game/mod_tf/cfg/local_loadout.txt | 908 ++++++++++++++++++++++++ game/mod_tf/cfg/server_blacklist.txt | 3 + game/mod_tf/stats.txt | 0 game/mod_tf/voice_ban.dt | Bin 0 -> 1156 bytes src/game/client/tf/tf_hud_target_id.cpp | 3 +- 6 files changed, 916 insertions(+), 1 deletion(-) create mode 100644 game/mod_tf/GameState.txt create mode 100644 game/mod_tf/cfg/local_loadout.txt create mode 100644 game/mod_tf/cfg/server_blacklist.txt create mode 100644 game/mod_tf/stats.txt create mode 100644 game/mod_tf/voice_ban.dt diff --git a/game/mod_tf/GameState.txt b/game/mod_tf/GameState.txt new file mode 100644 index 00000000000..b33ea6a5fc8 --- /dev/null +++ b/game/mod_tf/GameState.txt @@ -0,0 +1,3 @@ +"GameState" +{ +} diff --git a/game/mod_tf/cfg/local_loadout.txt b/game/mod_tf/cfg/local_loadout.txt new file mode 100644 index 00000000000..68fcaf8d866 --- /dev/null +++ b/game/mod_tf/cfg/local_loadout.txt @@ -0,0 +1,908 @@ +"local_loadout" +{ + "active_preset" + { + "scout" "0" + "sniper" "0" + "soldier" "0" + "demoman" "0" + "medic" "0" + "heavy" "0" + "pyro" "0" + "spy" "0" + "engineer" "0" + "Civilian" "0" + } + "0" + { + "scout" + { + "0" "0x00000003613B7ED3" + "1" "0x0000000398FD5A7E" + "2" "0x00000003998D1C01" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000011DBF58E6" + "8" "0x000000031B767CA3" + "9" "0x0000000000000000" + "10" "0x000000031C33970B" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000001EB7DC498" + "14" "0x0000000282E56F93" + "15" "0x000000004924A37E" + "16" "0x0000000332451925" + "17" "0x000000033244C8E8" + "18" "0x0000000399C7C1A5" + } + "sniper" + { + "0" "0x0000000377EBDA86" + "1" "0x000000035572446B" + "2" "0x0000000267536C98" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000010B1E14B0" + "8" "0x00000002CE47CD1F" + "9" "0x0000000000000000" + "10" "0x00000000D95130E8" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000001EB7DC498" + "14" "0x00000003240B502C" + "15" "0x000000004924A37E" + "16" "0x00000000E98D1302" + "17" "0x00000000334A3004" + "18" "0x00000003438C9F15" + } + "soldier" + { + "0" "0x000000026D279CFC" + "1" "0x00000002CE12FF6E" + "2" "0x000000034E705B14" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000026D5A13F5" + "8" "0x000000026A3D1C6D" + "9" "0x0000000000000000" + "10" "0x000000026D5AF35C" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x0000000281114E27" + "14" "0x00000001EB7DC498" + "15" "0x000000004924A37E" + "16" "0x0000000297B1E2C5" + "17" "0x00000000D6D4ECAE" + "18" "0x00000003438C9F15" + } + "demoman" + { + "0" "0x00000002FC47C5F0" + "1" "0x000000030B060B9B" + "2" "0x0000000267536C98" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000356163A8F" + "8" "0x00000001AFF41B76" + "9" "0x0000000000000000" + "10" "0x00000003561B0F23" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000002F5F3678C" + "14" "0x00000002B1046991" + "15" "0x000000004924A37E" + "16" "0x00000001EB7DC498" + "17" "0x00000000A0BB1CBA" + "18" "0x00000000334A3004" + } + "medic" + { + "0" "0x0000000297F27ECA" + "1" "0x00000002EC08F032" + "2" "0x00000002779E49EB" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000220A1A913" + "8" "0x00000002779CA6CD" + "9" "0x0000000000000000" + "10" "0x000000036CE8C4C3" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000002D5D98109" + "14" "0x00000001EB7DC498" + "15" "0x000000004924A37E" + "16" "0x0000000093CBE194" + "17" "0x00000002867D078B" + "18" "0x00000003438C9F15" + } + "heavy" + { + "0" "0x000000031AD8CD26" + "1" "0x0000000301EFD9B0" + "2" "0x0000000128004200" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x00000002693E99AD" + "8" "0x000000001BC719A5" + "9" "0x0000000000000000" + "10" "0x000000022107D660" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x000000036C3FC65A" + "14" "0x00000001EB7DC498" + "15" "0x000000004924A37E" + "16" "0x0000000105390E6B" + "17" "0x000000026755DB14" + "18" "0x00000000E98D1302" + } + "pyro" + { + "0" "0x0000000356C3C68E" + "1" "0x00000002CE12FF6E" + "2" "0x0000000356C3C9AC" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x000000028681C4EA" + "8" "0x000000026D5A13F5" + "9" "0x0000000000000000" + "10" "0x000000034E700F22" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x00000001EB7DC498" + "14" "0x0000000281114E27" + "15" "0x000000004924A37E" + "16" "0x00000000E98D1302" + "17" "0x00000000334A3004" + "18" "0x00000003438C9F15" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x00000002ACD3900A" + "2" "0x000000026C123BB5" + "3" "0x0000000000000000" + "4" "0x000000021B902222" + "5" "0x0000000000000000" + "6" "0x00000001FB5D5F93" + "7" "0x0000000359787B9B" + "8" "0x00000002C7249A42" + "9" "0x0000000000000000" + "10" "0x0000000297CF67AD" + "11" "0x00000001C2F04CCB" + "12" "0x00000003800808C7" + "13" "0x00000001EB7DC498" + "14" "0x00000000D6D4F736" + "15" "0x000000004924A37E" + "16" "0x00000000D6D4ECAE" + "17" "0x0000000281114E27" + "18" "0x00000003438C9F15" + } + "engineer" + { + "0" "0x000000031AD8D73A" + "1" "0x0000000398FD5A7E" + "2" "0x0000000267536C98" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x00000001F88ADFA4" + "6" "0x0000000000000000" + "7" "0x00000002DB0661CA" + "8" "0x000000026D5A13F5" + "9" "0x0000000000000000" + "10" "0x00000002412FF111" + "11" "0x00000001C2F04CCB" + "12" "0x000000038B764704" + "13" "0x0000000281114E27" + "14" "0x00000001DA3106B7" + "15" "0x000000004924A37E" + "16" "0x00000003438C9F15" + "17" "0x00000000D6D4ECAE" + "18" "0x00000000334A3004" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } + "1" + { + "scout" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "sniper" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "soldier" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "demoman" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "medic" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "heavy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "pyro" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "engineer" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } + "2" + { + "scout" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "sniper" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "soldier" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "demoman" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "medic" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "heavy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "pyro" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "engineer" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } + "3" + { + "scout" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "sniper" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "soldier" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "demoman" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "medic" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "heavy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "pyro" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "spy" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "engineer" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + "Civilian" + { + "0" "0x0000000000000000" + "1" "0x0000000000000000" + "2" "0x0000000000000000" + "3" "0x0000000000000000" + "4" "0x0000000000000000" + "5" "0x0000000000000000" + "6" "0x0000000000000000" + "7" "0x0000000000000000" + "8" "0x0000000000000000" + "9" "0x0000000000000000" + "10" "0x0000000000000000" + "11" "0x0000000000000000" + "12" "0x0000000000000000" + "13" "0x0000000000000000" + "14" "0x0000000000000000" + "15" "0x0000000000000000" + "16" "0x0000000000000000" + "17" "0x0000000000000000" + "18" "0x0000000000000000" + } + } +} diff --git a/game/mod_tf/cfg/server_blacklist.txt b/game/mod_tf/cfg/server_blacklist.txt new file mode 100644 index 00000000000..fda684a3302 --- /dev/null +++ b/game/mod_tf/cfg/server_blacklist.txt @@ -0,0 +1,3 @@ +"serverblacklist" +{ +} diff --git a/game/mod_tf/stats.txt b/game/mod_tf/stats.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/game/mod_tf/voice_ban.dt b/game/mod_tf/voice_ban.dt new file mode 100644 index 0000000000000000000000000000000000000000..8ca0112d5ce095c50fe71790d32027e1716a32fa GIT binary patch literal 1156 zcmZ{j%W(rS3`3oc2>#(da>}ItHp1DpFOj*oohO162z@;skDu=+o`eGyzw`h9yLf11 z6+a!gI1CU8wNv5ZYA%)@SU41noHGkIffa492bsX$zgsHBWYMQk#SC0Hl7T?!#zUl; zz3JPu9}m2i`fjL>{KhTD+j6e{!Mt-uSoA50u^>Jy@ZP_8p($H`m~^ot7k%@plFm(E z)oIMycpIf7R{y8gtS2H%|Ecdx=jK0?WVvkpkv1C?|FFP2-=Y?t;%5MEuE-b%q>lk_ zo;~4m$2s7;K9ub^2YmH+kFv_GKM>uTat7e8hp^`X_-Wvqw{UiJ2H@tdlP?h4{laLT Po#z97%|HI<roJ@fU literal 0 HcmV?d00001 diff --git a/src/game/client/tf/tf_hud_target_id.cpp b/src/game/client/tf/tf_hud_target_id.cpp index f575160503e..b5b92a74158 100644 --- a/src/game/client/tf/tf_hud_target_id.cpp +++ b/src/game/client/tf/tf_hud_target_id.cpp @@ -970,7 +970,8 @@ void CTargetID::UpdateID( void ) if ( pScheme ) { const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetRarity() ); // FIX: War Paint weapons now display color on ground - if (pDroppedEconItem->GetItemQuality() == AE_SELFMADE) pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI + if (pDroppedEconItem->GetItemQuality() == AE_SELFMADE) + pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI pszColorName = pszColorName ? pszColorName : "TanLight"; colorName = pScheme->GetColor( pszColorName, Color( 255, 255, 255, 255 ) ); From 376a345678ac3f211a0a1c84385c974610c1699d Mon Sep 17 00:00:00 2001 From: rabscootle Date: Wed, 26 Feb 2025 10:56:27 -0600 Subject: [PATCH 09/10] Revert "Smol fix for Self-Made check" This reverts commit cca69c193f9d6f5dbb394847cb0241562f662488. --- game/mod_tf/GameState.txt | 3 - game/mod_tf/cfg/local_loadout.txt | 908 ------------------------ game/mod_tf/cfg/server_blacklist.txt | 3 - game/mod_tf/stats.txt | 0 game/mod_tf/voice_ban.dt | Bin 1156 -> 0 bytes src/game/client/tf/tf_hud_target_id.cpp | 3 +- 6 files changed, 1 insertion(+), 916 deletions(-) delete mode 100644 game/mod_tf/GameState.txt delete mode 100644 game/mod_tf/cfg/local_loadout.txt delete mode 100644 game/mod_tf/cfg/server_blacklist.txt delete mode 100644 game/mod_tf/stats.txt delete mode 100644 game/mod_tf/voice_ban.dt diff --git a/game/mod_tf/GameState.txt b/game/mod_tf/GameState.txt deleted file mode 100644 index b33ea6a5fc8..00000000000 --- a/game/mod_tf/GameState.txt +++ /dev/null @@ -1,3 +0,0 @@ -"GameState" -{ -} diff --git a/game/mod_tf/cfg/local_loadout.txt b/game/mod_tf/cfg/local_loadout.txt deleted file mode 100644 index 68fcaf8d866..00000000000 --- a/game/mod_tf/cfg/local_loadout.txt +++ /dev/null @@ -1,908 +0,0 @@ -"local_loadout" -{ - "active_preset" - { - "scout" "0" - "sniper" "0" - "soldier" "0" - "demoman" "0" - "medic" "0" - "heavy" "0" - "pyro" "0" - "spy" "0" - "engineer" "0" - "Civilian" "0" - } - "0" - { - "scout" - { - "0" "0x00000003613B7ED3" - "1" "0x0000000398FD5A7E" - "2" "0x00000003998D1C01" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000011DBF58E6" - "8" "0x000000031B767CA3" - "9" "0x0000000000000000" - "10" "0x000000031C33970B" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000001EB7DC498" - "14" "0x0000000282E56F93" - "15" "0x000000004924A37E" - "16" "0x0000000332451925" - "17" "0x000000033244C8E8" - "18" "0x0000000399C7C1A5" - } - "sniper" - { - "0" "0x0000000377EBDA86" - "1" "0x000000035572446B" - "2" "0x0000000267536C98" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000010B1E14B0" - "8" "0x00000002CE47CD1F" - "9" "0x0000000000000000" - "10" "0x00000000D95130E8" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000001EB7DC498" - "14" "0x00000003240B502C" - "15" "0x000000004924A37E" - "16" "0x00000000E98D1302" - "17" "0x00000000334A3004" - "18" "0x00000003438C9F15" - } - "soldier" - { - "0" "0x000000026D279CFC" - "1" "0x00000002CE12FF6E" - "2" "0x000000034E705B14" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000026D5A13F5" - "8" "0x000000026A3D1C6D" - "9" "0x0000000000000000" - "10" "0x000000026D5AF35C" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x0000000281114E27" - "14" "0x00000001EB7DC498" - "15" "0x000000004924A37E" - "16" "0x0000000297B1E2C5" - "17" "0x00000000D6D4ECAE" - "18" "0x00000003438C9F15" - } - "demoman" - { - "0" "0x00000002FC47C5F0" - "1" "0x000000030B060B9B" - "2" "0x0000000267536C98" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000356163A8F" - "8" "0x00000001AFF41B76" - "9" "0x0000000000000000" - "10" "0x00000003561B0F23" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000002F5F3678C" - "14" "0x00000002B1046991" - "15" "0x000000004924A37E" - "16" "0x00000001EB7DC498" - "17" "0x00000000A0BB1CBA" - "18" "0x00000000334A3004" - } - "medic" - { - "0" "0x0000000297F27ECA" - "1" "0x00000002EC08F032" - "2" "0x00000002779E49EB" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000220A1A913" - "8" "0x00000002779CA6CD" - "9" "0x0000000000000000" - "10" "0x000000036CE8C4C3" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000002D5D98109" - "14" "0x00000001EB7DC498" - "15" "0x000000004924A37E" - "16" "0x0000000093CBE194" - "17" "0x00000002867D078B" - "18" "0x00000003438C9F15" - } - "heavy" - { - "0" "0x000000031AD8CD26" - "1" "0x0000000301EFD9B0" - "2" "0x0000000128004200" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x00000002693E99AD" - "8" "0x000000001BC719A5" - "9" "0x0000000000000000" - "10" "0x000000022107D660" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x000000036C3FC65A" - "14" "0x00000001EB7DC498" - "15" "0x000000004924A37E" - "16" "0x0000000105390E6B" - "17" "0x000000026755DB14" - "18" "0x00000000E98D1302" - } - "pyro" - { - "0" "0x0000000356C3C68E" - "1" "0x00000002CE12FF6E" - "2" "0x0000000356C3C9AC" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x000000028681C4EA" - "8" "0x000000026D5A13F5" - "9" "0x0000000000000000" - "10" "0x000000034E700F22" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x00000001EB7DC498" - "14" "0x0000000281114E27" - "15" "0x000000004924A37E" - "16" "0x00000000E98D1302" - "17" "0x00000000334A3004" - "18" "0x00000003438C9F15" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x00000002ACD3900A" - "2" "0x000000026C123BB5" - "3" "0x0000000000000000" - "4" "0x000000021B902222" - "5" "0x0000000000000000" - "6" "0x00000001FB5D5F93" - "7" "0x0000000359787B9B" - "8" "0x00000002C7249A42" - "9" "0x0000000000000000" - "10" "0x0000000297CF67AD" - "11" "0x00000001C2F04CCB" - "12" "0x00000003800808C7" - "13" "0x00000001EB7DC498" - "14" "0x00000000D6D4F736" - "15" "0x000000004924A37E" - "16" "0x00000000D6D4ECAE" - "17" "0x0000000281114E27" - "18" "0x00000003438C9F15" - } - "engineer" - { - "0" "0x000000031AD8D73A" - "1" "0x0000000398FD5A7E" - "2" "0x0000000267536C98" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x00000001F88ADFA4" - "6" "0x0000000000000000" - "7" "0x00000002DB0661CA" - "8" "0x000000026D5A13F5" - "9" "0x0000000000000000" - "10" "0x00000002412FF111" - "11" "0x00000001C2F04CCB" - "12" "0x000000038B764704" - "13" "0x0000000281114E27" - "14" "0x00000001DA3106B7" - "15" "0x000000004924A37E" - "16" "0x00000003438C9F15" - "17" "0x00000000D6D4ECAE" - "18" "0x00000000334A3004" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } - "1" - { - "scout" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "sniper" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "soldier" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "demoman" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "medic" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "heavy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "pyro" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "engineer" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } - "2" - { - "scout" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "sniper" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "soldier" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "demoman" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "medic" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "heavy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "pyro" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "engineer" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } - "3" - { - "scout" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "sniper" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "soldier" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "demoman" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "medic" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "heavy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "pyro" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "spy" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "engineer" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - "Civilian" - { - "0" "0x0000000000000000" - "1" "0x0000000000000000" - "2" "0x0000000000000000" - "3" "0x0000000000000000" - "4" "0x0000000000000000" - "5" "0x0000000000000000" - "6" "0x0000000000000000" - "7" "0x0000000000000000" - "8" "0x0000000000000000" - "9" "0x0000000000000000" - "10" "0x0000000000000000" - "11" "0x0000000000000000" - "12" "0x0000000000000000" - "13" "0x0000000000000000" - "14" "0x0000000000000000" - "15" "0x0000000000000000" - "16" "0x0000000000000000" - "17" "0x0000000000000000" - "18" "0x0000000000000000" - } - } -} diff --git a/game/mod_tf/cfg/server_blacklist.txt b/game/mod_tf/cfg/server_blacklist.txt deleted file mode 100644 index fda684a3302..00000000000 --- a/game/mod_tf/cfg/server_blacklist.txt +++ /dev/null @@ -1,3 +0,0 @@ -"serverblacklist" -{ -} diff --git a/game/mod_tf/stats.txt b/game/mod_tf/stats.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/game/mod_tf/voice_ban.dt b/game/mod_tf/voice_ban.dt deleted file mode 100644 index 8ca0112d5ce095c50fe71790d32027e1716a32fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmZ{j%W(rS3`3oc2>#(da>}ItHp1DpFOj*oohO162z@;skDu=+o`eGyzw`h9yLf11 z6+a!gI1CU8wNv5ZYA%)@SU41noHGkIffa492bsX$zgsHBWYMQk#SC0Hl7T?!#zUl; zz3JPu9}m2i`fjL>{KhTD+j6e{!Mt-uSoA50u^>Jy@ZP_8p($H`m~^ot7k%@plFm(E z)oIMycpIf7R{y8gtS2H%|Ecdx=jK0?WVvkpkv1C?|FFP2-=Y?t;%5MEuE-b%q>lk_ zo;~4m$2s7;K9ub^2YmH+kFv_GKM>uTat7e8hp^`X_-Wvqw{UiJ2H@tdlP?h4{laLT Po#z97%|HI<roJ@fU diff --git a/src/game/client/tf/tf_hud_target_id.cpp b/src/game/client/tf/tf_hud_target_id.cpp index b5b92a74158..f575160503e 100644 --- a/src/game/client/tf/tf_hud_target_id.cpp +++ b/src/game/client/tf/tf_hud_target_id.cpp @@ -970,8 +970,7 @@ void CTargetID::UpdateID( void ) if ( pScheme ) { const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetRarity() ); // FIX: War Paint weapons now display color on ground - if (pDroppedEconItem->GetItemQuality() == AE_SELFMADE) - pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI + if (pDroppedEconItem->GetItemQuality() == AE_SELFMADE) pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI pszColorName = pszColorName ? pszColorName : "TanLight"; colorName = pScheme->GetColor( pszColorName, Color( 255, 255, 255, 255 ) ); From e321cb940b1416caf2601e50c8bccff69f34d041 Mon Sep 17 00:00:00 2001 From: rabscootle Date: Wed, 26 Feb 2025 10:58:30 -0600 Subject: [PATCH 10/10] Removed extra files; Final submission --- src/game/client/tf/tf_hud_target_id.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/client/tf/tf_hud_target_id.cpp b/src/game/client/tf/tf_hud_target_id.cpp index f575160503e..b5b92a74158 100644 --- a/src/game/client/tf/tf_hud_target_id.cpp +++ b/src/game/client/tf/tf_hud_target_id.cpp @@ -970,7 +970,8 @@ void CTargetID::UpdateID( void ) if ( pScheme ) { const char* pszColorName = GetItemSchema()->GetRarityColor( pDroppedEconItem->GetRarity() ); // FIX: War Paint weapons now display color on ground - if (pDroppedEconItem->GetItemQuality() == AE_SELFMADE) pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI + if (pDroppedEconItem->GetItemQuality() == AE_SELFMADE) + pszColorName = EconQuality_GetColorString(AE_SELFMADE); // Addition for consistency with other economy UI pszColorName = pszColorName ? pszColorName : "TanLight"; colorName = pScheme->GetColor( pszColorName, Color( 255, 255, 255, 255 ) );