warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixes formatting (#200)

Browse source
This commit is contained in:
Kamron Batman 2020-08-25 18:53:35 -07:00 • committed by GitHub
parent 1f651992d7
commit 86b7b3aed1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
209 changed files with 51326 additions and 50397 deletions
Download patch file Download diff file Expand all files Collapse all files

118
Projects/Server/Targeting/LandTarget.cs
View file

@ -1,59 +1,59 @@
/***************************************************************************
* LandTarget.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
namespace Server.Targeting
{
public class LandTarget : IPoint3D
{
private Point3D m_Location;
public LandTarget(Point3D location, Map map)
{
m_Location = location;
if (map != null)
{
m_Location.Z = map.GetAverageZ(m_Location.X, m_Location.Y);
TileID = map.Tiles.GetLandTile(m_Location.X, m_Location.Y).ID & TileData.MaxLandValue;
}
}
[CommandProperty(AccessLevel.Counselor)]
public string Name => TileData.LandTable[TileID].Name;
[CommandProperty(AccessLevel.Counselor)]
public TileFlag Flags => TileData.LandTable[TileID].Flags;
[CommandProperty(AccessLevel.Counselor)]
public int TileID { get; }
[CommandProperty(AccessLevel.Counselor)]
public Point3D Location => m_Location;
[CommandProperty(AccessLevel.Counselor)]
public int X => m_Location.X;
[CommandProperty(AccessLevel.Counselor)]
public int Y => m_Location.Y;
[CommandProperty(AccessLevel.Counselor)]
public int Z => m_Location.Z;
}
}
/***************************************************************************
* LandTarget.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
namespace Server.Targeting
{
public class LandTarget : IPoint3D
{
private Point3D m_Location;
public LandTarget(Point3D location, Map map)
{
m_Location = location;
if (map != null)
{
m_Location.Z = map.GetAverageZ(m_Location.X, m_Location.Y);
TileID = map.Tiles.GetLandTile(m_Location.X, m_Location.Y).ID & TileData.MaxLandValue;
}
}
[CommandProperty(AccessLevel.Counselor)]
public string Name => TileData.LandTable[TileID].Name;
[CommandProperty(AccessLevel.Counselor)]
public TileFlag Flags => TileData.LandTable[TileID].Flags;
[CommandProperty(AccessLevel.Counselor)]
public int TileID { get; }
[CommandProperty(AccessLevel.Counselor)]
public Point3D Location => m_Location;
[CommandProperty(AccessLevel.Counselor)]
public int X => m_Location.X;
[CommandProperty(AccessLevel.Counselor)]
public int Y => m_Location.Y;
[CommandProperty(AccessLevel.Counselor)]
public int Z => m_Location.Z;
}
}

94
Projects/Server/Targeting/MultiTarget.cs
View file

@ -1,46 +1,48 @@
/***************************************************************************
* MultiTarget.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using Server.Network;
namespace Server.Targeting
{
public abstract class MultiTarget : Target
{
protected MultiTarget(int multiID, Point3D offset, int range = 10, bool allowGround = true,
TargetFlags flags = TargetFlags.None)
: base(range, allowGround, flags)
{
MultiID = multiID;
Offset = offset;
}
public int MultiID { get; set; }
public Point3D Offset { get; set; }
public override Packet GetPacketFor(NetState ns)
{
if (ns.HighSeas)
return new MultiTargetReqHS(this);
return new MultiTargetReq(this);
}
}
}
/***************************************************************************
* MultiTarget.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using Server.Network;
namespace Server.Targeting
{
public abstract class MultiTarget : Target
{
protected MultiTarget(
int multiID, Point3D offset, int range = 10, bool allowGround = true,
TargetFlags flags = TargetFlags.None
)
: base(range, allowGround, flags)
{
MultiID = multiID;
Offset = offset;
}
public int MultiID { get; set; }
public Point3D Offset { get; set; }
public override Packet GetPacketFor(NetState ns)
{
if (ns.HighSeas)
return new MultiTargetReqHS(this);
return new MultiTargetReq(this);
}
}
}

110
Projects/Server/Targeting/StaticTarget.cs
View file

@ -1,55 +1,55 @@
/***************************************************************************
* StaticTarget.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
namespace Server.Targeting
{
public class StaticTarget : IPoint3D
{
private Point3D m_Location;
public StaticTarget(Point3D location, int itemID)
{
m_Location = location;
ItemID = itemID & TileData.MaxItemValue;
m_Location.Z += TileData.ItemTable[ItemID].CalcHeight;
}
[CommandProperty(AccessLevel.Counselor)]
public Point3D Location => m_Location;
[CommandProperty(AccessLevel.Counselor)]
public string Name => TileData.ItemTable[ItemID].Name;
[CommandProperty(AccessLevel.Counselor)]
public TileFlag Flags => TileData.ItemTable[ItemID].Flags;
[CommandProperty(AccessLevel.Counselor)]
public int ItemID { get; }
[CommandProperty(AccessLevel.Counselor)]
public int X => m_Location.X;
[CommandProperty(AccessLevel.Counselor)]
public int Y => m_Location.Y;
[CommandProperty(AccessLevel.Counselor)]
public int Z => m_Location.Z;
}
}
/***************************************************************************
* StaticTarget.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
namespace Server.Targeting
{
public class StaticTarget : IPoint3D
{
private Point3D m_Location;
public StaticTarget(Point3D location, int itemID)
{
m_Location = location;
ItemID = itemID & TileData.MaxItemValue;
m_Location.Z += TileData.ItemTable[ItemID].CalcHeight;
}
[CommandProperty(AccessLevel.Counselor)]
public Point3D Location => m_Location;
[CommandProperty(AccessLevel.Counselor)]
public string Name => TileData.ItemTable[ItemID].Name;
[CommandProperty(AccessLevel.Counselor)]
public TileFlag Flags => TileData.ItemTable[ItemID].Flags;
[CommandProperty(AccessLevel.Counselor)]
public int ItemID { get; }
[CommandProperty(AccessLevel.Counselor)]
public int X => m_Location.X;
[CommandProperty(AccessLevel.Counselor)]
public int Y => m_Location.Y;
[CommandProperty(AccessLevel.Counselor)]
public int Z => m_Location.Z;
}
}

577
Projects/Server/Targeting/Target.cs
View file

@ -1,288 +1,289 @@
/***************************************************************************
* Target.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using System;
using Server.Network;
namespace Server.Targeting
{
public abstract class Target
{
private static int m_NextTargetID;
private Timer m_TimeoutTimer;
protected Target(int range, bool allowGround, TargetFlags flags)
{
TargetID = ++m_NextTargetID;
Range = range;
AllowGround = allowGround;
Flags = flags;
CheckLOS = true;
}
public DateTime TimeoutTime { get; private set; }
public bool CheckLOS { get; set; }
public bool DisallowMultis { get; set; }
public bool AllowNonlocal { get; set; }
public int TargetID { get; }
public int Range { get; set; }
public bool AllowGround { get; set; }
public TargetFlags Flags { get; set; }
public static void Cancel(Mobile m)
{
m.NetState?.Send(CancelTarget.Instance);
m.Target?.OnTargetCancel(m, TargetCancelType.Canceled);
}
public void BeginTimeout(Mobile from, TimeSpan delay)
{
TimeoutTime = DateTime.UtcNow + delay;
m_TimeoutTimer?.Stop();
m_TimeoutTimer = new TimeoutTimer(this, from, delay);
m_TimeoutTimer.Start();
}
public void CancelTimeout()
{
m_TimeoutTimer?.Stop();
m_TimeoutTimer = null;
}
public void Timeout(Mobile from)
{
CancelTimeout();
from.ClearTarget();
Cancel(from);
OnTargetCancel(from, TargetCancelType.Timeout);
OnTargetFinish(from);
}
public virtual Packet GetPacketFor(NetState ns) => new TargetReq(this);
public void Cancel(Mobile from, TargetCancelType type)
{
CancelTimeout();
from.ClearTarget();
OnTargetCancel(from, type);
OnTargetFinish(from);
}
public void Invoke(Mobile from, object targeted)
{
CancelTimeout();
from.ClearTarget();
if (from.Deleted)
{
OnTargetCancel(from, TargetCancelType.Canceled);
OnTargetFinish(from);
return;
}
Point3D loc;
Map map;
var item = targeted as Item;
var mobile = targeted as Mobile;
if (targeted is LandTarget target)
{
loc = target.Location;
map = from.Map;
}
else if (targeted is StaticTarget staticTarget)
{
loc = staticTarget.Location;
map = from.Map;
}
else if (mobile != null)
{
if (mobile.Deleted)
{
OnTargetDeleted(from, mobile);
OnTargetFinish(from);
return;
}
if (!mobile.CanTarget)
{
OnTargetUntargetable(from, mobile);
OnTargetFinish(from);
return;
}
loc = mobile.Location;
map = mobile.Map;
}
else if (item != null)
{
if (item.Deleted)
{
OnTargetDeleted(from, item);
OnTargetFinish(from);
return;
}
if (!item.CanTarget)
{
OnTargetUntargetable(from, item);
OnTargetFinish(from);
return;
}
if (!AllowNonlocal && item.RootParent is Mobile && item.RootParent != from && from.AccessLevel == AccessLevel.Player)
{
OnNonlocalTarget(from, item);
OnTargetFinish(from);
return;
}
loc = item.GetWorldLocation();
map = item.Map;
}
else
{
OnTargetCancel(from, TargetCancelType.Canceled);
OnTargetFinish(from);
return;
}
if (map == null || map != from.Map || (Range != -1 && !from.InRange(loc, Range)))
{
OnTargetOutOfRange(from, targeted);
}
else
{
if (!from.CanSee(targeted))
OnCantSeeTarget(from, targeted);
else if (CheckLOS && !from.InLOS(targeted))
OnTargetOutOfLOS(from, targeted);
else if (item?.InSecureTrade == true)
OnTargetInSecureTrade(from, targeted);
else if (item?.IsAccessibleTo(from) == false)
OnTargetNotAccessible(from, targeted);
else if (item?.CheckTarget(from, this, targeted) == false)
OnTargetUntargetable(from, targeted);
else if (mobile?.CheckTarget(from, this, mobile) == false)
OnTargetUntargetable(from, mobile);
else if (from.Region.OnTarget(from, this, targeted))
OnTarget(from, targeted);
}
OnTargetFinish(from);
}
protected virtual void OnTarget(Mobile from, object targeted)
{
}
protected virtual void OnTargetNotAccessible(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnTargetInSecureTrade(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnNonlocalTarget(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnCantSeeTarget(Mobile from, object targeted)
{
from.SendLocalizedMessage(500237); // Target can not be seen.
}
protected virtual void OnTargetOutOfLOS(Mobile from, object targeted)
{
from.SendLocalizedMessage(500237); // Target can not be seen.
}
protected virtual void OnTargetOutOfRange(Mobile from, object targeted)
{
from.SendLocalizedMessage(500446); // That is too far away.
}
protected virtual void OnTargetDeleted(Mobile from, object targeted)
{
}
protected virtual void OnTargetUntargetable(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnTargetCancel(Mobile from, TargetCancelType cancelType)
{
}
protected virtual void OnTargetFinish(Mobile from)
{
}
private class TimeoutTimer : Timer
{
private static readonly TimeSpan ThirtySeconds = TimeSpan.FromSeconds(30.0);
private static readonly TimeSpan TenSeconds = TimeSpan.FromSeconds(10.0);
private static readonly TimeSpan OneSecond = TimeSpan.FromSeconds(1.0);
private readonly Mobile m_Mobile;
private readonly Target m_Target;
public TimeoutTimer(Target target, Mobile m, TimeSpan delay) : base(delay)
{
m_Target = target;
m_Mobile = m;
if (delay >= ThirtySeconds)
Priority = TimerPriority.FiveSeconds;
else if (delay >= TenSeconds)
Priority = TimerPriority.OneSecond;
else if (delay >= OneSecond)
Priority = TimerPriority.TwoFiftyMS;
else
Priority = TimerPriority.TwentyFiveMS;
}
protected override void OnTick()
{
if (m_Mobile.Target == m_Target)
m_Target.Timeout(m_Mobile);
}
}
}
}
/***************************************************************************
* Target.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using System;
using Server.Network;
namespace Server.Targeting
{
public abstract class Target
{
private static int m_NextTargetID;
private Timer m_TimeoutTimer;
protected Target(int range, bool allowGround, TargetFlags flags)
{
TargetID = ++m_NextTargetID;
Range = range;
AllowGround = allowGround;
Flags = flags;
CheckLOS = true;
}
public DateTime TimeoutTime { get; private set; }
public bool CheckLOS { get; set; }
public bool DisallowMultis { get; set; }
public bool AllowNonlocal { get; set; }
public int TargetID { get; }
public int Range { get; set; }
public bool AllowGround { get; set; }
public TargetFlags Flags { get; set; }
public static void Cancel(Mobile m)
{
m.NetState?.Send(CancelTarget.Instance);
m.Target?.OnTargetCancel(m, TargetCancelType.Canceled);
}
public void BeginTimeout(Mobile from, TimeSpan delay)
{
TimeoutTime = DateTime.UtcNow + delay;
m_TimeoutTimer?.Stop();
m_TimeoutTimer = new TimeoutTimer(this, from, delay);
m_TimeoutTimer.Start();
}
public void CancelTimeout()
{
m_TimeoutTimer?.Stop();
m_TimeoutTimer = null;
}
public void Timeout(Mobile from)
{
CancelTimeout();
from.ClearTarget();
Cancel(from);
OnTargetCancel(from, TargetCancelType.Timeout);
OnTargetFinish(from);
}
public virtual Packet GetPacketFor(NetState ns) => new TargetReq(this);
public void Cancel(Mobile from, TargetCancelType type)
{
CancelTimeout();
from.ClearTarget();
OnTargetCancel(from, type);
OnTargetFinish(from);
}
public void Invoke(Mobile from, object targeted)
{
CancelTimeout();
from.ClearTarget();
if (from.Deleted)
{
OnTargetCancel(from, TargetCancelType.Canceled);
OnTargetFinish(from);
return;
}
Point3D loc;
Map map;
var item = targeted as Item;
var mobile = targeted as Mobile;
if (targeted is LandTarget target)
{
loc = target.Location;
map = from.Map;
}
else if (targeted is StaticTarget staticTarget)
{
loc = staticTarget.Location;
map = from.Map;
}
else if (mobile != null)
{
if (mobile.Deleted)
{
OnTargetDeleted(from, mobile);
OnTargetFinish(from);
return;
}
if (!mobile.CanTarget)
{
OnTargetUntargetable(from, mobile);
OnTargetFinish(from);
return;
}
loc = mobile.Location;
map = mobile.Map;
}
else if (item != null)
{
if (item.Deleted)
{
OnTargetDeleted(from, item);
OnTargetFinish(from);
return;
}
if (!item.CanTarget)
{
OnTargetUntargetable(from, item);
OnTargetFinish(from);
return;
}
if (!AllowNonlocal && item.RootParent is Mobile && item.RootParent != from &&
from.AccessLevel == AccessLevel.Player)
{
OnNonlocalTarget(from, item);
OnTargetFinish(from);
return;
}
loc = item.GetWorldLocation();
map = item.Map;
}
else
{
OnTargetCancel(from, TargetCancelType.Canceled);
OnTargetFinish(from);
return;
}
if (map == null || map != from.Map || Range != -1 && !from.InRange(loc, Range))
{
OnTargetOutOfRange(from, targeted);
}
else
{
if (!from.CanSee(targeted))
OnCantSeeTarget(from, targeted);
else if (CheckLOS && !from.InLOS(targeted))
OnTargetOutOfLOS(from, targeted);
else if (item?.InSecureTrade == true)
OnTargetInSecureTrade(from, targeted);
else if (item?.IsAccessibleTo(from) == false)
OnTargetNotAccessible(from, targeted);
else if (item?.CheckTarget(from, this, targeted) == false)
OnTargetUntargetable(from, targeted);
else if (mobile?.CheckTarget(from, this, mobile) == false)
OnTargetUntargetable(from, mobile);
else if (from.Region.OnTarget(from, this, targeted))
OnTarget(from, targeted);
}
OnTargetFinish(from);
}
protected virtual void OnTarget(Mobile from, object targeted)
{
}
protected virtual void OnTargetNotAccessible(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnTargetInSecureTrade(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnNonlocalTarget(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnCantSeeTarget(Mobile from, object targeted)
{
from.SendLocalizedMessage(500237); // Target can not be seen.
}
protected virtual void OnTargetOutOfLOS(Mobile from, object targeted)
{
from.SendLocalizedMessage(500237); // Target can not be seen.
}
protected virtual void OnTargetOutOfRange(Mobile from, object targeted)
{
from.SendLocalizedMessage(500446); // That is too far away.
}
protected virtual void OnTargetDeleted(Mobile from, object targeted)
{
}
protected virtual void OnTargetUntargetable(Mobile from, object targeted)
{
from.SendLocalizedMessage(500447); // That is not accessible.
}
protected virtual void OnTargetCancel(Mobile from, TargetCancelType cancelType)
{
}
protected virtual void OnTargetFinish(Mobile from)
{
}
private class TimeoutTimer : Timer
{
private static readonly TimeSpan ThirtySeconds = TimeSpan.FromSeconds(30.0);
private static readonly TimeSpan TenSeconds = TimeSpan.FromSeconds(10.0);
private static readonly TimeSpan OneSecond = TimeSpan.FromSeconds(1.0);
private readonly Mobile m_Mobile;
private readonly Target m_Target;
public TimeoutTimer(Target target, Mobile m, TimeSpan delay) : base(delay)
{
m_Target = target;
m_Mobile = m;
if (delay >= ThirtySeconds)
Priority = TimerPriority.FiveSeconds;
else if (delay >= TenSeconds)
Priority = TimerPriority.OneSecond;
else if (delay >= OneSecond)
Priority = TimerPriority.TwoFiftyMS;
else
Priority = TimerPriority.TwentyFiveMS;
}
protected override void OnTick()
{
if (m_Mobile.Target == m_Target)
m_Target.Timeout(m_Mobile);
}
}
}
}

60
Projects/Server/Targeting/TargetCancelType.cs
View file

@ -1,30 +1,30 @@
/***************************************************************************
* TargetCancelType.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
namespace Server.Targeting
{
public enum TargetCancelType
{
Overridden,
Canceled,
Disconnected,
Timeout
}
}
/***************************************************************************
* TargetCancelType.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
namespace Server.Targeting
{
public enum TargetCancelType
{
Overridden,
Canceled,
Disconnected,
Timeout
}
}

64
Projects/Server/Targeting/TargetFlags.cs
View file

@ -1,32 +1,32 @@
/***************************************************************************
* TargetFlags.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using System;
namespace Server.Targeting
{
[Flags]
public enum TargetFlags : byte
{
None = 0x00,
Harmful = 0x01,
Beneficial = 0x02
}
}
/***************************************************************************
* TargetFlags.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using System;
namespace Server.Targeting
{
[Flags]
public enum TargetFlags : byte
{
None = 0x00,
Harmful = 0x01,
Beneficial = 0x02
}
}