diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index fde19643..afd10762 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -139,6 +139,7 @@ namespace TShockAPI ChatCommands.Add(new Command("p", "", PartyChat)); ChatCommands.Add(new Command("rules", "", Rules)); ChatCommands.Add(new Command("whitelist", "maintenance", Whitelist)); + ChatCommands.Add(new Command("region", "editspawn", Region)); if (ConfigurationManager.DistributationAgent != "terraria-online") { ChatCommands.Add(new Command("kill", "kill", Kill)); @@ -879,6 +880,126 @@ namespace TShockAPI Tools.Broadcast(string.Format("Spawn is now {0}.", (ConfigurationManager.SpawnProtect ? "protected" : "open"))); } + private static void Region(CommandArgs args) + { + if (args.Parameters.Count > 0) + { + switch (args.Parameters[0].ToLower()) + { + case "set": + { + if (args.Parameters.Count > 1) + { + if (args.Parameters[1] == "1") + { + args.Player.TempArea.X = args.Player.TileX; + args.Player.TempArea.Y = args.Player.TileY; + args.Player.SendMessage("Set Temp Point 1", Color.Yellow); + } + else if (args.Parameters[1] == "2") + { + if (args.Player.TempArea.X != 0) + { + if (args.Player.TileX > args.Player.TempArea.X && args.Player.TileY > args.Player.TempArea.Y) + { + args.Player.TempArea.Width = args.Player.TileX - args.Player.TempArea.X; + args.Player.TempArea.Height = (args.Player.TileY + 3) - args.Player.TempArea.Y; + args.Player.SendMessage("Set Temp Point 2", Color.Yellow); + } + else + { + args.Player.SendMessage("Point 2 must be below and right of Point 1", Color.Yellow); + args.Player.SendMessage("Use /region clear to start again", Color.Yellow); + } + } + else + { + args.Player.SendMessage("You have not set Point 1 yet", Color.Red); + } + } + } + else + args.Player.SendMessage("Invalid syntax! Proper syntax: /region set [1/2]", Color.Red); + break; + } + case "define": + { + if (args.Parameters.Count > 1) + { + if (!args.Player.TempArea.IsEmpty) + { + if (RegionManager.AddRegion(args.Player.TempArea.X, args.Player.TempArea.Y, args.Player.TempArea.Width, args.Player.TempArea.Height, args.Parameters[1], true)) + { + RegionManager.WriteSettings(); + args.Player.TempArea = Rectangle.Empty; + args.Player.SendMessage("Set region " + args.Parameters[1], Color.Yellow); + } + else + { + args.Player.SendMessage("Region " + args.Parameters[1] + " already exists", Color.Red); + } + } + else + args.Player.SendMessage("Points not set up yet", Color.Red); + } + else + args.Player.SendMessage("Invalid syntax! Proper syntax: /region define [name]", Color.Red); + break; + } + case "protected": + { + if (args.Parameters.Count > 2) + { + if (args.Parameters[2].ToLower() == "true") + { + if(RegionManager.SetRegionState(args.Parameters[1],true)) + args.Player.SendMessage("Protected region " + args.Parameters[1], Color.Yellow); + else + args.Player.SendMessage("Could not find specified region", Color.Red); + } + else if (args.Parameters[2].ToLower() == "false") + { + if (RegionManager.SetRegionState(args.Parameters[1], false)) + args.Player.SendMessage("Unprotected region " + args.Parameters[1], Color.Yellow); + else + args.Player.SendMessage("Could not find specified region", Color.Red); + } + else + args.Player.SendMessage("Invalid syntax! Proper syntax: /region protected [name] [true/false]", Color.Red); + } + else + args.Player.SendMessage("Invalid syntax! Proper syntax: /region protected [name] [true/false]", Color.Red); + break; + } + case "delete": + { + if (args.Parameters.Count > 1) + { + if (RegionManager.DeleteRegion(args.Parameters[1])) + args.Player.SendMessage("Deleted region " + args.Parameters[1], Color.Yellow); + else + args.Player.SendMessage("Could not find specified region", Color.Red); + } + break; + } + case "clear": + { + args.Player.TempArea = Rectangle.Empty; + args.Player.SendMessage("Cleared temp area", Color.Yellow); + break; + } + case "help": + { + args.Player.SendMessage("Avialable region commands:", Color.Green); + args.Player.SendMessage("/region set [1/2] /region define [name]", Color.Yellow); + args.Player.SendMessage("/region delete [name] /region clear (temporary region)", Color.Yellow); + break; + } + } + } + + } + #endregion World Protection Commands #region General Commands diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 1929c3ce..863ec69c 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -216,6 +216,12 @@ namespace TShockAPI return true; } } + if (!args.Player.Group.HasPermission("editspawn") && RegionManager.InProtectedArea(x, y)) + { + args.Player.SendMessage("Region protected from changes.", Color.Red); + args.Player.SendTileSquare(x, y); + return true; + } if (ConfigurationManager.DisableBuild) { if (!args.Player.Group.HasPermission("editspawn")) diff --git a/TShockAPI/RegionManager.cs b/TShockAPI/RegionManager.cs new file mode 100644 index 00000000..364251cf --- /dev/null +++ b/TShockAPI/RegionManager.cs @@ -0,0 +1,214 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml; +using Microsoft.Xna.Framework; + +namespace TShockAPI +{ + public class RegionManager + { + public static List Regions = new List(); + + public static bool AddRegion(int tx, int ty, int width, int height, string name, bool state) + { + foreach (Region nametest in Regions) + { + if (name.ToLower() == nametest.Name.ToLower()) + { + return false; + } + } + Regions.Add(new Region(new Rectangle(tx, ty, width, height), name, true)); + return true; + } + + public static bool DeleteRegion(string name) + { + foreach (Region nametest in Regions) + { + if (name.ToLower() == nametest.Name.ToLower()) + { + Regions.Remove(nametest); + WriteSettings(); + return true; + } + } + return false; + } + + public static bool SetRegionState(string name, bool state) + { + foreach (Region nametest in Regions) + { + if (name.ToLower() == nametest.Name.ToLower()) + { + nametest.DisableBuild = state; + WriteSettings(); + return true; + } + } + return false; + } + + public static bool InProtectedArea(int X, int Y) + { + foreach(Region region in Regions) + { + if (X >= region.RegionArea.Left && X <= region.RegionArea.Right && Y >= region.RegionArea.Top && Y <= region.RegionArea.Bottom && region.DisableBuild) + { + return true; + } + } + return false; + } + + public static void WriteSettings() + { + try + { + XmlWriterSettings xmlWriterSettings = new XmlWriterSettings(); + xmlWriterSettings.Indent = true; + xmlWriterSettings.NewLineChars = Environment.NewLine; + + using (XmlWriter settingsw = XmlWriter.Create("regions.xml", xmlWriterSettings)) + { + settingsw.WriteStartDocument(); + settingsw.WriteStartElement("Regions"); + + foreach (Region region in Regions) + { + settingsw.WriteStartElement("ProtectedRegion"); + settingsw.WriteElementString("RegionName", region.Name); + settingsw.WriteElementString("Point1X", region.RegionArea.X.ToString()); + settingsw.WriteElementString("Point1Y", region.RegionArea.Y.ToString()); + settingsw.WriteElementString("Point2X", region.RegionArea.Width.ToString()); + settingsw.WriteElementString("Point2Y", region.RegionArea.Height.ToString()); + settingsw.WriteElementString("Protected", region.DisableBuild.ToString()); + settingsw.WriteEndElement(); + } + + settingsw.WriteEndElement(); + settingsw.WriteEndDocument(); + } + Log.Info("Wrote Regions"); + } + catch + { + Log.Info("Could not write Regions"); + } + } + + public static void ReadAllSettings() + { + try + { + XmlReaderSettings xmlReaderSettings = new XmlReaderSettings(); + xmlReaderSettings.IgnoreWhitespace = true; + + using (XmlReader settingr = XmlReader.Create("regions.xml", xmlReaderSettings)) + { + while (settingr.Read()) + { + if (settingr.IsStartElement()) + { + switch (settingr.Name) + { + case "Regions": + { + break; + } + case "ProtectedRegion": + { + if (settingr.Read()) + { + string name; + int x = 0; + int y = 0; + int width = 0; + int height = 0; + bool state = true; + + settingr.Read(); + name = settingr.Value; + + settingr.Read(); + settingr.Read(); + settingr.Read(); + if (settingr.Value != "" || settingr.Value != null) + Int32.TryParse(settingr.Value, out x); + else + Console.WriteLine("Could not parse x"); + + settingr.Read(); + settingr.Read(); + settingr.Read(); + if (settingr.Value != "" || settingr.Value != null) + Int32.TryParse(settingr.Value, out y); + else + Console.WriteLine("Could not parse y"); + + settingr.Read(); + settingr.Read(); + settingr.Read(); + if (settingr.Value != "" || settingr.Value != null) + Int32.TryParse(settingr.Value, out width); + else + Console.WriteLine("Could not parse width"); + + settingr.Read(); + settingr.Read(); + settingr.Read(); + if (settingr.Value != "" || settingr.Value != null) + Int32.TryParse(settingr.Value, out height); + else + Console.WriteLine("Could not parse height"); + + settingr.Read(); + settingr.Read(); + settingr.Read(); + if (settingr.Value != "" || settingr.Value != null) + bool.TryParse(settingr.Value, out state); + else + Console.WriteLine("Could not parse state"); + + AddRegion(x, y, width, height, name, state); + } + break; + } + } + } + } + } + Log.Info("Read Regions"); + } + catch + { + Log.Info("Could not read Regions"); + WriteSettings(); + } + } + } + + public class Region + { + public Rectangle RegionArea { get; set; } + public string Name { get; set; } + public bool DisableBuild { get; set; } + + public Region(Rectangle region, string name, bool disablebuild) + { + RegionArea = region; + Name = name; + DisableBuild = disablebuild; + } + + public Region() + { + RegionArea = Rectangle.Empty; + Name = string.Empty; + DisableBuild = true; + } + } +} diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index e026b201..2f3d4daf 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -35,6 +35,7 @@ namespace TShockAPI public bool ReceivedInfo { get; set; } public int Index { get; protected set; } public DateTime LastPvpChange { get; protected set; } + public Rectangle TempArea = new Rectangle(); public bool RealPlayer { get { return Index >= 0 && Index < Main.maxNetPlayers; } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 64421f3b..0d527194 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -101,6 +101,8 @@ namespace TShockAPI Commands.InitCommands(); Log.Info("Commands initialized"); + RegionManager.ReadAllSettings(); + Backups.KeepFor = ConfigurationManager.BackupKeepFor; Backups.Interval = ConfigurationManager.BackupInterval;