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

Fixed /warp list <page>

Browse source 
ListAllWarps now only returns names and only for the specified world.
This commit is contained in:
high 2011-07-22 21:36:07 -04:00
parent 5458fb567a
commit 1c2cead3c9
2 changed files with 87 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

124
TShockAPI/Commands.cs
View file

@ -327,7 +327,8 @@ namespace TShockAPI
args.Player.LoginAttempts++; args.Player.LoginAttempts++;
return; return;
} }
} catch (Exception) }
catch (Exception)
{ {
args.Player.SendMessage("There was an error processing your request. Maybe your account doesn't exist?", Color.Red); args.Player.SendMessage("There was an error processing your request. Maybe your account doesn't exist?", Color.Red);
return; return;
@ -727,7 +728,8 @@ namespace TShockAPI
args.Player.SendMessage("This command will also change all Worlds to reference this WorldID."); args.Player.SendMessage("This command will also change all Worlds to reference this WorldID.");
args.Player.SendMessage("You must manually fix multi-world configurations."); args.Player.SendMessage("You must manually fix multi-world configurations.");
args.Player.SendMessage("To confirm this: /convert yes"); args.Player.SendMessage("To confirm this: /convert yes");
} else if (args.Parameters[0] == "yes") }
else if (args.Parameters[0] == "yes")
{ {
TShock.Warps.ConvertDB(); TShock.Warps.ConvertDB();
TShock.Regions.ConvertDB(); TShock.Regions.ConvertDB();
@ -1124,61 +1126,79 @@ namespace TShockAPI
private static void UseWarp(CommandArgs args) private static void UseWarp(CommandArgs args)
{ {
if (args.Parameters.Count > 0) if (args.Parameters.Count < 1)
{ {
if (args.Parameters[0].Equals("list")) args.Player.SendMessage("Invalid syntax! Proper syntax: /warp [name] or /warp list <page>", Color.Red);
{ return;
args.Player.SendMessage("Current Warps:", Color.Green); }
int page = 1;
if (args.Parameters.Count > 1)
int.TryParse(args.Parameters[1], out page);
var sb = new StringBuilder();
List<Warp> Warps = TShock.Warps.ListAllWarps();
if (Warps.Count > (15 * (page - 1))) if (args.Parameters[0].Equals("list"))
{ {
for (int j = (15 * (page - 1)); j < (15 * page); j++) //How many warps per page
{ const int pagelimit = 15;
if (Warps[j].WorldWarpID == Main.worldName) //How many warps per line
{ const int perline = 5;
if (sb.Length != 0) //Pages start at 0 but are displayed and parsed at 1
sb.Append(", "); int page = 0;
sb.Append(Warps[j].WarpName);
if (j == Warps.Count - 1)
{ if (args.Parameters.Count > 1)
args.Player.SendMessage(sb.ToString(), Color.Yellow);
break;
}
if ((j + 1) % 5 == 0)
{
args.Player.SendMessage(sb.ToString(), Color.Yellow);
sb.Clear();
}
}
}
}
if (Warps.Count > (15 * page))
{
args.Player.SendMessage(string.Format("Type /warp list {0} for more warps.", (page + 1)), Color.Yellow);
}
}
else
{ {
string warpName = String.Join(" ", args.Parameters); if (!int.TryParse(args.Parameters[1], out page) || page < 1)
var warp = TShock.Warps.FindWarp(warpName);
if (warp.WarpPos != Vector2.Zero)
{ {
if (args.Player.Teleport((int)warp.WarpPos.X, (int)warp.WarpPos.Y + 3)) args.Player.SendMessage(string.Format("Invalid page number ({0})", page), Color.Red);
args.Player.SendMessage("Warped to " + warpName, Color.Yellow); return;
}
else
{
args.Player.SendMessage("Specified warp not found", Color.Red);
} }
page--; //Substract 1 as pages are parsed starting at 1 and not 0
}
var warps = TShock.Warps.ListAllWarps(Main.worldName);
//Check if they are trying to access a page that doesn't exist.
int pagecount = warps.Count / pagelimit;
if (page > pagecount)
{
args.Player.SendMessage(string.Format("Page number exceeds pages ({0}/{1})", page + 1, pagecount + 1), Color.Red);
return;
}
//Display the current page and the number of pages.
args.Player.SendMessage(string.Format("Current Warps ({0}/{1}):", page + 1, pagecount + 1), Color.Green);
//Add up to pagelimit names to a list
var nameslist = new List<string>();
for (int i = 0; i < pagelimit && i + (page * pagelimit) < warps.Count; i++)
{
nameslist.Add(warps[i].WarpName);
}
//convert the list to an array for joining
var names = nameslist.ToArray();
for (int i = 0; i < names.Length; i += perline)
{
args.Player.SendMessage(string.Join(", ", names, i, Math.Min(names.Length - i, perline)), Color.Yellow);
}
if (page < pagecount)
{
args.Player.SendMessage(string.Format("Type /warp list {0} for more warps.", (page + 1)), Color.Yellow);
} }
} }
else else
args.Player.SendMessage("Invalid syntax! Proper syntax: /warp [name] or warp list", Color.Red); {
string warpName = String.Join(" ", args.Parameters);
var warp = TShock.Warps.FindWarp(warpName);
if (warp.WarpPos != Vector2.Zero)
{
if (args.Player.Teleport((int)warp.WarpPos.X, (int)warp.WarpPos.Y + 3))
args.Player.SendMessage("Warped to " + warpName, Color.Yellow);
}
else
{
args.Player.SendMessage("Specified warp not found", Color.Red);
}
}
} }
#endregion Teleport Commands #endregion Teleport Commands
@ -1375,7 +1395,7 @@ namespace TShockAPI
{ {
foreach (Region r in TShock.Regions.Regions) foreach (Region r in TShock.Regions.Regions)
{ {
args.Player.SendMessage(r.RegionName + ": P: " + r.DisableBuild + " X: " + r.RegionArea.X + " Y: " + r.RegionArea.Y + " W: " + r.RegionArea.Width + " H: " + r.RegionArea.Height ); args.Player.SendMessage(r.RegionName + ": P: " + r.DisableBuild + " X: " + r.RegionArea.X + " Y: " + r.RegionArea.Y + " W: " + r.RegionArea.Width + " H: " + r.RegionArea.Height);
foreach (int s in r.RegionAllowedIDs) foreach (int s in r.RegionAllowedIDs)
{ {
args.Player.SendMessage(r.RegionName + ": " + s); args.Player.SendMessage(r.RegionName + ": " + s);
@ -1877,7 +1897,7 @@ namespace TShockAPI
return; return;
} }
int itemAmount = 0; int itemAmount = 0;
int.TryParse( args.Parameters[args.Parameters.Count - 1 ], out itemAmount ); int.TryParse(args.Parameters[args.Parameters.Count - 1], out itemAmount);
var items = Tools.GetItemByIdOrName(args.Parameters[0]); var items = Tools.GetItemByIdOrName(args.Parameters[0]);
if (items.Count == 0) if (items.Count == 0)
{ {
@ -1894,7 +1914,7 @@ namespace TShockAPI
{ {
if (args.Player.InventorySlotAvailable || item.name.Contains("Coin")) if (args.Player.InventorySlotAvailable || item.name.Contains("Coin"))
{ {
if( itemAmount == 0 || itemAmount > item.maxStack ) if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack; itemAmount = item.maxStack;
args.Player.GiveItem(item.type, item.name, item.width, item.height, itemAmount); args.Player.GiveItem(item.type, item.name, item.width, item.height, itemAmount);
args.Player.SendMessage(string.Format("Gave {0} {1}(s).", itemAmount.ToString(), item.name)); args.Player.SendMessage(string.Format("Gave {0} {1}(s).", itemAmount.ToString(), item.name));

18
TShockAPI/DB/WarpsManager.cs
View file

@ -215,20 +215,24 @@ namespace TShockAPI.DB
return new Warp(); return new Warp();
} }
public List<Warp> ListAllWarps() /// <summary>
/// Gets all the warps names from world
/// </summary>
/// <param name="worldid">World name to get warps from</param>
/// <returns>List of warps with only their names</returns>
public List<Warp> ListAllWarps(string worldid)
{ {
List<Warp> Warps = new List<Warp>(); var warps = new List<Warp>();
try try
{ {
using (var com = database.CreateCommand()) using (var com = database.CreateCommand())
{ {
com.CommandText = "SELECT * FROM Warps"; com.CommandText = "SELECT WarpName FROM Warps WHERE WorldID=@worldid";
com.AddParameter("@worldid", worldid);
using (var reader = com.ExecuteReader()) using (var reader = com.ExecuteReader())
{ {
while (reader.Read()) while (reader.Read())
Warps.Add(new Warp(new Vector2(reader.Get<int>("X"), reader.Get<int>("Y")), reader.Get<string>("WarpName"), reader.Get<string>("WorldID"))); warps.Add(new Warp { WarpName = reader.Get<string>("WarpName") });
reader.Close();
} }
} }
} }
@ -236,7 +240,7 @@ namespace TShockAPI.DB
{ {
Log.Error(ex.ToString()); Log.Error(ex.ToString());
} }
return Warps; return warps;
} }
} }