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

117
Server/ContextMenus/ContextMenu.cs
View file

@ -23,78 +23,69 @@ using System.Collections.Generic;
namespace Server.ContextMenus
{
/// <summary>
/// Represents the state of an active context menu. This includes who opened the menu, the menu's focus object, and a list of <see cref="ContextMenuEntry">entries</see> that the menu is composed of.
/// <seealso cref="ContextMenuEntry" />
/// Represents the state of an active context menu. This includes who opened the menu, the menu's focus object, and a list of
/// <see cref="ContextMenuEntry">entries</see> that the menu is composed of.
/// <seealso cref="ContextMenuEntry" />
/// </summary>
public class ContextMenu
{
/// <summary>
/// Gets the <see cref="Mobile" /> who opened this ContextMenu.
/// </summary>
public Mobile From { get; }
{
/// <summary>
/// Instantiates a new ContextMenu instance.
/// </summary>
/// <param name="from">
/// The <see cref="Mobile" /> who opened this ContextMenu.
/// <seealso cref="From" />
/// </param>
/// <param name="target">
/// The <see cref="Mobile" /> or <see cref="Item" /> for which this ContextMenu is on.
/// <seealso cref="Target" />
/// </param>
public ContextMenu(Mobile from, object target)
{
From = from;
Target = target;
/// <summary>
/// Gets an object of the <see cref="Mobile" /> or <see cref="Item" /> for which this ContextMenu is on.
/// </summary>
public object Target { get; }
List<ContextMenuEntry> list = new List<ContextMenuEntry>();
/// <summary>
/// Gets the list of <see cref="ContextMenuEntry">entries</see> contained in this ContextMenu.
/// </summary>
public ContextMenuEntry[] Entries { get; }
if (target is Mobile mobile)
mobile.GetContextMenuEntries(from, list);
else if (target is Item item) item.GetContextMenuEntries(from, list);
/// <summary>
/// Instantiates a new ContextMenu instance.
/// </summary>
/// <param name="from">
/// The <see cref="Mobile" /> who opened this ContextMenu.
/// <seealso cref="From" />
/// </param>
/// <param name="target">
/// The <see cref="Mobile" /> or <see cref="Item" /> for which this ContextMenu is on.
/// <seealso cref="Target" />
/// </param>
public ContextMenu( Mobile from, object target )
{
From = from;
Target = target;
//m_Entries = (ContextMenuEntry[])list.ToArray( typeof( ContextMenuEntry ) );
List<ContextMenuEntry> list = new List<ContextMenuEntry>();
Entries = list.ToArray();
if ( target is Mobile mobile )
{
mobile.GetContextMenuEntries( from, list );
}
else if ( target is Item item )
{
item.GetContextMenuEntries( from, list );
}
for (int i = 0; i < Entries.Length; ++i) Entries[i].Owner = this;
}
//m_Entries = (ContextMenuEntry[])list.ToArray( typeof( ContextMenuEntry ) );
/// <summary>
/// Gets the <see cref="Mobile" /> who opened this ContextMenu.
/// </summary>
public Mobile From{ get; }
Entries = list.ToArray();
/// <summary>
/// Gets an object of the <see cref="Mobile" /> or <see cref="Item" /> for which this ContextMenu is on.
/// </summary>
public object Target{ get; }
for ( int i = 0; i < Entries.Length; ++i )
{
Entries[i].Owner = this;
}
}
/// <summary>
/// Gets the list of <see cref="ContextMenuEntry">entries</see> contained in this ContextMenu.
/// </summary>
public ContextMenuEntry[] Entries{ get; }
/// <summary>
/// Returns true if this ContextMenu requires packet version 2.
/// </summary>
public bool RequiresNewPacket
{
get
{
for ( int i = 0; i < Entries.Length; ++i )
{
if ( Entries[i].Number < 3000000 || Entries[i].Number > 3032767 )
return true;
}
/// <summary>
/// Returns true if this ContextMenu requires packet version 2.
/// </summary>
public bool RequiresNewPacket
{
get
{
for (int i = 0; i < Entries.Length; ++i)
if (Entries[i].Number < 3000000 || Entries[i].Number > 3032767)
return true;
return false;
}
}
}
}
return false;
}
}
}
}

143
Server/ContextMenus/ContextMenuEntry.cs
View file

@ -23,85 +23,88 @@ using Server.Network;
namespace Server.ContextMenus
{
/// <summary>
/// Represents a single entry of a <see cref="ContextMenu">context menu</see>.
/// <seealso cref="ContextMenu" />
/// Represents a single entry of a <see cref="ContextMenu">context menu</see>.
/// <seealso cref="ContextMenu" />
/// </summary>
public class ContextMenuEntry
{
/// <summary>
/// Gets or sets additional <see cref="CMEFlags">flags</see> used in client communication.
/// </summary>
public CMEFlags Flags { get; set; }
{
/// <summary>
/// Instantiates a new ContextMenuEntry with a given <see cref="Number">localization number</see> (<paramref name="number" />
/// ). No <see cref="Range">maximum range</see> is used.
/// </summary>
/// <param name="number">
/// The localization number containing the name of this entry.
/// <seealso cref="Number" />
/// </param>
public ContextMenuEntry(int number) : this(number, -1)
{
}
/// <summary>
/// Gets or sets the <see cref="ContextMenu" /> that owns this entry.
/// </summary>
public ContextMenu Owner { get; set; }
/// <summary>
/// Instantiates a new ContextMenuEntry with a given <see cref="Number">localization number</see> (<paramref name="number" />)
/// and <see cref="Range">maximum range</see> (<paramref name="range" />).
/// </summary>
/// <param name="number">
/// The localization number containing the name of this entry.
/// <seealso cref="Number" />
/// </param>
/// <param name="range">
/// The maximum range at which this entry can be used.
/// <seealso cref="Range" />
/// </param>
public ContextMenuEntry(int number, int range)
{
if (number <= 0x7FFF) // Legacy code support
Number = 3000000 + number;
else
Number = number;
/// <summary>
/// Gets or sets the localization number containing the name of this entry.
/// </summary>
public int Number { get; set; }
Range = range;
Enabled = true;
Color = 0xFFFF;
}
/// <summary>
/// Gets or sets the maximum range at which this entry may be used, in tiles. A value of -1 signifies no maximum range.
/// </summary>
public int Range { get; set; }
/// <summary>
/// Gets or sets additional <see cref="CMEFlags">flags</see> used in client communication.
/// </summary>
public CMEFlags Flags{ get; set; }
/// <summary>
/// Gets or sets the color for this entry. Format is A1-R5-G5-B5.
/// </summary>
public int Color { get; set; }
/// <summary>
/// Gets or sets the <see cref="ContextMenu" /> that owns this entry.
/// </summary>
public ContextMenu Owner{ get; set; }
/// <summary>
/// Gets or sets whether this entry is enabled. When false, the entry will appear in a gray hue and <see cref="OnClick" /> will never be invoked.
/// </summary>
public bool Enabled { get; set; }
/// <summary>
/// Gets or sets the localization number containing the name of this entry.
/// </summary>
public int Number{ get; set; }
/// <summary>
/// Gets a value indicating if non local use of this entry is permitted.
/// </summary>
public virtual bool NonLocalUse => false;
/// <summary>
/// Gets or sets the maximum range at which this entry may be used, in tiles. A value of -1 signifies no maximum range.
/// </summary>
public int Range{ get; set; }
/// <summary>
/// Instantiates a new ContextMenuEntry with a given <see cref="Number">localization number</see> (<paramref name="number" />). No <see cref="Range">maximum range</see> is used.
/// </summary>
/// <param name="number">
/// The localization number containing the name of this entry.
/// <seealso cref="Number" />
/// </param>
public ContextMenuEntry( int number ) : this( number, -1 )
{
}
/// <summary>
/// Gets or sets the color for this entry. Format is A1-R5-G5-B5.
/// </summary>
public int Color{ get; set; }
/// <summary>
/// Instantiates a new ContextMenuEntry with a given <see cref="Number">localization number</see> (<paramref name="number" />) and <see cref="Range">maximum range</see> (<paramref name="range" />).
/// </summary>
/// <param name="number">
/// The localization number containing the name of this entry.
/// <seealso cref="Number" />
/// </param>
/// <param name="range">
/// The maximum range at which this entry can be used.
/// <seealso cref="Range" />
/// </param>
public ContextMenuEntry( int number, int range )
{
if ( number <= 0x7FFF ) // Legacy code support
Number = 3000000 + number;
else
Number = number;
/// <summary>
/// Gets or sets whether this entry is enabled. When false, the entry will appear in a gray hue and <see cref="OnClick" />
/// will never be invoked.
/// </summary>
public bool Enabled{ get; set; }
Range = range;
Enabled = true;
Color = 0xFFFF;
}
/// <summary>
/// Gets a value indicating if non local use of this entry is permitted.
/// </summary>
public virtual bool NonLocalUse => false;
/// <summary>
/// Overridable. Virtual event invoked when the entry is clicked.
/// </summary>
public virtual void OnClick()
{
}
}
}
/// <summary>
/// Overridable. Virtual event invoked when the entry is clicked.
/// </summary>
public virtual void OnClick()
{
}
}
}

24
Server/ContextMenus/OpenBackpackEntry.cs
View file

@ -20,18 +20,18 @@
namespace Server.ContextMenus
{
public class OpenBackpackEntry : ContextMenuEntry
{
private Mobile m_Mobile;
public class OpenBackpackEntry : ContextMenuEntry
{
private Mobile m_Mobile;
public OpenBackpackEntry( Mobile m ) : base( 6145 )
{
m_Mobile = m;
}
public OpenBackpackEntry(Mobile m) : base(6145)
{
m_Mobile = m;
}
public override void OnClick()
{
m_Mobile.Use( m_Mobile.Backpack );
}
}
public override void OnClick()
{
m_Mobile.Use(m_Mobile.Backpack);
}
}
}

26
Server/ContextMenus/PaperdollEntry.cs
View file

@ -20,19 +20,19 @@
namespace Server.ContextMenus
{
public class PaperdollEntry : ContextMenuEntry
{
private Mobile m_Mobile;
public class PaperdollEntry : ContextMenuEntry
{
private Mobile m_Mobile;
public PaperdollEntry( Mobile m ) : base( 6123, 18 )
{
m_Mobile = m;
}
public PaperdollEntry(Mobile m) : base(6123, 18)
{
m_Mobile = m;
}
public override void OnClick()
{
if ( m_Mobile.CanPaperdollBeOpenedBy( Owner.From ) )
m_Mobile.DisplayPaperdollTo( Owner.From );
}
}
public override void OnClick()
{
if (m_Mobile.CanPaperdollBeOpenedBy(Owner.From))
m_Mobile.DisplayPaperdollTo(Owner.From);
}
}
}