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

Add Skip_Confirm

Browse source
This commit is contained in:
ChocoTaco 2025-01-11 16:50:20 -05:00
parent fd58608f9e
commit c7335a3826
3 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classic/scripts/DMGame.cs
View file

@ -838,6 +838,10 @@ function DMGame::sendGameVoteMenu(%game, %client, %key)
if(%game.scheduleVote $= "") if(%game.scheduleVote $= "")
{ {
//echo(%client.ForceVote);
if(%client.ForceVote $= "skip_confirm")
return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
{ {
if(!$Host::DMSLOnlyMode) if(!$Host::DMSLOnlyMode)

4
Classic/scripts/LakRabbitGame.cs
View file

@ -1174,6 +1174,10 @@ function LakRabbitGame::sendGameVoteMenu( %game, %client, %key )
if( %game.scheduleVote $= "" ) if( %game.scheduleVote $= "" )
{ {
//echo(%client.ForceVote);
if(%client.ForceVote $= "skip_confirm")
return;
if(!%isAdmin || (%isAdmin && %client.ForceVote)) if(!%isAdmin || (%isAdmin && %client.ForceVote))
{ {
if(!Game.duelMode) if(!Game.duelMode)

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

@ -63,6 +63,12 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
messageClient(%client, 'MsgVoteItem',"", %key, 'ForceVote', 'Cancel Force Vote', "Cancel 'Vote To...'"); messageClient(%client, 'MsgVoteItem',"", %key, 'ForceVote', 'Cancel Force Vote', "Cancel 'Vote To...'");
return; return;
} }
else if (%client.ForceVote $= "skip_confirm") //Skip mission Confirm cuz its so annoying
{
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipConfirm', 'Are you sure you want to Skip the Mission?','Are you sure you want to Skip the Mission?');
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'Yes, Skip the Mission', 'Yes, Skip the Mission' );
return;
}
//Pass Stop Menu //Pass Stop Menu
if(%client.isAdmin && %game.scheduleVote !$= "") if(%client.isAdmin && %game.scheduleVote !$= "")
@ -79,7 +85,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
{ {
switch$($CurrentMissionType) switch$($CurrentMissionType)
{ {
case CTF or SCtF: case CTF or SCtF or LCTF:
if($Host::TournamentMode) if($Host::TournamentMode)
%showTL = " - Time Limit:" SPC $Host::TimeLimit SPC "Minutes"; %showTL = " - Time Limit:" SPC $Host::TimeLimit SPC "Minutes";
if($voteNext) if($voteNext)
@ -191,7 +197,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
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
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Skip the Mission' ); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipConfirm', 'skip the mission to', 'Skip the Mission' );
//Admin Vote Menu //Admin Vote Menu
if(%client.isAdmin && $Host::AllowAdminVotes) if(%client.isAdmin && $Host::AllowAdminVotes)
messageClient(%client, 'MsgVoteItem', "", %key, 'ForceVote', 'Vote to ...', 'Vote to ...'); messageClient(%client, 'MsgVoteItem', "", %key, 'ForceVote', 'Vote to ...', 'Vote to ...');
@ -547,6 +553,15 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
%msg = %client.nameBase @ " initiated a vote to " @ ($FairTeams == 0 ? "enable" : "disable") @ " fair teams."; %msg = %client.nameBase @ " initiated a vote to " @ ($FairTeams == 0 ? "enable" : "disable") @ " fair teams.";
} }
case "VoteSkipConfirm":
if(%isAdmin && %client.ForceVote !$= "skip_confirm")
{
%client.ForceVote = "skip_confirm";
return;
}
else
%client.ForceVote = 0;
case "VoteSkipMission": case "VoteSkipMission":
if((!%isAdmin && $Host::AllowPlayerVoteSkipMission) || (%isAdmin && %client.ForceVote)) if((!%isAdmin && $Host::AllowPlayerVoteSkipMission) || (%isAdmin && %client.ForceVote))
{ {
@ -840,12 +855,12 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
%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.";
//LCTF Stuff //LCTF Stuff
case "SCtFProMode": case "LCTFProMode":
if(!$CurrentMissionType $= "sctf") if(!$CurrentMissionType $= "LCTF")
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.LCTFProMode == 0 ? "enable" : "disable") @ " pro mode.";
case "showServerRules": case "showServerRules":
if (($Host::ServerRules[1] !$= "") && (!%client.CantView)) if (($Host::ServerRules[1] !$= "") && (!%client.CantView))