X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=e22399f4acd14ed8b42b8901d1dc2f9c056050e2;hb=a645a7ec4f9bbd8b46a2b5cc351eec004bc83773;hp=b4048a721d8923f96ca2beabfa5df8d980aa033e;hpb=5d4356eea933cc687e5958e9632695f0e2890159;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index b4048a721..5264699a1 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -5,7 +5,7 @@ float SV_ParseClientCommand_floodcheck() { - if not(timeout_status) // not while paused + if (!timeout_status) // not while paused { if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time)) { @@ -39,13 +39,13 @@ void ClientCommand_autoswitch(float request, float argc) return; } } - + default: sprint(self, "Incorrect parameters for ^2autoswitch^7\n"); case CMD_REQUEST_USAGE: { sprint(self, "\nUsage:^3 cmd autoswitch selection\n"); - sprint(self, " Where 'selection' controls if autoswitch is on or off.\n"); + sprint(self, " Where 'selection' controls if autoswitch is on or off.\n"); return; } } @@ -61,7 +61,7 @@ void ClientCommand_checkfail(float request, string command) // internal command, self.checkfail = 1; return; // never fall through to usage } - + default: sprint(self, "Incorrect parameters for ^2checkfail^7\n"); case CMD_REQUEST_USAGE: @@ -81,30 +81,30 @@ void ClientCommand_clientversion(float request, float argc) // internal command, { if(argv(1) != "") { - if(self.flags & FL_CLIENT) + if(IS_CLIENT(self)) { self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1))); - + if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max) { self.version_mismatch = 1; ClientKill_TeamChange(-2); // observe - } - else if(autocvar_g_campaign || autocvar_g_balance_teams) + } + else if(autocvar_g_campaign || autocvar_g_balance_teams) { //JoinBestTeam(self, FALSE, TRUE); - } - else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) + } + else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) { self.classname = "observer"; // really? stuffcmd(self, "menu_showteamselect\n"); } } - + return; } } - + default: sprint(self, "Incorrect parameters for ^2clientversion^7\n"); case CMD_REQUEST_USAGE: @@ -124,13 +124,13 @@ void ClientCommand_mv_getpicture(float request, float argc) // internal command, { if(argv(1) != "") { - if(intermission_running) + if(intermission_running) MapVote_SendPicture(stof(argv(1))); return; } } - + default: sprint(self, "Incorrect parameters for ^2mv_getpicture^7\n"); case CMD_REQUEST_USAGE: @@ -142,36 +142,36 @@ void ClientCommand_mv_getpicture(float request, float argc) // internal command, } } -void ClientCommand_join(float request) +void ClientCommand_join(float request) { switch(request) { case CMD_REQUEST_COMMAND: { - if(self.flags & FL_CLIENT) + if(IS_CLIENT(self)) { - if(self.classname != "player" && !lockteams && !g_arena) + if(!IS_PLAYER(self) && !lockteams) { - if(nJoinAllowed(self)) + if(nJoinAllowed(self)) { - if(g_ca) { self.caplayer = 1; } if(autocvar_g_campaign) { campaign_bots_may_start = 1; } - + self.classname = "player"; PlayerScore_Clear(self); - bprint ("^4", self.netname, "^4 is playing now\n"); + Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN); + Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname); PutClientInServer(); } - else + else { //player may not join because of g_maxplayers is set - centerprint(self, PREVENT_JOIN_TEXT); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_PREVENT); } } } return; // never fall through to usage } - + default: case CMD_REQUEST_USAGE: { @@ -182,6 +182,89 @@ void ClientCommand_join(float request) } } +void ClientCommand_mobedit(float request, float argc) +{ + switch(request) + { + case CMD_REQUEST_COMMAND: + { + if(argv(1) && argv(2)) + { + makevectors(self.v_angle); + WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 100, MOVE_NORMAL, self); + + if(!autocvar_g_monsters_edit) { sprint(self, "Monster property editing is not enabled.\n"); } + if(!(trace_ent.flags & FL_MONSTER)) { sprint(self, "You need to aim at your monster to edit its properties.\n"); } + else if(trace_ent.realowner != self) { sprint(self, "That monster does not belong to you.\n"); } + else // all went well, continue + { + switch(argv(1)) + { + case "skin": + { + if(trace_ent.monsterid != MON_MAGE) + trace_ent.skin = stof(argv(2)); + break; + } + case "movetarget": + { + trace_ent.monster_moveflags = stof(argv(2)); + break; + } + } + } + + return; + } + } + default: + sprint(self, "Incorrect parameters for ^2mobedit^7\n"); + case CMD_REQUEST_USAGE: + { + sprint(self, "\nUsage:^3 cmd mobedit [argument]\n"); + sprint(self, " Where 'argument' can be skin or movetarget.\n"); + return; + } + } +} + +void ClientCommand_mobkill(float request) +{ + switch(request) + { + case CMD_REQUEST_COMMAND: + { + makevectors(self.v_angle); + WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 100, MOVE_NORMAL, self); + + if(trace_ent.flags & FL_MONSTER) + { + if(trace_ent.realowner != self) + { + sprint(self, "That monster does not belong to you.\n"); + return; + } + sprint(self, strcat("Your pet '", trace_ent.monster_name, "' has been brutally mutilated.\n")); + Damage (trace_ent, world, world, trace_ent.health + trace_ent.max_health + 200, DEATH_KILL, trace_ent.origin, '0 0 0'); + return; + } + else + sprint(self, "You need to aim at your monster to kill it.\n"); + + return; + } + + default: + sprint(self, "Incorrect parameters for ^2mobkill^7\n"); + case CMD_REQUEST_USAGE: + { + sprint(self, "\nUsage:^3 cmd mobkill\n"); + sprint(self, " Aim at your monster to kill it.\n"); + return; + } + } +} + void ClientCommand_mobspawn(float request, float argc) { switch(request) @@ -189,37 +272,40 @@ void ClientCommand_mobspawn(float request, float argc) case CMD_REQUEST_COMMAND: { entity e; - string tospawn, mname; + string tospawn; float moveflag; moveflag = (argv(2) ? stof(argv(2)) : 1); // follow owner if not defined - tospawn = argv(1); - mname = argv(3); + tospawn = strtolower(argv(1)); if(tospawn == "list") { - sprint(self, "Available monsters:\n"); - sprint(self, strcat(monsterlist(), "\n")); + sprint(self, monsterlist_reply); return; } - if(self.classname != STR_PLAYER) { sprint(self, "You can't spawn monsters while spectating.\n"); } - else if(self.deadflag) { sprint(self, "You can't spawn monsters while dead.\n"); } + if(autocvar_g_monsters_max <= 0 || autocvar_g_monsters_max_perplayer <= 0) { sprint(self, "Monster spawning is disabled.\n"); } + else if(!IS_PLAYER(self)) { sprint(self, "You can't spawn monsters while spectating.\n"); } + else if(tospawn == "") { sprint(self, "No argument specified.\n"); } + else if(MUTATOR_CALLHOOK(AllowMobSpawning)) { sprint(self, "Monster spawning is currently disabled by a mutator.\n"); } + else if(!autocvar_g_monsters) { Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_MONSTERS_DISABLED); } + else if(self.vehicle) { sprint(self, "You can't spawn monsters while driving a vehicle.\n"); } + else if(autocvar_g_campaign) { sprint(self, "You can't spawn monsters in campaign mode.\n"); } + else if(self.deadflag != DEAD_NO) { sprint(self, "You can't spawn monsters while dead.\n"); } else if(self.monstercount >= autocvar_g_monsters_max_perplayer) { sprint(self, "You have spawned too many monsters, kill some before trying to spawn any more.\n"); } else if(totalspawned >= autocvar_g_monsters_max) { sprint(self, "The global maximum monster count has been reached, kill some before trying to spawn any more.\n"); } - else + else // all worked out, so continue { - // all worked out, so continue self.monstercount += 1; totalspawned += 1; makevectors(self.v_angle); - WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 100, MOVE_NORMAL, self); + WarpZone_TraceBox (CENTER_OR_VIEWOFS(self), PL_MIN, PL_MAX, CENTER_OR_VIEWOFS(self) + v_forward * 150, TRUE, self); + //WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, MOVE_NORMAL, self); - e = spawnmonster(tospawn, self, self, trace_endpos, FALSE, moveflag); - if(mname != "") e.netname = strzone(mname); - - sprint(self, strcat("Spawned 1 ", tospawn, "\n")); + e = spawnmonster(tospawn, 0, self, self, trace_endpos, FALSE, moveflag); + + sprint(self, strcat("Spawned ", e.monster_name, "\n")); } return; @@ -229,8 +315,10 @@ void ClientCommand_mobspawn(float request, float argc) sprint(self, "Incorrect parameters for ^2mobspawn^7\n"); case CMD_REQUEST_USAGE: { - sprint(self, "\nUsage:^3 cmd mobspawn monster\n"); + sprint(self, "\nUsage:^3 cmd mobspawn [movetype]\n"); sprint(self, " See 'cmd mobspawn list' for available arguments.\n"); + sprint(self, " Argument 'random' spawns a random monster.\n"); + sprint(self, " Monster will follow the owner if second argument is not defined.\n"); return; } } @@ -242,12 +330,14 @@ void ClientCommand_ready(float request) // todo: anti-spam for toggling readynes { case CMD_REQUEST_COMMAND: { - if(self.flags & FL_CLIENT) + if(IS_CLIENT(self)) { - if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2) + if(warmup_stage || autocvar_sv_ready_restart || g_race_qualifying == 2) { if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable) { + if(time < game_starttime) // game is already restarting + return; if (self.ready) // toggle { self.ready = FALSE; @@ -260,7 +350,7 @@ void ClientCommand_ready(float request) // todo: anti-spam for toggling readynes } // cannot reset the game while a timeout is active! - if not(timeout_status) + if (!timeout_status) ReadyCount(); } else { sprint(self, "^1Game has already been restarted\n"); @@ -269,7 +359,7 @@ void ClientCommand_ready(float request) // todo: anti-spam for toggling readynes } return; // never fall through to usage } - + default: case CMD_REQUEST_USAGE: { @@ -289,7 +379,7 @@ void ClientCommand_say(float request, float argc, string command) if(argc >= 2) { Say(self, FALSE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); } return; // never fall through to usage } - + default: case CMD_REQUEST_USAGE: { @@ -309,7 +399,7 @@ void ClientCommand_say_team(float request, float argc, string command) if(argc >= 2) { Say(self, TRUE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); } return; // never fall through to usage } - + default: case CMD_REQUEST_USAGE: { @@ -328,25 +418,25 @@ void ClientCommand_selectteam(float request, float argc) { if(argv(1) != "") { - if(self.flags & FL_CLIENT) + if(IS_CLIENT(self)) { if(teamplay) - if not(self.team_forced > 0) - if not(lockteams) + if(self.team_forced <= 0) + if (!lockteams) { float selection; - + switch(argv(1)) { - case "red": selection = COLOR_TEAM1; break; - case "blue": selection = COLOR_TEAM2; break; - case "yellow": selection = COLOR_TEAM3; break; - case "pink": selection = COLOR_TEAM4; break; + case "red": selection = NUM_TEAM_1; break; + case "blue": selection = NUM_TEAM_2; break; + case "yellow": selection = NUM_TEAM_3; break; + case "pink": selection = NUM_TEAM_4; break; case "auto": selection = (-1); break; - + default: selection = 0; break; } - + if(selection) { if(self.team == selection && self.deadflag == DEAD_NO) @@ -364,7 +454,7 @@ void ClientCommand_selectteam(float request, float argc) else sprint(self, "^7selectteam can only be used in teamgames\n"); } - return; + return; } } @@ -392,7 +482,7 @@ void ClientCommand_selfstuff(float request, string command) return; } } - + default: sprint(self, "Incorrect parameters for ^2selectteam^7\n"); case CMD_REQUEST_USAGE: @@ -414,19 +504,19 @@ void ClientCommand_sentcvar(float request, float argc, string command) { //float tokens; string s; - + if(argc == 2) // undefined cvar: use the default value on the server then { s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\""); tokenize_console(s); } - + GetCvars(1); - + return; } } - + default: sprint(self, "Incorrect parameters for ^2sentcvar^7\n"); case CMD_REQUEST_USAGE: @@ -438,19 +528,20 @@ void ClientCommand_sentcvar(float request, float argc, string command) } } -void ClientCommand_spectate(float request) +void ClientCommand_spectate(float request) { switch(request) { case CMD_REQUEST_COMMAND: { - if(self.flags & FL_CLIENT) + if(IS_CLIENT(self)) { - if(g_arena) { return; } if(g_lms) { if(self.lms_spectate_warning) { + // for the forfeit message... + self.lms_spectate_warning = 2; // mark player as spectator PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0)); } @@ -461,13 +552,13 @@ void ClientCommand_spectate(float request) return; } } - - if(self.classname == "player" && autocvar_sv_spectate == 1) + + if(IS_PLAYER(self) && autocvar_sv_spectate == 1) ClientKill_TeamChange(-2); // observe - + // in CA, allow a dead player to move to spectators (without that, caplayer!=0 will be moved back to the player list) // note: if arena game mode is ever done properly, this needs to be removed. - if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer")) + if(self.caplayer && (IS_SPEC(self) || IS_OBSERVER(self))) { sprint(self, "WARNING: you will spectate in the next round.\n"); self.caplayer = 0; @@ -475,7 +566,7 @@ void ClientCommand_spectate(float request) } return; // never fall through to usage } - + default: case CMD_REQUEST_USAGE: { @@ -498,7 +589,7 @@ void ClientCommand_suggestmap(float request, float argc) return; } } - + default: sprint(self, "Incorrect parameters for ^2suggestmap^7\n"); case CMD_REQUEST_USAGE: @@ -520,7 +611,7 @@ void ClientCommand_tell(float request, float argc, string command) { entity tell_to = GetIndexedEntity(argc, 1); float tell_accepted = VerifyClientEntity(tell_to, TRUE, FALSE); - + if(tell_accepted > 0) // the target is a real client { if(tell_to != self) // and we're allowed to send to them :D @@ -530,15 +621,15 @@ void ClientCommand_tell(float request, float argc, string command) } else { print_to(self, "You can't ^2tell^7 a message to yourself."); return; } } - else if(argv(1) == "#0") - { + else if(argv(1) == "#0") + { trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token))); return; } else { print_to(self, strcat("tell: ", GetClientErrorString(tell_accepted, argv(1)), ".")); return; } } } - + default: sprint(self, "Incorrect parameters for ^2tell^7\n"); case CMD_REQUEST_USAGE: @@ -550,7 +641,7 @@ void ClientCommand_tell(float request, float argc, string command) } } -void ClientCommand_voice(float request, float argc, string command) +void ClientCommand_voice(float request, float argc, string command) { switch(request) { @@ -562,11 +653,11 @@ void ClientCommand_voice(float request, float argc, string command) VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2))); else VoiceMessage(argv(1), ""); - + return; } } - + default: sprint(self, "Incorrect parameters for ^2voice^7\n"); case CMD_REQUEST_USAGE: @@ -587,10 +678,10 @@ void ClientCommand_(float request) { case CMD_REQUEST_COMMAND: { - + return; // never fall through to usage } - + default: case CMD_REQUEST_USAGE: { @@ -614,6 +705,8 @@ void ClientCommand_(float request) CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \ CLIENT_COMMAND("mv_getpicture", ClientCommand_mv_getpicture(request, arguments), "Retrieve mapshot picture from the server") \ CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \ + CLIENT_COMMAND("mobedit", ClientCommand_mobedit(request, arguments), "Edit your monster's properties") \ + CLIENT_COMMAND("mobkill", ClientCommand_mobkill(request), "Kills your monster") \ CLIENT_COMMAND("mobspawn", ClientCommand_mobspawn(request, arguments), "Spawn monsters infront of yourself") \ CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \ CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \ @@ -626,15 +719,15 @@ void ClientCommand_(float request) CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \ CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \ /* nothing */ - + void ClientCommand_macro_help() { #define CLIENT_COMMAND(name,function,description) \ { sprint(self, " ^2", name, "^7: ", description, "\n"); } - + CLIENT_COMMANDS(0, 0, "") #undef CLIENT_COMMAND - + return; } @@ -642,10 +735,10 @@ float ClientCommand_macro_command(float argc, string command) { #define CLIENT_COMMAND(name,function,description) \ { if(name == strtolower(argv(0))) { function; return TRUE; } } - + CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc, command) #undef CLIENT_COMMAND - + return FALSE; } @@ -653,21 +746,21 @@ float ClientCommand_macro_usage(float argc) { #define CLIENT_COMMAND(name,function,description) \ { if(name == strtolower(argv(1))) { function; return TRUE; } } - + CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc, "") #undef CLIENT_COMMAND - + return FALSE; } void ClientCommand_macro_write_aliases(float fh) { #define CLIENT_COMMAND(name,function,description) \ - { CMD_Write_Alias("qc_cmd_cmd", name, description); } - + { CMD_Write_Alias("qc_cmd_cmd", name, description); } + CLIENT_COMMANDS(0, 0, "") #undef CLIENT_COMMAND - + return; } @@ -683,17 +776,17 @@ void SV_ParseClientCommand(string command) return; float argc = tokenize_console(command); - + // for the mutator hook system cmd_name = strtolower(argv(0)); cmd_argc = argc; cmd_string = command; - + // Guide for working with argc arguments by example: // argc: 1 - 2 - 3 - 4 - // argv: 0 - 1 - 2 - 3 + // argv: 0 - 1 - 2 - 3 // cmd vote - master - login - password - + // for floodcheck switch(strtolower(argv(0))) { @@ -705,29 +798,29 @@ void SV_ParseClientCommand(string command) case "prespawn": break; // handled by engine in host_cmd.c case "sentcvar": break; // handled by server in this file case "spawn": break; // handled by engine in host_cmd.c - - default: + + default: if(SV_ParseClientCommand_floodcheck()) break; // "TRUE": continue, as we're not flooding yet else return; // "FALSE": not allowed to continue, halt // print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); } - + /* NOTE: should this be disabled? It can be spammy perhaps, but hopefully it's okay for now */ - if(argv(0) == "help") + if(argv(0) == "help") { - if(argc == 1) + if(argc == 1) { sprint(self, "\nClient networked commands:\n"); ClientCommand_macro_help(); - + sprint(self, "\nCommon networked commands:\n"); CommonCommand_macro_help(self); - + sprint(self, "\nUsage:^3 cmd COMMAND...^7, where possible commands are listed above.\n"); sprint(self, "For help about a specific command, type cmd help COMMAND\n"); return; - } + } else if(CommonCommand_macro_usage(argc, self)) // Instead of trying to call a command, we're going to see detailed information about it { return; @@ -736,12 +829,12 @@ void SV_ParseClientCommand(string command) { return; } - } + } else if(MUTATOR_CALLHOOK(SV_ParseClientCommand)) { return; // handled by a mutator } - else if(CheatCommand(argc)) + else if(CheatCommand(argc)) { return; // handled by server/cheats.qc }