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

Whoops, rand.next was off by one, also now defaults to 10 so you dont need to type it out unless you want something other than 10 to drop

Browse source
This commit is contained in:
Zack Piispanen 2011-12-12 22:22:47 -05:00
parent e8982c3138
commit 9d88673ee4
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/Commands.cs
View file

@ -964,7 +964,7 @@ namespace TShockAPI
* /idrop <itemname, id, group> [amt=10] * /idrop <itemname, id, group> [amt=10]
*/ */
if (args.Parameters.Count < 2) if (args.Parameters.Count < 1)
{ {
//error //error
args.Player.SendMessage("Invalid input: /idrop <itemname, id, group> [amt=10]", Color.Red); args.Player.SendMessage("Invalid input: /idrop <itemname, id, group> [amt=10]", Color.Red);
@ -972,8 +972,12 @@ namespace TShockAPI
} }
int amt = 10; int amt = 10;
int.TryParse( args.Parameters[1], out amt );
amt = Math.Min(100, amt); if (args.Parameters.Count > 1)
{
int.TryParse(args.Parameters[1], out amt);
amt = Math.Min(100, amt);
}
string name = args.Parameters[0]; string name = args.Parameters[0];
List<string> items = new List<string>(); List<string> items = new List<string>();
@ -1055,7 +1059,7 @@ namespace TShockAPI
TSPlayer.All.SendMessage("Raining " + name + " from the skies!", Color.Green); TSPlayer.All.SendMessage("Raining " + name + " from the skies!", Color.Green);
for( int i = 0; i < amt; i++ ) for( int i = 0; i < amt; i++ )
{ {
int id = Main.rand.Next(0, items.Count - 1); int id = Main.rand.Next(0, items.Count );
var itemlist = TShock.Utils.GetItemByIdOrName(items[id]); var itemlist = TShock.Utils.GetItemByIdOrName(items[id]);
if (itemlist.Count > 0) if (itemlist.Count > 0)
@ -1064,7 +1068,6 @@ namespace TShockAPI
var item = itemlist[0]; var item = itemlist[0];
int x = ( Main.rand.Next(Main.maxTilesX - 50) + 100 ) * 0x10; int x = ( Main.rand.Next(Main.maxTilesX - 50) + 100 ) * 0x10;
int y = Main.rand.Next((int)(Main.maxTilesY * 0.05)) * 0x10; int y = Main.rand.Next((int)(Main.maxTilesY * 0.05)) * 0x10;
int itemid = Terraria.Item.NewItem(x, y, item.width, item.height, item.type, 1, true); int itemid = Terraria.Item.NewItem(x, y, item.width, item.height, item.type, 1, true);
// This is for special pickaxe/hammers/swords etc // This is for special pickaxe/hammers/swords etc
Main.item[itemid].SetDefaults(item.name); Main.item[itemid].SetDefaults(item.name);