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

Took Out z0dd Vote % Calc

Browse source 
All the deleted lines are Atom editor taking out extra spaces/tabs etc
This commit is contained in:
ChocoTaco1 2021-01-04 14:53:18 -05:00
parent 98dfa4a3fa
commit 253100ec10
1 changed files with 109 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,18 +34,18 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
{ {
%isAdmin = (%client.isAdmin || %client.isSuperAdmin); %isAdmin = (%client.isAdmin || %client.isSuperAdmin);
%multipleTeams = %game.numTeams > 1; %multipleTeams = %game.numTeams > 1;
// ******************************************** // ********************************************
// Admin Vote For ... Submenu // Admin Vote For ... Submenu
// ******************************************** // ********************************************
if (!$Host::TournamentMode) if (!$Host::TournamentMode)
{ {
if (%client.ForceVote > 0) if (%client.ForceVote > 0)
%client.ForceVote = %client.ForceVote - 1; %client.ForceVote = %client.ForceVote - 1;
if (%client.ForceVote > 0) if (%client.ForceVote > 0)
{ {
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTournamentMode', 'change server to Tournament.', 'Vote Tournament Mode'); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTournamentMode', 'change server to Tournament.', 'Vote Tournament Mode');
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeMission', 'change the mission to', 'Vote to Change the Mission'); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeMission', 'change the mission to', 'Vote to Change the Mission');
// if(%multipleTeams) // if(%multipleTeams)
// { // {
@ -60,12 +60,12 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
return; // Display no further vote options return; // Display no further vote options
} }
} }
//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") if($CurrentMissionType $= "CTF" || $CurrentMissionType $= "SCtF")
messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win", 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"); $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win");
else else
{ {
@ -75,7 +75,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
$MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap); $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap);
} }
} }
// TEAM OPTIONS // TEAM OPTIONS
if(!$Host::TournamentMode) if(!$Host::TournamentMode)
{ {
@ -113,7 +113,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTournamentMode', 'Change server to Tournament.', 'Vote Tournament Mode'); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTournamentMode', 'Change server to Tournament.', 'Vote Tournament Mode');
if($Host::AllowPlayerVoteTimeLimit) if($Host::AllowPlayerVoteTimeLimit)
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit'); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit');
// if(%multipleTeams) // if(%multipleTeams)
// { // {
// if($teamDamage) // if($teamDamage)
@ -121,8 +121,8 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
// else // else
// messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'enable team damage', 'Vote to Enable Team Damage'); // messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'enable team damage', 'Vote to Enable Team Damage');
// } // }
if($Host::AllowPlayerVoteSkipMission) if($Host::AllowPlayerVoteSkipMission)
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Vote to Skip Mission' ); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Vote to Skip Mission' );
} }
else else
@ -169,7 +169,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
if($Host::Password !$= "") if($Host::Password !$= "")
messageClient(%client, 'MsgVoteItem', "", %key, 'TogglePUGpassword', 'Disable PUG Password', 'Disable PUG Password'); messageClient(%client, 'MsgVoteItem', "", %key, 'TogglePUGpassword', 'Disable PUG Password', 'Disable PUG Password');
else else
messageClient(%client, 'MsgVoteItem', "", %key, 'TogglePUGpassword', 'Enable PUG Password', 'Enable PUG Password'); messageClient(%client, 'MsgVoteItem', "", %key, 'TogglePUGpassword', 'Enable PUG Password', 'Enable PUG Password');
} }
// if(%multipleTeams) // if(%multipleTeams)
// { // {
@ -337,7 +337,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
messageClient(%client, "", "\c2You have exhausted your voting rights for this mission."); messageClient(%client, "", "\c2You have exhausted your voting rights for this mission.");
return; return;
} }
if($CurrentMissionType $= "Siege") // Can't change time in this one if($CurrentMissionType $= "Siege") // Can't change time in this one
{ {
messageClient(%client, "", "\c2Cannot change the time limit in this gametype."); messageClient(%client, "", "\c2Cannot change the time limit in this gametype.");
@ -356,21 +356,21 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
messageClient(%client, "", "\c2Switching to this time wouldn't affect the time limit at all."); messageClient(%client, "", "\c2Switching to this time wouldn't affect the time limit at all.");
return; return;
} }
//If proposed time is lower than server set or higher than unlimited //If proposed time is lower than server set or higher than unlimited
if(%arg1 < $Host::TimeLimit || %arg1 > 999) if(%arg1 < $Host::TimeLimit || %arg1 > 999)
{ {
messageClient(%client, "", "\c2Invalid time selection."); messageClient(%client, "", "\c2Invalid time selection.");
return; return;
} }
//If proposed time is something other than what is selectable //If proposed time is something other than what is selectable
if(%arg1 !$= "90" && %arg1 !$= "120" && %arg1 !$= "150" && %arg1 !$= "180" && %arg1 !$= "240" && %arg1 !$= "360" && %arg1 !$= "480" && %arg1 !$= "999") if(%arg1 !$= "90" && %arg1 !$= "120" && %arg1 !$= "150" && %arg1 !$= "180" && %arg1 !$= "240" && %arg1 !$= "360" && %arg1 !$= "480" && %arg1 !$= "999")
{ {
messageClient(%client, "", "\c2Only selectable times allowed."); messageClient(%client, "", "\c2Only selectable times allowed.");
return; return;
} }
if((!%isAdmin && $Host::AllowPlayerVoteTimeLimit) || (%isAdmin && %client.ForceVote)) if((!%isAdmin && $Host::AllowPlayerVoteTimeLimit) || (%isAdmin && %client.ForceVote))
{ {
if(%arg1 $= "999") %time = "unlimited"; else %time = %arg1; if(%arg1 $= "999") %time = "unlimited"; else %time = %arg1;
@ -388,7 +388,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
%msg = %client.nameBase @ " initiated a vote to start the match."; %msg = %client.nameBase @ " initiated a vote to start the match.";
} }
case "CancelMatchStart": case "CancelMatchStart":
if(%isAdmin) // only admins can cancel match start if(%isAdmin) // only admins can cancel match start
{ {
@ -441,7 +441,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
adminStartNewVote( %client, %typename, %arg1, %arg2, %arg3, %arg4); adminStartNewVote( %client, %typename, %arg1, %arg2, %arg3, %arg4);
adminLog(%client, " passed the vote in progress."); adminLog(%client, " passed the vote in progress.");
} }
case "stopRunningVote": case "stopRunningVote":
if(%client.isSuperAdmin || (%client.isAdmin && $Host::AllowAdminStopVote)) if(%client.isSuperAdmin || (%client.isAdmin && $Host::AllowAdminStopVote))
{ {
@ -470,21 +470,21 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
%msg = %client.nameBase @ " initiated a vote to " @ (Game.pubPro == 0 ? "enable" : "disable") @ " pro mode."; %msg = %client.nameBase @ " initiated a vote to " @ (Game.pubPro == 0 ? "enable" : "disable") @ " pro mode.";
case "DMSLOnlyMode": case "DMSLOnlyMode":
if(!$CurrentMissionType $= "DM") if(!$CurrentMissionType $= "DM")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
%msg = %client.nameBase @ " initiated a vote to " @ (Game.DMSLOnlyMode == 0 ? "enable" : "disable") @ " shocklance only mode."; %msg = %client.nameBase @ " initiated a vote to " @ (Game.DMSLOnlyMode == 0 ? "enable" : "disable") @ " shocklance only mode.";
case "SCtFProMode": case "SCtFProMode":
if(!$CurrentMissionType $= "sctf") if(!$CurrentMissionType $= "sctf")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
%msg = %client.nameBase @ " initiated a vote to " @ (Game.SCtFProMode == 0 ? "enable" : "disable") @ " pro mode."; %msg = %client.nameBase @ " initiated a vote to " @ (Game.SCtFProMode == 0 ? "enable" : "disable") @ " pro mode.";
case "showServerRules": case "showServerRules":
if (($Host::ServerRules[1] !$= "") && (!%client.CantView)) if (($Host::ServerRules[1] !$= "") && (!%client.CantView))
{ {
@ -519,23 +519,23 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
if($Host::EnableNetTourneyClient) if($Host::EnableNetTourneyClient)
{ {
$Host::EnableNetTourneyClient = 0; $Host::EnableNetTourneyClient = 0;
if(isActivePackage(checkver)) if(isActivePackage(checkver))
deactivatePackage(checkver); deactivatePackage(checkver);
messageClient( %client, '', "Tournament Net Client checking has been disabled.~wfx/powered/vehicle_screen_on.wav" ); messageClient( %client, '', "Tournament Net Client checking has been disabled.~wfx/powered/vehicle_screen_on.wav" );
adminLog(%client, " has disabled Net Tourney Client checking."); adminLog(%client, " has disabled Net Tourney Client checking.");
} }
else else
{ {
$Host::EnableNetTourneyClient = 1; $Host::EnableNetTourneyClient = 1;
if(!isActivePackage(checkver)) if(!isActivePackage(checkver))
activatePackage(checkver); activatePackage(checkver);
//Boot Offenders into Obs //Boot Offenders into Obs
CheckVerObserver(%client); CheckVerObserver(%client);
messageClient( %client, '', "Tournament Net Client checking has been enabled.~wfx/powered/vehicle_screen_on.wav" ); messageClient( %client, '', "Tournament Net Client checking has been enabled.~wfx/powered/vehicle_screen_on.wav" );
ResetGetCountsStatus(); ResetGetCountsStatus();
adminLog(%client, " has enabled Net Tourney Client checking."); adminLog(%client, " has enabled Net Tourney Client checking.");
@ -584,7 +584,7 @@ function playerStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %tea
//Specifically for votehud compatibility //Specifically for votehud compatibility
switch$(%typeName) switch$(%typeName)
{ {
case "VoteKickPlayer": case "VoteKickPlayer":
messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "kick player", %arg1.name); messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "kick player", %arg1.name);
default: default:
messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, %arg1); messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, %arg1);
@ -601,7 +601,7 @@ function playerStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %tea
} }
} }
else else
{ {
%count = ClientGroup.getCount(); %count = ClientGroup.getCount();
for(%i = 0; %i < %count; %i++) for(%i = 0; %i < %count; %i++)
{ {
@ -618,7 +618,7 @@ function playerStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %tea
case "VoteChangeTimeLimit": case "VoteChangeTimeLimit":
if(%arg1 $= "999") %time = "Unlimited"; else %time = %arg1; if(%arg1 $= "999") %time = "Unlimited"; else %time = %arg1;
messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "change the time limit to", %time); messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "change the time limit to", %time);
case "VoteKickPlayer": case "VoteKickPlayer":
messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "kick player", %arg1.name); messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "kick player", %arg1.name);
case "VoteTournamentMode": case "VoteTournamentMode":
messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "Tournament Mode", %arg1); messageClient( %cl, 'VoteStarted', "\c2" @ %msg, %client.name, "Tournament Mode", %arg1);
@ -644,7 +644,7 @@ function playerStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %tea
clearVotes(); clearVotes();
Game.voteType = %typeName; Game.voteType = %typeName;
Game.scheduleVote = schedule(($Host::VoteTime * 1000), 0, "calcVotes", %typeName, %arg1, %arg2, %arg3, %arg4); Game.scheduleVote = schedule(($Host::VoteTime * 1000), 0, "calcVotes", %typeName, %arg1, %arg2, %arg3, %arg4);
// Eolk - Voting control variables // Eolk - Voting control variables
Game.votingArgs[typeName] = %typeName; Game.votingArgs[typeName] = %typeName;
Game.votingArgs[arg1] = %arg1; Game.votingArgs[arg1] = %arg1;
@ -659,11 +659,11 @@ function playerStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %tea
%client.canVote = false; %client.canVote = false;
%client.rescheduleVote = schedule(($Host::VoteCooldown * 1000) + ($Host::VoteTime * 1000) , 0, "resetVotePrivs", %client); %client.rescheduleVote = schedule(($Host::VoteCooldown * 1000) + ($Host::VoteTime * 1000) , 0, "resetVotePrivs", %client);
// Log Vote // Log Vote
voteLog(%client, %typeName, %arg1, %arg2, %arg3, %arg4); voteLog(%client, %typeName, %arg1, %arg2, %arg3, %arg4);
echo(%msg); echo(%msg);
if($Host::EnableVoteSoundReminders > 0) if($Host::EnableVoteSoundReminders > 0)
{ {
%time = mFloor($Host::VoteTime / ($Host::EnableVoteSoundReminders + 1)) * 1000; %time = mFloor($Host::VoteTime / ($Host::EnableVoteSoundReminders + 1)) * 1000;
@ -676,7 +676,7 @@ function playerStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %tea
function DefaultGame::gameOver(%game) function DefaultGame::gameOver(%game)
{ {
Parent::gameOver(%game); Parent::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
} }
@ -704,33 +704,33 @@ function DefaultGame::cancelMatchStart(%game, %admin)
function DefaultGame::voteKickPlayer(%game, %admin, %client) function DefaultGame::voteKickPlayer(%game, %admin, %client)
{ {
%cause = ""; %cause = "";
if(isObject(%admin)) if(isObject(%admin))
{ {
kick(%client, %admin, %client.guid ); kick(%client, %admin, %client.guid );
%cause = "(admin)"; %cause = "(admin)";
} }
else else
{ {
%team = %client.team; %team = %client.team;
%totalVotes = %game.votesFor[%game.kickTeam] + %game.votesAgainst[%game.kickTeam]; %totalVotes = %game.votesFor[%game.kickTeam] + %game.votesAgainst[%game.kickTeam];
if(%totalVotes > 0 && (%game.votesFor[%game.kickTeam] / %totalVotes) > ($Host::VotePasspercent / 100)) if(%totalVotes > 0 && (%game.votesFor[%game.kickTeam] / %totalVotes) > ($Host::VotePasspercent / 100))
{ {
kick(%client, %admin, %game.kickGuid); kick(%client, %admin, %game.kickGuid);
%cause = "(vote)"; %cause = "(vote)";
} }
else else
{ {
for ( %idx = 0; %idx < ClientGroup.getCount(); %idx++ ) for ( %idx = 0; %idx < ClientGroup.getCount(); %idx++ )
{ {
%cl = ClientGroup.getObject( %idx ); %cl = ClientGroup.getObject( %idx );
if (%cl.team == %game.kickTeam && !%cl.isAIControlled()) if (%cl.team == %game.kickTeam && !%cl.isAIControlled())
messageClient( %cl, 'MsgVoteFailed', '\c2Kick player vote did not pass.' ); messageClient( %cl, 'MsgVoteFailed', '\c2Kick player vote did not pass.' );
} }
} }
} }
%game.kickTeam = ""; %game.kickTeam = "";
%game.kickGuid = ""; %game.kickGuid = "";
%game.kickClientName = ""; %game.kickClientName = "";
@ -759,22 +759,21 @@ function DefaultGame::voteChangeMission(%game, %admin, %missionDisplayName, %typ
// Eolk - Part of $admincl fix. // Eolk - Part of $admincl fix.
if(isObject(%admin)) if(isObject(%admin))
{ {
messageAll('MsgAdminChangeMission', '\c2The Admin %3 has changed the mission to %1 (%2).', %missionDisplayName, %typeDisplayName, %admin.name ); messageAll('MsgAdminChangeMission', '\c2The Admin %3 has changed the mission to %1 (%2).', %missionDisplayName, %typeDisplayName, %admin.name );
%game.gameOver(); %game.gameOver();
loadMission( %mission, %missionType, false ); loadMission( %mission, %missionType, false );
} }
else else
{ {
%totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst;
// Added people who dont vote into the equation, now if you do not vote, it doesn't count as a no. - z0dd - ZOD if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount)) > ($Host::VotePasspercent / 100))
if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone)) > ($Host::VotePasspercent / 100))
{ {
messageAll('MsgVotePassed', '\c2The mission was changed to %1 (%2) by vote.', %missionDisplayName, %typeDisplayName ); messageAll('MsgVotePassed', '\c2The mission was changed to %1 (%2) by vote.', %missionDisplayName, %typeDisplayName );
%game.gameOver(); %game.gameOver();
loadMission( %mission, %missionType, false ); loadMission( %mission, %missionType, false );
} }
else else
messageAll('MsgVoteFailed', '\c2Change mission vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); messageAll('MsgVoteFailed', '\c2Change mission vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
} }
} }
@ -796,18 +795,17 @@ function DefaultGame::voteTournamentMode( %game, %admin, %missionDisplayName, %t
} }
%cause = ""; %cause = "";
if (isObject(%admin)) if (isObject(%admin))
{ {
messageAll( 'MsgAdminForce', '\c2The Admin %2 has switched the server to Tournament mode (%1).', %missionDisplayName, %admin.name ); messageAll( 'MsgAdminForce', '\c2The Admin %2 has switched the server to Tournament mode (%1).', %missionDisplayName, %admin.name );
setModeTournament( %mission, %missionType ); setModeTournament( %mission, %missionType );
} }
else else
{ {
%totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst;
// Added people who dont vote into the equation, now if you do not vote, it doesn't count as a no. - z0dd - ZOD if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount)) > ($Host::VotePasspercent / 100))
if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone)) > ($Host::VotePasspercent / 100))
{ {
messageAll('MsgVotePassed', '\c2Server switched to Tournament mode by vote (%1): %2 percent.', %missionDisplayName, mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); messageAll('MsgVotePassed', '\c2Server switched to Tournament mode by vote (%1): %2 percent.', %missionDisplayName, mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
setModeTournament( %mission, %missionType ); setModeTournament( %mission, %missionType );
} }
else else
@ -825,7 +823,7 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit )
%display = "unlimited"; %display = "unlimited";
else else
%display = %newLimit; %display = %newLimit;
%cause = ""; %cause = "";
if ( %admin ) if ( %admin )
{ {
@ -834,18 +832,17 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit )
} }
else else
{ {
%totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst;
// Added people who dont vote into the equation, now if you do not vote, it doesn't count as a no. - z0dd - ZOD if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount)) > ($Host::VotePasspercent / 100))
if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone)) > ($Host::VotePasspercent / 100))
{ {
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 // VoteOvertime
ResetVOTimeChanged(%game); ResetVOTimeChanged(%game);
// Reset the voted time limit when changing mission // Reset the voted time limit when changing mission
$TimeLimitChanged = 1; $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 // VoteOvertime
@ -872,29 +869,28 @@ function DefaultGame::voteFFAMode( %game, %admin, %client )
{ {
%cause = ""; %cause = "";
%name = getTaggedString(%client.name); %name = getTaggedString(%client.name);
if(isObject(%admin)) if(isObject(%admin))
{ {
messageAll('MsgAdminForce', '\c2The Admin %1 has switched the server to Free For All mode.', %admin.name); messageAll('MsgAdminForce', '\c2The Admin %1 has switched the server to Free For All mode.', %admin.name);
setModeFFA($CurrentMission, $CurrentMissionType); setModeFFA($CurrentMission, $CurrentMissionType);
} }
else else
{ {
%totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst;
// Added people who dont vote into the equation, now if you do not vote, it doesn't count as a no. - z0dd - ZOD if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount)) > ($Host::VotePasspercent / 100))
if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone)) > ($Host::VotePasspercent / 100))
{ {
messageAll('MsgVotePassed', '\c2Server switched to Free For All mode by vote.', %client); messageAll('MsgVotePassed', '\c2Server switched to Free For All mode by vote.', %client);
setModeFFA($CurrentMission, $CurrentMissionType); setModeFFA($CurrentMission, $CurrentMissionType);
} }
else else
messageAll('MsgVoteFailed', '\c2Free For All mode vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); messageAll('MsgVoteFailed', '\c2Free For All mode vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
} }
} }
function DefaultGame::voteSkipMission(%game, %admin, %arg1, %arg2, %arg3, %arg4) function DefaultGame::voteSkipMission(%game, %admin, %arg1, %arg2, %arg3, %arg4)
{ {
if(isObject(%admin)) if(isObject(%admin))
{ {
messageAll('MsgAdminForce', '\c2The Admin %1 has skipped to the next mission.',%admin.name ); messageAll('MsgAdminForce', '\c2The Admin %1 has skipped to the next mission.',%admin.name );
%game.gameOver(); %game.gameOver();
@ -903,11 +899,10 @@ function DefaultGame::voteSkipMission(%game, %admin, %arg1, %arg2, %arg3, %arg4)
} }
else else
{ {
%totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst;
// Added people who dont vote into the equation, now if you do not vote, it doesn't count as a no. - z0dd - ZOD if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount)) > ($Host::VotePasspercent / 100))
if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone)) > ($Host::VotePasspercent / 100))
{ {
messageAll('MsgVotePassed', '\c2The mission was skipped to next by vote.'); messageAll('MsgVotePassed', '\c2The mission was skipped to next by vote.');
echo("mission skipped (vote)"); echo("mission skipped (vote)");
%game.gameOver(); %game.gameOver();
//loadMission( findNextCycleMission(), $CurrentMissionType, false ); //loadMission( findNextCycleMission(), $CurrentMissionType, false );
@ -945,16 +940,15 @@ function DefaultGame::voteMatchStart( %game, %admin)
return; return;
} }
else else
{ {
%totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst;
// Added people who dont vote into the equation, now if you do not vote, it doesn't count as a no. - z0dd - ZOD if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount)) > ($Host::VotePasspercent / 100))
if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone)) > ($Host::VotePasspercent / 100))
{ {
messageAll('MsgVotePassed', '\c2The match has been started by vote: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); messageAll('MsgVotePassed', '\c2The match has been started by vote: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
startTourneyCountdown(); startTourneyCountdown();
} }
else else
messageAll('MsgVoteFailed', '\c2Start Match vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); messageAll('MsgVoteFailed', '\c2Start Match vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
} }
} }
} }
@ -964,46 +958,45 @@ function DefaultGame::voteTeamDamage(%game, %admin)
{ {
%setto = ""; %setto = "";
%cause = ""; %cause = "";
if(isObject(%admin)) if(isObject(%admin))
{ {
if($teamDamage) if($teamDamage)
{ {
messageAll('MsgAdminForce', '\c2The Admin %1 has disabled team damage.', %admin.name); messageAll('MsgAdminForce', '\c2The Admin %1 has disabled team damage.', %admin.name);
$Host::TeamDamageOn = $TeamDamage = 0; $Host::TeamDamageOn = $TeamDamage = 0;
%setto = "disabled"; %setto = "disabled";
} }
else else
{ {
messageAll('MsgAdminForce', '\c2The Admin %1 has enabled team damage.', %admin.name); messageAll('MsgAdminForce', '\c2The Admin %1 has enabled team damage.', %admin.name);
$Host::TeamDamageOn = $TeamDamage = 1; $Host::TeamDamageOn = $TeamDamage = 1;
%setto = "enabled"; %setto = "enabled";
} }
} }
else else
{ {
%totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst;
// Added people who dont vote into the equation, now if you do not vote, it doesn't count as a no. - z0dd - ZOD if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount)) > ($Host::VotePasspercent / 100))
if(%totalVotes > 0 && (%game.totalVotesFor / (ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone)) > ($Host::VotePasspercent / 100))
{ {
if($teamDamage) if($teamDamage)
{ {
messageAll('MsgVotePassed', '\c2Team damage was disabled by vote.'); messageAll('MsgVotePassed', '\c2Team damage was disabled by vote.');
$Host::TeamDamageOn = $TeamDamage = 0; $Host::TeamDamageOn = $TeamDamage = 0;
%setto = "disabled"; %setto = "disabled";
} }
else else
{ {
messageAll('MsgVotePassed', '\c2Team damage was enabled by vote.'); messageAll('MsgVotePassed', '\c2Team damage was enabled by vote.');
$Host::TeamDamageOn = $TeamDamage = 1; $Host::TeamDamageOn = $TeamDamage = 1;
%setto = "enabled"; %setto = "enabled";
} }
} }
else else
{ {
if($teamDamage) if($teamDamage)
messageAll('MsgVoteFailed', '\c2Disable team damage vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); messageAll('MsgVoteFailed', '\c2Disable team damage vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
else else
messageAll('MsgVoteFailed', '\c2Enable team damage vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100)); messageAll('MsgVoteFailed', '\c2Enable team damage vote did not pass: %1 percent.', mFloor(%game.totalVotesFor/(ClientGroup.getCount() - $HostGameBotCount - %game.totalVotesNone) * 100));
} }
} }
} }
@ -1060,7 +1053,7 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
{ {
if ( $Host::allowAdminPlayerVotes && !%isTargetBot ) // z0dd - ZOD, 9/29/02. Removed T2 demo code from here if ( $Host::allowAdminPlayerVotes && !%isTargetBot ) // z0dd - ZOD, 9/29/02. Removed T2 demo code from here
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "AdminPlayer", "", 'Vote to Make Admin', 2 ); messageClient( %client, 'MsgPlayerPopupItem', "", %key, "AdminPlayer", "", 'Vote to Make Admin', 2 );
if ( !%isTargetSelf ) if ( !%isTargetSelf )
{ {
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "KickPlayer", "", 'Vote to Kick', 3 ); messageClient( %client, 'MsgPlayerPopupItem', "", %key, "KickPlayer", "", 'Vote to Kick', 3 );
@ -1116,21 +1109,21 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "StripAdmin", "", 'Strip admin', 14 ); messageClient( %client, 'MsgPlayerPopupItem', "", %key, "StripAdmin", "", 'Strip admin', 14 );
if ( %game.numTeams > 1 ) if ( %game.numTeams > 1 )
{ {
if ( %isTargetObserver ) if ( %isTargetObserver )
{ {
%action = %isTargetSelf ? "Join " : "Change to "; %action = %isTargetSelf ? "Join " : "Change to ";
%str1 = %action @ getTaggedString( %game.getTeamName(1) ); %str1 = %action @ getTaggedString( %game.getTeamName(1) );
%str2 = %action @ getTaggedString( %game.getTeamName(2) ); %str2 = %action @ getTaggedString( %game.getTeamName(2) );
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str1, 6 ); messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str1, 6 );
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str2, 7 ); messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str2, 7 );
} }
else if( %isSuperAdmin || ($Host::AllowAdminSwitchTeams && %isAdmin) ) else if( %isSuperAdmin || ($Host::AllowAdminSwitchTeams && %isAdmin) )
{ {
%changeTo = %targetClient.team == 1 ? 2 : 1; %changeTo = %targetClient.team == 1 ? 2 : 1;
%str = "Switch to " @ getTaggedString( %game.getTeamName(%changeTo) ); %str = "Switch to " @ getTaggedString( %game.getTeamName(%changeTo) );
%caseId = 5 + %changeTo; %caseId = 5 + %changeTo;
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str, %caseId ); messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str, %caseId );
@ -1170,7 +1163,7 @@ function DefaultGame::stopRunningVote(%game, %admin, %arg1, %arg2, %arg3, %arg4)
function adminStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4) function adminStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4)
{ {
if ( Game.scheduleVote !$= "" && Game.voteType $= %typeName ) if ( Game.scheduleVote !$= "" && Game.voteType $= %typeName )
{ {
messageAll('closeVoteHud', ""); messageAll('closeVoteHud', "");
cancel(Game.scheduleVote); cancel(Game.scheduleVote);
@ -1282,31 +1275,31 @@ function calcVotes(%typeName, %arg1, %arg2, %arg3, %arg4)
return; return;
} }
} }
for(%idx = 0; %idx < ClientGroup.getCount(); %idx++) for(%idx = 0; %idx < ClientGroup.getCount(); %idx++)
{ {
%cl = ClientGroup.getObject(%idx); %cl = ClientGroup.getObject(%idx);
messageClient(%cl, 'closeVoteHud', ""); messageClient(%cl, 'closeVoteHud', "");
if(%cl.vote !$= "") if(%cl.vote !$= "")
{ {
if(%cl.vote) if(%cl.vote)
{ {
Game.votesFor[%cl.team]++; Game.votesFor[%cl.team]++;
Game.totalVotesFor++; Game.totalVotesFor++;
} }
else else
{ {
Game.votesAgainst[%cl.team]++; Game.votesAgainst[%cl.team]++;
Game.totalVotesAgainst++; Game.totalVotesAgainst++;
} }
} }
else else
{ {
Game.votesNone[%cl.team]++; Game.votesNone[%cl.team]++;
Game.totalVotesNone++; Game.totalVotesNone++;
} }
} }
Game.evalVote(%typeName, false, %arg1, %arg2, %arg3, %arg4); Game.evalVote(%typeName, false, %arg1, %arg2, %arg3, %arg4);
Game.scheduleVote = ""; Game.scheduleVote = "";
@ -1333,4 +1326,4 @@ function resetViewSchedule(%client)
// Prevent package from being activated if it is already // Prevent package from being activated if it is already
if (!isActivePackage(ExtraVoteMenu)) if (!isActivePackage(ExtraVoteMenu))
activatePackage(ExtraVoteMenu); activatePackage(ExtraVoteMenu);