Bad > / Better echos

This commit is contained in:
ChocoTaco1 2020-10-12 02:20:38 -04:00
parent 023476ea9f
commit 34dea78fd5

21
Classic/scripts/autoexec/Autobalance.cs Executable file → Normal file
View file

@ -9,7 +9,7 @@
// exec("scripts/autoexec/Autobalance.cs"); // exec("scripts/autoexec/Autobalance.cs");
// //
// If it takes too long for specific canidates to die. After a time choose anyone. // If it takes too long for specific canidates to die. After a time choose anyone.
$Autobalance::Fallback = 60000; //60000 is 1 minute $Autobalance::Fallback = 120000; //60000 is 1 minute
// Run from TeamBalanceNotify.cs via NotifyUnbalanced // Run from TeamBalanceNotify.cs via NotifyUnbalanced
function Autobalance( %game ) function Autobalance( %game )
@ -63,7 +63,7 @@ function Autobalance( %game )
$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(%i); echo($TeamRank[$BigTeam, %i].nameBase); //echo("[Autobalance]: Selected" SPC $TeamRank[$BigTeam, %i].nameBase @ ", " @ %i);
$Autobalance::Canidate[%i] = $TeamRank[$BigTeam, %i]; $Autobalance::Canidate[%i] = $TeamRank[$BigTeam, %i];
} }
%a = " selected"; %a = " selected";
@ -87,7 +87,7 @@ function CheckCanidate(%client)
return true; return true;
} }
} }
return false; return false;
} }
package Autobalance package Autobalance
@ -95,20 +95,23 @@ package Autobalance
function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation) function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation)
{ {
parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation); parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation);
if($BigTeam !$= "" && %clVictim.team == $BigTeam) if($BigTeam !$= "" && %clVictim.team == $BigTeam)
{ {
%otherTeam = $BigTeam == 1 ? 2 : 1; %otherTeam = $BigTeam == 1 ? 2 : 1;
if($TeamRank[$BigTeam, count] - $TeamRank[%otherTeam, count] >= 2) if($TeamRank[$BigTeam, count] - $TeamRank[%otherTeam, count] >= 2)
{ {
%fallback = 0;
if($Autobalance::CanidateFallbackTime $= "") if($Autobalance::CanidateFallbackTime $= "")
$Autobalance::CanidateFallbackTime = getSimTime(); $Autobalance::CanidateFallbackTime = getSimTime();
else if((getSimTime() - $Autobalance::CanidateFallbackTime) < $Autobalance::Fallback)
%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 || (getSimTime() - $Autobalance::CanidateFallbackTime > $Autobalance::Fallback))) if(%damageType !$= 0 && (CheckCanidate(%clVictim) || $Autobalance::UseAllMode || %fallback))
{ {
echo("[Autobalance]" SPC %clVictim.nameBase @ " has been moved to Team " @ %otherTeam @ " for balancing. [AM:" @ $Autobalance::UseAllMode @ "]"); echo("[Autobalance]" SPC %clVictim.nameBase @ " has been moved to Team " @ %otherTeam @ " for balancing. [AM:" @ $Autobalance::UseAllMode SPC "#BT:" @ $TeamRank[$BigTeam, count] 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]);
messageAllExcept(%clVictim, -1, 'MsgTeamBalanceNotify', '~wfx/powered/vehicle_screen_on.wav'); messageAllExcept(%clVictim, -1, 'MsgTeamBalanceNotify', '~wfx/powered/vehicle_screen_on.wav');
@ -121,7 +124,7 @@ function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %
ResetTBNStatus(); ResetTBNStatus();
deleteVariables("$Autobalace::Canidate*"); deleteVariables("$Autobalace::Canidate*");
} }
} }
} }
function DefaultGame::gameOver(%game) function DefaultGame::gameOver(%game)