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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

84
Scripts/Misc/AttackMessage.cs
View file

@ -4,57 +4,59 @@ using Server.Network;
namespace Server.Misc
{
public class AttackMessage
{
private const string AggressorFormat = "You are attacking {0}!";
private const string AggressedFormat = "{0} is attacking you!";
private const int Hue = 0x22;
public class AttackMessage
{
private const string AggressorFormat = "You are attacking {0}!";
private const string AggressedFormat = "{0} is attacking you!";
private const int Hue = 0x22;
private static TimeSpan Delay = TimeSpan.FromMinutes( 1.0 );
private static TimeSpan Delay = TimeSpan.FromMinutes(1.0);
public static void Initialize()
{
EventSink.AggressiveAction += EventSink_AggressiveAction;
}
public static void Initialize()
{
EventSink.AggressiveAction += EventSink_AggressiveAction;
}
public static void EventSink_AggressiveAction( AggressiveActionEventArgs e )
{
Mobile aggressor = e.Aggressor;
Mobile aggressed = e.Aggressed;
public static void EventSink_AggressiveAction(AggressiveActionEventArgs e)
{
Mobile aggressor = e.Aggressor;
Mobile aggressed = e.Aggressed;
if ( !aggressor.Player || !aggressed.Player )
return;
if (!aggressor.Player || !aggressed.Player)
return;
if ( !CheckAggressions( aggressor, aggressed ) )
{
aggressor.LocalOverheadMessage( MessageType.Regular, Hue, true, string.Format( AggressorFormat, aggressed.Name ) );
aggressed.LocalOverheadMessage( MessageType.Regular, Hue, true, string.Format( AggressedFormat, aggressor.Name ) );
}
}
if (!CheckAggressions(aggressor, aggressed))
{
aggressor.LocalOverheadMessage(MessageType.Regular, Hue, true,
string.Format(AggressorFormat, aggressed.Name));
aggressed.LocalOverheadMessage(MessageType.Regular, Hue, true,
string.Format(AggressedFormat, aggressor.Name));
}
}
public static bool CheckAggressions( Mobile m1, Mobile m2 )
{
List<AggressorInfo> list = m1.Aggressors;
public static bool CheckAggressions(Mobile m1, Mobile m2)
{
List<AggressorInfo> list = m1.Aggressors;
for ( int i = 0; i < list.Count; ++i )
{
AggressorInfo info = list[i];
for (int i = 0; i < list.Count; ++i)
{
AggressorInfo info = list[i];
if ( info.Attacker == m2 && DateTime.UtcNow < (info.LastCombatTime + Delay) )
return true;
}
if (info.Attacker == m2 && DateTime.UtcNow < info.LastCombatTime + Delay)
return true;
}
list = m2.Aggressors;
list = m2.Aggressors;
for ( int i = 0; i < list.Count; ++i )
{
AggressorInfo info = list[i];
for (int i = 0; i < list.Count; ++i)
{
AggressorInfo info = list[i];
if ( info.Attacker == m1 && DateTime.UtcNow < (info.LastCombatTime + Delay) )
return true;
}
if (info.Attacker == m1 && DateTime.UtcNow < info.LastCombatTime + Delay)
return true;
}
return false;
}
}
return false;
}
}
}