fix up / clean up some common cvars

Author: mastercoms

game/tc2/cfg/server_casual.cfg

@@ -8,6 +8,8 @@ mp_tournament 1
 mp_tournament_readymode 1
 mp_tournament_readymode_min 0
 
+mp_tournament_post_match_period 10
+
 mp_forceautoteam 1
 mp_forcecamera 1
 mp_idledealmethod 2

game/tc2/cfg/server_competitive.cfg

@@ -10,13 +10,14 @@ mp_tournament 1
 mp_tournament_readymode 1
 mp_tournament_readymode_min 0
 
+mp_tournament_post_match_period 10
+
 mp_sixes 1
 
 mp_forceautoteam 1
 mp_forcecamera 1
 mp_idledealmethod 2
 mp_idlemaxtime 5
-
 mp_idledealduringplay 0
 
 tf_ctf_bonus_time 0

game/tc2/cfg/server_matchmaking_base.cfg

@@ -8,6 +8,7 @@ mp_forceautoteam 0
 mp_forcecamera 1
 mp_idledealmethod 1
 mp_idlemaxtime 3
+mp_idledealduringplay 1
 mp_maxrounds 0
 mp_timelimit 0
 mp_winlimit 0
@@ -17,6 +18,7 @@ mp_tournament 0
 mp_tournament_post_match_period 90
 mp_tournament_readymode 0
 mp_tournament_readymode_min 2
+mp_tournament_readymode_team_size 0
 sv_namechange_cooldown_seconds 300
 
 mp_sixes 0
@@ -29,7 +31,7 @@ tf_allow_player_name_change 0
 
 tf_weapon_criticals 1
 
-sv_minrate 3500
+sv_minrate 65536
 sv_vote_issue_kick_min_connect_time_mvm 180
 sv_pure 1
 

src/game/server/team_control_point_master.cpp

@@ -55,7 +55,8 @@ END_DATADESC()
 
 LINK_ENTITY_TO_CLASS( team_control_point_master, CTeamControlPointMaster );
 
-ConVar mp_time_between_capscoring( "mp_time_between_capscoring", "30", FCVAR_GAMEDLL, "Delay between scoring of owned capture points.", true, 1, false, 0 );
+// TODO(mcoms): what is this?
+//ConVar mp_time_between_capscoring( "mp_time_between_capscoring", "30", FCVAR_GAMEDLL, "Delay between scoring of owned capture points.", true, 1, false, 0 );
 
 // sort function for the list of control_point_rounds (we're sorting them by priority...highest first)
 int ControlPointRoundSort( CTeamControlPointRound* const *p1, CTeamControlPointRound* const *p2 )

src/game/shared/gc_clientsystem.cpp

@@ -119,7 +119,7 @@ bool CGCClientSystem::BSendMessage( const GCSDK::CProtoBufMsgBase& msg )
 }
 
 #ifdef GAME_DLL
-ConVar sv_private_token( "sv_private_token", "0", FCVAR_HIDDEN );
+ConVar sv_private_token( "sv_private_token", "0", FCVAR_HIDDEN | FCVAR_PROTECTED | FCVAR_SERVER_CANNOT_QUERY );
 #endif
 
 //-----------------------------------------------------------------------------

src/game/shared/multiplay_gamerules.cpp

@@ -337,6 +337,11 @@ CMultiplayRules::CMultiplayRules()
 	{
 		sv_maxupdaterate.SetValue( iMaxPacketRate );
 	}
+	static ConVarRef tv_snapshotrate( "tv_snapshotrate" );
+	if ( tv_snapshotrate.GetInt() > iMaxPacketRate )
+	{
+		tv_snapshotrate.SetValue( iMaxPacketRate );
+	}
 
 	nextlevel.SetValue( "" );
 	LoadMapCycleFile();

src/game/shared/teamplayroundbased_gamerules.cpp

@@ -211,7 +211,7 @@ ConVar mp_blockstyle( "mp_blockstyle", "1", FCVAR_REPLICATED | FCVAR_DEVELOPMENT
 ConVar mp_respawnwavetime( "mp_respawnwavetime", "10.0", FCVAR_NOTIFY | FCVAR_REPLICATED, "Time between respawn waves." );
 ConVar mp_capdeteriorate_time( "mp_capdeteriorate_time", "90.0", FCVAR_REPLICATED | FCVAR_DEVELOPMENTONLY, "Time it takes for a full capture point to deteriorate." );
 ConVar mp_tournament( "mp_tournament", "0", FCVAR_REPLICATED | FCVAR_NOTIFY );
-ConVar mp_tournament_post_match_period( "mp_tournament_post_match_period", "10", FCVAR_REPLICATED, "The amount of time (in seconds) before the server resets post-match.", true, 5, true, 300 );
+ConVar mp_tournament_post_match_period( "mp_tournament_post_match_period", "90", FCVAR_REPLICATED, "The amount of time (in seconds) before the server resets post-match.", true, 5, true, 300 );
 
 ConVar mp_tournament_required_for_pause( "mp_tournament_required_for_pause", "1", FCVAR_REPLICATED );
 
@@ -2089,17 +2089,6 @@ void CTeamplayRoundBasedRules::State_Think_TEAM_WIN( void )
 				g_fGameOver = true;
 				State_Enter( GR_STATE_GAME_OVER );
 				float flPostMatchPeriod = GetPostMatchPeriod();
-				if ( TFGameRules()->IsEmulatingMatch() )
-				{
-					if ( TFGameRules()->IsEmulatingMatch() == 1 )
-					{
-						flPostMatchPeriod = 10.0f;
-					}
-					else if ( TFGameRules()->IsEmulatingMatch() == 2 )
-					{
-						flPostMatchPeriod = 10.0f;
-					}
-				}
 
 				bool bWillLeaveMap = false;
 				const IMatchGroupDescription* pMatchDesc = GetMatchGroupDescription( TFGameRules()->GetCurrentMatchGroup() );

src/game/shared/tf/tf_gamerules.cpp

@@ -3299,7 +3299,7 @@ bool CTFGameRules::PlayerReadyStatus_ArePlayersOnTeamReady( int iTeam )
 	}
 
 	// Team isn't ready if there was nobody on it.
-	return iPlayerReadyCount > 0;
+	return iPlayerReadyCount > mp_tournament_readymode_team_size.GetInt();
 }
 
 //-----------------------------------------------------------------------------
@@ -19243,9 +19243,9 @@ int CTFGameRules::GetBonusRoundTime( bool bGameOver /* = false*/ )
 	{
 		return 5;
 	}
-	if ( IsCompetitiveGame() && bGameOver )
+	if ( IsCompetitiveGame() )
 	{
-		return 5;
+		return bGameOver ? 5 : 10;
 	}
 
 	return BaseClass::GetBonusRoundTime( bGameOver );