Updates location command (#104)

This commit is contained in:
Kamron Batman 2020-04-12 21:49:24 -07:00 committed by GitHub
parent 5fcd3b7505
commit 9ba0cfcc59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,14 +1,16 @@
using System.Collections.Generic;
using Server.Commands.Generic; using Server.Commands.Generic;
using Server.Items; using Server.Items;
using Server.Targeting; using Server.Targeting;
using System.Globalization; using System.Globalization;
using System.Linq;
namespace Server.Commands namespace Server.Commands
{ {
public class LocationCommand : BaseCommand public class LocationCommand : BaseCommand
{ {
public LocationCommand() : base() private static readonly List<int> m_DefaultGraphics = new List<int>{ 0x17AF, 0x17B0, 0x17B1, 0x17B2 };
public LocationCommand()
{ {
AccessLevel = AccessLevel.Counselor; AccessLevel = AccessLevel.Counselor;
Commands = new[] { "Location", "Loc", "Pos" }; Commands = new[] { "Location", "Loc", "Pos" };
@ -16,37 +18,46 @@ namespace Server.Commands
Supports = CommandSupport.Single | CommandSupport.Multi; Supports = CommandSupport.Single | CommandSupport.Multi;
Usage = "Location [itemIds ...]"; Usage = "Location [itemIds ...]";
Description = "Retrieves the positional coordinates of a target. Displaying a message above the item, " Description = "Retrieves the positional coordinates of a target. Displaying a message above the item, "
+ "mobile, or environment. Environment targets will also have a graphic temporarily displayed " + "mobile, or environment. Environment targets will also have a graphic temporarily displayed "
+ "on the tile. This graphic can be changed to the provided list of itemIds."; + "on the tile. This graphic can be changed to the provided list of itemIds.";
} }
public override void Execute(CommandEventArgs e, object obj) public override void Execute(CommandEventArgs e, object obj)
{ {
int[] graphics = new[] { 0x17AF, 0X17B0, 0X17B1, 0X17B2 }; if (!(obj is IPoint3D point))
if (e.Arguments.Length > 0)
graphics = e.Arguments
.Select(x => int.TryParse(x, out int result)
? result : int.TryParse(x.Substring(2), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out result)
? result : (int?)null)
.Where(x => x.HasValue)
.Select(x => x.Value)
.ToArray();
if (obj is IPoint3D point)
{ {
var label = $"(x:{point.X}, y:{point.Y}, z:{point.Z})"; LogFailure("That cannot be located.");
if (obj is LandTarget || obj is StaticTarget) return;
{
var item = EffectItem.Create(new Point3D(point), e.Mobile.Map, EffectItem.DefaultDuration);
foreach (int graphic in graphics)
Effects.SendLocationParticles(item, graphic, 10, 50, 2023);
item.LabelTo(e.Mobile, label);
}
else if (obj is Mobile entity) entity.SayTo(e.Mobile, label);
else if (obj is Item item) item.LabelTo(e.Mobile, label);
AddResponse($"Location: {label}");
} }
else
LogFailure("That is not locatable."); var label = $"(x:{point.X}, y:{point.Y}, z:{point.Z})";
if (obj is LandTarget || obj is StaticTarget)
{
List<int> graphics;
if (e.Arguments.Length == 0)
graphics = m_DefaultGraphics;
else
{
graphics = new List<int>();
foreach (var arg in e.Arguments)
{
var numberStyles = arg.ToLower().StartsWith("0x") ? NumberStyles.HexNumber : NumberStyles.Integer;
if (int.TryParse(arg, numberStyles, CultureInfo.InvariantCulture, out int result))
graphics.Add(result);
}
}
var item = EffectItem.Create(new Point3D(point), e.Mobile.Map, EffectItem.DefaultDuration);
foreach (int graphic in graphics)
Effects.SendLocationParticles(item, graphic, 10, 50, 2023);
item.LabelTo(e.Mobile, label);
}
else if (obj is Mobile entity) entity.SayTo(e.Mobile, label);
else if (obj is Item item) item.LabelTo(e.Mobile, label);
AddResponse($"Location: {label}");
} }
} }
} }