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

Numerous fixes

Browse source
This commit is contained in:
ChocoTaco 2025-05-14 14:51:15 -04:00
parent fae87aa449
commit d1131f76b3
1 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -486,19 +486,8 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
} }
else //is an admin else //is an admin
{ {
if($Host::TournamentMode) //Admins still have the option to set the time to 30 minutes in Tourney Mode messageClient(%client, "", "\c2Invalid time selection.");
{ return;
if(%arg1 !$= "30") //30 minutes only
{
messageClient(%client, "", "\c2Invalid time selection.");
return;
}
}
else
{
messageClient(%client, "", "\c2Invalid time selection.");
return;
}
} }
} }
@ -834,21 +823,21 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
// LakRabbit Stuff // LakRabbit Stuff
case "VoteDuelMode": case "VoteDuelMode":
if(!$CurrentMissionType $= "LakRabbit") if($CurrentMissionType !$= "LakRabbit")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
%msg = %client.nameBase @ " initiated a vote to " @ (Game.duelMode == 0 ? "enable" : "disable") @ " duel mode."; %msg = %client.nameBase @ " initiated a vote to " @ (Game.duelMode == 0 ? "enable" : "disable") @ " duel mode.";
case "VoteSplashDamage": case "VoteSplashDamage":
if(!$CurrentMissionType $= "LakRabbit") if($CurrentMissionType !$= "LakRabbit")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
%msg = %client.nameBase @ " initiated a vote to " @ (Game.noSplashDamage == 1 ? "enable" : "disable") @ " splash damage."; %msg = %client.nameBase @ " initiated a vote to " @ (Game.noSplashDamage == 1 ? "enable" : "disable") @ " splash damage.";
case "VotePro": case "VotePro":
if(!$CurrentMissionType $= "LakRabbit") if($CurrentMissionType !$= "LakRabbit")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
@ -856,7 +845,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
//Deathmatch Stuff //Deathmatch Stuff
case "DMSLOnlyMode": case "DMSLOnlyMode":
if(!$CurrentMissionType $= "DM") if($CurrentMissionType !$= "DM")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
@ -864,18 +853,21 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
//LCTF Stuff //LCTF Stuff
case "LCTFProMode": case "LCTFProMode":
if(!$CurrentMissionType $= "LCTF") if($CurrentMissionType !$= "LCTF")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
%msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFProMode == 0 ? "enable" : "disable") @ " pro mode."; %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFProMode == 0 ? "enable" : "disable") @ " pro mode.";
case "LCTFOneMine": case "LCTFOneMine":
if(!$CurrentMissionType $= "LCTF") if($CurrentMissionType !$= "LCTF")
return; return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if($InvBanList[LCTF, "Mine"])
%msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 0 ? "enable" : "disable") @ " one mine mode."; messageClient(%client, "", "\c2Mines are disabled at this time.");
if(!%isAdmin || (%isAdmin && %client.ForceVote))
%msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 0 ? "enable" : "disable") @ " one mine mode.";
case "showServerRules": case "showServerRules":
if (($Host::ServerRules[1] !$= "") && (!%client.CantView)) if (($Host::ServerRules[1] !$= "") && (!%client.CantView))
@ -1220,7 +1212,8 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit )
{ {
messageAll( 'MsgAdminForce', '\c2The Admin %2 changed the mission time limit to %1 minutes.', %display, %admin.name ); messageAll( 'MsgAdminForce', '\c2The Admin %2 changed the mission time limit to %1 minutes.', %display, %admin.name );
$Host::TimeLimit = %newLimit; $Host::TimeLimit = %newLimit;
adminLog(%admin, " has changed the mission time limit to " @ %display @ " minutes."); adminLog(%admin, " has changed the mission time limit to " @ %display @ " minutes.");
$TimeLimitChanged = 1;
} }
else else
{ {
@ -1230,9 +1223,9 @@ 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 // 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;
//Log Vote % //Log Vote %