Add some mutator hooks for regen & mob spawning

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / cmd.qc

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 404e514e46ad9af6e3c4b25fe4d53cba71528f68..5264699a1a3063ba66feb4f0e33190bdb836a98b 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -188,16 +188,33 @@ void ClientCommand_mobedit(float request, float argc)
        {
                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))
+                       if(argv(1) && argv(2))
                        {
-                               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;
+                               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:
@@ -210,7 +227,7 @@ void ClientCommand_mobedit(float request, float argc)
                }
        }
 }
-       
+
 void ClientCommand_mobkill(float request)
 {
        switch(request)
@@ -256,7 +273,7 @@ void ClientCommand_mobspawn(float request, float argc)
                {
                        entity e;
                        string tospawn;
-                       float moveflag, i;
+                       float moveflag;
                        
                        moveflag = (argv(2) ? stof(argv(2)) : 1); // follow owner if not defined
                        tospawn = strtolower(argv(1));
@@ -267,18 +284,10 @@ void ClientCommand_mobspawn(float request, float argc)
                                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(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"); }
@@ -306,9 +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 <random> <monster> [movetype]\n");
                        sprint(self, "  See 'cmd mobspawn list' for available arguments.\n");
-                       sprint(self, "  Argument 'random' spawns a randomly selected monster.\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;
                }
        }