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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Server/Items/BaseMulti.cs
View file

@ -36,9 +36,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public override int ItemID {
get {
return base.ItemID;
}
get => base.ItemID;
set {
if ( base.ItemID != value ) {
Map facet = ( this.Parent == null ? this.Map : null );
@ -88,10 +86,7 @@ namespace Server.Items
}
}
public virtual bool AllowsRelativeDrop
{
get { return false; }
}
public virtual bool AllowsRelativeDrop => false;
public override int GetMaxUpdateRange()
{
@ -103,13 +98,7 @@ namespace Server.Items
return 22;
}
public virtual MultiComponentList Components
{
get
{
return MultiData.GetComponents( ItemID );
}
}
public virtual MultiComponentList Components => MultiData.GetComponents( ItemID );
public virtual bool Contains( Point2D p )
{

69
Server/Items/Container.cs
View file

@ -37,8 +37,8 @@ namespace Server.Items
public static ContainerSnoopHandler SnoopHandler
{
get{ return m_SnoopHandler; }
set{ m_SnoopHandler = value; }
get => m_SnoopHandler;
set => m_SnoopHandler = value;
}
private ContainerData m_ContainerData;
@ -64,13 +64,13 @@ namespace Server.Items
return m_ContainerData;
}
set{ m_ContainerData = value; }
set => m_ContainerData = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public override int ItemID
{
get{ return base.ItemID; }
get => base.ItemID;
set
{
int oldID = this.ItemID;
@ -85,21 +85,21 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int GumpID
{
get{ return ( m_GumpID == -1 ? DefaultGumpID : m_GumpID ); }
set{ m_GumpID = value; }
get => ( m_GumpID == -1 ? DefaultGumpID : m_GumpID );
set => m_GumpID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int DropSound
{
get{ return ( m_DropSound == -1 ? DefaultDropSound : m_DropSound ); }
set{ m_DropSound = value; }
get => ( m_DropSound == -1 ? DefaultDropSound : m_DropSound );
set => m_DropSound = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MaxItems
{
get{ return ( m_MaxItems == -1 ? DefaultMaxItems : m_MaxItems ); }
get => ( m_MaxItems == -1 ? DefaultMaxItems : m_MaxItems );
set{ m_MaxItems = value; InvalidateProperties(); }
}
@ -120,8 +120,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool LiftOverride
{
get{ return m_LiftOverride; }
set{ m_LiftOverride = value; }
get => m_LiftOverride;
set => m_LiftOverride = value;
}
public virtual void UpdateContainerData()
@ -129,19 +129,18 @@ namespace Server.Items
this.ContainerData = ContainerData.GetData( this.ItemID );
}
public virtual Rectangle2D Bounds{ get{ return ContainerData.Bounds; } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual int DefaultGumpID{ get{ return ContainerData.GumpID; } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual int DefaultDropSound{ get{ return ContainerData.DropSound; } }
public virtual Rectangle2D Bounds => ContainerData.Bounds;
public virtual int DefaultMaxItems{ get{ return m_GlobalMaxItems; } }
public virtual int DefaultMaxWeight{ get{ return m_GlobalMaxWeight; } }
[CommandProperty( AccessLevel.GameMaster )]
public virtual int DefaultGumpID => ContainerData.GumpID;
public virtual bool IsDecoContainer
{
get{ return !Movable && !IsLockedDown && !IsSecure && Parent == null && !m_LiftOverride; }
}
[CommandProperty( AccessLevel.GameMaster )]
public virtual int DefaultDropSound => ContainerData.DropSound;
public virtual int DefaultMaxItems => m_GlobalMaxItems;
public virtual int DefaultMaxWeight => m_GlobalMaxWeight;
public virtual bool IsDecoContainer => !Movable && !IsLockedDown && !IsSecure && Parent == null && !m_LiftOverride;
public virtual int GetDroppedSound( Item item )
{
@ -1377,8 +1376,12 @@ namespace Server.Items
private static int m_GlobalMaxItems = 125;
private static int m_GlobalMaxWeight = 400;
public static int GlobalMaxItems{ get{ return m_GlobalMaxItems; } set{ m_GlobalMaxItems = value; } }
public static int GlobalMaxWeight{ get{ return m_GlobalMaxWeight; } set{ m_GlobalMaxWeight = value; } }
public static int GlobalMaxItems{ get => m_GlobalMaxItems;
set => m_GlobalMaxItems = value;
}
public static int GlobalMaxWeight{ get => m_GlobalMaxWeight;
set => m_GlobalMaxWeight = value;
}
public Container( int itemID ) : base( itemID )
{
@ -1644,7 +1647,7 @@ namespace Server.Items
}
}
public virtual bool DisplaysContent{ get{ return true; } }
public virtual bool DisplaysContent => true;
public virtual bool CheckContentDisplay( Mobile from )
{
@ -1672,11 +1675,11 @@ namespace Server.Items
public List<Mobile> Openers
{
get{ return m_Openers; }
set{ m_Openers = value; }
get => m_Openers;
set => m_Openers = value;
}
public virtual bool IsPublicContainer{ get{ return false; } }
public virtual bool IsPublicContainer => false;
public override void OnDelete()
{
@ -1872,8 +1875,8 @@ namespace Server.Items
public static ContainerData Default
{
get{ return m_Default; }
set{ m_Default = value; }
get => m_Default;
set => m_Default = value;
}
public static ContainerData GetData( int itemID )
@ -1891,9 +1894,9 @@ namespace Server.Items
private Rectangle2D m_Bounds;
private int m_DropSound;
public int GumpID{ get{ return m_GumpID; } }
public Rectangle2D Bounds{ get{ return m_Bounds; } }
public int DropSound{ get{ return m_DropSound; } }
public int GumpID => m_GumpID;
public Rectangle2D Bounds => m_Bounds;
public int DropSound => m_DropSound;
public ContainerData( int gumpID, Rectangle2D bounds, int dropSound )
{

33
Server/Items/Containers.cs
View file

@ -30,38 +30,17 @@ namespace Server.Items
private Mobile m_Owner;
private bool m_Open;
public override int DefaultMaxWeight
{
get
{
return 0;
}
}
public override int DefaultMaxWeight => 0;
public override bool IsVirtualItem
{
get { return true; }
}
public override bool IsVirtualItem => true;
public BankBox( Serial serial ) : base( serial )
{
}
public Mobile Owner
{
get
{
return m_Owner;
}
}
public Mobile Owner => m_Owner;
public bool Opened
{
get
{
return m_Open;
}
}
public bool Opened => m_Open;
public void Open()
{
@ -111,7 +90,9 @@ namespace Server.Items
private static bool m_SendRemovePacket;
public static bool SendDeleteOnClose{ get{ return m_SendRemovePacket; } set{ m_SendRemovePacket = value; } }
public static bool SendDeleteOnClose{ get => m_SendRemovePacket;
set => m_SendRemovePacket = value;
}
public void Close()
{

8
Server/Items/SecureTradeContainer.cs
View file

@ -27,13 +27,7 @@ namespace Server.Items
{
private SecureTrade m_Trade;
public SecureTrade Trade
{
get
{
return m_Trade;
}
}
public SecureTrade Trade => m_Trade;
public SecureTradeContainer( SecureTrade trade ) : base( 0x1E5E )
{

4
Server/Items/VirtualCheck.cs
View file

@ -33,7 +33,7 @@ namespace Server
[CommandProperty(AccessLevel.Administrator)]
public int Plat
{
get { return _Plat; }
get => _Plat;
set
{
_Plat = value;
@ -46,7 +46,7 @@ namespace Server
[CommandProperty(AccessLevel.Administrator)]
public int Gold
{
get { return _Gold; }
get => _Gold;
set
{
_Gold = value;

8
Server/Items/VirtualHair.cs
View file

@ -28,10 +28,14 @@ namespace Server
private int m_Hue;
[CommandProperty( AccessLevel.GameMaster )]
public int ItemID { get { return m_ItemID; } set { m_ItemID = value; } }
public int ItemID { get => m_ItemID;
set => m_ItemID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Hue { get { return m_Hue; } set { m_Hue = value; } }
public int Hue { get => m_Hue;
set => m_Hue = value;
}
protected BaseHairInfo( int itemid )
: this( itemid, 0 )