Merge branch 'master' into Mario/monsters

[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 010800950701db060b400307ff05fa0e81df54b9..5baf7ded5e16c655ef6d3394215e7f018e01f01a 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -196,8 +196,7 @@ void ClientCommand_mobedit(float request, float argc)
                        
                        switch(argv(1))
                        {
-                               case "name": trace_ent.netname = strzone(strdecolorize(argv(2))); if(trace_ent.sprite) WaypointSprite_UpdateSprites(trace_ent.sprite, trace_ent.netname, "", ""); return;
-                               case "skin": if(trace_ent.monsterid != MONSTER_MAGE) { trace_ent.skin = stof(argv(2)); trace_ent.SendFlags |= MSF_STATUS; } return;
+                               case "skin": if(trace_ent.monsterid != MON_MAGE) { trace_ent.skin = stof(argv(2)); trace_ent.SendFlags |= MSF_STATUS; } return;
                                case "movetarget": trace_ent.monster_moveflags = stof(argv(2)); return;
                        }
                }
@@ -206,7 +205,7 @@ void ClientCommand_mobedit(float request, float argc)
                case CMD_REQUEST_USAGE:
                {
                        sprint(self, "\nUsage:^3 cmd mobedit [argument]\n");
-                       sprint(self, "  Where 'argument' can be name, color or movetarget.\n");
+                       sprint(self, "  Where 'argument' can be skin or movetarget.\n");
                        return;
                }
        }
@@ -228,7 +227,7 @@ void ClientCommand_mobkill(float request)
                                        sprint(self, "That monster does not belong to you.\n");
                                        return;
                                }
-                               sprint(self, strcat("Your pet '", trace_ent.netname, "' has been brutally mutilated.\n"));
+                               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;
                        }
@@ -256,20 +255,19 @@ 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 = strtolower(argv(1));
-                       mname = argv(3);
                        
                        if(tospawn == "list")
                        {
                                float i;
                                string list = "Available monsters:";
                                
-                               for(i = MONSTER_FIRST + 1; i < MONSTER_LAST; ++i)
-                                       list = strcat(list, " ", monster_id2string(i));
+                               for(i = MON_FIRST; i <= MON_LAST; ++i)
+                                       list = strcat(list, " ", (get_monsterinfo(i)).netname);
                                
                                sprint(self, strcat(list, "\n"));
                                
@@ -278,11 +276,11 @@ void ClientCommand_mobspawn(float request, float argc)
                        
                        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 not(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(g_td) { sprint(self, "You can't spawn monsters in Tower Defense mode.\n"); }
-                       else if(self.deadflag) { sprint(self, "You can't spawn monsters while dead.\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
@@ -291,12 +289,12 @@ void ClientCommand_mobspawn(float request, float argc)
                                totalspawned += 1;
                        
                                makevectors(self.v_angle);
-                               WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, 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, 0, self, self, trace_endpos, FALSE, moveflag);
-                               if(mname) e.netname = strzone(mname);
                                
-                               sprint(self, strcat("Spawned ", e.netname, "\n"));
+                               sprint(self, strcat("Spawned ", e.monster_name, "\n"));
                        }
                        
                        return;
@@ -321,7 +319,7 @@ void ClientCommand_ready(float request) // todo: anti-spam for toggling readynes
                {
                        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)
                                        {