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

VoteOvertime stuff

Browse source
This commit is contained in:
ChocoTaco1 2020-04-03 17:31:45 -04:00
parent d818f0b647
commit 9b06b68ab2
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Classic/scripts/autoexec/VoteMenu.cs
View file

@ -323,6 +323,8 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
{ {
if(%arg1 $= "999") %time = "unlimited"; else %time = %arg1; if(%arg1 $= "999") %time = "unlimited"; else %time = %arg1;
%msg = %client.nameBase @ " initiated a vote to change the time limit to " @ %time @ "."; %msg = %client.nameBase @ " initiated a vote to change the time limit to " @ %time @ ".";
// VoteOvertime
StartVOTimeVote(%game);
} }
case "VoteMatchStart": case "VoteMatchStart":
@ -783,9 +785,17 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit )
{ {
messageAll('MsgVotePassed', '\c2The mission time limit was set to %1 minutes by vote.', %display); messageAll('MsgVotePassed', '\c2The mission time limit was set to %1 minutes by vote.', %display);
$Host::TimeLimit = %newLimit; $Host::TimeLimit = %newLimit;
// VoteOvertime
ResetVOTimeChanged(%game);
// Reset the voted time limit when changing mission
$TimeLimitChanged = 1;
} }
else else
messageAll('MsgVoteFailed', '\c2The vote to change the mission time limit did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); {
messageAll('MsgVoteFailed', '\c2The vote to change the mission time limit did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
// VoteOvertime
ResetVOall(%game);
}
} }
//if the match has been started, reset the end of match countdown //if the match has been started, reset the end of match countdown
@ -1094,7 +1104,8 @@ function DefaultGame::passRunningVote(%game, %admin, %arg1, %arg2, %arg3, %arg4)
function DefaultGame::stopRunningVote(%game, %admin, %arg1, %arg2, %arg3, %arg4) function DefaultGame::stopRunningVote(%game, %admin, %arg1, %arg2, %arg3, %arg4)
{ {
if(%admin && Game.scheduleVote !$= "") %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime();
if(%admin && Game.scheduleVote !$= "" && %curTimeLeftMS > 0)
{ {
stopCurrentVote(); stopCurrentVote();
messageAll('MsgAdminForce', '\c2The Admin stopped the vote.'); messageAll('MsgAdminForce', '\c2The Admin stopped the vote.');

3
Classic/scripts/autoexec/VoteOverTime.cs
View file

@ -68,9 +68,6 @@ function DefaultGame::gameOver(%game)
//Reset everything to do with Vote Overtime //Reset everything to do with Vote Overtime
ResetVOall(%game); ResetVOall(%game);
if(isEventPending($VoteSoundSchedule))
cancel($VoteSoundSchedule);
} }
}; };