themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added option to /butcher to kill town NPCS

Browse source
This commit is contained in:
Lucas Nicodemus 2012-05-25 20:57:26 -06:00
parent 5394734a33
commit c84f2b6055
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Commands.cs
View file

@ -3107,9 +3107,9 @@ namespace TShockAPI
private static void Butcher(CommandArgs args) private static void Butcher(CommandArgs args)
{ {
if (args.Parameters.Count > 1) if (args.Parameters.Count > 2)
{ {
args.Player.SendMessage("Invalid syntax! Proper syntax: /butcher [killFriendly(true/false)]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /butcher [killFriendly(true/false)] [killTownNPCs(true/false)]", Color.Red);
return; return;
} }
@ -3117,10 +3117,14 @@ namespace TShockAPI
if (args.Parameters.Count == 1) if (args.Parameters.Count == 1)
bool.TryParse(args.Parameters[0], out killFriendly); bool.TryParse(args.Parameters[0], out killFriendly);
bool killTownNPCs = false;
if (args.Parameters.Count == 2)
bool.TryParse(args.Parameters[1], out killTownNPCs);
int killcount = 0; int killcount = 0;
for (int i = 0; i < Main.npc.Length; i++) for (int i = 0; i < Main.npc.Length; i++)
{ {
if (Main.npc[i].active && Main.npc[i].type != 0 && !Main.npc[i].townNPC && (!Main.npc[i].friendly || killFriendly)) if (Main.npc[i].active && Main.npc[i].type != 0 && (!Main.npc[i].townNPC || killTownNPCs) && (!Main.npc[i].friendly || killFriendly))
{ {
TSPlayer.Server.StrikeNPC(i, 99999, 90f, 1); TSPlayer.Server.StrikeNPC(i, 99999, 90f, 1);
killcount++; killcount++;