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

Added Moon Lord to SpawnBoss

Browse source
This commit is contained in:
White 2015-07-16 20:06:54 +09:30
parent e4722c8c2f
commit 1ab66128ab
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Commands.cs
View file

@ -2014,7 +2014,7 @@ namespace TShockAPI
{ {
case "*": case "*":
case "all": case "all":
int[] npcIds = { 4, 13, 35, 50, 125, 126, 127, 134, 222, 245, 262, 266, 370 }; int[] npcIds = { 4, 13, 35, 50, 125, 126, 127, 134, 222, 245, 262, 266, 370, 398 };
TSPlayer.Server.SetTime(false, 0.0); TSPlayer.Server.SetTime(false, 0.0);
foreach (int i in npcIds) foreach (int i in npcIds)
{ {
@ -2057,7 +2057,6 @@ namespace TShockAPI
return; return;
case "golem": case "golem":
npc.SetDefaults(245); npc.SetDefaults(245);
TSPlayer.Server.SetTime(false, 0.0);
TSPlayer.Server.SpawnNPC(npc.type, npc.name, amount, args.Player.TileX, args.Player.TileY); TSPlayer.Server.SpawnNPC(npc.type, npc.name, amount, args.Player.TileX, args.Player.TileY);
TSPlayer.All.SendSuccessMessage("{0} has spawned Golem {1} time(s).", args.Player.Name, amount); TSPlayer.All.SendSuccessMessage("{0} has spawned Golem {1} time(s).", args.Player.Name, amount);
return; return;
@ -2082,7 +2081,6 @@ namespace TShockAPI
case "queen": case "queen":
case "queen bee": case "queen bee":
npc.SetDefaults(222); npc.SetDefaults(222);
TSPlayer.Server.SetTime(false, 0.0);
TSPlayer.Server.SpawnNPC(npc.type, npc.name, amount, args.Player.TileX, args.Player.TileY); TSPlayer.Server.SpawnNPC(npc.type, npc.name, amount, args.Player.TileX, args.Player.TileY);
TSPlayer.All.SendSuccessMessage("{0} has spawned Queen Bee {1} time(s).", args.Player.Name, amount); TSPlayer.All.SendSuccessMessage("{0} has spawned Queen Bee {1} time(s).", args.Player.Name, amount);
return; return;
@ -2115,6 +2113,12 @@ namespace TShockAPI
NPC.SpawnWOF(new Vector2(args.Player.X, args.Player.Y)); NPC.SpawnWOF(new Vector2(args.Player.X, args.Player.Y));
TSPlayer.All.SendSuccessMessage("{0} has spawned the Wall of Flesh.", args.Player.Name); TSPlayer.All.SendSuccessMessage("{0} has spawned the Wall of Flesh.", args.Player.Name);
return; return;
case "moon":
case "moon lord":
npc.SetDefaults(398);
TSPlayer.Server.SpawnNPC(npc.type, npc.name, amount, args.Player.TileX, args.Player.TileY);
TSPlayer.All.SendSuccessMessage("{0} has spawned the Moon Lord {1} time(s).", args.Player.Name, amount);
return;
default: default:
args.Player.SendErrorMessage("Invalid boss type!"); args.Player.SendErrorMessage("Invalid boss type!");
return; return;

4
TShockAPI/Utils.cs
View file

@ -243,6 +243,9 @@ namespace TShockAPI
return found; return found;
} }
//Random should not be generated in a method
Random r = new Random();
/// <summary> /// <summary>
/// Gets a random clear tile in range /// Gets a random clear tile in range
/// </summary> /// </summary>
@ -264,7 +267,6 @@ namespace TShockAPI
tileY = startTileY; tileY = startTileY;
break; break;
} }
Random r = new Random();
tileX = startTileX + r.Next(tileXRange*-1, tileXRange); tileX = startTileX + r.Next(tileXRange*-1, tileXRange);
tileY = startTileY + r.Next(tileYRange*-1, tileYRange); tileY = startTileY + r.Next(tileYRange*-1, tileYRange);
j++; j++;