> TeamRank

This commit is contained in:
ChocoTaco1 2020-08-18 18:21:44 -04:00
parent ab761f0922
commit 59fe9259b5
2 changed files with 18 additions and 22 deletions

View file

@ -20,7 +20,7 @@ function CreateServer( %mission, %missionType )
{
parent::CreateServer( %mission, %missionType );
//Call for a GetTeamCount update
GetTeamCounts( %game, %client, %respawn );
GetTeamCounts(%game);
// Set when server starts
// Used to reset timelimit (if voted) when map changes
@ -37,29 +37,21 @@ function CreateServer( %mission, %missionType )
if (!isActivePackage(StartTeamCounts))
activatePackage(StartTeamCounts);
function GetTeamCounts( %game, %client, %respawn )
function GetTeamCounts(%game)
{
switch$($GetCountsStatus)
{
case UPDATE:
//Get teamcounts
if($countdownStarted && $MatchStarted )
{
//Variables
$PlayerCount[1] = $TeamRank[1, count];
$PlayerCount[2] = $TeamRank[2, count];
$PlayerCount[0] = $HostGamePlayerCount - ($PlayerCount[1] + $PlayerCount[2]);
//echo ("$PlayerCount[0] " @ $PlayerCount[0]);
//echo ("$PlayerCount[1] " @ $PlayerCount[1]);
//echo ("$PlayerCount[2] " @ $PlayerCount[2]);
$TotalTeamPlayerCount = $PlayerCount[1] + $PlayerCount[2];
$TotalTeamPlayerCount = $TeamRank[1, count] + $TeamRank[2, count];
$AllPlayerCount = $HostGamePlayerCount;
%team1difference = $PlayerCount[1] - $PlayerCount[2];
%team2difference = $PlayerCount[2] - $PlayerCount[1];
//echo("$PlayerCount[0] " @ $HostGamePlayerCount - ($TeamRank[1, count] + $TeamRank[2, count]));
//echo("$PlayerCount[1] " @ $TeamRank[1, count]);
//echo("$PlayerCount[2] " @ $TeamRank[2, count]);
if( !$Host::TournamentMode )
{
if( $CurrentMissionType $= "CTF" )
@ -67,7 +59,7 @@ function GetTeamCounts( %game, %client, %respawn )
NBRStatusNotify(%game);
CheckAntiPack(%game);
}
TeamBalanceNotify(%game, %team1difference, %team2difference);
TeamBalanceNotify(%game);
}
//Set so counter wont run when it doesnt need to.

View file

@ -12,15 +12,18 @@
// Called in GetTeamCounts.cs
function TeamBalanceNotify( %game, %team1difference, %team2difference )
function TeamBalanceNotify(%game)
{
if( Game.numTeams > 1 && $TotalTeamPlayerCount !$= 0 )
{
//echo ("%Team1Difference " @ %Team1Difference);
//echo ("%Team2Difference " @ %Team2Difference);
%team1difference = $TeamRank[1, count] - $TeamRank[2, count];
%team2difference = $TeamRank[2, count] - $TeamRank[1, count];
//echo("%Team1Difference " @ %team1difference);
//echo("%Team2Difference " @ %team2difference);
//Uneven
if( $PlayerCount[1] !$= $PlayerCount[2] )
if($TeamRank[1, count] !$= $TeamRank[2, count])
{
if( %team1difference >= 2 || %team2difference >= 2 ) //Teams are unbalanced
{
@ -32,7 +35,7 @@ function TeamBalanceNotify( %game, %team1difference, %team2difference )
$TBNStatus = "UNEVEN";
}
//Teams are even
else if( $PlayerCount[1] == $PlayerCount[2] && $TBNStatus !$= "PLAYEDEVEN" )
else if($TeamRank[1, count] == $TeamRank[2, count] && $TBNStatus !$= "PLAYEDEVEN" )
$TBNStatus = "EVEN";
switch$($TBNStatus)
@ -82,7 +85,8 @@ function NotifyUnbalanced( %game )
//If Autobalance is disabled, message only.
else if( $Host::EnableTeamBalanceNotify )
{
messageAll('MsgTeamBalanceNotify', '\c1Teams are unbalanced: \c0%1 vs %2 with %3 observers.~wgui/vote_nopass.wav', $PlayerCount[1], $PlayerCount[2], $PlayerCount[0] );
%observers = $HostGamePlayerCount - ($TeamRank[1, count] + $TeamRank[2, count]);
messageAll('MsgTeamBalanceNotify', '\c1Teams are unbalanced: \c0%1 vs %2 with %3 observers.~wgui/vote_nopass.wav', $TeamRank[1, count], $TeamRank[2, count], %observers );
schedule(13000, 0, "ResetTBNStatus");
schedule(15000, 0, "ResetGetCountsStatus");
}