X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;fp=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=011a12716cdab435f89d594a72b98043394ab0e0;hb=11b5d310f4714debb77c3ccdde963c76555a3aa5;hp=44cc46a02bcd7bad0a07422ec6dc8b11917c9c5e;hpb=8a44cef6e025ab6f878cba5c20c35e138f0bdfe4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 44cc46a02..011a12716 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -182,6 +182,138 @@ void ClientCommand_join(float request) } } +void ClientCommand_mobedit(float request, float argc) +{ + 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)) { sprint(self, "You need to aim at your monster to edit its properties.\n"); return; } + if(trace_ent.realowner != self) { sprint(self, "That monster does not belong to you.\n"); return; } + + switch(argv(1)) + { + case "skin": if(trace_ent.monsterid != MON_MAGE) { trace_ent.skin = stof(argv(2)); } return; + case "movetarget": trace_ent.monster_moveflags = stof(argv(2)); 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) + { + case CMD_REQUEST_COMMAND: + { + entity e; + string tospawn; + float moveflag, i; + + moveflag = (argv(2) ? stof(argv(2)) : 1); // follow owner if not defined + tospawn = strtolower(argv(1)); + + if(tospawn == "list") + { + sprint(self, monsterlist_reply); + return; + } + + if(tospawn == "random") + { + RandomSelection_Init(); + for(i = MON_FIRST; i <= MON_LAST; ++i) + RandomSelection_Add(world, 0, (get_monsterinfo(i)).netname, 1, 1); + + tospawn = RandomSelection_chosen_string; + } + + 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(g_invasion) { sprint(self, "You can't spawn monsters during an invasion!\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 // all worked out, so continue + { + self.monstercount += 1; + totalspawned += 1; + + makevectors(self.v_angle); + 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, 0, self, self, trace_endpos, FALSE, moveflag); + + sprint(self, strcat("Spawned ", e.monster_name, "\n")); + } + + return; + } + + default: + sprint(self, "Incorrect parameters for ^2mobspawn^7\n"); + case CMD_REQUEST_USAGE: + { + sprint(self, "\nUsage:^3 cmd mobspawn monster\n"); + sprint(self, " See 'cmd mobspawn list' for available arguments.\n"); + sprint(self, " Argument 'random' spawns a randomly selected monster.\n"); + return; + } + } +} + void ClientCommand_ready(float request) // todo: anti-spam for toggling readyness { switch(request) @@ -564,6 +696,9 @@ 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") \ CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \