mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-07-16 00:24:35 +00:00
Obj instead of Globals
This commit is contained in:
parent
f51829f5d5
commit
b6e47728af
1 changed files with 22 additions and 17 deletions
|
|
@ -60,11 +60,14 @@ function Autobalance( %game )
|
||||||
//Select lower half of team rank as canidates for team change
|
//Select lower half of team rank as canidates for team change
|
||||||
if(!$Autobalance::UseAllMode)
|
if(!$Autobalance::UseAllMode)
|
||||||
{
|
{
|
||||||
|
//Reset clients canidate var
|
||||||
|
ResetABClients();
|
||||||
|
|
||||||
$Autobalance::Max = mFloor($TeamRank[$BigTeam, count]/2);
|
$Autobalance::Max = mFloor($TeamRank[$BigTeam, count]/2);
|
||||||
for(%i = $Autobalance::Max; %i < $TeamRank[$BigTeam, count]; %i++)
|
for(%i = $Autobalance::Max; %i < $TeamRank[$BigTeam, count]; %i++)
|
||||||
{
|
{
|
||||||
//echo("[Autobalance]: Selected" SPC $TeamRank[$BigTeam, %i].nameBase @ ", " @ %i);
|
//echo("[Autobalance]: Selected" SPC $TeamRank[$BigTeam, %i].nameBase @ ", " @ %i);
|
||||||
$Autobalance::Canidate[%i] = $TeamRank[$BigTeam, %i];
|
$TeamRank[$BigTeam, %i].abCanidate = true;
|
||||||
}
|
}
|
||||||
%a = " selected";
|
%a = " selected";
|
||||||
}
|
}
|
||||||
|
|
@ -76,18 +79,12 @@ function Autobalance( %game )
|
||||||
messageAll('MsgTeamBalanceNotify', '\c1Teams are unbalanced: \c0Autobalance will switch the next%3 respawning player%2 on Team %1.', $TeamName[$BigTeam], %s, %a);
|
messageAll('MsgTeamBalanceNotify', '\c1Teams are unbalanced: \c0Autobalance will switch the next%3 respawning player%2 on Team %1.', $TeamName[$BigTeam], %s, %a);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return true if client is a canidate
|
function ResetABClients()
|
||||||
function CheckCanidate(%client)
|
|
||||||
{
|
{
|
||||||
if(!$Autobalance::UseAllMode)
|
for(%i = 0; %i < $TeamRank[$BigTeam, count]; %i++)
|
||||||
{
|
{
|
||||||
for(%i = $Autobalance::Max; %i < $TeamRank[$BigTeam, count]; %i++)
|
$TeamRank[$BigTeam, %i].abCanidate = false;
|
||||||
{
|
|
||||||
if(%client $= $Autobalance::Canidate[%i])
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package Autobalance
|
package Autobalance
|
||||||
|
|
@ -103,13 +100,13 @@ function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %
|
||||||
if($TeamRank[$BigTeam, count] - $TeamRank[%otherTeam, count] >= 2)
|
if($TeamRank[$BigTeam, count] - $TeamRank[%otherTeam, count] >= 2)
|
||||||
{
|
{
|
||||||
%fallback = 0;
|
%fallback = 0;
|
||||||
if($Autobalance::CanidateFallbackTime $= "")
|
if($Autobalance::FallbackTime $= "")
|
||||||
$Autobalance::CanidateFallbackTime = getSimTime();
|
$Autobalance::FallbackTime = getSimTime();
|
||||||
else if((getSimTime() - $Autobalance::CanidateFallbackTime) < $Autobalance::Fallback)
|
else if((getSimTime() - $Autobalance::FallbackTime) < $Autobalance::Fallback)
|
||||||
%fallback = 1;
|
%fallback = 1;
|
||||||
|
|
||||||
//damageType 0: If someone switches to observer or disconnects
|
//damageType 0: If someone switches to observer or disconnects
|
||||||
if(%damageType !$= 0 && (CheckCanidate(%clVictim) || $Autobalance::UseAllMode || %fallback))
|
if(%damageType !$= 0 && (%clVictim.abCanidate || $Autobalance::UseAllMode || %fallback))
|
||||||
{
|
{
|
||||||
echo("[Autobalance]" SPC %clVictim.nameBase @ " has been moved to Team " @ %otherTeam @ " for balancing. [AM:" @ $Autobalance::UseAllMode SPC "#BT:" @ ($TeamRank[$BigTeam, count]-1) SPC "#OT:" @ ($TeamRank[%otherTeam, count]+1) SPC "FB:" @ %fallback @ "]");
|
echo("[Autobalance]" SPC %clVictim.nameBase @ " has been moved to Team " @ %otherTeam @ " for balancing. [AM:" @ $Autobalance::UseAllMode SPC "#BT:" @ ($TeamRank[$BigTeam, count]-1) SPC "#OT:" @ ($TeamRank[%otherTeam, count]+1) SPC "FB:" @ %fallback @ "]");
|
||||||
messageClient(%clVictim, 'MsgTeamBalanceNotify', '\c0You were switched to Team %1 for balancing.~wfx/powered/vehicle_screen_on.wav', $TeamName[%otherTeam]);
|
messageClient(%clVictim, 'MsgTeamBalanceNotify', '\c0You were switched to Team %1 for balancing.~wfx/powered/vehicle_screen_on.wav', $TeamName[%otherTeam]);
|
||||||
|
|
@ -120,9 +117,10 @@ function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$BigTeam = "";
|
ResetABClients();
|
||||||
ResetTBNStatus();
|
ResetTBNStatus();
|
||||||
deleteVariables("$Autobalace::Canidate*");
|
$Autobalance::FallbackTime = "";
|
||||||
|
$BigTeam = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -133,7 +131,14 @@ function DefaultGame::gameOver(%game)
|
||||||
|
|
||||||
//Reset Autobalance
|
//Reset Autobalance
|
||||||
$BigTeam = "";
|
$BigTeam = "";
|
||||||
deleteVariables("$Autobalace::Canidate*");
|
$Autobalance::FallbackTime = "";
|
||||||
|
|
||||||
|
//Reset all clients canidate var
|
||||||
|
for (%i = 0; %i < ClientGroup.getCount(); %i++)
|
||||||
|
{
|
||||||
|
%client = ClientGroup.getObject(%i);
|
||||||
|
%client.abCanidate = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue