// =============================================
// Server side voting code, reworked by Samual
-// Last updated: December 14th, 2011
+// Last updated: December 27th, 2011
// =============================================
// Nagger for players to know status of voting
}
vote_called = VOTE_NULL;
+ vote_caller = world;
vote_endtime = 0;
+
vote_called_command = string_null;
vote_called_display = string_null;
}
}
-void VoteCount()
+void VoteCount(float first_count)
{
// declarations
vote_accept_count = vote_reject_count = vote_abstain_count = 0;
float spectators_allowed = ((autocvar_sv_vote_nospectators != 2)
- || ((autocvar_sv_vote_nospectators == 1) && inWarmupStage)
+ || ((autocvar_sv_vote_nospectators == 1) && (inWarmupStage || gameover))
|| (autocvar_sv_vote_nospectators == 0));
float vote_player_count, is_player, notvoters;
vote_factor_of_voted = bound(0.5, autocvar_sv_vote_majority_factor_of_voted, 0.999);
vote_needed_of_voted = floor((vote_accept_count + vote_reject_count) * vote_factor_of_voted) + 1;
+ // are there any players at all on the server? it could be an admin vote
+ if(vote_player_count == 0 && first_count)
+ {
+ VoteSpam(0, -1, "yes"); // no players at all, just accept it
+ VoteAccept();
+ return;
+ }
- // finally calculate the result of the vote
+ // since there ARE players, finally calculate the result of the vote
if(vote_accept_count >= vote_needed_overall)
{
VoteSpam(notvoters, -1, "yes"); // there is enough acceptions to pass the vote
if(vote_endtime > 0) // a vote was called
if(time > vote_endtime) // time is up
{
- VoteCount();
+ VoteCount(FALSE);
}
return;
}
// after a restart every players number of allowed timeouts gets reset, too
- if(autocvar_sv_timeout) { FOR_EACH_REALPLAYER(tmp_player) { tmp_player.allowedTimeouts = autocvar_sv_timeout_number; } }
+ if(autocvar_sv_timeout) { FOR_EACH_REALPLAYER(tmp_player) { tmp_player.allowed_timeouts = autocvar_sv_timeout_number; } }
//reset map immediately if this cvar is not set
if not(autocvar_sv_ready_restart_after_countdown) { reset_map(TRUE); }
else
output = substring(input, argv_start_index(startpos), argv_end_index(-1) - argv_start_index(startpos));
- print("VoteCommand_parse: '", output, "'. \n");
return output;
}
float VoteCommand_parse(entity caller, string vote_command, string vote_list, float startpos, float argc)
{
string first_command;
- entity victim;
first_command = argv(startpos);
- if not(VoteCommand_checkinlist(vote_command, vote_list))
+ if not(VoteCommand_checkinlist(first_command, vote_list))
return FALSE;
- if((argc - 1) < startpos) // These commands won't work without arguments
+ if(argc < startpos) // These commands won't work without arguments
{
switch(first_command)
{
case "kick":
case "kickban": // catch all kick/kickban commands
{
- victim = edict_num(GetFilteredNumber(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1))));
- if not(victim) { return FALSE; }
- // TODO: figure out how kick/kickban/ban commands work and re-write this to fit around them
- vote_parsed_command = vote_command;
- vote_parsed_display = strcat("^1", vote_command, " (^7", victim.netname, "^1): ", "todo");
+ entity victim = GetIndexedEntity(argc, (startpos + 1));
+ float accepted = VerifyClientEntity(victim, TRUE, FALSE);
+
+ if(accepted > 0)
+ {
+ string reason = ((argc > next_token) ? substring(vote_command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token)) : "No reason provided");
+ string command_arguments;
+
+ if(first_command == "kickban")
+ command_arguments = strcat(ftos(autocvar_g_ban_default_bantime), " ", ftos(autocvar_g_ban_default_masksize), " ~");
+ else
+ command_arguments = reason;
+
+ vote_parsed_command = strcat(first_command, " # ", ftos(num_for_edict(victim)), " ", command_arguments);
+ vote_parsed_display = strcat("^1", vote_command, " (^7", victim.netname, "^1): ", reason);
+ }
+ else { print_to(caller, strcat("vcall: ", GetClientErrorString(accepted, argv(startpos + 1)), ".\n")); return FALSE; }
break;
}
case "chmap":
case "gotomap": // re-direct all map selection commands to gotomap
{
- vote_command = ValidateMap(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1)), caller);
+ vote_command = ValidateMap(argv(startpos + 1), caller);
if not(vote_command) { return FALSE; }
vote_parsed_command = strcat("gotomap ", vote_command);
vote_parsed_display = strzone(strcat("^1", vote_parsed_command));
print_to(caller, "^1You abstained from your vote.");
caller.vote_selection = VOTE_SELECT_ABSTAIN;
msg_entity = caller;
- if(!autocvar_sv_vote_singlecount) { VoteCount(); }
+ if(!autocvar_sv_vote_singlecount) { VoteCount(FALSE); }
}
return;
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote abstain");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote abstain"));
print_to(caller, " No arguments required.");
return;
}
if not(autocvar_sv_vote_call || !caller) { print_to(caller, "^1Vote calling is not allowed."); }
else if(vote_called) { print_to(caller, "^1There is already a vote called."); }
else if(!spectators_allowed && (caller && (caller.classname != "player"))) { print_to(caller, "^1Only players can call a vote."); }
- else if(timeoutStatus) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
+ else if(timeout_status) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
else if(caller && (time < caller.vote_waittime)) { print_to(caller, strcat("^1You have to wait ^2", ftos(ceil(caller.vote_waittime - time)), "^1 seconds before you can again call a vote.")); }
else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_commands, 2, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
- else // everything went okay, continue with calling the vote // TODO: fixes to make this more compatible with sv_cmd
+ else // everything went okay, continue with calling the vote
{
vote_caller = caller; // remember who called the vote
vote_called = VOTE_NORMAL;
{
caller.vote_selection = VOTE_SELECT_ACCEPT;
caller.vote_waittime = time + autocvar_sv_vote_wait;
- msg_entity = caller; // todo: what is this for?
+ msg_entity = caller;
}
FOR_EACH_REALCLIENT(tmp_player) { ++tmp_playercount; }
bprint("\{1}^2* ^3", GetCallerName(vote_caller), "^2 calls a vote for ", vote_called_display, "\n");
if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vcall:", ftos(vote_caller.playerid), ":", vote_called_display)); }
Nagger_VoteChanged();
- VoteCount(); // needed if you are the only one
+ VoteCount(TRUE); // needed if you are the only one
}
return;
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote call command");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote call command"));
print_to(caller, " Where 'command' is the command to request a vote upon.");
- print_to(caller, "Examples: call gotomap dance");
- print_to(caller, " call endmatch");
+ print_to(caller, strcat("Examples: ", GetCommandPrefix(caller), " vote call gotomap dance"));
+ print_to(caller, strcat(" ", GetCommandPrefix(caller), " vote call endmatch"));
return;
}
}
if not(caller.vote_master) { print_to(caller, "^1You do not have vote master privelages."); }
else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
- else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_master_commands, 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
+ else if not(VoteCommand_parse(caller, vote_command, strcat(autocvar_sv_vote_commands, " ", autocvar_sv_vote_master_commands), 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
else // everything went okay, proceed with command
{
default: // calling a vote for master
{
+ float spectators_allowed = ((autocvar_sv_vote_nospectators != 2)
+ || ((autocvar_sv_vote_nospectators == 1) && inWarmupStage)
+ || (autocvar_sv_vote_nospectators == 0));
+
if not(autocvar_sv_vote_master_callable) { print_to(caller, "^1Vote to become vote master is not allowed."); }
else if(vote_called) { print_to(caller, "^1There is already a vote called."); }
+ else if(!spectators_allowed && (caller && (caller.classname != "player"))) { print_to(caller, "^1Only players can call a vote."); }
+ else if(timeout_status) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
else // everything went okay, continue with creating vote
{
bprint("\{1}^2* ^3", GetCallerName(vote_caller), "^2 calls a vote to become ^3master^2.\n");
if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vcall:", ftos(vote_caller.playerid), ":", vote_called_display)); }
Nagger_VoteChanged();
- VoteCount(); // needed if you are the only one
+ VoteCount(TRUE); // needed if you are the only one
}
return;
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote master [action [command | password]]");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote master [action [command | password]]"));
print_to(caller, " If action is left blank, it calls a vote for you to become master.");
print_to(caller, " Otherwise the actions are either 'do' a command or 'login' as master.");
return;
{
if not(vote_called) { print_to(caller, "^1No vote called."); }
else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+ else if(((caller == vote_caller) || caller.vote_master) && autocvar_sv_vote_no_stops_vote) { VoteStop(caller); }
else // everything went okay, continue changing vote
{
print_to(caller, "^1You rejected the vote.");
caller.vote_selection = VOTE_SELECT_REJECT;
msg_entity = caller;
- if(!autocvar_sv_vote_singlecount) { VoteCount(); }
+ if(!autocvar_sv_vote_singlecount) { VoteCount(FALSE); }
}
return;
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote no");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote no"));
print_to(caller, " No arguments required.");
return;
}
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote status");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote status"));
print_to(caller, " No arguments required.");
return;
}
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote stop");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote stop"));
print_to(caller, " No arguments required.");
return;
}
case CMD_REQUEST_COMMAND:
{
if not(vote_called) { print_to(caller, "^1No vote called."); }
- if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+ else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
else // everything went okay, continue changing vote
{
print_to(caller, "^1You accepted the vote.");
caller.vote_selection = VOTE_SELECT_ACCEPT;
msg_entity = caller;
- if(!autocvar_sv_vote_singlecount) { VoteCount(); }
+ if(!autocvar_sv_vote_singlecount) { VoteCount(FALSE); }
}
return;
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote yes");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote yes"));
print_to(caller, " No arguments required.");
return;
}
}
}
-/* use this when creating a new command, making sure to place it in alphabetical order.
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
void VoteCommand_(float request)
{
switch(request)
default:
case CMD_REQUEST_USAGE:
{
- print_to(caller, "\nUsage:^3 vote ");
+ print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " vote ");
print_to(caller, " No arguments required.");
return;
}
VOTE_COMMAND("abstain", VoteCommand_abstain(request, caller), "Abstain your vote in current vote", VC_ASGNMNT_CLIENTONLY) \
VOTE_COMMAND("call", VoteCommand_call(request, caller, arguments, command), "Create a new vote for players to decide on", VC_ASGNMNT_BOTH) \
VOTE_COMMAND("help", VoteCommand_macro_help(caller, arguments), "Shows this information", VC_ASGNMNT_BOTH) \
- VOTE_COMMAND("master", VoteCommand_master(request, caller, arguments, command), "", VC_ASGNMNT_CLIENTONLY) \
+ VOTE_COMMAND("master", VoteCommand_master(request, caller, arguments, command), "Full control over all voting and vote commands", VC_ASGNMNT_CLIENTONLY) \
VOTE_COMMAND("no", VoteCommand_no(request, caller), "Select no in current vote", VC_ASGNMNT_CLIENTONLY) \
VOTE_COMMAND("status", VoteCommand_status(request, caller), "Prints information about current vote", VC_ASGNMNT_BOTH) \
VOTE_COMMAND("stop", VoteCommand_stop(request, caller), "Immediately end a vote", VC_ASGNMNT_BOTH) \
if(argc == 2) // help display listing all commands
{
- print_to(caller, strcat("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are:"));
-
+ print_to(caller, "\nVoting commands:\n");
#define VOTE_COMMAND(name,function,description,assignment) \
{ if(Votecommand_check_assignment(caller, assignment)) { print_to(caller, strcat(" ^2", name, "^7: ", description)); } }
VOTE_COMMANDS(0, caller, 0, "")
#undef VOTE_COMMAND
- print_to(caller, strcat("For help about specific commands, type ", command_origin, " vote help COMMAND"));
+ print_to(caller, strcat("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are listed above.\n"));
+ print_to(caller, strcat("For help about a specific command, type ", command_origin, " vote help COMMAND"));
+ print_to(caller, strcat("\n^7You can call a vote for or execute these commands: ^3", autocvar_sv_vote_commands, "^7 and maybe further ^3arguments^7"));
}
else // usage for individual command
{
}
default:
- print_to(caller, strcat("Unknown vote command", ((argv(1) != "") ? strcat(" \"", argv(1), "\"") : ""), ". For a list of supported commands, try ", GetCommandPrefix(caller), " help.\n"));
+ print_to(caller, strcat(((argv(1) != "") ? strcat("Unknown vote command \"", argv(1), "\"") : "No command provided"), ". For a list of supported commands, try ", GetCommandPrefix(caller), " vote help.\n"));
case CMD_REQUEST_USAGE:
{
VoteCommand_macro_help(caller, argc);
}
}
}
-
-// =======================
-// Game logic for voting
-// =======================
-
-void VoteHelp(entity e) {
- string vmasterdis;
- if(!autocvar_sv_vote_master) {
- vmasterdis = " ^1(disabled)";
- }
-
- string vlogindis;
- if("" == autocvar_sv_vote_master_password) {
- vlogindis = " ^1(disabled)";
- }
-
- string vcalldis;
- if(!autocvar_sv_vote_call) {
- vcalldis = " ^1(disabled)";
- }
-
- print_to(e, "^7You can use voting with \"^2cmd vote help^7\" \"^2cmd vote status^7\" \"^2cmd vote call ^3COMMAND ARGUMENTS^7\" \"^2cmd vote stop^7\" \"^2cmd vote master^7\" \"^2cmd vote login^7\" \"^2cmd vote do ^3COMMAND ARGUMENTS^7\" \"^2cmd vote yes^7\" \"^2cmd vote no^7\" \"^2cmd vote abstain^7\" \"^2cmd vote dontcare^7\".");
- print_to(e, "^7Or if your version is up to date you can use these aliases \"^2vhelp^7\" \"^2vstatus^7\" \"^2vcall ^3COMMAND ARGUMENTS^7\" \"^2vstop^7\" \"^2vmaster^7\" \"^2vlogin^7\" \"^2vdo ^3COMMAND ARGUMENTS^7\" \"^2vyes^7\" \"^2vno^7\" \"^2abstain^7\" \"^2vdontcare^7\".");
- print_to(e, "^7\"^2help^7\" shows this info.");
- print_to(e, "^7\"^2status^7\" shows if there is a vote called and who called it.");
- print_to(e, strcat("^7\"^2call^7\" is used to call a vote. See the list of allowed commands.", vcalldis, "^7"));
- print_to(e, "^7\"^2stop^7\" can be used by the vote caller or an admin to stop a vote and maybe correct it.");
- print_to(e, strcat("^7\"^2master^7\" call a vote to become master who can execute commands without a vote", vmasterdis, "^7"));
- print_to(e, strcat("^7\"^2login^7\" login to become master who can execute commands without a vote.", vlogindis, "^7"));
- print_to(e, "^7\"^2do^7\" executes a command if you are a master. See the list of allowed commands.");
- print_to(e, "^7\"^2yes^7\", \"^2no^7\", \"^2abstain^7\" and \"^2dontcare^7\" to make your vote.");
- print_to(e, "^7If enough of the players vote yes the vote is accepted.");
- print_to(e, "^7If enough of the players vote no the vote is rejected.");
- print_to(e, strcat("^7If neither the vote will timeout after ", ftos(autocvar_sv_vote_timeout), "^7 seconds."));
- print_to(e, "^7You can call a vote for or execute these commands:");
- print_to(e, strcat("^3", autocvar_sv_vote_commands, "^7 and maybe further ^3arguments^7"));
-}
\ No newline at end of file
projects / xonotic / xonotic-data.pk3dir.git / blobdiff