mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-07-14 07:34:36 +00:00
Beginning Match Vote Delay
&& a switchcase
This commit is contained in:
parent
b053a44297
commit
45c62a347b
1 changed files with 28 additions and 9 deletions
|
|
@ -10,6 +10,10 @@
|
||||||
//$Host::AllowPlayerVoteTimeLimit = 1;
|
//$Host::AllowPlayerVoteTimeLimit = 1;
|
||||||
//$Host::AllowPlayerVoteTournamentMode = 1;
|
//$Host::AllowPlayerVoteTournamentMode = 1;
|
||||||
|
|
||||||
|
//Beginning match VoteDelay
|
||||||
|
//Delay the ability to vote at the beginning of the match
|
||||||
|
$VoteDelay::Time = 120000; //120000 is two minutes
|
||||||
|
|
||||||
package ExtraVoteMenu
|
package ExtraVoteMenu
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -67,15 +71,19 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
||||||
//Mission Info Header - Mission Name, Type, Caps to Win
|
//Mission Info Header - Mission Name, Type, Caps to Win
|
||||||
if(%client.canVote)
|
if(%client.canVote)
|
||||||
{
|
{
|
||||||
if($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF")
|
switch$($CurrentMissionType)
|
||||||
messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win",
|
|
||||||
$MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win");
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
if($CurrentMissionType $= "LakRabbit") %cap = "2000 Points to Win";
|
case CTF or SCtF:
|
||||||
else %cap = "25 Points to Win"; //DM
|
messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win",
|
||||||
messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap,
|
$MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win");
|
||||||
$MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap);
|
case LakRabbit:
|
||||||
|
%cap = "2000 Points to Win";
|
||||||
|
messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap,
|
||||||
|
$MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap);
|
||||||
|
case DM:
|
||||||
|
%cap = "25 Points to Win";
|
||||||
|
messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap,
|
||||||
|
$MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -101,6 +109,14 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
||||||
messageClient(%client, 'MsgVoteItem', "", %key, 'MakeObserver', "", 'Become an Observer');
|
messageClient(%client, 'MsgVoteItem', "", %key, 'MakeObserver', "", 'Become an Observer');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Beginning match Vote Delay
|
||||||
|
if(!%client.isAdmin)
|
||||||
|
{
|
||||||
|
if((getSimTime() - $VoteDelay) < $VoteDelay::Time)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(!%client.canVote && !%isAdmin)
|
if(!%client.canVote && !%isAdmin)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -179,7 +195,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
||||||
else
|
else
|
||||||
messageClient(%client, 'MsgVoteItem', "", %key, 'ToggleLockedTeams', 'Enable Locked Teams', 'Enable Locked Teams');
|
messageClient(%client, 'MsgVoteItem', "", %key, 'ToggleLockedTeams', 'Enable Locked Teams', 'Enable Locked Teams');
|
||||||
}
|
}
|
||||||
|
|
||||||
if(%multipleTeams)
|
if(%multipleTeams)
|
||||||
{
|
{
|
||||||
if($teamDamage)
|
if($teamDamage)
|
||||||
|
|
@ -712,6 +728,9 @@ function DefaultGame::gameOver(%game)
|
||||||
|
|
||||||
//Reset ClassicMaxMapChangeVotes
|
//Reset ClassicMaxMapChangeVotes
|
||||||
deleteVariables("$CMHasVoted*"); // Eolk - let people who have voted vote again
|
deleteVariables("$CMHasVoted*"); // Eolk - let people who have voted vote again
|
||||||
|
|
||||||
|
//Beginning match Vote Delay
|
||||||
|
$VoteDelay = getSimTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
function DefaultGame::cancelMatchStart(%game, %admin)
|
function DefaultGame::cancelMatchStart(%game, %admin)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue