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": 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;
}
}
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;
}
}
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;
}
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")
{
- sprint(self, "Available monsters:\n");
- sprint(self, strcat(autocvar_g_monsters_spawn_list, "\n"));
+ float i;
+ string list = "Available monsters:";
+
+ for(i = MON_FIRST; i <= MON_LAST; ++i)
+ list = strcat(list, " ", (get_monsterinfo(i)).netname);
+
+ sprint(self, strcat(list, "\n"));
+
return;
}
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
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, 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;
{
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)
{