Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-01-19 16:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Dev' into Stable

Browse source
This commit is contained in:
ChocoTaco 2025-06-23 15:38:21 -04:00
parent f38811b7a1 9aea8e23a6
commit dd61ee5fa0
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Classic/scripts/CTFGame.cs
View file

@ -1266,8 +1266,9 @@ function CTFGame::checkTimeLimit(%game, %forced)
{
%teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP);
%teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP);
if(%teamOneCaps == %teamTwoCaps && $CTF::Overtime && $Host::TournamentMode){ //Setting exists
if(!%game.overtime){
if(%teamOneCaps == %teamTwoCaps && $CTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)){
if(!%game.overtime)
{
%game.overtime = 1;
if($CTF::Overtime > 1){ %s = "s"; }
messageAll('MsgOvertime', '\c2Sudden-Death Overtime Initiated: %1 Minute%2 Remaining~wfx/powered/turret_heavy_activate.wav', $CTF::Overtime, %s);
@ -1277,14 +1278,15 @@ function CTFGame::checkTimeLimit(%game, %forced)
%game.timeCheck = %game.schedule($CTF::Overtime * 60 * 1000, "timeLimitReached");
}
}
else{
if(%game.scheduleVote !$= ""){
if(!%game.voteOT){
messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav');
%game.voteOT = 1;
}
else
{
if(%game.scheduleVote !$= "" && !%game.voteOT)
{
messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav');
%game.voteOT = 1;
}
else{
else
{
%game.timeLimitReached();
}
}

20
Classic/scripts/LCTFGame.cs
View file

@ -1566,8 +1566,9 @@ function LCTFGame::checkTimeLimit(%game, %forced)
{
%teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP);
%teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP);
if(%teamOneCaps == %teamTwoCaps && $LCTF::Overtime && $Host::TournamentMode){ //Setting exists
if(!%game.overtime){
if(%teamOneCaps == %teamTwoCaps && $LCTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)){
if(!%game.overtime)
{
%game.overtime = 1;
if($LCTF::Overtime > 1){ %s = "s"; }
messageAll('MsgOvertime', '\c2Sudden-Death Overtime Initiated: %1 Minute%2 Remaining~wfx/powered/turret_heavy_activate.wav', $LCTF::Overtime, %s);
@ -1577,14 +1578,15 @@ function LCTFGame::checkTimeLimit(%game, %forced)
%game.timeCheck = %game.schedule($LCTF::Overtime * 60 * 1000, "timeLimitReached");
}
}
else{
if(%game.scheduleVote !$= ""){
if(!%game.voteOT){
messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav');
%game.voteOT = 1;
}
else
{
if(%game.scheduleVote !$= "" && !%game.voteOT)
{
messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav');
%game.voteOT = 1;
}
else{
else
{
%game.timeLimitReached();
}
}