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

Cleanup/Housekeeping (#242)

Browse source
This commit is contained in:
Kamron Batman 2020-09-12 15:31:21 -07:00 • committed by GitHub
parent 90ede0659f
commit 741e8d8300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
228 changed files with 6292 additions and 2690 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,23 +1,3 @@
/***************************************************************************
* 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

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

@ -1,23 +1,3 @@
/***************************************************************************
* 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
@ -41,7 +21,10 @@ namespace Server.Targeting
public override Packet GetPacketFor(NetState ns)
{
if (ns.HighSeas)
{
return new MultiTargetReqHS(this);
}
return new MultiTargetReq(this);
}
}

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

@ -1,23 +1,3 @@
/***************************************************************************
* 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

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

@ -1,23 +1,3 @@
/***************************************************************************
* 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;
@ -187,19 +167,33 @@ namespace Server.Targeting
else
{
if (!from.CanSee(targeted))
OnCantSeeTarget(from, targeted);
{
OnCantSeeTarget(@from, targeted);
}
else if (CheckLOS && !from.InLOS(targeted))
OnTargetOutOfLOS(from, targeted);
{
OnTargetOutOfLOS(@from, targeted);
}
else if (item?.InSecureTrade == true)
OnTargetInSecureTrade(from, targeted);
{
OnTargetInSecureTrade(@from, targeted);
}
else if (item?.IsAccessibleTo(from) == false)
OnTargetNotAccessible(from, targeted);
{
OnTargetNotAccessible(@from, targeted);
}
else if (item?.CheckTarget(from, this, targeted) == false)
OnTargetUntargetable(from, targeted);
{
OnTargetUntargetable(@from, targeted);
}
else if (mobile?.CheckTarget(from, this, mobile) == false)
OnTargetUntargetable(from, mobile);
{
OnTargetUntargetable(@from, mobile);
}
else if (from.Region.OnTarget(from, this, targeted))
OnTarget(from, targeted);
{
OnTarget(@from, targeted);
}
}
OnTargetFinish(from);
@ -270,19 +264,29 @@ namespace Server.Targeting
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);
}
}
}
}

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

@ -1,23 +1,3 @@
/***************************************************************************
* 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

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

@ -1,23 +1,3 @@
/***************************************************************************
* 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