Fixes body expression style.

Scripts/Accounting/Account.cs

@@ -65,8 +65,8 @@ namespace Server.Accounting
 		/// </summary>
 		public HardwareInfo HardwareInfo
 		{
-			get { return m_HardwareInfo; }
+			get => m_HardwareInfo;
-			set { m_HardwareInfo = value; }
+			set => m_HardwareInfo = value;
 		}
 
 		/// <summary>
@@ -74,8 +74,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string[] IPRestrictions
 		{
-			get { return m_IPRestrictions; }
+			get => m_IPRestrictions;
-			set { m_IPRestrictions = value; }
+			set => m_IPRestrictions = value;
 		}
 
 		/// <summary>
@@ -83,8 +83,8 @@ namespace Server.Accounting
 		/// </summary>
 		public IPAddress[] LoginIPs
 		{
-			get { return m_LoginIPs; }
+			get => m_LoginIPs;
-			set { m_LoginIPs = value; }
+			set => m_LoginIPs = value;
 		}
 
 		/// <summary>
@@ -108,8 +108,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string Username
 		{
-			get { return m_Username; }
+			get => m_Username;
-			set { m_Username = value; }
+			set => m_Username = value;
 		}
 
 		/// <summary>
@@ -117,8 +117,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string Email
 		{
-			get { return m_Email; }
+			get => m_Email;
-			set { m_Email = value; }
+			set => m_Email = value;
 		}
 
 		/// <summary>
@@ -126,8 +126,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string PlainPassword
 		{
-			get { return m_PlainPassword; }
+			get => m_PlainPassword;
-			set { m_PlainPassword = value; }
+			set => m_PlainPassword = value;
 		}
 
 		/// <summary>
@@ -135,8 +135,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string CryptPassword
 		{
-			get { return m_CryptPassword; }
+			get => m_CryptPassword;
-			set { m_CryptPassword = value; }
+			set => m_CryptPassword = value;
 		}
 
 		/// <summary>
@@ -144,8 +144,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string NewCryptPassword
 		{
-			get { return m_NewCryptPassword; }
+			get => m_NewCryptPassword;
-			set { m_NewCryptPassword = value; }
+			set => m_NewCryptPassword = value;
 		}
 
 		/// <summary>
@@ -153,8 +153,8 @@ namespace Server.Accounting
 		/// </summary>
 		public AccessLevel AccessLevel
 		{
-			get { return m_AccessLevel; }
+			get => m_AccessLevel;
-			set { m_AccessLevel = value; }
+			set => m_AccessLevel = value;
 		}
 
 		/// <summary>
@@ -162,8 +162,8 @@ namespace Server.Accounting
 		/// </summary>
 		public int Flags
 		{
-			get { return m_Flags; }
+			get => m_Flags;
-			set { m_Flags = value; }
+			set => m_Flags = value;
 		}
 
 		/// <summary>
@@ -193,7 +193,7 @@ namespace Server.Accounting
 
 				return true;
 			}
-			set { SetFlag( 0, value ); }
+			set => SetFlag( 0, value );
 		}
 
 		/// <summary>
@@ -201,7 +201,7 @@ namespace Server.Accounting
 		/// </summary>
 		public bool Young
 		{
-			get { return !GetFlag( 1 ); }
+			get => !GetFlag( 1 );
 			set
 			{
 				SetFlag( 1, !value );
@@ -217,18 +217,15 @@ namespace Server.Accounting
 		/// <summary>
 		/// The date and time of when this account was created.
 		/// </summary>
-		public DateTime Created
+		public DateTime Created => m_Created;
-		{
-			get { return m_Created; }
-		}
 
 		/// <summary>
 		/// Gets or sets the date and time when this account was last accessed.
 		/// </summary>
 		public DateTime LastLogin
 		{
-			get { return m_LastLogin; }
+			get => m_LastLogin;
-			set { m_LastLogin = value; }
+			set => m_LastLogin = value;
 		}
 
 		/// <summary>
@@ -1127,18 +1124,12 @@ namespace Server.Accounting
 		/// <summary>
 		/// Gets the maximum amount of characters allowed to be created on this account. Values other than 1, 5, 6, or 7 are not supported by the client.
 		/// </summary>
-		public int Limit
+		public int Limit => ( Core.SA ? 7 : Core.AOS ? 6 : 5 );
-		{
-			get { return ( Core.SA ? 7 : Core.AOS ? 6 : 5 ); }
-		}
 
 		/// <summary>
 		/// Gets the maximum amount of characters that this account can hold.
 		/// </summary>
-		public int Length
+		public int Length => m_Mobiles.Length;
-		{
-			get { return m_Mobiles.Length; }
-		}
 
 		/// <summary>
 		/// Gets or sets the character at a specified index for this account. Out of bound index values are handled; null returned for get, ignored for set.

Scripts/Accounting/AccountAttackLimiter.cs

@@ -110,25 +110,22 @@ namespace Server.Accounting
 
 		public IPAddress Address
 		{
-			get{ return m_Address; }
+			get => m_Address;
-			set{ m_Address = value; }
+			set => m_Address = value;
 		}
 
 		public DateTime LastAccessTime
 		{
-			get{ return m_LastAccessTime; }
+			get => m_LastAccessTime;
-			set{ m_LastAccessTime = value; }
+			set => m_LastAccessTime = value;
 		}
 
-		public bool HasExpired
+		public bool HasExpired => ( DateTime.UtcNow >= ( m_LastAccessTime + TimeSpan.FromHours( 1.0 ) ) );
-		{
-			get{ return ( DateTime.UtcNow >= ( m_LastAccessTime + TimeSpan.FromHours( 1.0 ) ) ); }
-		}
 
 		public int Counts
 		{
-			get{ return m_Counts; }
+			get => m_Counts;
-			set{ m_Counts = value; }
+			set => m_Counts = value;
 		}
 
 		public void RefreshAccessTime()

Scripts/Accounting/AccountComment.cs

@@ -12,27 +12,21 @@ namespace Server.Accounting
 		/// <summary>
 		/// A string representing who added this comment.
 		/// </summary>
-		public string AddedBy
+		public string AddedBy => m_AddedBy;
-		{
-			get{ return m_AddedBy; }
-		}
 
 		/// <summary>
 		/// Gets or sets the body of this comment. Setting this value will reset LastModified.
 		/// </summary>
 		public string Content
 		{
-			get{ return m_Content; }
+			get => m_Content;
 			set{ m_Content = value; m_LastModified = DateTime.UtcNow; }
 		}
 
 		/// <summary>
 		/// The date and time when this account was last modified -or- the comment creation time, if never modified.
 		/// </summary>
-		public DateTime LastModified
+		public DateTime LastModified => m_LastModified;
-		{
-			get{ return m_LastModified; }
-		}
 
 		/// <summary>
 		/// Constructs a new AccountComment instance.

Scripts/Accounting/AccountHandler.cs

@@ -30,8 +30,8 @@ namespace Server.Misc
 
 		public static AccessLevel LockdownLevel
 		{
-			get{ return m_LockdownLevel; }
+			get => m_LockdownLevel;
-			set{ m_LockdownLevel = value; }
+			set => m_LockdownLevel = value;
 		}
 
 		private static CityInfo[] StartingCities = new CityInfo[]

Scripts/Accounting/AccountTag.cs

@@ -11,8 +11,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string Name
 		{
-			get{ return m_Name; }
+			get => m_Name;
-			set{ m_Name = value; }
+			set => m_Name = value;
 		}
 
 		/// <summary>
@@ -20,8 +20,8 @@ namespace Server.Accounting
 		/// </summary>
 		public string Value
 		{
-			get{ return m_Value; }
+			get => m_Value;
-			set{ m_Value = value; }
+			set => m_Value = value;
 		}
 
 		/// <summary>

Scripts/Accounting/Firewall.cs

@@ -184,13 +184,7 @@ namespace Server
 			}
 		}
 
-		public static List<IFirewallEntry> List
+		public static List<IFirewallEntry> List => m_Blocked;
-		{
-			get
-			{
-				return m_Blocked;
-			}
-		}
 
 		public static IFirewallEntry ToFirewallEntry( object entry )
 		{

Scripts/Commands/Attributes.cs

@@ -6,7 +6,7 @@ namespace Server
 	{
 		private string m_Usage;
 
-		public string Usage{ get{ return m_Usage; } }
+		public string Usage => m_Usage;
 
 		public UsageAttribute( string usage )
 		{
@@ -18,7 +18,7 @@ namespace Server
 	{
 		private string m_Description;
 
-		public string Description{ get{ return m_Description; } }
+		public string Description => m_Description;
 
 		public DescriptionAttribute( string description )
 		{
@@ -30,7 +30,7 @@ namespace Server
 	{
 		private string[] m_Aliases;
 
-		public string[] Aliases{ get{ return m_Aliases; } }
+		public string[] Aliases => m_Aliases;
 
 		public AliasesAttribute( params string[] aliases )
 		{

Scripts/Commands/Batch.cs

@@ -15,20 +15,17 @@ namespace Server.Commands
 
 		public BaseCommandImplementor Scope
 		{
-			get{ return m_Scope; }
+			get => m_Scope;
-			set{ m_Scope = value; }
+			set => m_Scope = value;
 		}
 
 		public string Condition
 		{
-			get{ return m_Condition; }
+			get => m_Condition;
-			set{ m_Condition = value; }
+			set => m_Condition = value;
 		}
 
-		public ArrayList BatchCommands
+		public ArrayList BatchCommands => m_BatchCommands;
-		{
-			get{ return m_BatchCommands; }
-		}
 
 		public Batch()
 		{
@@ -200,14 +197,14 @@ namespace Server.Commands
 
 		public string Command
 		{
-			get{ return m_Command; }
+			get => m_Command;
-			set{ m_Command = value; }
+			set => m_Command = value;
 		}
 
 		public string Object
 		{
-			get{ return m_Object; }
+			get => m_Object;
-			set{ m_Object = value; }
+			set => m_Object = value;
 		}
 
 		public void GetDetails( out string command, out string argString, out string[] args )

Scripts/Commands/Decorate.cs

@@ -1109,8 +1109,8 @@ namespace Server.Commands
 		private Point3D m_Location;
 		private string m_Extra;
 
-		public Point3D Location{ get{ return m_Location; } }
+		public Point3D Location => m_Location;
-		public string Extra{ get{ return m_Extra; } }
+		public string Extra => m_Extra;
 
 		public DecorationEntry( string line )
 		{

Scripts/Commands/DecorateMag.cs

@@ -1106,8 +1106,8 @@ namespace Server.Commands
 		private Point3D m_Location;
 		private string m_Extra;
 
-		public Point3D Location{ get{ return m_Location; } }
+		public Point3D Location => m_Location;
-		public string Extra{ get{ return m_Extra; } }
+		public string Extra => m_Extra;
 
 		public DecorationEntryMag( string line )
 		{

Scripts/Commands/GenCategorization.cs

@@ -272,8 +272,8 @@ namespace Server.Commands
 		private Type m_Type;
 		private object m_Object;
 
-		public Type Type{ get{ return m_Type; } }
+		public Type Type => m_Type;
-		public object Object{ get{ return m_Object; } }
+		public object Object => m_Object;
 
 		public CategoryTypeEntry( Type type )
 		{
@@ -290,11 +290,11 @@ namespace Server.Commands
 		private CategoryEntry m_Parent;
 		private ArrayList m_Matched;
 
-		public string Title{ get{ return m_Title; } }
+		public string Title => m_Title;
-		public Type[] Matches{ get{ return m_Matches; } }
+		public Type[] Matches => m_Matches;
-		public CategoryEntry Parent{ get{ return m_Parent; } }
+		public CategoryEntry Parent => m_Parent;
-		public CategoryEntry[] SubCategories{ get{ return m_SubCategories; } }
+		public CategoryEntry[] SubCategories => m_SubCategories;
-		public ArrayList Matched{ get{ return m_Matched; } }
+		public ArrayList Matched => m_Matched;
 
 		public CategoryEntry()
 		{
@@ -378,8 +378,8 @@ namespace Server.Commands
 		private int m_Indentation;
 		private string m_Text;
 
-		public int Indentation{ get{ return m_Indentation; } }
+		public int Indentation => m_Indentation;
-		public string Text{ get{ return m_Text; } }
+		public string Text => m_Text;
 
 		public CategoryLine( string input )
 		{

Scripts/Commands/Generic/Commands/BaseCommand.cs

@@ -24,44 +24,44 @@ namespace Server.Commands.Generic
 
 		public bool ListOptimized
 		{
-			get{ return m_ListOptimized; }
+			get => m_ListOptimized;
-			set{ m_ListOptimized = value; }
+			set => m_ListOptimized = value;
 		}
 
 		public string[] Commands
 		{
-			get{ return m_Commands; }
+			get => m_Commands;
-			set{ m_Commands = value; }
+			set => m_Commands = value;
 		}
 
 		public string Usage
 		{
-			get{ return m_Usage; }
+			get => m_Usage;
-			set{ m_Usage = value; }
+			set => m_Usage = value;
 		}
 
 		public string Description
 		{
-			get{ return m_Description; }
+			get => m_Description;
-			set{ m_Description = value; }
+			set => m_Description = value;
 		}
 
 		public AccessLevel AccessLevel
 		{
-			get{ return m_AccessLevel; }
+			get => m_AccessLevel;
-			set{ m_AccessLevel = value; }
+			set => m_AccessLevel = value;
 		}
 
 		public ObjectTypes ObjectTypes
 		{
-			get{ return m_ObjectTypes; }
+			get => m_ObjectTypes;
-			set{ m_ObjectTypes = value; }
+			set => m_ObjectTypes = value;
 		}
 
 		public CommandSupport Supports
 		{
-			get{ return m_Implementors; }
+			get => m_Implementors;
-			set{ m_Implementors = value; }
+			set => m_Implementors = value;
 		}
 
 		public BaseCommand()

Scripts/Commands/Generic/Commands/Commands.cs

@@ -60,7 +60,7 @@ namespace Server.Commands.Generic
 
 		private static List<BaseCommand> m_AllCommands = new List<BaseCommand>();
 
-		public static List<BaseCommand> AllCommands{ get{ return m_AllCommands; } }
+		public static List<BaseCommand> AllCommands => m_AllCommands;
 
 		public static void Register( BaseCommand command )
 		{

Scripts/Commands/Generic/Extensions/BaseExtension.cs

@@ -10,10 +10,7 @@ namespace Server.Commands.Generic
 	{
 		private static Dictionary<string, ExtensionInfo> m_Table = new Dictionary<string, ExtensionInfo>( StringComparer.InvariantCultureIgnoreCase );
 
-		public static Dictionary<string, ExtensionInfo> Table
+		public static Dictionary<string, ExtensionInfo> Table => m_Table;
-		{
-			get { return m_Table; }
-		}
 
 		public static void Register( ExtensionInfo ext )
 		{
@@ -27,30 +24,15 @@ namespace Server.Commands.Generic
 
 		private ExtensionConstructor m_Constructor;
 
-		public int Order
+		public int Order => m_Order;
-		{
-			get { return m_Order; }
-		}
 
-		public string Name
+		public string Name => m_Name;
-		{
-			get { return m_Name; }
-		}
 
-		public int Size
+		public int Size => m_Size;
-		{
-			get { return m_Size; }
-		}
 
-		public bool IsFixedSize
+		public bool IsFixedSize => ( m_Size >= 0 );
-		{
-			get { return ( m_Size >= 0 ); }
-		}
 
-		public ExtensionConstructor Constructor
+		public ExtensionConstructor Constructor => m_Constructor;
-		{
-			get { return m_Constructor; }
-		}
 
 		public ExtensionInfo( int order, string name, int size, ExtensionConstructor constructor )
 		{
@@ -141,25 +123,13 @@ namespace Server.Commands.Generic
 	{
 		public abstract ExtensionInfo Info { get; }
 
-		public string Name
+		public string Name => Info.Name;
-		{
-			get { return Info.Name; }
-		}
 
-		public int Size
+		public int Size => Info.Size;
-		{
-			get { return Info.Size; }
-		}
 
-		public bool IsFixedSize
+		public bool IsFixedSize => Info.IsFixedSize;
-		{
-			get { return Info.IsFixedSize; }
-		}
 
-		public int Order
+		public int Order => Info.Order;
-		{
-			get { return Info.Order; }
-		}
 
 		public virtual void Optimize( Mobile from, Type baseType, ref AssemblyEmitter assembly )
 		{

Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs

@@ -44,25 +44,13 @@ namespace Server.Commands.Generic
 		private object m_Value;
 		private FieldInfo m_Field;
 
-		public Type Type
+		public Type Type => m_Type;
-		{
-			get { return m_Type; }
-		}
 
-		public object Value
+		public object Value => m_Value;
-		{
-			get { return m_Value; }
-		}
 
-		public FieldInfo Field
+		public FieldInfo Field => m_Field;
-		{
-			get { return m_Field; }
-		}
 
-		public bool HasField
+		public bool HasField => ( m_Field != null );
-		{
-			get { return ( m_Field != null ); }
-		}
 
 		public PropertyValue( Type type, object value )
 		{

Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs

@@ -12,25 +12,25 @@ namespace Server.Commands.Generic
 
 		public Property Property
 		{
-			get { return m_Property; }
+			get => m_Property;
-			set { m_Property = value; }
+			set => m_Property = value;
 		}
 
 		public bool IsAscending
 		{
-			get { return ( m_Order > 0 ); }
+			get => ( m_Order > 0 );
-			set { m_Order = ( value ? +1 : -1 ); }
+			set => m_Order = ( value ? +1 : -1 );
 		}
 
 		public bool IsDescending
 		{
-			get { return ( m_Order < 0 ); }
+			get => ( m_Order < 0 );
-			set { m_Order = ( value ? -1 : +1 ); }
+			set => m_Order = ( value ? -1 : +1 );
 		}
 
 		public int Sign
 		{
-			get { return Math.Sign( m_Order ); }
+			get => Math.Sign( m_Order );
 			set
 			{
 				m_Order = Math.Sign( value );

Scripts/Commands/Generic/Extensions/DistinctExtension.cs

@@ -13,10 +13,7 @@ namespace Server.Commands.Generic
 			ExtensionInfo.Register( ExtInfo );
 		}
 
-		public override ExtensionInfo Info
+		public override ExtensionInfo Info => ExtInfo;
-		{
-			get { return ExtInfo; }
-		}
 
 		private List<Property> m_Properties;
 

Scripts/Commands/Generic/Extensions/LimitExtension.cs

@@ -12,17 +12,11 @@ namespace Server.Commands.Generic
 			ExtensionInfo.Register( ExtInfo );
 		}
 
-		public override ExtensionInfo Info
+		public override ExtensionInfo Info => ExtInfo;
-		{
-			get { return ExtInfo; }
-		}
 
 		private int m_Limit;
 
-		public int Limit
+		public int Limit => m_Limit;
-		{
-			get { return m_Limit; }
-		}
 
 		public LimitExtension()
 		{

Scripts/Commands/Generic/Extensions/SortExtension.cs

@@ -13,10 +13,7 @@ namespace Server.Commands.Generic
 			ExtensionInfo.Register( ExtInfo );
 		}
 
-		public override ExtensionInfo Info
+		public override ExtensionInfo Info => ExtInfo;
-		{
-			get { return ExtInfo; }
-		}
 
 		private List<OrderInfo> m_Orders;
 

Scripts/Commands/Generic/Extensions/WhereExtension.cs

@@ -11,17 +11,11 @@ namespace Server.Commands.Generic
 			ExtensionInfo.Register( ExtInfo );
 		}
 
-		public override ExtensionInfo Info
+		public override ExtensionInfo Info => ExtInfo;
-		{
-			get { return ExtInfo; }
-		}
 
 		private ObjectConditional m_Conditional;
 
-		public ObjectConditional Conditional
+		public ObjectConditional Conditional => m_Conditional;
-		{
-			get { return m_Conditional; }
-		}
 
 		public WhereExtension()
 		{

Scripts/Commands/Generic/Implementors/AreaCommandImplementor.cs

@@ -7,10 +7,7 @@ namespace Server.Commands.Generic
 	{
 		private static AreaCommandImplementor m_Instance;
 
-		public static AreaCommandImplementor Instance
+		public static AreaCommandImplementor Instance => m_Instance;
-		{
-			get { return m_Instance; }
-		}
 
 		public AreaCommandImplementor()
 		{

Scripts/Commands/Generic/Implementors/BaseCommandImplementor.cs

@@ -57,44 +57,41 @@ namespace Server.Commands.Generic
 
 		public bool SupportsConditionals
 		{
-			get{ return m_SupportsConditionals; }
+			get => m_SupportsConditionals;
-			set{ m_SupportsConditionals = value; }
+			set => m_SupportsConditionals = value;
 		}
 
 		public string[] Accessors
 		{
-			get{ return m_Accessors; }
+			get => m_Accessors;
-			set{ m_Accessors = value; }
+			set => m_Accessors = value;
 		}
 
 		public string Usage
 		{
-			get{ return m_Usage; }
+			get => m_Usage;
-			set{ m_Usage = value; }
+			set => m_Usage = value;
 		}
 
 		public string Description
 		{
-			get{ return m_Description; }
+			get => m_Description;
-			set{ m_Description = value; }
+			set => m_Description = value;
 		}
 
 		public AccessLevel AccessLevel
 		{
-			get{ return m_AccessLevel; }
+			get => m_AccessLevel;
-			set{ m_AccessLevel = value; }
+			set => m_AccessLevel = value;
 		}
 
 		public CommandSupport SupportRequirement
 		{
-			get{ return m_SupportRequirement; }
+			get => m_SupportRequirement;
-			set{ m_SupportRequirement = value; }
+			set => m_SupportRequirement = value;
 		}
 
-		public Dictionary<string, BaseCommand> Commands
+		public Dictionary<string, BaseCommand> Commands => m_Commands;
-		{
-			get{ return m_Commands; }
-		}
 
 		public BaseCommandImplementor()
 		{

Scripts/Commands/Generic/Implementors/ObjectConditional.cs

@@ -15,27 +15,15 @@ namespace Server.Commands.Generic
 
 		private IConditional[] m_Conditionals;
 
-		public Type Type
+		public Type Type => m_ObjectType;
-		{
-			get { return m_ObjectType; }
-		}
 
-		public bool IsItem
+		public bool IsItem => ( m_ObjectType == null || m_ObjectType == typeofItem || m_ObjectType.IsSubclassOf( typeofItem ) );
-		{
-			get { return ( m_ObjectType == null || m_ObjectType == typeofItem || m_ObjectType.IsSubclassOf( typeofItem ) ); }
-		}
 
-		public bool IsMobile
+		public bool IsMobile => ( m_ObjectType == null || m_ObjectType == typeofMobile || m_ObjectType.IsSubclassOf( typeofMobile ) );
-		{
-			get { return ( m_ObjectType == null || m_ObjectType == typeofMobile || m_ObjectType.IsSubclassOf( typeofMobile ) ); }
-		}
 
 		public static readonly ObjectConditional Empty = new ObjectConditional( null, null );
 
-		public bool HasCompiled
+		public bool HasCompiled => ( m_Conditionals != null );
-		{
-			get { return ( m_Conditionals != null ); }
-		}
 
 		public void Compile( ref AssemblyEmitter emitter )
 		{

Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs

@@ -4,10 +4,7 @@ namespace Server.Commands.Generic
 	{
 		private static RangeCommandImplementor m_Instance;
 
-		public static RangeCommandImplementor Instance
+		public static RangeCommandImplementor Instance => m_Instance;
-		{
-			get { return m_Instance; }
-		}
 
 		public RangeCommandImplementor()
 		{

Scripts/Commands/Logging.cs

@@ -9,9 +9,11 @@ namespace Server.Commands
 		private static StreamWriter m_Output;
 		private static bool m_Enabled = true;
 
-		public static bool Enabled{ get{ return m_Enabled; } set{ m_Enabled = value; } }
+		public static bool Enabled{ get => m_Enabled;
+			set => m_Enabled = value;
+		}
 
-		public static StreamWriter Output{ get{ return m_Output; } }
+		public static StreamWriter Output => m_Output;
 
 		public static void Initialize()
 		{

Scripts/Commands/Properties.cs

@@ -579,10 +579,7 @@ namespace Server
 	{
 		protected Property m_Property;
 
-		public Property Property
+		public Property Property => m_Property;
-		{
-			get { return m_Property; }
-		}
 
 		public PropertyException( Property property, string message )
 			: base( message )
@@ -660,15 +657,9 @@ namespace Server
 		protected AccessLevel m_PlayerAccess;
 		protected AccessLevel m_NeededAccess;
 
-		public AccessLevel PlayerAccess
+		public AccessLevel PlayerAccess => m_PlayerAccess;
-		{
-			get { return m_PlayerAccess; }
-		}
 
-		public AccessLevel NeededAccess
+		public AccessLevel NeededAccess => m_NeededAccess;
-		{
-			get { return m_NeededAccess; }
-		}
 
 		public ClearanceException( Property property, AccessLevel playerAccess, AccessLevel neededAccess, string accessType )
 			: base( property, string.Format(
@@ -703,20 +694,11 @@ namespace Server
 		private PropertyInfo[] m_Chain;
 		private PropertyAccess m_Access;
 
-		public string Binding
+		public string Binding => m_Binding;
-		{
-			get { return m_Binding; }
-		}
 
-		public bool IsBound
+		public bool IsBound => ( m_Chain != null );
-		{
-			get { return ( m_Chain != null ); }
-		}
 
-		public PropertyAccess Access
+		public PropertyAccess Access => m_Access;
-		{
-			get { return m_Access; }
-		}
 
 		public PropertyInfo[] Chain
 		{

Scripts/Engines/BulkOrders/Books/BOBFilter.cs

@@ -7,10 +7,7 @@ namespace Server.Engines.BulkOrders
 		private int m_Material;
 		private int m_Quantity;
 
-		public bool IsDefault
+		public bool IsDefault => ( m_Type == 0 && m_Quality == 0 && m_Material == 0 && m_Quantity == 0 );
-		{
-			get{ return ( m_Type == 0 && m_Quality == 0 && m_Material == 0 && m_Quantity == 0 ); }
-		}
 
 		public void Clear()
 		{
@@ -22,26 +19,26 @@ namespace Server.Engines.BulkOrders
 
 		public int Type
 		{
-			get{ return m_Type; }
+			get => m_Type;
-			set{ m_Type = value; }
+			set => m_Type = value;
 		}
 
 		public int Quality
 		{
-			get{ return m_Quality; }
+			get => m_Quality;
-			set{ m_Quality = value; }
+			set => m_Quality = value;
 		}
 
 		public int Material
 		{
-			get{ return m_Material; }
+			get => m_Material;
-			set{ m_Material = value; }
+			set => m_Material = value;
 		}
 
 		public int Quantity
 		{
-			get{ return m_Quantity; }
+			get => m_Quantity;
-			set{ m_Quantity = value; }
+			set => m_Quantity = value;
 		}
 
 		public BOBFilter()

Scripts/Engines/BulkOrders/Books/BOBLargeEntry.cs

@@ -9,12 +9,14 @@ namespace Server.Engines.BulkOrders
 		private int m_Price;
 		private BOBLargeSubEntry[] m_Entries;
 
-		public bool RequireExceptional{ get{ return m_RequireExceptional; } }
+		public bool RequireExceptional => m_RequireExceptional;
-		public BODType DeedType{ get{ return m_DeedType; } }
+		public BODType DeedType => m_DeedType;
-		public BulkMaterialType Material{ get{ return m_Material; } }
+		public BulkMaterialType Material => m_Material;
-		public int AmountMax{ get{ return m_AmountMax; } }
+		public int AmountMax => m_AmountMax;
-		public int Price{ get{ return m_Price; } set{ m_Price = value; } }
+		public int Price{ get => m_Price;
-		public BOBLargeSubEntry[] Entries{ get{ return m_Entries; } }
+			set => m_Price = value;
+		}
+		public BOBLargeSubEntry[] Entries => m_Entries;
 
 		public Item Reconstruct()
 		{

Scripts/Engines/BulkOrders/Books/BOBLargeSubEntry.cs

@@ -9,10 +9,10 @@ namespace Server.Engines.BulkOrders
 		private int m_Number;
 		private int m_Graphic;
 
-		public Type ItemType{ get{ return m_ItemType; } }
+		public Type ItemType => m_ItemType;
-		public int AmountCur{ get{ return m_AmountCur; } }
+		public int AmountCur => m_AmountCur;
-		public int Number{ get{ return m_Number; } }
+		public int Number => m_Number;
-		public int Graphic{ get{ return m_Graphic; } }
+		public int Graphic => m_Graphic;
 
 		public BOBLargeSubEntry( LargeBulkEntry lbe )
 		{

Scripts/Engines/BulkOrders/Books/BOBSmallEntry.cs

@@ -13,15 +13,17 @@ namespace Server.Engines.BulkOrders
 		private int m_Graphic;
 		private int m_Price;
 
-		public Type ItemType{ get{ return m_ItemType; } }
+		public Type ItemType => m_ItemType;
-		public bool RequireExceptional{ get{ return m_RequireExceptional; } }
+		public bool RequireExceptional => m_RequireExceptional;
-		public BODType DeedType{ get{ return m_DeedType; } }
+		public BODType DeedType => m_DeedType;
-		public BulkMaterialType Material{ get{ return m_Material; } }
+		public BulkMaterialType Material => m_Material;
-		public int AmountCur{ get{ return m_AmountCur; } }
+		public int AmountCur => m_AmountCur;
-		public int AmountMax{ get{ return m_AmountMax; } }
+		public int AmountMax => m_AmountMax;
-		public int Number{ get{ return m_Number; } }
+		public int Number => m_Number;
-		public int Graphic{ get{ return m_Graphic; } }
+		public int Graphic => m_Graphic;
-		public int Price{ get{ return m_Price; } set{ m_Price = value; } }
+		public int Price{ get => m_Price;
+			set => m_Price = value;
+		}
 
 		public Item Reconstruct()
 		{

Scripts/Engines/BulkOrders/Books/BulkOrderBook.cs

@@ -21,31 +21,25 @@ namespace Server.Engines.BulkOrders
 		[CommandProperty( AccessLevel.GameMaster )]
 		public string BookName
 		{
-			get{ return m_BookName; }
+			get => m_BookName;
 			set{ m_BookName = value; InvalidateProperties(); }
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public SecureLevel Level
 		{
-			get{ return m_Level; }
+			get => m_Level;
-			set{ m_Level = value; }
+			set => m_Level = value;
 		}
 
-		public ArrayList Entries
+		public ArrayList Entries => m_Entries;
-		{
-			get{ return m_Entries; }
-		}
 
-		public BOBFilter Filter
+		public BOBFilter Filter => m_Filter;
-		{
-			get{ return m_Filter; }
-		}
 
 		public int ItemCount
 		{
-			get{ return m_ItemCount; }
+			get => m_ItemCount;
-			set{ m_ItemCount = value; }
+			set => m_ItemCount = value;
 		}
 
 		[Constructible]

Scripts/Engines/BulkOrders/LargeBOD.cs

@@ -12,15 +12,19 @@ namespace Server.Engines.BulkOrders
 		private LargeBulkEntry[] m_Entries;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public int AmountMax{ get{ return m_AmountMax; } set{ m_AmountMax = value; InvalidateProperties(); } }
+		public int AmountMax{ get => m_AmountMax;
+			set{ m_AmountMax = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public bool RequireExceptional{ get{ return m_RequireExceptional; } set{ m_RequireExceptional = value; InvalidateProperties(); } }
+		public bool RequireExceptional{ get => m_RequireExceptional;
+			set{ m_RequireExceptional = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public BulkMaterialType Material{ get{ return m_Material; } set{ m_Material = value; InvalidateProperties(); } }
+		public BulkMaterialType Material{ get => m_Material;
+			set{ m_Material = value; InvalidateProperties(); } }
 
-		public LargeBulkEntry[] Entries{ get{ return m_Entries; } set{ m_Entries = value; InvalidateProperties(); } }
+		public LargeBulkEntry[] Entries{ get => m_Entries;
+			set{ m_Entries = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool Complete

Scripts/Engines/BulkOrders/LargeBulkEntry.cs

@@ -9,120 +9,57 @@ namespace Server.Engines.BulkOrders
 		private int m_Amount;
 		private SmallBulkEntry m_Details;
 
-		public LargeBOD Owner{ get{ return m_Owner; } set{ m_Owner = value; } }
+		public LargeBOD Owner{ get => m_Owner;
-		public int Amount{ get{ return m_Amount; } set{ m_Amount = value; if ( m_Owner != null ) m_Owner.InvalidateProperties(); } }
+			set => m_Owner = value;
-		public SmallBulkEntry Details{ get{ return m_Details; } }
-
-		public static SmallBulkEntry[] LargeRing
-		{
-			get{ return GetEntries( "Blacksmith", "largering" ); }
 		}
+		public int Amount{ get => m_Amount;
+			set{ m_Amount = value; if ( m_Owner != null ) m_Owner.InvalidateProperties(); } }
+		public SmallBulkEntry Details => m_Details;
 
-		public static SmallBulkEntry[] LargePlate
+		public static SmallBulkEntry[] LargeRing => GetEntries( "Blacksmith", "largering" );
-		{
-			get{ return GetEntries( "Blacksmith", "largeplate" ); }
-		}
 
-		public static SmallBulkEntry[] LargeChain
+		public static SmallBulkEntry[] LargePlate => GetEntries( "Blacksmith", "largeplate" );
-		{
-			get{ return GetEntries( "Blacksmith", "largechain" ); }
-		}
 
-		public static SmallBulkEntry[] LargeAxes
+		public static SmallBulkEntry[] LargeChain => GetEntries( "Blacksmith", "largechain" );
-		{
-			get{ return GetEntries( "Blacksmith", "largeaxes" ); }
-		}
 
-		public static SmallBulkEntry[] LargeFencing
+		public static SmallBulkEntry[] LargeAxes => GetEntries( "Blacksmith", "largeaxes" );
-		{
-			get{ return GetEntries( "Blacksmith", "largefencing" ); }
-		}
 
-		public static SmallBulkEntry[] LargeMaces
+		public static SmallBulkEntry[] LargeFencing => GetEntries( "Blacksmith", "largefencing" );
-		{
-			get{ return GetEntries( "Blacksmith", "largemaces" ); }
-		}
 
-		public static SmallBulkEntry[] LargePolearms
+		public static SmallBulkEntry[] LargeMaces => GetEntries( "Blacksmith", "largemaces" );
-		{
-			get{ return GetEntries( "Blacksmith", "largepolearms" ); }
-		}
 
-		public static SmallBulkEntry[] LargeSwords
+		public static SmallBulkEntry[] LargePolearms => GetEntries( "Blacksmith", "largepolearms" );
-		{
+
-			get{ return GetEntries( "Blacksmith", "largeswords" ); }
+		public static SmallBulkEntry[] LargeSwords => GetEntries( "Blacksmith", "largeswords" );
-		}
 
 
-		public static SmallBulkEntry[] BoneSet
+		public static SmallBulkEntry[] BoneSet => GetEntries( "Tailoring", "boneset" );
-		{
-			get{ return GetEntries( "Tailoring", "boneset" ); }
-		}
 
-		public static SmallBulkEntry[] Farmer
+		public static SmallBulkEntry[] Farmer => GetEntries( "Tailoring", "farmer" );
-		{
-			get{ return GetEntries( "Tailoring", "farmer" ); }
-		}
 
-		public static SmallBulkEntry[] FemaleLeatherSet
+		public static SmallBulkEntry[] FemaleLeatherSet => GetEntries( "Tailoring", "femaleleatherset" );
-		{
-			get{ return GetEntries( "Tailoring", "femaleleatherset" ); }
-		}
 
-		public static SmallBulkEntry[] FisherGirl
+		public static SmallBulkEntry[] FisherGirl => GetEntries( "Tailoring", "fishergirl" );
-		{
-			get{ return GetEntries( "Tailoring", "fishergirl" ); }
-		}
 
-		public static SmallBulkEntry[] Gypsy
+		public static SmallBulkEntry[] Gypsy => GetEntries( "Tailoring", "gypsy" );
-		{
-			get{ return GetEntries( "Tailoring", "gypsy" ); }
-		}
 
-		public static SmallBulkEntry[] HatSet
+		public static SmallBulkEntry[] HatSet => GetEntries( "Tailoring", "hatset" );
-		{
-			get{ return GetEntries( "Tailoring", "hatset" ); }
-		}
 
-		public static SmallBulkEntry[] Jester
+		public static SmallBulkEntry[] Jester => GetEntries( "Tailoring", "jester" );
-		{
-			get{ return GetEntries( "Tailoring", "jester" ); }
-		}
 
-		public static SmallBulkEntry[] Lady
+		public static SmallBulkEntry[] Lady => GetEntries( "Tailoring", "lady" );
-		{
-			get{ return GetEntries( "Tailoring", "lady" ); }
-		}
 
-		public static SmallBulkEntry[] MaleLeatherSet
+		public static SmallBulkEntry[] MaleLeatherSet => GetEntries( "Tailoring", "maleleatherset" );
-		{
-			get{ return GetEntries( "Tailoring", "maleleatherset" ); }
-		}
 
-		public static SmallBulkEntry[] Pirate
+		public static SmallBulkEntry[] Pirate => GetEntries( "Tailoring", "pirate" );
-		{
-			get{ return GetEntries( "Tailoring", "pirate" ); }
-		}
 
-		public static SmallBulkEntry[] ShoeSet
+		public static SmallBulkEntry[] ShoeSet => GetEntries( "Tailoring", "shoeset" );
-		{
-			get{ return GetEntries( "Tailoring", "shoeset" ); }
-		}
 
-		public static SmallBulkEntry[] StuddedSet
+		public static SmallBulkEntry[] StuddedSet => GetEntries( "Tailoring", "studdedset" );
-		{
-			get{ return GetEntries( "Tailoring", "studdedset" ); }
-		}
 
-		public static SmallBulkEntry[] TownCrier
+		public static SmallBulkEntry[] TownCrier => GetEntries( "Tailoring", "towncrier" );
-		{
-			get{ return GetEntries( "Tailoring", "towncrier" ); }
-		}
 
-		public static SmallBulkEntry[] Wizard
+		public static SmallBulkEntry[] Wizard => GetEntries( "Tailoring", "wizard" );
-		{
-			get{ return GetEntries( "Tailoring", "wizard" ); }
-		}
 
 
 		private static Dictionary<string,Dictionary<string,SmallBulkEntry[]>> m_Cache;

Scripts/Engines/BulkOrders/Rewards.cs

@@ -10,8 +10,8 @@ namespace Server.Engines.BulkOrders
 		private int m_Points;
 		private Type[] m_Types;
 
-		public int Points{ get{ return m_Points; } }
+		public int Points => m_Points;
-		public Type[] Types{ get{ return m_Types; } }
+		public Type[] Types => m_Types;
 
 		public RewardType( int points, params Type[] types )
 		{
@@ -37,9 +37,9 @@ namespace Server.Engines.BulkOrders
 		private ConstructCallback m_Constructor;
 		private int m_Type;
 
-		public int Weight{ get{ return m_Weight; } }
+		public int Weight => m_Weight;
-		public ConstructCallback Constructor{ get{ return m_Constructor; } }
+		public ConstructCallback Constructor => m_Constructor;
-		public int Type{ get{ return m_Type; } }
+		public int Type => m_Type;
 
 		public RewardItem( int weight, ConstructCallback constructor ) : this( weight, constructor, 0 )
 		{
@@ -64,8 +64,8 @@ namespace Server.Engines.BulkOrders
 		private int m_Points;
 		private RewardItem[] m_Items;
 
-		public int Points{ get{ return m_Points; } }
+		public int Points => m_Points;
-		public RewardItem[] Items{ get{ return m_Items; } }
+		public RewardItem[] Items => m_Items;
 
 		public RewardGroup( int points, params RewardItem[] items )
 		{
@@ -105,7 +105,9 @@ namespace Server.Engines.BulkOrders
 	{
 		private RewardGroup[] m_Groups;
 
-		public RewardGroup[] Groups{ get{ return m_Groups; } set{ m_Groups = value; } }
+		public RewardGroup[] Groups{ get => m_Groups;
+			set => m_Groups = value;
+		}
 
 		public abstract int ComputePoints( int quantity, bool exceptional, BulkMaterialType material, int itemCount, Type type );
 		public abstract int ComputeGold( int quantity, bool exceptional, BulkMaterialType material, int itemCount, Type type );

Scripts/Engines/BulkOrders/SmallBOD.cs

@@ -16,28 +16,37 @@ namespace Server.Engines.BulkOrders
 		private BulkMaterialType m_Material;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public int AmountCur{ get{ return m_AmountCur; } set{ m_AmountCur = value; InvalidateProperties(); } }
+		public int AmountCur{ get => m_AmountCur;
+			set{ m_AmountCur = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public int AmountMax{ get{ return m_AmountMax; } set{ m_AmountMax = value; InvalidateProperties(); } }
+		public int AmountMax{ get => m_AmountMax;
+			set{ m_AmountMax = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Type Type{ get{ return m_Type; } set{ m_Type = value; } }
+		public Type Type{ get => m_Type;
+			set => m_Type = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public int Number{ get{ return m_Number; } set{ m_Number = value; InvalidateProperties(); } }
+		public int Number{ get => m_Number;
+			set{ m_Number = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public int Graphic{ get{ return m_Graphic; } set{ m_Graphic = value; } }
+		public int Graphic{ get => m_Graphic;
+			set => m_Graphic = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public bool RequireExceptional{ get{ return m_RequireExceptional; } set{ m_RequireExceptional = value; InvalidateProperties(); } }
+		public bool RequireExceptional{ get => m_RequireExceptional;
+			set{ m_RequireExceptional = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public BulkMaterialType Material{ get{ return m_Material; } set{ m_Material = value; InvalidateProperties(); } }
+		public BulkMaterialType Material{ get => m_Material;
+			set{ m_Material = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public bool Complete{ get{ return ( m_AmountCur == m_AmountMax ); } }
+		public bool Complete => ( m_AmountCur == m_AmountMax );
 
 		public override int LabelNumber => 1045151; // a bulk order deed
 

Scripts/Engines/BulkOrders/SmallBulkEntry.cs

@@ -10,9 +10,9 @@ namespace Server.Engines.BulkOrders
 		private int m_Number;
 		private int m_Graphic;
 
-		public Type Type{ get{ return m_Type; } }
+		public Type Type => m_Type;
-		public int Number{ get{ return m_Number; } }
+		public int Number => m_Number;
-		public int Graphic{ get{ return m_Graphic; } }
+		public int Graphic => m_Graphic;
 
 		public SmallBulkEntry( Type type, int number, int graphic )
 		{
@@ -21,25 +21,13 @@ namespace Server.Engines.BulkOrders
 			m_Graphic = graphic;
 		}
 
-		public static SmallBulkEntry[] BlacksmithWeapons
+		public static SmallBulkEntry[] BlacksmithWeapons => GetEntries( "Blacksmith", "weapons" );
-		{
-			get{ return GetEntries( "Blacksmith", "weapons" ); }
-		}
 
-		public static SmallBulkEntry[] BlacksmithArmor
+		public static SmallBulkEntry[] BlacksmithArmor => GetEntries( "Blacksmith", "armor" );
-		{
-			get{ return GetEntries( "Blacksmith", "armor" ); }
-		}
 
-		public static SmallBulkEntry[] TailorCloth
+		public static SmallBulkEntry[] TailorCloth => GetEntries( "Tailoring", "cloth" );
-		{
-			get{ return GetEntries( "Tailoring", "cloth" ); }
-		}
 
-		public static SmallBulkEntry[] TailorLeather
+		public static SmallBulkEntry[] TailorLeather => GetEntries( "Tailoring", "leather" );
-		{
-			get{ return GetEntries( "Tailoring", "leather" ); }
-		}
 
 		private static Dictionary<string, Dictionary<string, SmallBulkEntry[]>> m_Cache;
 

Scripts/Engines/CannedEvil/ChampionSkull.cs

@@ -7,7 +7,8 @@ namespace Server.Items
 		private ChampionSkullType m_Type;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public ChampionSkullType Type{ get{ return m_Type; } set{ m_Type = value; InvalidateProperties(); } }
+		public ChampionSkullType Type{ get => m_Type;
+			set{ m_Type = value; InvalidateProperties(); } }
 
 		public override int LabelNumber => 1049479 + (int)m_Type;
 

Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs

@@ -11,13 +11,15 @@ namespace Server.Engines.CannedEvil
 		private Item m_Skull;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public ChampionSkullPlatform Platform{ get{ return m_Platform; } }
+		public ChampionSkullPlatform Platform => m_Platform;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public ChampionSkullType Type{ get{ return m_Type; } set{ m_Type = value; InvalidateProperties(); } }
+		public ChampionSkullType Type{ get => m_Type;
+			set{ m_Type = value; InvalidateProperties(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Item Skull{ get{ return m_Skull; } set{ m_Skull = value; if ( m_Platform != null ) m_Platform.Validate(); } }
+		public Item Skull{ get => m_Skull;
+			set{ m_Skull = value; if ( m_Platform != null ) m_Platform.Validate(); } }
 
 		public override int LabelNumber => 1049489 + (int)m_Type;
 

Scripts/Engines/CannedEvil/ChampionSpawn.cs

@@ -12,14 +12,8 @@ namespace Server.Engines.CannedEvil
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int SpawnSzMod
 		{
-			get
+			get => ( m_SPawnSzMod < 1 || m_SPawnSzMod > 12 ) ? 12 : m_SPawnSzMod;
-			{
+			set => m_SPawnSzMod = ( value < 1 || value > 12 ) ? 12 : value;
-				return ( m_SPawnSzMod < 1 || m_SPawnSzMod > 12 ) ? 12 : m_SPawnSzMod;
-			}
-			set
-			{
-				m_SPawnSzMod = ( value < 1 || value > 12 ) ? 12 : value;
-			}
 		}
 		private int m_SPawnSzMod;
 
@@ -56,15 +50,15 @@ namespace Server.Engines.CannedEvil
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool ConfinedRoaming
 		{
-			get { return m_ConfinedRoaming; }
+			get => m_ConfinedRoaming;
-			set { m_ConfinedRoaming = value; }
+			set => m_ConfinedRoaming = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool HasBeenAdvanced
 		{
-			get { return m_HasBeenAdvanced; }
+			get => m_HasBeenAdvanced;
-			set { m_HasBeenAdvanced = value; }
+			set => m_HasBeenAdvanced = value;
 		}
 
 		[Constructible]
@@ -123,17 +117,14 @@ namespace Server.Engines.CannedEvil
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool RandomizeType
 		{
-			get { return m_RandomizeType; }
+			get => m_RandomizeType;
-			set { m_RandomizeType = value; }
+			set => m_RandomizeType = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int Kills
 		{
-			get
+			get => m_Kills;
-			{
-				return m_Kills;
-			}
 			set
 			{
 				m_Kills = value;
@@ -144,10 +135,7 @@ namespace Server.Engines.CannedEvil
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Rectangle2D SpawnArea
 		{
-			get
+			get => m_SpawnArea;
-			{
-				return m_SpawnArea;
-			}
 			set
 			{
 				m_SpawnArea = value;
@@ -159,58 +147,31 @@ namespace Server.Engines.CannedEvil
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TimeSpan RestartDelay
 		{
-			get
+			get => m_RestartDelay;
-			{
+			set => m_RestartDelay = value;
-				return m_RestartDelay;
-			}
-			set
-			{
-				m_RestartDelay = value;
-			}
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public DateTime RestartTime
+		public DateTime RestartTime => m_RestartTime;
-		{
-			get
-			{
-				return m_RestartTime;
-			}
-		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TimeSpan ExpireDelay
 		{
-			get
+			get => m_ExpireDelay;
-			{
+			set => m_ExpireDelay = value;
-				return m_ExpireDelay;
-			}
-			set
-			{
-				m_ExpireDelay = value;
-			}
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public DateTime ExpireTime
 		{
-			get
+			get => m_ExpireTime;
-			{
+			set => m_ExpireTime = value;
-				return m_ExpireTime;
-			}
-			set
-			{
-				m_ExpireTime = value;
-			}
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public ChampionSpawnType Type
 		{
-			get
+			get => m_Type;
-			{
-				return m_Type;
-			}
 			set
 			{
 				m_Type = value;
@@ -221,10 +182,7 @@ namespace Server.Engines.CannedEvil
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool Active
 		{
-			get
+			get => m_Active;
-			{
-				return m_Active;
-			}
 			set
 			{
 				if ( value )
@@ -239,23 +197,14 @@ namespace Server.Engines.CannedEvil
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Mobile Champion
 		{
-			get
+			get => m_Champion;
-			{
+			set => m_Champion = value;
-				return m_Champion;
-			}
-			set
-			{
-				m_Champion = value;
-			}
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int Level
 		{
-			get
+			get => m_RedSkulls.Count;
-			{
-				return m_RedSkulls.Count;
-			}
 			set
 			{
 				for( int i = m_RedSkulls.Count - 1; i >= value; --i )
@@ -281,13 +230,7 @@ namespace Server.Engines.CannedEvil
 			}
 		}
 
-		public int MaxKills
+		public int MaxKills => ( m_SPawnSzMod * ( 250 / 12 ) ) - ( Level * m_SPawnSzMod );
-		{
-			get
-			{
-				return ( m_SPawnSzMod * ( 250 / 12 ) ) - ( Level * m_SPawnSzMod );
-			}
-		}
 
 		public bool IsChampionSpawn( Mobile m )
 		{
@@ -1254,10 +1197,7 @@ namespace Server.Engines.CannedEvil
 
 		private ChampionSpawn m_Spawn;
 
-		public ChampionSpawn ChampionSpawn
+		public ChampionSpawn ChampionSpawn => m_Spawn;
-		{
-			get { return m_Spawn; }
-		}
 
 		public ChampionSpawnRegion( ChampionSpawn spawn ) : base( null, spawn.Map, Region.Find( spawn.Location, spawn.Map ), spawn.SpawnArea )
 		{
@@ -1282,10 +1222,7 @@ namespace Server.Engines.CannedEvil
 
 		public ChampionSpawn Spawn  => m_Spawn;
 
-		public override string DefaultName
+		public override string DefaultName => "Idol of the Champion";
-		{
-			get { return "Idol of the Champion"; }
-		}
 
 
 		public IdolOfTheChampion( ChampionSpawn spawn ): base( 0x1F18 )

Scripts/Engines/Chat/Channel.cs

@@ -28,10 +28,7 @@ namespace Server.Engines.Chat
 
 		public string Name
 		{
-			get
+			get => m_Name;
-			{
-				return m_Name;
-			}
 			set
 			{
 				SendCommand( ChatCommand.RemoveChannel, m_Name );
@@ -43,10 +40,7 @@ namespace Server.Engines.Chat
 
 		public string Password
 		{
-			get
+			get => m_Password;
-			{
-				return m_Password;
-			}
 			set
 			{
 				string newValue = null;
@@ -238,10 +232,7 @@ namespace Server.Engines.Chat
 
 		public bool VoiceRestricted
 		{
-			get
+			get => m_VoiceRestricted;
-			{
-				return m_VoiceRestricted;
-			}
 			set
 			{
 				m_VoiceRestricted = value;
@@ -255,14 +246,8 @@ namespace Server.Engines.Chat
 
 		public bool AlwaysAvailable
 		{
-			get
+			get => m_AlwaysAvailable;
-			{
+			set => m_AlwaysAvailable = value;
-				return m_AlwaysAvailable;
-			}
-			set
-			{
-				m_AlwaysAvailable = value;
-			}
 		}
 
 		public void AddVoiced( ChatUser user )
@@ -461,13 +446,7 @@ namespace Server.Engines.Chat
 
 		private static List<Channel> m_Channels = new List<Channel>();
 
-		public static List<Channel> Channels
+		public static List<Channel> Channels => m_Channels;
-		{
-			get
-			{
-				return m_Channels;
-			}
-		}
 
 		public static void SendChannelsTo( ChatUser user )
 		{

Scripts/Engines/Chat/Chat.cs

@@ -11,8 +11,8 @@ namespace Server.Engines.Chat
 
 		public static bool Enabled
 		{
-			get{ return m_Enabled; }
+			get => m_Enabled;
-			set{ m_Enabled = value; }
+			set => m_Enabled = value;
 		}
 
 		public static void Initialize()

Scripts/Engines/Chat/ChatActionHandler.cs

@@ -8,9 +8,9 @@ namespace Server.Engines.Chat
 		private bool m_RequireConference;
 		private OnChatAction m_Callback;
 
-		public bool RequireModerator{ get{ return m_RequireModerator; } }
+		public bool RequireModerator => m_RequireModerator;
-		public bool RequireConference{ get{ return m_RequireConference; } }
+		public bool RequireConference => m_RequireConference;
-		public OnChatAction Callback{ get{ return m_Callback; } }
+		public OnChatAction Callback => m_Callback;
 
 		public ChatActionHandler( bool requireModerator, bool requireConference, OnChatAction callback )
 		{

Scripts/Engines/Chat/ChatUser.cs

@@ -18,29 +18,11 @@ namespace Server.Engines.Chat
 			m_Ignoring = new List<ChatUser>();
 		}
 
-		public Mobile Mobile
+		public Mobile Mobile => m_Mobile;
-		{
-			get
-			{
-				return m_Mobile;
-			}
-		}
 
-		public List<ChatUser> Ignored
+		public List<ChatUser> Ignored => m_Ignored;
-		{
-			get
-			{
-				return m_Ignored;
-			}
-		}
 
-		public List<ChatUser> Ignoring
+		public List<ChatUser> Ignoring => m_Ignoring;
-		{
-			get
-			{
-				return m_Ignoring;
-			}
-		}
 
 		public string Username
 		{
@@ -60,46 +42,22 @@ namespace Server.Engines.Chat
 
 		public Channel CurrentChannel
 		{
-			get
+			get => m_Channel;
-			{
+			set => m_Channel = value;
-				return m_Channel;
-			}
-			set
-			{
-				m_Channel = value;
-			}
 		}
 
-		public bool IsOnline
+		public bool IsOnline => ( m_Mobile.NetState != null );
-		{
-			get
-			{
-				return ( m_Mobile.NetState != null );
-			}
-		}
 
 		public bool Anonymous
 		{
-			get
+			get => m_Anonymous;
-			{
+			set => m_Anonymous = value;
-				return m_Anonymous;
-			}
-			set
-			{
-				m_Anonymous = value;
-			}
 		}
 
 		public bool IgnorePrivateMessage
 		{
-			get
+			get => m_IgnorePrivateMessage;
-			{
+			set => m_IgnorePrivateMessage = value;
-				return m_IgnorePrivateMessage;
-			}
-			set
-			{
-				m_IgnorePrivateMessage = value;
-			}
 		}
 
 		public const char NormalColorCharacter = '0';
@@ -153,13 +111,7 @@ namespace Server.Engines.Chat
 			return m_Ignored.Contains( check );
 		}
 
-		public bool IsModerator
+		public bool IsModerator => ( m_Channel != null && m_Channel.IsModerator( this ) );
-		{
-			get
-			{
-				return ( m_Channel != null && m_Channel.IsModerator( this ) );
-			}
-		}
 
 		public void AddIgnored( ChatUser user )
 		{

Scripts/Engines/ConPVP/AcceptDuelGump.cs

@@ -120,8 +120,8 @@ namespace Server.Engines.ConPVP
 			public Mobile m_Ignored;
 			public DateTime m_Expire;
 
-			public Mobile Ignored{ get{ return m_Ignored; } }
+			public Mobile Ignored => m_Ignored;
-			public bool Expired{ get{ return ( DateTime.UtcNow >= m_Expire ); } }
+			public bool Expired => ( DateTime.UtcNow >= m_Expire );
 
 			private static TimeSpan ExpireDelay = TimeSpan.FromMinutes( 15.0 );
 

Scripts/Engines/ConPVP/Arena.cs

@@ -10,16 +10,16 @@ namespace Server.Engines.ConPVP
 		private bool m_IsPrivate;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Arena Arena{ get{ return m_Arena; } set{} }
+		public Arena Arena{ get => m_Arena;
+			set{} }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public bool IsPrivate{ get{ return m_IsPrivate; } set{ m_IsPrivate = value; } }
+		public bool IsPrivate{ get => m_IsPrivate;
-
+			set => m_IsPrivate = value;
-		public override string DefaultName
-		{
-			get { return "arena controller"; }
 		}
 
+		public override string DefaultName => "arena controller";
+
 		[Constructible]
 		public ArenaController() : base( 0x1B7A )
 		{
@@ -86,7 +86,9 @@ namespace Server.Engines.ConPVP
 
 		private static List<ArenaController> m_Instances = new List<ArenaController>();
 
-		public static List<ArenaController> Instances{ get{ return m_Instances; } set{ m_Instances = value; } }
+		public static List<ArenaController> Instances{ get => m_Instances;
+			set => m_Instances = value;
+		}
 	}
 
 	[PropertyObject]
@@ -94,31 +96,47 @@ namespace Server.Engines.ConPVP
 	{
 		private Point3D[] m_Points;
 
-		public Point3D[] Points{ get{ return m_Points; } }
+		public Point3D[] Points => m_Points;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D EdgeWest{ get{ return m_Points[0]; } set{ m_Points[0] = value; } }
+		public Point3D EdgeWest{ get => m_Points[0];
+			set => m_Points[0] = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D EdgeEast{ get{ return m_Points[1]; } set{ m_Points[1] = value; } }
+		public Point3D EdgeEast{ get => m_Points[1];
+			set => m_Points[1] = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D EdgeNorth{ get{ return m_Points[2]; } set{ m_Points[2] = value; } }
+		public Point3D EdgeNorth{ get => m_Points[2];
+			set => m_Points[2] = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D EdgeSouth{ get{ return m_Points[3]; } set{ m_Points[3] = value; } }
+		public Point3D EdgeSouth{ get => m_Points[3];
+			set => m_Points[3] = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D CornerNW{ get{ return m_Points[4]; } set{ m_Points[4] = value; } }
+		public Point3D CornerNW{ get => m_Points[4];
+			set => m_Points[4] = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D CornerSE{ get{ return m_Points[5]; } set{ m_Points[5] = value; } }
+		public Point3D CornerSE{ get => m_Points[5];
+			set => m_Points[5] = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D CornerSW{ get{ return m_Points[6]; } set{ m_Points[6] = value; } }
+		public Point3D CornerSW{ get => m_Points[6];
+			set => m_Points[6] = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D CornerNE{ get{ return m_Points[7]; } set{ m_Points[7] = value; } }
+		public Point3D CornerNE{ get => m_Points[7];
+			set => m_Points[7] = value;
+		}
 
 		public override string ToString()
 		{
@@ -179,14 +197,14 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public LadderController Ladder
 		{
-			get{ return m_Ladder; }
+			get => m_Ladder;
-			set{ m_Ladder = value; }
+			set => m_Ladder = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool IsGuarded
 		{
-			get{ return m_IsGuarded; }
+			get => m_IsGuarded;
 			set
 			{
 				m_IsGuarded = value;
@@ -207,7 +225,7 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TournamentController Tournament
 		{
-			get{ return m_Tournament; }
+			get => m_Tournament;
 			set
 			{
 				if ( m_Tournament != null )
@@ -223,21 +241,21 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Mobile Announcer
 		{
-			get{ return m_Announcer; }
+			get => m_Announcer;
-			set{ m_Announcer = value; }
+			set => m_Announcer = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public string Name
 		{
-			get{ return m_Name; }
+			get => m_Name;
 			set{ m_Name = value; if ( m_Active ) m_Arenas.Sort(); }
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Map Facet
 		{
-			get{ return m_Facet; }
+			get => m_Facet;
 			set
 			{
 				m_Facet = value;
@@ -256,7 +274,9 @@ namespace Server.Engines.ConPVP
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Rectangle2D Bounds{ get{ return m_Bounds; } set{ m_Bounds = value; } }
+		public Rectangle2D Bounds{ get => m_Bounds;
+			set => m_Bounds = value;
+		}
 
 		private SafeZone m_Region;
 
@@ -279,7 +299,7 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Rectangle2D Zone
 		{
-			get{ return m_Zone; }
+			get => m_Zone;
 			set
 			{
 				m_Zone = value;
@@ -302,31 +322,41 @@ namespace Server.Engines.ConPVP
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D Outside{ get{ return m_Outside; } set{ m_Outside = value; } }
+		public Point3D Outside{ get => m_Outside;
+			set => m_Outside = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D GateIn{ get{ return m_GateIn; } set{ m_GateIn = value; } }
+		public Point3D GateIn{ get => m_GateIn;
+			set => m_GateIn = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D GateOut{ get{ return m_GateOut; } set{ m_GateOut = value; if ( m_Teleporter != null ) m_Teleporter.Location = m_GateOut; } }
+		public Point3D GateOut{ get => m_GateOut;
+			set{ m_GateOut = value; if ( m_Teleporter != null ) m_Teleporter.Location = m_GateOut; } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Point3D Wall{ get{ return m_Wall; } set{ m_Wall = value; } }
+		public Point3D Wall{ get => m_Wall;
+			set => m_Wall = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public bool IsOccupied{ get{ return ( m_Players.Count > 0 ); } }
+		public bool IsOccupied => ( m_Players.Count > 0 );
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public ArenaStartPoints Points{ get{ return m_Points; } set{} }
+		public ArenaStartPoints Points{ get => m_Points;
+			set{} }
 
-		public Item Teleporter{ get{ return m_Teleporter; } set{ m_Teleporter = value; } }
+		public Item Teleporter{ get => m_Teleporter;
+			set => m_Teleporter = value;
+		}
 
-		public List<Mobile> Players{ get{ return m_Players; } }
+		public List<Mobile> Players => m_Players;
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool Active
 		{
-			get{ return m_Active; }
+			get => m_Active;
 			set
 			{
 				if ( m_Active == value )
@@ -567,7 +597,8 @@ namespace Server.Engines.ConPVP
 		}
 
 		[CommandProperty( AccessLevel.Administrator, AccessLevel.Administrator )]
-		public bool ForceEvict{ get{ return false; } set{ if ( value ) Evict(); } }
+		public bool ForceEvict{ get => false;
+			set{ if ( value ) Evict(); } }
 
 		public void Evict()
 		{
@@ -662,7 +693,7 @@ namespace Server.Engines.ConPVP
 
 		private static List<Arena> m_Arenas = new List<Arena>();
 
-		public static List<Arena> Arenas{ get{ return m_Arenas; } }
+		public static List<Arena> Arenas => m_Arenas;
 
 		public static Arena FindArena( List<Mobile> players )
 		{
@@ -765,20 +796,7 @@ namespace Server.Engines.ConPVP
 			public int m_VotesFor;
 			public int m_VotesAgainst;
 
-			public int Value
+			public int Value => m_VotesFor;
-			{
-				get
-				{
-					return m_VotesFor;
-
-					/*if ( m_VotesFor > m_VotesAgainst )
-						return m_VotesFor - m_VotesAgainst;
-					else if ( m_VotesFor > 0 )
-						return 1;
-					else
-						return 0;*/
-				}
-			}
 
 			public ArenaEntry( Arena arena )
 			{

Scripts/Engines/ConPVP/ArenaGump.cs

@@ -9,10 +9,7 @@ namespace Server.Engines.ConPVP
 {
 	public class ArenasMoongate : Item
 	{
-		public override string DefaultName
+		public override string DefaultName => "arena moongate";
-		{
-			get { return "arena moongate"; }
-		}
 
 		[Constructible]
 		public ArenasMoongate() : base( 0x1FD4 )

Scripts/Engines/ConPVP/DuelContext.cs

@@ -34,19 +34,19 @@ namespace Server.Engines.ConPVP
 
 		private bool m_Rematch;
 
-		public bool Rematch{ get{ return m_Rematch; } }
+		public bool Rematch => m_Rematch;
 
-		public bool ReadyWait{ get{ return m_ReadyWait; } }
+		public bool ReadyWait => m_ReadyWait;
-		public int ReadyCount{ get{ return m_ReadyCount; } }
+		public int ReadyCount => m_ReadyCount;
 
-		public bool Registered{ get{ return m_Registered; } }
+		public bool Registered => m_Registered;
-		public bool Finished{ get{ return m_Finished; } }
+		public bool Finished => m_Finished;
-		public bool Started{ get{ return m_Started; } }
+		public bool Started => m_Started;
 
-		public Mobile Initiator{ get{ return m_Initiator; } }
+		public Mobile Initiator => m_Initiator;
-		public ArrayList Participants{ get{ return m_Participants; } }
+		public ArrayList Participants => m_Participants;
-		public Ruleset Ruleset{ get{ return m_Ruleset; } }
+		public Ruleset Ruleset => m_Ruleset;
-		public Arena Arena{ get{ return m_Arena; } }
+		public Arena Arena => m_Arena;
 
 		private bool CantDoAnything( Mobile mob )
 		{
@@ -896,11 +896,13 @@ namespace Server.Engines.ConPVP
 		private Timer m_AutoTieTimer;
 		private bool m_Tied;
 
-		public bool Tied{ get{ return m_Tied; } }
+		public bool Tied => m_Tied;
 
 		private bool m_IsSuddenDeath;
 
-		public bool IsSuddenDeath{ get{ return m_IsSuddenDeath; } set{ m_IsSuddenDeath = value; } }
+		public bool IsSuddenDeath{ get => m_IsSuddenDeath;
+			set => m_IsSuddenDeath = value;
+		}
 
 		private Timer m_SDWarnTimer, m_SDActivateTimer;
 
@@ -1664,8 +1666,8 @@ namespace Server.Engines.ConPVP
 		private bool m_StartedBeginCountdown;
 		private bool m_StartedReadyCountdown;
 
-		public bool StartedBeginCountdown{ get{ return m_StartedBeginCountdown; } }
+		public bool StartedBeginCountdown => m_StartedBeginCountdown;
-		public bool StartedReadyCountdown{ get{ return m_StartedReadyCountdown; } }
+		public bool StartedReadyCountdown => m_StartedReadyCountdown;
 
 		private class InternalWall : Item
 		{
@@ -2000,9 +2002,9 @@ namespace Server.Engines.ConPVP
 			private Map m_Facet;
 			private DateTime m_Expire;
 
-			public Mobile Mobile{ get{ return m_Mobile; } }
+			public Mobile Mobile => m_Mobile;
-			public Point3D Location{ get{ return m_Location; } }
+			public Point3D Location => m_Location;
-			public Map Facet{ get{ return m_Facet; } }
+			public Map Facet => m_Facet;
 
 			public void Return()
 			{
@@ -2036,7 +2038,7 @@ namespace Server.Engines.ConPVP
 				m_Expire = DateTime.UtcNow + TimeSpan.FromMinutes( 30.0 );
 			}
 
-			public bool Expired{ get{ return ( DateTime.UtcNow >= m_Expire ); } }
+			public bool Expired => ( DateTime.UtcNow >= m_Expire );
 
 			public void Update()
 			{
@@ -2059,10 +2061,7 @@ namespace Server.Engines.ConPVP
 		{
 			private ArrayList m_Entries;
 
-			public override string DefaultName
+			public override string DefaultName => "return teleporter";
-			{
-				get { return "return teleporter"; }
-			}
 
 			public ExitTeleporter() : base( 0x1822 )
 			{
@@ -2183,10 +2182,7 @@ namespace Server.Engines.ConPVP
 		{
 			private ExitTeleporter m_Teleporter;
 
-			public override string DefaultName
+			public override string DefaultName => "spectator moongate";
-			{
-				get { return "spectator moongate"; }
-			}
 
 			public ArenaMoongate( Point3D target, Map map, ExitTeleporter tp ) : base( target, map )
 			{

Scripts/Engines/ConPVP/DuelContextGump.cs

@@ -9,8 +9,8 @@ namespace Server.Engines.ConPVP
 		private Mobile m_From;
 		private DuelContext m_Context;
 
-		public Mobile From{ get{ return m_From; } } 
+		public Mobile From => m_From;
-		public DuelContext Context{ get{ return m_Context; } }
+		public DuelContext Context => m_Context;
 
 		public string Center( string text )
 		{

Scripts/Engines/ConPVP/Games/BombingRun.cs

@@ -788,7 +788,8 @@ namespace Server.Engines.ConPVP
 		private bool m_North = false;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public bool North { get { return m_North; } set { m_North = value; Remake(); } }
+		public bool North { get => m_North;
+			set { m_North = value; Remake(); } }
 
 		private static AddonComponent SetHue( AddonComponent ac, int hue )
 		{
@@ -908,7 +909,7 @@ namespace Server.Engines.ConPVP
 
 		public BRTeamInfo Team
 		{
-			get { return m_Team; }
+			get => m_Team;
 			set
 			{
 				m_Team = value;
@@ -1190,17 +1191,11 @@ namespace Server.Engines.ConPVP
 			return res;
 		}
 
-		public string Name
+		public string Name => m_Player.Name;
-		{
-			get { return m_Player.Name; }
-		}
 
 		public int Kills
 		{
-			get
+			get => m_Kills;
-			{
-				return m_Kills;
-			}
 			set
 			{
 				m_TeamInfo.Kills += ( value - m_Kills );
@@ -1210,10 +1205,7 @@ namespace Server.Engines.ConPVP
 
 		public int Captures
 		{
-			get
+			get => m_Captures;
-			{
-				return m_Captures;
-			}
 			set
 			{
 				m_TeamInfo.Captures += ( value - m_Captures );
@@ -1223,10 +1215,7 @@ namespace Server.Engines.ConPVP
 
 		public int Score
 		{
-			get
+			get => m_Score;
-			{
-				return m_Score;
-			}
 			set
 			{
 				m_TeamInfo.Score += ( value - m_Score );
@@ -1277,38 +1266,40 @@ namespace Server.Engines.ConPVP
 			return res;
 		}
 
-		public string Name
+		public string Name => String.Format( "{0} Team", m_Name );
-		{
-			get { return String.Format( "{0} Team", m_Name ); }
-		}
 
-		public BRGame Game { get { return m_Game; } set { m_Game = value; } }
+		public BRGame Game { get => m_Game;
+			set => m_Game = value;
+		}
 		public int TeamID  => m_TeamID;
 
-		public int Kills { get { return m_Kills; } set { m_Kills = value; } }
+		public int Kills { get => m_Kills;
-		public int Captures { get { return m_Captures; } set { m_Captures = value; } }
+			set => m_Kills = value;
+		}
+		public int Captures { get => m_Captures;
+			set => m_Captures = value;
+		}
 
-		public int Score { get { return m_Score; } set { m_Score = value; } }
+		public int Score { get => m_Score;
+			set => m_Score = value;
+		}
 
 		private BRPlayerInfo m_Leader;
 
 		public BRPlayerInfo Leader
 		{
-			get { return m_Leader; }
+			get => m_Leader;
-			set { m_Leader = value; }
+			set => m_Leader = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public BRBoard Board
 		{
-			get { return m_Board; }
+			get => m_Board;
-			set { m_Board = value; }
+			set => m_Board = value;
 		}
 
-		public Hashtable Players
+		public Hashtable Players => m_Players;
-		{
-			get { return m_Players; }
-		}
 
 		public BRPlayerInfo this[Mobile mob]
 		{
@@ -1327,21 +1318,21 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int Color
 		{
-			get { return m_Color; }
+			get => m_Color;
-			set { m_Color = value; }
+			set => m_Color = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public string TeamName
 		{
-			get { return m_Name; }
+			get => m_Name;
-			set { m_Name = value; }
+			set => m_Name = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public BRGoal Goal
 		{
-			get { return m_Goal; }
+			get => m_Goal;
 			set
 			{
 				m_Goal = value;
@@ -1423,29 +1414,33 @@ namespace Server.Engines.ConPVP
 		public BRTeamInfo[] TeamInfo  => m_TeamInfo;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public BRTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
+		public BRTeamInfo Team1 { get => m_TeamInfo[0];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public BRTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
+		public BRTeamInfo Team2 { get => m_TeamInfo[1];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public BRTeamInfo Team3 { get { return m_TeamInfo[2]; } set { } }
+		public BRTeamInfo Team3 { get => m_TeamInfo[2];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public BRTeamInfo Team4 { get { return m_TeamInfo[3]; } set { } }
+		public BRTeamInfo Team4 { get => m_TeamInfo[3];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TimeSpan Duration
 		{
-			get { return m_Duration; }
+			get => m_Duration;
-			set { m_Duration = value; }
+			set => m_Duration = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Point3D BombHome
 		{
-			get { return m_BombHome; }
+			get => m_BombHome;
-			set { m_BombHome = value; }
+			set => m_BombHome = value;
 		}
 
 		public override string Title => "Bombing Run";

Scripts/Engines/ConPVP/Games/CTF.cs

@@ -13,10 +13,7 @@ namespace Server.Engines.ConPVP
 	{
 		public CTFTeamInfo m_TeamInfo;
 
-		public override string DefaultName
+		public override string DefaultName => "scoreboard";
-		{
-			get { return "scoreboard"; }
-		}
 
 		[Constructible]
 		public CTFBoard()
@@ -233,10 +230,7 @@ namespace Server.Engines.ConPVP
 	{
 		public CTFTeamInfo m_TeamInfo;
 
-		public override string DefaultName
+		public override string DefaultName => "old people cookies";
-		{
-			get { return "old people cookies"; }
-		}
 
 		public Mobile m_Fragger;
 		public DateTime m_FragTime;
@@ -548,17 +542,11 @@ namespace Server.Engines.ConPVP
 
 		public Mobile Player  => m_Player;
 
-		string IRankedCTF.Name
+		string IRankedCTF.Name => m_Player.Name;
-		{
-			get { return m_Player.Name; }
-		}
 
 		public int Kills
 		{
-			get
+			get => m_Kills;
-			{
-				return m_Kills;
-			}
 			set
 			{
 				m_TeamInfo.Kills += ( value - m_Kills );
@@ -568,10 +556,7 @@ namespace Server.Engines.ConPVP
 
 		public int Captures
 		{
-			get
+			get => m_Captures;
-			{
-				return m_Captures;
-			}
 			set
 			{
 				m_TeamInfo.Captures += ( value - m_Captures );
@@ -581,10 +566,7 @@ namespace Server.Engines.ConPVP
 
 		public int Score
 		{
-			get
+			get => m_Score;
-			{
-				return m_Score;
-			}
 			set
 			{
 				m_TeamInfo.Score += ( value - m_Score );
@@ -623,38 +605,40 @@ namespace Server.Engines.ConPVP
 
 		private Dictionary<Mobile, CTFPlayerInfo> m_Players;
 
-		string IRankedCTF.Name
+		string IRankedCTF.Name => String.Format( "{0} Team", m_Name );
-		{
-			get { return String.Format( "{0} Team", m_Name ); }
-		}
 
-		public CTFGame Game { get { return m_Game; } set { m_Game = value; } }
+		public CTFGame Game { get => m_Game;
+			set => m_Game = value;
+		}
 		public int TeamID  => m_TeamID;
 
-		public int Kills { get { return m_Kills; } set { m_Kills = value; } }
+		public int Kills { get => m_Kills;
-		public int Captures { get { return m_Captures; } set { m_Captures = value; } }
+			set => m_Kills = value;
+		}
+		public int Captures { get => m_Captures;
+			set => m_Captures = value;
+		}
 
-		public int Score { get { return m_Score; } set { m_Score = value; } }
+		public int Score { get => m_Score;
+			set => m_Score = value;
+		}
 
 		private CTFPlayerInfo m_Leader;
 
 		public CTFPlayerInfo Leader
 		{
-			get { return m_Leader; }
+			get => m_Leader;
-			set { m_Leader = value; }
+			set => m_Leader = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public CTFBoard Board
 		{
-			get { return m_Board; }
+			get => m_Board;
-			set { m_Board = value; }
+			set => m_Board = value;
 		}
 
-		public Dictionary<Mobile, CTFPlayerInfo> Players
+		public Dictionary<Mobile, CTFPlayerInfo> Players => m_Players;
-		{
-			get { return m_Players; }
-		}
 
 		public CTFPlayerInfo this[Mobile mob]
 		{
@@ -673,29 +657,29 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int Color
 		{
-			get { return m_Color; }
+			get => m_Color;
-			set { m_Color = value; }
+			set => m_Color = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public string Name
 		{
-			get { return m_Name; }
+			get => m_Name;
-			set { m_Name = value; }
+			set => m_Name = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public CTFFlag Flag
 		{
-			get { return m_Flag; }
+			get => m_Flag;
-			set { m_Flag = value; }
+			set => m_Flag = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Point3D Origin
 		{
-			get { return m_Origin; }
+			get => m_Origin;
-			set { m_Origin = value; }
+			set => m_Origin = value;
 		}
 
 		public CTFTeamInfo( int teamID )
@@ -787,40 +771,45 @@ namespace Server.Engines.ConPVP
 		public CTFTeamInfo[] TeamInfo  => m_TeamInfo;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
+		public CTFTeamInfo Team1 { get => m_TeamInfo[0];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
+		public CTFTeamInfo Team2 { get => m_TeamInfo[1];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team3 { get { return m_TeamInfo[2]; } set { } }
+		public CTFTeamInfo Team3 { get => m_TeamInfo[2];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team4 { get { return m_TeamInfo[3]; } set { } }
+		public CTFTeamInfo Team4 { get => m_TeamInfo[3];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team5 { get { return m_TeamInfo[4]; } set { } }
+		public CTFTeamInfo Team5 { get => m_TeamInfo[4];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team6 { get { return m_TeamInfo[5]; } set { } }
+		public CTFTeamInfo Team6 { get => m_TeamInfo[5];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team7 { get { return m_TeamInfo[6]; } set { } }
+		public CTFTeamInfo Team7 { get => m_TeamInfo[6];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public CTFTeamInfo Team8 { get { return m_TeamInfo[7]; } set { } }
+		public CTFTeamInfo Team8 { get => m_TeamInfo[7];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TimeSpan Duration
 		{
-			get { return m_Duration; }
+			get => m_Duration;
-			set { m_Duration = value; }
+			set => m_Duration = value;
 		}
 
-		public override string Title
+		public override string Title => "CTF";
-		{
-			get { return "CTF"; }
-		}
 
 		public override string GetTeamName( int teamID )
 		{

Scripts/Engines/ConPVP/Games/DoubleDom.cs

@@ -11,10 +11,7 @@ namespace Server.Engines.ConPVP
 	{
 		public DDTeamInfo m_TeamInfo;
 
-		public override string DefaultName
+		public override string DefaultName => "scoreboard";
-		{
-			get { return "scoreboard"; }
-		}
 
 		[Constructible]
 		public DDBoard()
@@ -238,17 +235,11 @@ namespace Server.Engines.ConPVP
 
 		public Mobile Player  => m_Player;
 
-		public string Name
+		public string Name => m_Player.Name;
-		{
-			get { return m_Player.Name; }
-		}
 
 		public int Kills
 		{
-			get
+			get => m_Kills;
-			{
-				return m_Kills;
-			}
 			set
 			{
 				m_TeamInfo.Kills += ( value - m_Kills );
@@ -258,10 +249,7 @@ namespace Server.Engines.ConPVP
 
 		public int Captures
 		{
-			get
+			get => m_Captures;
-			{
-				return m_Captures;
-			}
 			set
 			{
 				m_TeamInfo.Captures += ( value - m_Captures );
@@ -271,10 +259,7 @@ namespace Server.Engines.ConPVP
 
 		public int Score
 		{
-			get
+			get => m_Score;
-			{
-				return m_Score;
-			}
 			set
 			{
 				m_TeamInfo.Score += ( value - m_Score );
@@ -312,38 +297,40 @@ namespace Server.Engines.ConPVP
 
 		private Dictionary<Mobile, DDPlayerInfo> m_Players;
 
-		public string Name
+		public string Name => String.Format( "{0} Team", m_Name );
-		{
-			get { return String.Format( "{0} Team", m_Name ); }
-		}
 
-		public DDGame Game { get { return m_Game; } set { m_Game = value; } }
+		public DDGame Game { get => m_Game;
+			set => m_Game = value;
+		}
 		public int TeamID  => m_TeamID;
 
-		public int Kills { get { return m_Kills; } set { m_Kills = value; } }
+		public int Kills { get => m_Kills;
-		public int Captures { get { return m_Captures; } set { m_Captures = value; } }
+			set => m_Kills = value;
+		}
+		public int Captures { get => m_Captures;
+			set => m_Captures = value;
+		}
 
-		public int Score { get { return m_Score; } set { m_Score = value; } }
+		public int Score { get => m_Score;
+			set => m_Score = value;
+		}
 
 		private DDPlayerInfo m_Leader;
 
 		public DDPlayerInfo Leader
 		{
-			get { return m_Leader; }
+			get => m_Leader;
-			set { m_Leader = value; }
+			set => m_Leader = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public DDBoard Board
 		{
-			get { return m_Board; }
+			get => m_Board;
-			set { m_Board = value; }
+			set => m_Board = value;
 		}
 
-		public Dictionary<Mobile, DDPlayerInfo> Players
+		public Dictionary<Mobile, DDPlayerInfo> Players => m_Players;
-		{
-			get { return m_Players; }
-		}
 
 		public DDPlayerInfo this[Mobile mob]
 		{
@@ -362,22 +349,22 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int Color
 		{
-			get { return m_Color; }
+			get => m_Color;
-			set { m_Color = value; }
+			set => m_Color = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public string TeamName
 		{
-			get { return m_Name; }
+			get => m_Name;
-			set { m_Name = value; }
+			set => m_Name = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Point3D Origin
 		{
-			get { return m_Origin; }
+			get => m_Origin;
-			set { m_Origin = value; }
+			set => m_Origin = value;
 		}
 
 		public DDTeamInfo( int teamID )
@@ -446,30 +433,33 @@ namespace Server.Engines.ConPVP
 		public DDTeamInfo[] TeamInfo  => m_TeamInfo;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public DDTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
+		public DDTeamInfo Team1 { get => m_TeamInfo[0];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public DDTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
+		public DDTeamInfo Team2 { get => m_TeamInfo[1];
+			set { } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public DDWayPoint PointA { get { return m_PointA; } set { m_PointA = value; } }
+		public DDWayPoint PointA { get => m_PointA;
+			set => m_PointA = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public DDWayPoint PointB { get { return m_PointB; } set { m_PointB = value; } }
+		public DDWayPoint PointB { get => m_PointB;
+			set => m_PointB = value;
+		}
 
 		private DDWayPoint m_PointA, m_PointB;
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TimeSpan Duration
 		{
-			get { return m_Duration; }
+			get => m_Duration;
-			set { m_Duration = value; }
+			set => m_Duration = value;
 		}
 
-		public override string Title
+		public override string Title => "DoubleDom";
-		{
-			get { return "DoubleDom"; }
-		}
 
 		public override string GetTeamName( int teamID )
 		{
@@ -1109,7 +1099,7 @@ namespace Server.Engines.ConPVP
 
 		public DDGame Game
 		{
-			get{ return m_Game; }
+			get => m_Game;
 			set
 			{
 				m_Game = value;
@@ -1124,7 +1114,7 @@ namespace Server.Engines.ConPVP
 
 		public DDTeamInfo TeamOwner
 		{
-			get{ return m_TeamOwner; }
+			get => m_TeamOwner;
 			set
 			{
 				m_TeamOwner = value;

Scripts/Engines/ConPVP/Games/KingOfTheHill.cs

@@ -58,18 +58,12 @@ namespace Server.Engines.ConPVP
             writer.WriteEncodedInt(m_ScoreInterval);
         }
 
-        public Mobile King
+        public Mobile King => m_King;
-        {
-            get
-            {
-                return m_King;
-            }
-        }
 
-        public KHGame Game
+	    public KHGame Game
         {
-            get { return m_Game; }
+            get => m_Game;
-            set
+		    set
             {
                 if (m_Game != value)
                 {
@@ -82,7 +76,9 @@ namespace Server.Engines.ConPVP
         }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public int ScoreInterval { get { return m_ScoreInterval; } set { m_ScoreInterval = value; } }
+        public int ScoreInterval { get => m_ScoreInterval;
+	        set => m_ScoreInterval = value;
+        }
 
         public int CapturesSoFar
         {
@@ -307,8 +303,8 @@ namespace Server.Engines.ConPVP
         [CommandProperty(AccessLevel.GameMaster)]
         public KHController Controller
         {
-            get { return m_Controller; }
+            get => m_Controller;
-            set
+	        set
             {
                 if (m_Controller != value)
                 {
@@ -563,11 +559,8 @@ namespace Server.Engines.ConPVP
 
         public int Kills
         {
-            get
+            get => m_Kills;
-            {
+	        set
-                return m_Kills;
-            }
-            set
             {
                 m_TeamInfo.Kills += (value - m_Kills);
                 m_Kills = value;
@@ -576,11 +569,8 @@ namespace Server.Engines.ConPVP
 
         public int Captures
         {
-            get
+            get => m_Captures;
-            {
+	        set
-                return m_Captures;
-            }
-            set
             {
                 m_TeamInfo.Captures += (value - m_Captures);
                 m_Captures = value;
@@ -589,11 +579,8 @@ namespace Server.Engines.ConPVP
 
         public int Score
         {
-            get
+            get => m_Score;
-            {
+	        set
-                return m_Score;
-            }
-            set
             {
                 m_TeamInfo.Score += (value - m_Score);
                 m_Score = value;
@@ -644,27 +631,32 @@ namespace Server.Engines.ConPVP
             }
         }
 
-        public KHGame Game { get { return m_Game; } set { m_Game = value; } }
+        public KHGame Game { get => m_Game;
+	        set => m_Game = value;
+        }
         public int TeamID  => m_TeamID;
 
-        public int Kills { get { return m_Kills; } set { m_Kills = value; } }
+        public int Kills { get => m_Kills;
-        public int Captures { get { return m_Captures; } set { m_Captures = value; } }
+	        set => m_Kills = value;
-        public int Score { get { return m_Score; } set { m_Score = value; } }
+        }
+        public int Captures { get => m_Captures;
+	        set => m_Captures = value;
+        }
+        public int Score { get => m_Score;
+	        set => m_Score = value;
+        }
 
         private KHPlayerInfo m_Leader;
 
         public KHPlayerInfo Leader
         {
-            get { return m_Leader; }
+            get => m_Leader;
-            set { m_Leader = value; }
+	        set => m_Leader = value;
         }
 
-        public Hashtable Players
+        public Hashtable Players => m_Players;
-        {
-            get { return m_Players; }
-        }
 
-        public KHPlayerInfo this[Mobile mob]
+	    public KHPlayerInfo this[Mobile mob]
         {
             get
             {
@@ -681,15 +673,15 @@ namespace Server.Engines.ConPVP
         [CommandProperty(AccessLevel.GameMaster)]
         public int Color
         {
-            get { return m_Color; }
+            get => m_Color;
-            set { m_Color = value; }
+	        set => m_Color = value;
         }
 
         [CommandProperty(AccessLevel.GameMaster)]
         public string TeamName
         {
-            get { return m_Name; }
+            get => m_Name;
-            set { m_Name = value; }
+	        set => m_Name = value;
         }
 
         public KHTeamInfo(int teamID)
@@ -755,58 +747,71 @@ namespace Server.Engines.ConPVP
         public KHTeamInfo[] TeamInfo  => m_TeamInfo;
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team1_W { get { return m_TeamInfo[0]; } set { } }
+        public KHTeamInfo Team1_W { get => m_TeamInfo[0];
+	        set { } }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team2_E { get { return m_TeamInfo[1]; } set { } }
+        public KHTeamInfo Team2_E { get => m_TeamInfo[1];
+	        set { } }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team3_N { get { return m_TeamInfo[2]; } set { } }
+        public KHTeamInfo Team3_N { get => m_TeamInfo[2];
+	        set { } }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team4_S { get { return m_TeamInfo[3]; } set { } }
+        public KHTeamInfo Team4_S { get => m_TeamInfo[3];
+	        set { } }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team5_NW { get { return m_TeamInfo[4]; } set { } }
+        public KHTeamInfo Team5_NW { get => m_TeamInfo[4];
+	        set { } }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team6_SE { get { return m_TeamInfo[5]; } set { } }
+        public KHTeamInfo Team6_SE { get => m_TeamInfo[5];
+	        set { } }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team7_SW { get { return m_TeamInfo[6]; } set { } }
+        public KHTeamInfo Team7_SW { get => m_TeamInfo[6];
+	        set { } }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public KHTeamInfo Team8_NE { get { return m_TeamInfo[7]; } set { } }
+        public KHTeamInfo Team8_NE { get => m_TeamInfo[7];
+	        set { } }
 
         public HillOfTheKing[] Hills  => m_Hills;
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public HillOfTheKing Hill1 { get { return m_Hills[0]; } set { m_Hills[0] = value; } }
+        public HillOfTheKing Hill1 { get => m_Hills[0];
+	        set => m_Hills[0] = value;
+        }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public HillOfTheKing Hill2 { get { return m_Hills[1]; } set { m_Hills[1] = value; } }
+        public HillOfTheKing Hill2 { get => m_Hills[1];
+	        set => m_Hills[1] = value;
+        }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public HillOfTheKing Hill3 { get { return m_Hills[2]; } set { m_Hills[2] = value; } }
+        public HillOfTheKing Hill3 { get => m_Hills[2];
+	        set => m_Hills[2] = value;
+        }
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public HillOfTheKing Hill4 { get { return m_Hills[3]; } set { m_Hills[3] = value; } }
+        public HillOfTheKing Hill4 { get => m_Hills[3];
+	        set => m_Hills[3] = value;
+        }
 
         public ArrayList Boards  => m_Boards;
 
         [CommandProperty(AccessLevel.GameMaster)]
         public TimeSpan Duration
         {
-            get { return m_Duration; }
+            get => m_Duration;
-            set { m_Duration = value; }
+	        set => m_Duration = value;
         }
 
-        public override string Title
+        public override string Title => "King of the Hill";
-        {
-            get { return "King of the Hill"; }
-        }
 
-        public override string GetTeamName(int teamID)
+	    public override string GetTeamName(int teamID)
         {
             return m_TeamInfo[teamID % m_TeamInfo.Length].Name;
         }

Scripts/Engines/ConPVP/Ladder.cs

@@ -8,12 +8,10 @@ namespace Server.Engines.ConPVP
 		private Ladder m_Ladder;
 
 		//[CommandProperty( AccessLevel.GameMaster )]
-		public Ladder Ladder{ get{ return m_Ladder; } set{} }
+		public Ladder Ladder{ get => m_Ladder;
+			set{} }
 
-		public override string DefaultName
+		public override string DefaultName => "ladder controller";
-		{
-			get { return "ladder controller"; }
-		}
 
 		[Constructible]
 		public LadderController() : base( 0x1B7A )
@@ -251,7 +249,9 @@ namespace Server.Engines.ConPVP
 
 		private static Ladder m_Instance;
 
-		public static Ladder Instance{ get{ return m_Instance; } set{ m_Instance = value; } }
+		public static Ladder Instance{ get => m_Instance;
+			set => m_Instance = value;
+		}
 
 		public Ladder()
 		{
@@ -322,21 +322,28 @@ namespace Server.Engines.ConPVP
 		private int m_Index;
 		private Ladder m_Ladder;
 
-		public Mobile Mobile{ get{ return m_Mobile; } }
+		public Mobile Mobile => m_Mobile;
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
-		public int Experience{ get{ return m_Experience; } set{ m_Experience = value; m_Ladder.UpdateEntry(this); } }
+		public int Experience{ get => m_Experience;
+			set{ m_Experience = value; m_Ladder.UpdateEntry(this); } }
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
-		public int Wins{ get{ return m_Wins; } set{ m_Wins = value; } }
+		public int Wins{ get => m_Wins;
+			set => m_Wins = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
-		public int Losses{ get{ return m_Losses; } set{ m_Losses = value; } }
+		public int Losses{ get => m_Losses;
+			set => m_Losses = value;
+		}
 
-		public int Index{ get{ return m_Index; } set{ m_Index = value; } }
+		public int Index{ get => m_Index;
+			set => m_Index = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public int Rank{ get{ return m_Index; } }
+		public int Rank => m_Index;
 
 		public LadderEntry( Mobile mob, Ladder ladder )
 		{

Scripts/Engines/ConPVP/LadderGump.cs

@@ -12,14 +12,11 @@ namespace Server.Engines.ConPVP
 		[CommandProperty( AccessLevel.GameMaster )]
 		public LadderController Ladder
 		{
-			get{ return m_Ladder; }
+			get => m_Ladder;
-			set{ m_Ladder = value; }
+			set => m_Ladder = value;
 		}
 
-		public override string DefaultName
+		public override string DefaultName => "1v1 leaderboard";
-		{
-			get { return "1v1 leaderboard"; }
-		}
 
 		[Constructible]
 		public LadderItem() : base( 0x117F )

Scripts/Engines/ConPVP/Participant.cs

@@ -10,10 +10,12 @@ namespace Server.Engines.ConPVP
 		private DuelPlayer[] m_Players;
 		private TournyParticipant m_TournyPart;
 
-		public int Count{ get{ return m_Players.Length; } }
+		public int Count => m_Players.Length;
-		public DuelPlayer[] Players{ get{ return m_Players; } }
+		public DuelPlayer[] Players => m_Players;
-		public DuelContext Context{ get{ return m_Context; } }
+		public DuelContext Context => m_Context;
-		public TournyParticipant TournyPart{ get{ return m_TournyPart; } set{ m_TournyPart = value; } }
+		public TournyParticipant TournyPart{ get => m_TournyPart;
+			set => m_TournyPart = value;
+		}
 
 		public DuelPlayer Find( Mobile mob )
 		{
@@ -215,10 +217,15 @@ namespace Server.Engines.ConPVP
 		private bool m_Ready;
 		private Participant m_Participant;
 
-		public Mobile Mobile{ get{ return m_Mobile; } }
+		public Mobile Mobile => m_Mobile;
-		public bool Ready{ get{ return m_Ready; } set{ m_Ready = value; } }
+		public bool Ready{ get => m_Ready;
-		public bool Eliminated{ get{ return m_Eliminated; } set{ m_Eliminated = value; if ( m_Participant.Context.m_Tournament != null && m_Eliminated ){ m_Participant.Context.m_Tournament.OnEliminated( this ); m_Mobile.SendEverything(); } } }
+			set => m_Ready = value;
-		public Participant Participant{ get{ return m_Participant; } set{ m_Participant = value; } }
+		}
+		public bool Eliminated{ get => m_Eliminated;
+			set{ m_Eliminated = value; if ( m_Participant.Context.m_Tournament != null && m_Eliminated ){ m_Participant.Context.m_Tournament.OnEliminated( this ); m_Mobile.SendEverything(); } } }
+		public Participant Participant{ get => m_Participant;
+			set => m_Participant = value;
+		}
 
 		public DuelPlayer( Mobile mob, Participant p )
 		{

Scripts/Engines/ConPVP/ParticipantGump.cs

@@ -12,9 +12,9 @@ namespace Server.Engines.ConPVP
 		private DuelContext m_Context;
 		private Participant m_Participant;
 
-		public Mobile From{ get{ return m_From; } }
+		public Mobile From => m_From;
-		public DuelContext Context{ get{ return m_Context; } }
+		public DuelContext Context => m_Context;
-		public Participant Participant{ get{ return m_Participant; } }
+		public Participant Participant => m_Participant;
 
 		public string Center( string text )
 		{

Scripts/Engines/ConPVP/Preferences.cs

@@ -11,12 +11,10 @@ namespace Server.Engines.ConPVP
 		private Preferences m_Preferences;
 
 		//[CommandProperty( AccessLevel.GameMaster )]
-		public Preferences Preferences{ get{ return m_Preferences; } set{} }
+		public Preferences Preferences{ get => m_Preferences;
+			set{} }
 
-		public override string DefaultName
+		public override string DefaultName => "preferences controller";
-		{
-			get { return "preferences controller"; }
-		}
 
 		[Constructible]
 		public PreferencesController() : base( 0x1B7A )
@@ -74,7 +72,7 @@ namespace Server.Engines.ConPVP
 		private ArrayList m_Entries;
 		private Hashtable m_Table;
 
-		public ArrayList Entries{ get{ return m_Entries; } }
+		public ArrayList Entries => m_Entries;
 
 		public PreferencesEntry Find( Mobile mob )
 		{
@@ -91,7 +89,9 @@ namespace Server.Engines.ConPVP
 
 		private static Preferences m_Instance;
 
-		public static Preferences Instance{ get{ return m_Instance; } set{ m_Instance = value; } }
+		public static Preferences Instance{ get => m_Instance;
+			set => m_Instance = value;
+		}
 
 		public Preferences()
 		{
@@ -145,8 +145,8 @@ namespace Server.Engines.ConPVP
 		private ArrayList m_Disliked;
 		private Preferences m_Preferences;
 
-		public Mobile Mobile{ get{ return m_Mobile; } }
+		public Mobile Mobile => m_Mobile;
-		public ArrayList Disliked{ get{ return m_Disliked; } }
+		public ArrayList Disliked => m_Disliked;
 
 		public PreferencesEntry( Mobile mob, Preferences prefs )
 		{

Scripts/Engines/ConPVP/Ruleset.cs

@@ -12,13 +12,17 @@ namespace Server.Engines.ConPVP
 		private ArrayList m_Flavors = new ArrayList();
 		private bool m_Changed;
 
-		public RulesetLayout Layout{ get{ return m_Layout; } }
+		public RulesetLayout Layout => m_Layout;
-		public BitArray Options{ get{ return m_Options; } }
+		public BitArray Options => m_Options;
-		public string Title{ get{ return m_Title; } set{ m_Title = value; } }
+		public string Title{ get => m_Title;
+			set => m_Title = value;
+		}
 
-		public Ruleset Base{ get{ return m_Base; } }
+		public Ruleset Base => m_Base;
-		public ArrayList Flavors{ get{ return m_Flavors; } }
+		public ArrayList Flavors => m_Flavors;
-		public bool Changed{ get{ return m_Changed; } set{ m_Changed = value; } }
+		public bool Changed{ get => m_Changed;
+			set => m_Changed = value;
+		}
 
 		public void ApplyDefault( Ruleset newDefault )
 		{

Scripts/Engines/ConPVP/RulesetLayout.cs

@@ -660,18 +660,22 @@ namespace Server.Engines.ConPVP
 		private RulesetLayout m_Parent;
 		private RulesetLayout[] m_Children;
 
-		public string Title{ get{ return m_Title; } }
+		public string Title => m_Title;
-		public string Description{ get{ return m_Description; } }
+		public string Description => m_Description;
-		public string[] Options{ get{ return m_Options; } }
+		public string[] Options => m_Options;
 
-		public int Offset{ get{ return m_Offset; } }
+		public int Offset => m_Offset;
-		public int TotalLength{ get{ return m_TotalLength; } }
+		public int TotalLength => m_TotalLength;
 
-		public RulesetLayout Parent{ get{ return m_Parent; } }
+		public RulesetLayout Parent => m_Parent;
-		public RulesetLayout[] Children{ get{ return m_Children; } }
+		public RulesetLayout[] Children => m_Children;
 
-		public Ruleset[] Defaults{ get{ return m_Defaults; } set{ m_Defaults = value; } }
+		public Ruleset[] Defaults{ get => m_Defaults;
-		public Ruleset[] Flavors{ get{ return m_Flavors; } set{ m_Flavors = value; } }
+			set => m_Defaults = value;
+		}
+		public Ruleset[] Flavors{ get => m_Flavors;
+			set => m_Flavors = value;
+		}
 
 		public RulesetLayout FindByTitle( string title )
 		{

Scripts/Engines/ConPVP/Tournament.cs

@@ -41,7 +41,9 @@ namespace Server.Engines.ConPVP
 		private TournamentController m_Tournament;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
+		public TournamentController Tournament{ get => m_Tournament;
+			set => m_Tournament = value;
+		}
 
 		[Constructible]
 		public TournamentRegistrar()
@@ -138,16 +140,17 @@ namespace Server.Engines.ConPVP
 		private Mobile m_Registrar;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
+		public TournamentController Tournament{ get => m_Tournament;
+			set => m_Tournament = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Mobile Registrar{ get{ return m_Registrar; } set{ m_Registrar = value; } }
+		public Mobile Registrar{ get => m_Registrar;
-
+			set => m_Registrar = value;
-		public override string DefaultName
-		{
-			get { return "tournament signup book"; }
 		}
 
+		public override string DefaultName => "tournament signup book";
+
 		[Constructible]
 		public TournamentSignupItem() : base( 4029 )
 		{
@@ -1186,7 +1189,8 @@ namespace Server.Engines.ConPVP
 		private Tournament m_Tournament;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Tournament Tournament{ get{ return m_Tournament; } set{} }
+		public Tournament Tournament{ get => m_Tournament;
+			set{} }
 
 		private static ArrayList m_Instances = new ArrayList();
 
@@ -1206,10 +1210,7 @@ namespace Server.Engines.ConPVP
 			}
 		}
 
-		public override string DefaultName
+		public override string DefaultName => "tournament controller";
-		{
-			get { return "tournament controller"; }
-		}
 
 		[Constructible]
 		public TournamentController() : base( 0x1B7A )
@@ -1360,139 +1361,132 @@ namespace Server.Engines.ConPVP
 
 		private EventController m_EventController;
 
-		public bool IsNotoRestricted { get { return ( m_TournyType != TournyType.Standard ); } }
+		public bool IsNotoRestricted => ( m_TournyType != TournyType.Standard );
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public EventController EventController
 		{
-			get { return m_EventController; }
+			get => m_EventController;
-			set { m_EventController = value; }
+			set => m_EventController = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int SuddenDeathRounds
 		{
-			get{ return m_SuddenDeathRounds; }
+			get => m_SuddenDeathRounds;
-			set{ m_SuddenDeathRounds = value; }
+			set => m_SuddenDeathRounds = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TournyType TournyType
 		{
-			get{ return m_TournyType; }
+			get => m_TournyType;
-			set{ m_TournyType = value; }
+			set => m_TournyType = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public GroupingType GroupType
 		{
-			get{ return m_GroupType; }
+			get => m_GroupType;
-			set{ m_GroupType = value; }
+			set => m_GroupType = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TieType TieType
 		{
-			get{ return m_TieType; }
+			get => m_TieType;
-			set{ m_TieType = value; }
+			set => m_TieType = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TimeSpan SuddenDeath
 		{
-			get{ return m_SuddenDeath; }
+			get => m_SuddenDeath;
-			set{ m_SuddenDeath = value; }
+			set => m_SuddenDeath = value;
 		}
 
 		public Ruleset Ruleset
 		{
-			get{ return m_Ruleset; }
+			get => m_Ruleset;
-			set{ m_Ruleset = value; }
+			set => m_Ruleset = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int ParticipantsPerMatch
 		{
-			get{ return m_ParticipantsPerMatch; }
+			get => m_ParticipantsPerMatch;
 			set{ if ( value < 2 ) value = 2; else if ( value > 10 ) value = 10; m_ParticipantsPerMatch = value; }
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int PlayersPerParticipant
 		{
-			get{ return m_PlayersPerParticipant; }
+			get => m_PlayersPerParticipant;
 			set{ if ( value < 1 ) value = 1; else if ( value > 10 ) value = 10; m_PlayersPerParticipant = value; }
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public int LevelRequirement
 		{
-			get{ return m_LevelRequirement; }
+			get => m_LevelRequirement;
-			set{ m_LevelRequirement = value; }
+			set => m_LevelRequirement = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool FactionRestricted
 		{
-			get{ return m_FactionRestricted; }
+			get => m_FactionRestricted;
-			set{ m_FactionRestricted = value; }
+			set => m_FactionRestricted = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public TimeSpan SignupPeriod
 		{
-			get{ return m_SignupPeriod; }
+			get => m_SignupPeriod;
-			set{ m_SignupPeriod = value; }
+			set => m_SignupPeriod = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public DateTime SignupStart
 		{
-			get{ return m_SignupStart; }
+			get => m_SignupStart;
-			set{ m_SignupStart = value; }
+			set => m_SignupStart = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public TournamentStage CurrentStage
+		public TournamentStage CurrentStage => m_Stage;
-		{
-			get{ return m_Stage; }
-		}
 
 		public TournamentStage Stage
 		{
-			get{ return m_Stage; }
+			get => m_Stage;
-			set{ m_Stage = value; }
+			set => m_Stage = value;
 		}
 
 		public TournyPyramid Pyramid
 		{
-			get{ return m_Pyramid; }
+			get => m_Pyramid;
-			set{ m_Pyramid = value; }
+			set => m_Pyramid = value;
 		}
 
 		public ArrayList Arenas
 		{
-			get{ return m_Arenas; }
+			get => m_Arenas;
-			set{ m_Arenas = value; }
+			set => m_Arenas = value;
 		}
 
 		public ArrayList Participants
 		{
-			get{ return m_Participants; }
+			get => m_Participants;
-			set{ m_Participants = value; }
+			set => m_Participants = value;
 		}
 
 		public ArrayList Undefeated
 		{
-			get{ return m_Undefeated; }
+			get => m_Undefeated;
-			set{ m_Undefeated = value; }
+			set => m_Undefeated = value;
 		}
 
-		public bool IsFactionRestricted {
+		public bool IsFactionRestricted => ( m_FactionRestricted || m_TournyType == TournyType.Faction );
-			get {
-				return ( m_FactionRestricted || m_TournyType == TournyType.Faction );
-			}
-		}
 
 		public bool HasParticipant( Mobile mob )
 		{
@@ -2255,8 +2249,8 @@ namespace Server.Engines.ConPVP
 
 		public ArrayList Levels
 		{
-			get{ return m_Levels; }
+			get => m_Levels;
-			set{ m_Levels = value; }
+			set => m_Levels = value;
 		}
 
 		public TournyPyramid()
@@ -2443,14 +2437,14 @@ namespace Server.Engines.ConPVP
 
 		public ArrayList Matches
 		{
-			get{ return m_Matches; }
+			get => m_Matches;
-			set{ m_Matches = value; }
+			set => m_Matches = value;
 		}
 
 		public TournyParticipant FreeAdvance
 		{
-			get{ return m_FreeAdvance; }
+			get => m_FreeAdvance;
-			set{ m_FreeAdvance = value; }
+			set => m_FreeAdvance = value;
 		}
 
 		public PyramidLevel()
@@ -2467,26 +2461,23 @@ namespace Server.Engines.ConPVP
 
 		public ArrayList Participants
 		{
-			get{ return m_Participants; }
+			get => m_Participants;
-			set{ m_Participants = value; }
+			set => m_Participants = value;
 		}
 
 		public TournyParticipant Winner
 		{
-			get{ return m_Winner; }
+			get => m_Winner;
-			set{ m_Winner = value; }
+			set => m_Winner = value;
 		}
 
 		public DuelContext Context
 		{
-			get{ return m_Context; }
+			get => m_Context;
-			set{ m_Context = value; }
+			set => m_Context = value;
 		}
 
-		public bool InProgress
+		public bool InProgress => ( m_Context != null && m_Context.Registered );
-		{
-			get{ return ( m_Context != null && m_Context.Registered ); }
-		}
 
 		public void Start( Arena arena, Tournament tourny )
 		{
@@ -2601,20 +2592,20 @@ namespace Server.Engines.ConPVP
 
 		public ArrayList Players
 		{
-			get{ return m_Players; }
+			get => m_Players;
-			set{ m_Players = value; }
+			set => m_Players = value;
 		}
 
 		public ArrayList Log
 		{
-			get{ return m_Log; }
+			get => m_Log;
-			set{ m_Log = value; }
+			set => m_Log = value;
 		}
 
 		public int FreeAdvances
 		{
-			get{ return m_FreeAdvances; }
+			get => m_FreeAdvances;
-			set{ m_FreeAdvances = value; }
+			set => m_FreeAdvances = value;
 		}
 
 		public int TotalLadderXP
@@ -3520,13 +3511,12 @@ namespace Server.Engines.ConPVP
 		private TournamentController m_Tournament;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
+		public TournamentController Tournament{ get => m_Tournament;
-
+			set => m_Tournament = value;
-		public override string DefaultName
-		{
-			get { return "tournament bracket"; }
 		}
 
+		public override string DefaultName => "tournament bracket";
+
 		[Constructible]
 		public TournamentBracketItem() : base( 3774 )
 		{

Scripts/Engines/ConPVP/Trophy.cs

@@ -18,16 +18,21 @@ namespace Server.Items
 		private DateTime m_Date;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public string Title{ get{ return m_Title; } set{ m_Title = value; } }
+		public string Title{ get => m_Title;
+			set => m_Title = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public TrophyRank Rank{ get{ return m_Rank; } set{ m_Rank = value; UpdateStyle(); } }
+		public TrophyRank Rank{ get => m_Rank;
+			set{ m_Rank = value; UpdateStyle(); } }
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public Mobile Owner{ get{ return m_Owner; } set{ m_Owner = value; } }
+		public Mobile Owner{ get => m_Owner;
+			set => m_Owner = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public DateTime Date{ get{ return m_Date; } }
+		public DateTime Date => m_Date;
 
 		[Constructible]
 		public Trophy( string title, TrophyRank rank ) : base( 5020 )

Scripts/Engines/Craft/Core/CraftContext.cs

@@ -19,11 +19,21 @@ namespace Server.Engines.Craft
 		private CraftMarkOption m_MarkOption;
 
 		public List<CraftItem> Items  => m_Items;
-		public int LastResourceIndex{ get{ return m_LastResourceIndex; } set{ m_LastResourceIndex = value; } }
+		public int LastResourceIndex{ get => m_LastResourceIndex;
-		public int LastResourceIndex2{ get{ return m_LastResourceIndex2; } set{ m_LastResourceIndex2 = value; } }
+			set => m_LastResourceIndex = value;
-		public int LastGroupIndex{ get{ return m_LastGroupIndex; } set{ m_LastGroupIndex = value; } }
+		}
-		public bool DoNotColor{ get{ return m_DoNotColor; } set{ m_DoNotColor = value; } }
+		public int LastResourceIndex2{ get => m_LastResourceIndex2;
-		public CraftMarkOption MarkOption{ get{ return m_MarkOption; } set{ m_MarkOption = value; } }
+			set => m_LastResourceIndex2 = value;
+		}
+		public int LastGroupIndex{ get => m_LastGroupIndex;
+			set => m_LastGroupIndex = value;
+		}
+		public bool DoNotColor{ get => m_DoNotColor;
+			set => m_DoNotColor = value;
+		}
+		public CraftMarkOption MarkOption{ get => m_MarkOption;
+			set => m_MarkOption = value;
+		}
 
 		public CraftContext()
 		{

Scripts/Engines/Craft/Core/CraftGroup.cs

@@ -19,19 +19,10 @@ namespace Server.Engines.Craft
 			m_arCraftItem.Add( craftItem );
 		}
 
-		public CraftItemCol CraftItems
+		public CraftItemCol CraftItems => m_arCraftItem;
-		{
-			get { return m_arCraftItem; }
-		}
 
-		public string NameString
+		public string NameString => m_NameString;
-		{
-			get { return m_NameString; }
-		}
 
-		public int NameNumber
+		public int NameNumber => m_NameNumber;
-		{
-			get { return m_NameNumber; }
-		}
 	}
 }

Scripts/Engines/Craft/Core/CraftItem.cs

@@ -49,24 +49,21 @@ namespace Server.Engines.Craft
 
 		public bool ForceNonExceptional
 		{
-			get { return m_ForceNonExceptional; }
+			get => m_ForceNonExceptional;
-			set { m_ForceNonExceptional = value; }
+			set => m_ForceNonExceptional = value;
 		}
 
 		private Expansion m_RequiredExpansion;
 
 		public Expansion RequiredExpansion
 		{
-			get { return m_RequiredExpansion; }
+			get => m_RequiredExpansion;
-			set { m_RequiredExpansion = value; }
+			set => m_RequiredExpansion = value;
 		}
 
 		private Recipe m_Recipe;
 
-		public Recipe Recipe
+		public Recipe Recipe => m_Recipe;
-		{
-			get { return m_Recipe; }
-		}
 
 		public void AddRecipe( int id, CraftSystem system )
 		{
@@ -148,8 +145,8 @@ namespace Server.Engines.Craft
 
 		public BeverageType RequiredBeverage
 		{
-			get { return m_RequiredBeverage; }
+			get => m_RequiredBeverage;
-			set { m_RequiredBeverage = value; }
+			set => m_RequiredBeverage = value;
 		}
 
 		public void AddRes( Type type, TextDefinition name, int amount )
@@ -172,92 +169,71 @@ namespace Server.Engines.Craft
 
 		public int Mana
 		{
-			get { return m_Mana; }
+			get => m_Mana;
-			set { m_Mana = value; }
+			set => m_Mana = value;
 		}
 
 		public int Hits
 		{
-			get { return m_Hits; }
+			get => m_Hits;
-			set { m_Hits = value; }
+			set => m_Hits = value;
 		}
 
 		public int Stam
 		{
-			get { return m_Stam; }
+			get => m_Stam;
-			set { m_Stam = value; }
+			set => m_Stam = value;
 		}
 
 		public bool UseSubRes2
 		{
-			get { return m_UseSubRes2; }
+			get => m_UseSubRes2;
-			set { m_UseSubRes2 = value; }
+			set => m_UseSubRes2 = value;
 		}
 
 		public bool UseAllRes
 		{
-			get { return m_UseAllRes; }
+			get => m_UseAllRes;
-			set { m_UseAllRes = value; }
+			set => m_UseAllRes = value;
 		}
 
 		public bool NeedHeat
 		{
-			get { return m_NeedHeat; }
+			get => m_NeedHeat;
-			set { m_NeedHeat = value; }
+			set => m_NeedHeat = value;
 		}
 
 		public bool NeedOven
 		{
-			get { return m_NeedOven; }
+			get => m_NeedOven;
-			set { m_NeedOven = value; }
+			set => m_NeedOven = value;
 		}
 
 		public bool NeedMill
 		{
-			get { return m_NeedMill; }
+			get => m_NeedMill;
-			set { m_NeedMill = value; }
+			set => m_NeedMill = value;
 		}
 
-		public Type ItemType
+		public Type ItemType => m_Type;
-		{
-			get { return m_Type; }
-		}
 
 		public int ItemHue
 		{
-			get { return m_ItemHue; }
+			get => m_ItemHue;
-			set { m_ItemHue = value; }
+			set => m_ItemHue = value;
 		}
 
-		public string GroupNameString
+		public string GroupNameString => m_GroupNameString;
-		{
-			get { return m_GroupNameString; }
-		}
 
-		public int GroupNameNumber
+		public int GroupNameNumber => m_GroupNameNumber;
-		{
-			get { return m_GroupNameNumber; }
-		}
 
-		public string NameString
+		public string NameString => m_NameString;
-		{
-			get { return m_NameString; }
-		}
 
-		public int NameNumber
+		public int NameNumber => m_NameNumber;
-		{
-			get { return m_NameNumber; }
-		}
 
-		public CraftResCol Resources
+		public CraftResCol Resources => m_arCraftRes;
-		{
-			get { return m_arCraftRes; }
-		}
 
-		public CraftSkillCol Skills
+		public CraftSkillCol Skills => m_arCraftSkill;
-		{
-			get { return m_arCraftSkill; }
-		}
 
 		public bool ConsumeAttributes( Mobile from, ref object message, bool consume )
 		{

Scripts/Engines/Craft/Core/CraftItemIDAttribute.cs

@@ -7,7 +7,7 @@ namespace Server.Engines.Craft
 	{
 		private int m_ItemID;
 
-		public int ItemID{ get{ return m_ItemID; } }
+		public int ItemID => m_ItemID;
 
 		public CraftItemIDAttribute( int itemID )
 		{

Scripts/Engines/Craft/Core/CraftRes.cs

@@ -38,34 +38,16 @@ namespace Server.Engines.Craft
 				from.SendLocalizedMessage( 502925 ); // You don't have the resources required to make that item.
 		}
 
-		public Type ItemType
+		public Type ItemType => m_Type;
-		{
-			get { return m_Type; }
-		}
 
-		public string MessageString
+		public string MessageString => m_MessageString;
-		{
-			get { return m_MessageString; }
-		}
 
-		public int MessageNumber
+		public int MessageNumber => m_MessageNumber;
-		{
-			get { return m_MessageNumber; }
-		}
 
-		public string NameString
+		public string NameString => m_NameString;
-		{
-			get { return m_NameString; }
-		}
 
-		public int NameNumber
+		public int NameNumber => m_NameNumber;
-		{
-			get { return m_NameNumber; }
-		}
 
-		public int Amount
+		public int Amount => m_Amount;
-		{
-			get { return m_Amount; }
-		}
 	}
 }

Scripts/Engines/Craft/Core/CraftSkill.cs

@@ -13,19 +13,10 @@ namespace Server.Engines.Craft
 			m_MaxSkill = maxSkill;
 		}
 
-		public SkillName SkillToMake
+		public SkillName SkillToMake => m_SkillToMake;
-		{
-			get { return m_SkillToMake; }
-		}
 
-		public double MinSkill
+		public double MinSkill => m_MinSkill;
-		{
-			get { return m_MinSkill; }
-		}
 
-		public double MaxSkill
+		public double MaxSkill => m_MaxSkill;
-		{
-			get { return m_MaxSkill; }
-		}
 	}
 }

Scripts/Engines/Craft/Core/CraftSubRes.cs

@@ -25,34 +25,16 @@ namespace Server.Engines.Craft
 			m_Message = message;
 		}
 
-		public Type ItemType
+		public Type ItemType => m_Type;
-		{
-			get { return m_Type; }
-		}
 
-		public string NameString
+		public string NameString => m_NameString;
-		{
-			get { return m_NameString; }
-		}
 
-		public int NameNumber
+		public int NameNumber => m_NameNumber;
-		{
-			get { return m_NameNumber; }
-		}
 
-		public int GenericNameNumber
+		public int GenericNameNumber => m_GenericNameNumber;
-		{
-			get { return m_GenericNameNumber; }
-		}
 
-		public object Message
+		public object Message => m_Message;
-		{
-			get { return m_Message; }
-		}
 
-		public double RequiredSkill
+		public double RequiredSkill => m_ReqSkill;
-		{
-			get { return m_ReqSkill; }
-		}
 	}
 }

Scripts/Engines/Craft/Core/CraftSubResCol.cs

@@ -11,26 +11,26 @@ namespace Server.Engines.Craft
 
 		public bool Init
 		{
-			get { return m_Init; }
+			get => m_Init;
-			set { m_Init = value; }
+			set => m_Init = value;
 		}
 				
 		public Type ResType
 		{
-			get { return m_Type; }
+			get => m_Type;
-			set { m_Type = value; }
+			set => m_Type = value;
 		}
 
 		public string NameString
 		{
-			get { return m_NameString; }
+			get => m_NameString;
-			set { m_NameString = value; }
+			set => m_NameString = value;
 		}
 
 		public int NameNumber
 		{
-			get { return m_NameNumber; }
+			get => m_NameNumber;
-			set { m_NameNumber = value; }
+			set => m_NameNumber = value;
 		}
 
 		public CraftSubResCol()

Scripts/Engines/Craft/Core/CraftSystem.cs

@@ -40,10 +40,10 @@ namespace Server.Engines.Craft
 
 		public abstract SkillName MainSkill{ get; }
 
-		public virtual int GumpTitleNumber{ get{ return 0; } }
+		public virtual int GumpTitleNumber => 0;
-		public virtual string GumpTitleString{ get{ return ""; } }
+		public virtual string GumpTitleString => "";
 
-		public virtual CraftECA ECA{ get{ return CraftECA.ChanceMinusSixty; } }
+		public virtual CraftECA ECA => CraftECA.ChanceMinusSixty;
 
 		private Dictionary<Mobile, CraftContext> m_ContextTable = new Dictionary<Mobile, CraftContext>();
 
@@ -83,26 +83,26 @@ namespace Server.Engines.Craft
 
 		public bool Resmelt
 		{
-			get { return m_Resmelt; }
+			get => m_Resmelt;
-			set { m_Resmelt = value; }
+			set => m_Resmelt = value;
 		}
 
 		public bool Repair
 		{
-			get{ return m_Repair; }
+			get => m_Repair;
-			set{ m_Repair = value; }
+			set => m_Repair = value;
 		}
 
 		public bool MarkOption
 		{
-			get{ return m_MarkOption; }
+			get => m_MarkOption;
-			set{ m_MarkOption = value; }
+			set => m_MarkOption = value;
 		}
 
 		public bool CanEnhance
 		{
-			get{ return m_CanEnhance; }
+			get => m_CanEnhance;
-			set{ m_CanEnhance = value; }
+			set => m_CanEnhance = value;
 		}
 
 		public CraftSystem( int minCraftEffect, int maxCraftEffect, double delay )

Scripts/Engines/Craft/Core/CustomCraft.cs

@@ -12,12 +12,12 @@ namespace Server.Engines.Craft
 		private BaseTool m_Tool;
 		private int m_Quality;
 
-		public Mobile From{ get{ return m_From; } }
+		public Mobile From => m_From;
-		public CraftItem CraftItem{ get{ return m_CraftItem; } }
+		public CraftItem CraftItem => m_CraftItem;
-		public CraftSystem CraftSystem{ get{ return m_CraftSystem; } }
+		public CraftSystem CraftSystem => m_CraftSystem;
-		public Type TypeRes{ get{ return m_TypeRes; } }
+		public Type TypeRes => m_TypeRes;
-		public BaseTool Tool{ get{ return m_Tool; } }
+		public BaseTool Tool => m_Tool;
-		public int Quality{ get{ return m_Quality; } }
+		public int Quality => m_Quality;
 
 		public CustomCraft( Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool, int quality )
 		{

Scripts/Engines/Craft/Core/Recipes.cs

@@ -68,30 +68,27 @@ namespace Server.Engines.Craft
 		public static Dictionary<int, Recipe> Recipes  => m_Recipes;
 
 		private static int m_LargestRecipeID;
-		public  static int LargestRecipeID{ get{ return m_LargestRecipeID; } }
+		public  static int LargestRecipeID => m_LargestRecipeID;
 
 		private CraftSystem m_System;
 
 		public CraftSystem CraftSystem
 		{
-			get { return m_System; }
+			get => m_System;
-			set { m_System = value; }
+			set => m_System = value;
 		}
 
 		private CraftItem m_CraftItem;
 
 		public CraftItem CraftItem
 		{
-			get { return m_CraftItem; }
+			get => m_CraftItem;
-			set { m_CraftItem = value; }
+			set => m_CraftItem = value;
 		}
 
 		private int m_ID;
 
-		public int ID
+		public int ID => m_ID;
-		{
-			get { return m_ID; }
-		}
 
 		private TextDefinition m_TD;
 		public TextDefinition TextDefinition

Scripts/Engines/Craft/DefAlchemy.cs

@@ -5,15 +5,9 @@ namespace Server.Engines.Craft
 {
 	public class DefAlchemy : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Alchemy;
-		{
-			get	{ return SkillName.Alchemy;	}
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044001;
-		{
-			get { return 1044001; } // <CENTER>ALCHEMY MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefBlacksmithy.cs

@@ -5,15 +5,9 @@ namespace Server.Engines.Craft
 {
 	public class DefBlacksmithy : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Blacksmith;
-		{
-			get	{ return SkillName.Blacksmith;	}
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044002;
-		{
-			get { return 1044002; } // <CENTER>BLACKSMITHY MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefBowFletching.cs

@@ -5,15 +5,9 @@ namespace Server.Engines.Craft
 {
 	public class DefBowFletching : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Fletching;
-		{
-			get	{ return SkillName.Fletching; }
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044006;
-		{
-			get { return 1044006; } // <CENTER>BOWCRAFT AND FLETCHING MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefCarpentry.cs

@@ -5,15 +5,9 @@ namespace Server.Engines.Craft
 {
 	public class DefCarpentry : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Carpentry;
-		{
-			get	{ return SkillName.Carpentry;	}
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044004;
-		{
-			get { return 1044004; } // <CENTER>CARPENTRY MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefCartography.cs

@@ -5,15 +5,9 @@ namespace Server.Engines.Craft
 {
 	public class DefCartography : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Cartography;
-		{
-			get	{ return SkillName.Cartography; }
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044008;
-		{
-			get { return 1044008; } // <CENTER>CARTOGRAPHY MENU</CENTER>
-		}
 
 		public override double GetChanceAtMin( CraftItem item )
 		{

Scripts/Engines/Craft/DefCooking.cs

@@ -5,15 +5,9 @@ namespace Server.Engines.Craft
 {
 	public class DefCooking : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Cooking;
-		{
-			get	{ return SkillName.Cooking;	}
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044003;
-		{
-			get { return 1044003; } // <CENTER>COOKING MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefGlassblowing.cs

@@ -6,15 +6,9 @@ namespace Server.Engines.Craft
 {
 	public class DefGlassblowing : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Alchemy;
-		{
-			get{ return SkillName.Alchemy; }
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044622;
-		{
-			get{ return 1044622; } // <CENTER>Glassblowing MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefInscription.cs

@@ -6,15 +6,9 @@ namespace Server.Engines.Craft
 {
 	public class DefInscription : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Inscribe;
-		{
-			get { return SkillName.Inscribe; }
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044009;
-		{
-			get { return 1044009; } // <CENTER>INSCRIPTION MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefMasonry.cs

@@ -6,15 +6,9 @@ namespace Server.Engines.Craft
 {
 	public class DefMasonry : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Carpentry;
-		{
-			get{ return SkillName.Carpentry; }
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044500;
-		{
-			get{ return 1044500; } // <CENTER>MASONRY MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefTailoring.cs

@@ -5,15 +5,9 @@ namespace Server.Engines.Craft
 {
 	public class DefTailoring : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Tailoring;
-		{
-			get	{ return SkillName.Tailoring; }
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044005;
-		{
-			get { return 1044005; } // <CENTER>TAILORING MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 

Scripts/Engines/Craft/DefTinkering.cs

@@ -7,15 +7,9 @@ namespace Server.Engines.Craft
 {
 	public class DefTinkering : CraftSystem
 	{
-		public override SkillName MainSkill
+		public override SkillName MainSkill => SkillName.Tinkering;
-		{
-			get	{ return SkillName.Tinkering; }
-		}
 
-		public override int GumpTitleNumber
+		public override int GumpTitleNumber => 1044007;
-		{
-			get { return 1044007; } // <CENTER>TINKERING MENU</CENTER>
-		}
 
 		private static CraftSystem m_CraftSystem;
 
@@ -388,7 +382,7 @@ namespace Server.Engines.Craft
 	{
 		private LockableContainer m_Container;
 
-		public LockableContainer Container{ get{ return m_Container; } }
+		public LockableContainer Container => m_Container;
 
 		public abstract TrapType TrapType{ get; }
 

Scripts/Engines/Doom/GauntletSpawner.cs

@@ -38,29 +38,29 @@ namespace Server.Engines.Doom
 		[CommandProperty( AccessLevel.GameMaster )]
 		public string TypeName
 		{
-			get{ return m_TypeName; }
+			get => m_TypeName;
-			set{ m_TypeName = value; }
+			set => m_TypeName = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public BaseDoor Door
 		{
-			get{ return m_Door; }
+			get => m_Door;
-			set{ m_Door = value; }
+			set => m_Door = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public BaseAddon Addon
 		{
-			get{ return m_Addon; }
+			get => m_Addon;
-			set{ m_Addon = value; }
+			set => m_Addon = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public GauntletSpawner Sequence
 		{
-			get{ return m_Sequence; }
+			get => m_Sequence;
-			set{ m_Sequence = value; }
+			set => m_Sequence = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
@@ -86,14 +86,14 @@ namespace Server.Engines.Doom
 		[CommandProperty( AccessLevel.GameMaster )]
 		public Rectangle2D RegionBounds
 		{
-			get{ return m_RegionBounds; }
+			get => m_RegionBounds;
-			set{ m_RegionBounds = value; }
+			set => m_RegionBounds = value;
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public GauntletSpawnerState State
 		{
-			get{ return m_State; }
+			get => m_State;
 			set
 			{
 				if ( m_State == value )
@@ -163,20 +163,20 @@ namespace Server.Engines.Doom
 
 		public List<Mobile> Creatures
 		{
-			get{ return m_Creatures; }
+			get => m_Creatures;
-			set{ m_Creatures = value; }
+			set => m_Creatures = value;
 		}
 
 		public List<BaseTrap> Traps
 		{
-			get{ return m_Traps; }
+			get => m_Traps;
-			set{ m_Traps = value; }
+			set => m_Traps = value;
 		}
 
 		public Region Region
 		{
-			get{ return m_Region; }
+			get => m_Region;
-			set{ m_Region = value; }
+			set => m_Region = value;
 		}
 
 		public virtual void CreateRegion()
@@ -380,10 +380,7 @@ namespace Server.Engines.Doom
 			}
 		}
 
-		public override string DefaultName
+		public override string DefaultName => "doom spawner";
-		{
-			get { return "doom spawner"; }
-		}
 
 		[Constructible]
 		public GauntletSpawner() : this( null )

Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs

@@ -58,15 +58,21 @@ namespace Server.Engines.Doom
 		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public UInt16 MyKey { get{ return m_MyKey; } set{ m_MyKey = value; } }
+		public UInt16 MyKey { get => m_MyKey;
+			set => m_MyKey = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public UInt16 TheirKey { get{ return m_TheirKey; } set{ m_TheirKey = value; } }
+		public UInt16 TheirKey { get => m_TheirKey;
+			set => m_TheirKey = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public bool Enabled { get{ return m_Enabled; } set{ m_Enabled = value; } }
+		public bool Enabled { get => m_Enabled;
+			set => m_Enabled = value;
+		}
 
-		public Mobile Successful { get{ return m_Successful; } }
+		public Mobile Successful => m_Successful;
 
 		public bool CircleComplete
 		{

Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs

@@ -99,10 +99,7 @@ namespace Server.Engines.Doom
 		private LeverPuzzleController m_Controller;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public UInt16 Code
+		public UInt16 Code => m_Code;
-		{
-			get{ return m_Code; }
-		}
 
 		public LeverPuzzleLever( UInt16 code, LeverPuzzleController controller ) : base( 0x108E )
 		{

Scripts/Engines/Ethics/Core/Ethic.cs

@@ -159,15 +159,9 @@ namespace Server.Ethics
 
 		protected PlayerCollection m_Players;
 
-		public EthicDefinition Definition
+		public EthicDefinition Definition => m_Definition;
-		{
-			get { return m_Definition; }
-		}
 
-		public PlayerCollection Players
+		public PlayerCollection Players => m_Players;
-		{
-			get { return m_Players; }
-		}
 
 		public static Ethic Find( Mobile mob )
 		{

Scripts/Engines/Ethics/Core/Persistance.cs

@@ -6,10 +6,7 @@ namespace Server.Ethics
 
 		public static EthicsPersistance Instance  => m_Instance;
 
-		public override string DefaultName
+		public override string DefaultName => "Ethics Persistance - Internal";
-		{
-			get { return "Ethics Persistance - Internal"; }
-		}
 
 		[Constructible]
 		public EthicsPersistance()

Scripts/Engines/Ethics/Core/Player.cs

@@ -56,16 +56,24 @@ namespace Server.Ethics
 		public Mobile Mobile  => m_Mobile;
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
-		public int Power { get { return m_Power; } set { m_Power = value; } }
+		public int Power { get => m_Power;
+			set => m_Power = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
-		public int History { get { return m_History; } set { m_History = value; } }
+		public int History { get => m_History;
+			set => m_History = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
-		public Mobile Steed { get { return m_Steed; } set { m_Steed = value; } }
+		public Mobile Steed { get => m_Steed;
+			set => m_Steed = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
-		public Mobile Familiar { get { return m_Familiar; } set { m_Familiar = value; } }
+		public Mobile Familiar { get => m_Familiar;
+			set => m_Familiar = value;
+		}
 
 		[CommandProperty( AccessLevel.GameMaster )]
 		public bool IsShielded

Scripts/Engines/Factions/Core/Election.cs

@@ -20,15 +20,16 @@ namespace Server.Factions
 		private ElectionState m_State;
 		private DateTime m_LastStateTime;
 
-		public Faction Faction{ get{ return m_Faction; } }
+		public Faction Faction => m_Faction;
 
 		public List<Candidate> Candidates  => m_Candidates;
 
-		public ElectionState State{ get{ return m_State; } set{ m_State = value; m_LastStateTime = DateTime.UtcNow; } }
+		public ElectionState State{ get => m_State;
-		public DateTime LastStateTime{ get{ return m_LastStateTime; } }
+			set{ m_State = value; m_LastStateTime = DateTime.UtcNow; } }
+		public DateTime LastStateTime => m_LastStateTime;
 
 		[CommandProperty( AccessLevel.GameMaster )]
-		public ElectionState CurrentState{ get{ return m_State; } }
+		public ElectionState CurrentState => m_State;
 
 		[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
 		public TimeSpan NextStateTime
@@ -383,25 +384,13 @@ namespace Server.Factions
 		private IPAddress m_Address;
 		private DateTime m_Time;
 
-		public Mobile From
+		public Mobile From => m_From;
-		{
-			get{ return m_From; }
-		}
 
-		public Mobile Candidate
+		public Mobile Candidate => m_Candidate;
-		{
-			get{ return m_Candidate; }
-		}
 
-		public IPAddress Address
+		public IPAddress Address => m_Address;
-		{
-			get{ return m_Address; }
-		}
 
-		public DateTime Time
+		public DateTime Time => m_Time;
-		{
-			get{ return m_Time; }
-		}
 
 		public object[] AcquireFields()
 		{
@@ -480,10 +469,10 @@ namespace Server.Factions
 		private Mobile m_Mobile;
 		private List<Voter> m_Voters;
 
-		public Mobile Mobile{ get{ return m_Mobile; } }
+		public Mobile Mobile => m_Mobile;
 		public List<Voter> Voters  => m_Voters;
 
-		public int Votes{ get{ return m_Voters.Count; } }
+		public int Votes => m_Voters.Count;
 
 		public void CleanMuleVotes()
 		{

Scripts/Engines/Factions/Core/Faction.cs

@@ -23,13 +23,13 @@ namespace Server.Factions
 
 		public StrongholdRegion StrongholdRegion
 		{
-			get{ return m_StrongholdRegion; }
+			get => m_StrongholdRegion;
-			set{ m_StrongholdRegion = value; }
+			set => m_StrongholdRegion = value;
 		}
 
 		public FactionDefinition Definition
 		{
-			get{ return m_Definition; }
+			get => m_Definition;
 			set
 			{
 				m_Definition = value;
@@ -39,46 +39,43 @@ namespace Server.Factions
 
 		public FactionState State
 		{
-			get{ return m_State; }
+			get => m_State;
-			set{ m_State = value; }
+			set => m_State = value;
 		}
 
 		public Election Election
 		{
-			get{ return m_State.Election; }
+			get => m_State.Election;
-			set{ m_State.Election = value; }
+			set => m_State.Election = value;
 		}
 
 		public Mobile Commander
 		{
-			get{ return m_State.Commander; }
+			get => m_State.Commander;
-			set{ m_State.Commander = value; }
+			set => m_State.Commander = value;
 		}
 
 		public int Tithe
 		{
-			get{ return m_State.Tithe; }
+			get => m_State.Tithe;
-			set{ m_State.Tithe = value; }
+			set => m_State.Tithe = value;
 		}
 
 		public int Silver
 		{
-			get{ return m_State.Silver; }
+			get => m_State.Silver;
-			set{ m_State.Silver = value; }
+			set => m_State.Silver = value;
 		}
 
 		public List<PlayerState> Members
 		{
-			get{ return m_State.Members; }
+			get => m_State.Members;
-			set{ m_State.Members = value; }
+			set => m_State.Members = value;
 		}
 
 		public static readonly TimeSpan LeavePeriod = TimeSpan.FromDays( 3.0 );
 
-		public bool FactionMessageReady
+		public bool FactionMessageReady => m_State.FactionMessageReady;
-		{
-			get{ return m_State.FactionMessageReady; }
-		}
 
 		public void Broadcast( string text )
 		{
@@ -948,12 +945,12 @@ namespace Server.Factions
 			return silver;
 		}
 
-		public virtual int MaximumTraps{ get{ return 15; } }
+		public virtual int MaximumTraps => 15;
 
 		public List<BaseFactionTrap> Traps
 		{
-			get{ return m_State.Traps; }
+			get => m_State.Traps;
-			set{ m_State.Traps = value; }
+			set => m_State.Traps = value;
 		}
 
 		public const int StabilityFactor = 300; // 300% greater (3 times) than smallest faction
@@ -1219,7 +1216,7 @@ namespace Server.Factions
 			writer.WriteEncodedInt( (int) (idx + 1) );
 		}
 
-		public static List<Faction> Factions{ get{ return Reflector.Factions; } }
+		public static List<Faction> Factions => Reflector.Factions;
 
 		public static Faction ReadReference( GenericReader reader )
 		{

Scripts/Engines/Factions/Core/FactionItem.cs

@@ -15,9 +15,9 @@ namespace Server.Factions
 		private Faction m_Faction;
 		private DateTime m_Expiration;
 
-		public Item Item{ get{ return m_Item; } }
+		public Item Item => m_Item;
-		public Faction Faction{ get{ return m_Faction; } }
+		public Faction Faction => m_Faction;
-		public DateTime Expiration{ get{ return m_Expiration; } }
+		public DateTime Expiration => m_Expiration;
 
 		public bool HasExpired
 		{

Scripts/Engines/Factions/Core/FactionState.cs

@@ -20,7 +20,9 @@ namespace Server.Factions
 
 		private DateTime[] m_LastBroadcasts = new DateTime[BroadcastsPerPeriod];
 
-		public DateTime LastAtrophy{ get{ return m_LastAtrophy; } set{ m_LastAtrophy = value; } }
+		public DateTime LastAtrophy{ get => m_LastAtrophy;
+			set => m_LastAtrophy = value;
+		}
 
 		public bool FactionMessageReady
 		{
@@ -36,7 +38,7 @@ namespace Server.Factions
 			}
 		}
 
-		public bool IsAtrophyReady{ get{ return DateTime.UtcNow >= (m_LastAtrophy + TimeSpan.FromHours( 47.0 )); } }
+		public bool IsAtrophyReady => DateTime.UtcNow >= (m_LastAtrophy + TimeSpan.FromHours( 47.0 ));
 
 		public int CheckAtrophy()
 		{
@@ -82,25 +84,25 @@ namespace Server.Factions
 
 		public List<FactionItem> FactionItems
 		{
-			get{ return m_FactionItems; }
+			get => m_FactionItems;
-			set{ m_FactionItems = value; }
+			set => m_FactionItems = value;
 		}
 
 		public List<BaseFactionTrap> Traps
 		{
-			get{ return m_FactionTraps; }
+			get => m_FactionTraps;
-			set{ m_FactionTraps = value; }
+			set => m_FactionTraps = value;
 		}
 
 		public Election Election
 		{
-			get{ return m_Election; }
+			get => m_Election;
-			set{ m_Election = value; }
+			set => m_Election = value;
 		}
 
 		public Mobile Commander
 		{
-			get{ return m_Commander; }
+			get => m_Commander;
 			set
 			{
 				if ( m_Commander != null )
@@ -127,20 +129,20 @@ namespace Server.Factions
 
 		public int Tithe
 		{
-			get{ return m_Tithe; }
+			get => m_Tithe;
-			set{ m_Tithe = value; }
+			set => m_Tithe = value;
 		}
 
 		public int Silver
 		{
-			get{ return m_Silver; }
+			get => m_Silver;
-			set{ m_Silver = value; }
+			set => m_Silver = value;
 		}
 
 		public List<PlayerState> Members
 		{
-			get{ return m_Members; }
+			get => m_Members;
-			set{ m_Members = value; }
+			set => m_Members = value;
 		}
 
 		public FactionState( Faction faction )

Scripts/Engines/Factions/Core/GuardList.cs

@@ -8,8 +8,8 @@ namespace Server.Factions
 		private GuardDefinition m_Definition;
 		private List<BaseFactionGuard> m_Guards;
 
-		public GuardDefinition Definition{ get{ return m_Definition; } }
+		public GuardDefinition Definition => m_Definition;
-		public List<BaseFactionGuard> Guards{ get{ return m_Guards; } }
+		public List<BaseFactionGuard> Guards => m_Guards;
 
 		public BaseFactionGuard Construct()
 		{

Scripts/Engines/Factions/Core/MerchantTitles.cs

@@ -18,11 +18,11 @@ namespace Server.Factions
 		private TextDefinition m_Label;
 		private TextDefinition m_Assigned;
 
-		public SkillName Skill{ get{ return m_Skill; } }
+		public SkillName Skill => m_Skill;
-		public double Requirement{ get{ return m_Requirement; } }
+		public double Requirement => m_Requirement;
-		public TextDefinition Title{ get{ return m_Title; } }
+		public TextDefinition Title => m_Title;
-		public TextDefinition Label{ get{ return m_Label; } }
+		public TextDefinition Label => m_Label;
-		public TextDefinition Assigned{ get{ return m_Assigned; } }
+		public TextDefinition Assigned => m_Assigned;
 
 		public MerchantTitleInfo( SkillName skill, double requirement, TextDefinition title, TextDefinition label, TextDefinition assigned )
 		{
@@ -46,7 +46,7 @@ namespace Server.Factions
 				new MerchantTitleInfo( SkillName.Tailoring,		90.0,	new TextDefinition( 1022982, "Tailor" ),		new TextDefinition( 1018300, "TAILOR" ),		new TextDefinition( 1042162, "You now have the faction title of Tailor" ) ),
 			};
 
-		public static MerchantTitleInfo[] Info{ get{ return m_Info; } }
+		public static MerchantTitleInfo[] Info => m_Info;
 
 		public static MerchantTitleInfo GetInfo( MerchantTitle title )
 		{

Scripts/Engines/Factions/Core/Persistance.cs

@@ -6,12 +6,9 @@ namespace Server.Factions
 	{
 		private static FactionPersistance m_Instance;
 
-		public static FactionPersistance Instance{ get{ return m_Instance; } }
+		public static FactionPersistance Instance => m_Instance;
 
-		public override string DefaultName
+		public override string DefaultName => "Faction Persistance - Internal";
-		{
-			get { return "Faction Persistance - Internal"; }
-		}
 
 		public FactionPersistance() : base( 1 )
 		{

Scripts/Engines/Factions/Core/PlayerState.cs

@@ -21,16 +21,19 @@ namespace Server.Factions
 
 		private DateTime m_LastHonorTime;
 
-		public Mobile Mobile{ get{ return m_Mobile; } }
+		public Mobile Mobile => m_Mobile;
-		public Faction Faction{ get{ return m_Faction; } }
+		public Faction Faction => m_Faction;
 		public List<PlayerState> Owner  => m_Owner;
-		public MerchantTitle MerchantTitle{ get{ return m_MerchantTitle; } set{ m_MerchantTitle = value; Invalidate(); } }
+		public MerchantTitle MerchantTitle{ get => m_MerchantTitle;
-		public Town Sheriff{ get{ return m_Sheriff; } set{ m_Sheriff = value; Invalidate(); } }
+			set{ m_MerchantTitle = value; Invalidate(); } }
-		public Town Finance{ get{ return m_Finance; } set{ m_Finance = value; Invalidate(); } }
+		public Town Sheriff{ get => m_Sheriff;
+			set{ m_Sheriff = value; Invalidate(); } }
+		public Town Finance{ get => m_Finance;
+			set{ m_Finance = value; Invalidate(); } }
 		public List<SilverGivenEntry> SilverGiven  => m_SilverGiven;
 
 		public int KillPoints {
-			get { return m_KillPoints; }
+			get => m_KillPoints;
 			set {
 				if ( m_KillPoints != value ) {
 					if ( value > m_KillPoints ) {
@@ -102,7 +105,8 @@ namespace Server.Factions
 		private bool m_InvalidateRank = true;
 		private int  m_RankIndex = -1;
 
-		public int RankIndex { get { return m_RankIndex; } set { if ( m_RankIndex != value ) { m_RankIndex = value; m_InvalidateRank = true; } } }
+		public int RankIndex { get => m_RankIndex;
+			set { if ( m_RankIndex != value ) { m_RankIndex = value; m_InvalidateRank = true; } } }
 
 		public RankDefinition Rank {
 			get {
@@ -134,11 +138,17 @@ namespace Server.Factions
 			}
 		}
 
-		public DateTime LastHonorTime{ get{ return m_LastHonorTime; } set{ m_LastHonorTime = value; } }
+		public DateTime LastHonorTime{ get => m_LastHonorTime;
-		public DateTime Leaving{ get{ return m_Leaving; } set{ m_Leaving = value; } }
+			set => m_LastHonorTime = value;
-		public bool IsLeaving{ get{ return ( m_Leaving > DateTime.MinValue ); } }
+		}
+		public DateTime Leaving{ get => m_Leaving;
+			set => m_Leaving = value;
+		}
+		public bool IsLeaving => ( m_Leaving > DateTime.MinValue );
 
-		public bool IsActive{ get{ return m_IsActive; } set{ m_IsActive = value; } }
+		public bool IsActive{ get => m_IsActive;
+			set => m_IsActive = value;
+		}
 
 		public bool CanGiveSilverTo( Mobile mob )
 		{

Scripts/Engines/Factions/Core/SilverGivenEntry.cs

@@ -9,10 +9,10 @@ namespace Server.Factions
 		private Mobile m_GivenTo;
 		private DateTime m_TimeOfGift;
 
-		public Mobile GivenTo{ get{ return m_GivenTo; } }
+		public Mobile GivenTo => m_GivenTo;
-		public DateTime TimeOfGift{ get{ return m_TimeOfGift; } }
+		public DateTime TimeOfGift => m_TimeOfGift;
 
-		public bool IsExpired{ get{ return ( m_TimeOfGift + ExpirePeriod ) < DateTime.UtcNow; } }
+		public bool IsExpired => ( m_TimeOfGift + ExpirePeriod ) < DateTime.UtcNow;
 
 		public SilverGivenEntry( Mobile givenTo )
 		{

Scripts/Engines/Factions/Core/StrongholdRegion.cs

@@ -9,8 +9,8 @@ namespace Server.Factions
 
 		public Faction Faction
 		{
-			get{ return m_Faction; }
+			get => m_Faction;
-			set{ m_Faction = value; }
+			set => m_Faction = value;
 		}
 
 		public StrongholdRegion( Faction faction ) : base( faction.Definition.FriendlyName, Faction.Facet, Region.DefaultPriority, faction.Definition.Stronghold.Area )

Scripts/Engines/Factions/Core/Town.cs

@@ -14,59 +14,56 @@ namespace Server.Factions
 
 		public TownDefinition Definition
 		{
-			get{ return m_Definition; }
+			get => m_Definition;
-			set{ m_Definition = value; }
+			set => m_Definition = value;
 		}
 
 		public TownState State
 		{
-			get{ return m_State; }
+			get => m_State;
 			set{ m_State = value; ConstructGuardLists(); }
 		}
 
 		public int Silver
 		{
-			get{ return m_State.Silver; }
+			get => m_State.Silver;
-			set{ m_State.Silver = value; }
+			set => m_State.Silver = value;
 		}
 
 		public Faction Owner
 		{
-			get{ return m_State.Owner; }
+			get => m_State.Owner;
-			set{ Capture( value ); }
+			set => Capture( value );
 		}
 
 		public Mobile Sheriff
 		{
-			get{ return m_State.Sheriff; }
+			get => m_State.Sheriff;
-			set{ m_State.Sheriff = value; }
+			set => m_State.Sheriff = value;
 		}
 
 		public Mobile Finance
 		{
-			get{ return m_State.Finance; }
+			get => m_State.Finance;
-			set{ m_State.Finance = value; }
+			set => m_State.Finance = value;
 		}
 
 		public int Tax
 		{
-			get{ return m_State.Tax; }
+			get => m_State.Tax;
-			set{ m_State.Tax = value; }
+			set => m_State.Tax = value;
 		}
 
 		public DateTime LastTaxChange
 		{
-			get{ return m_State.LastTaxChange; }
+			get => m_State.LastTaxChange;
-			set{ m_State.LastTaxChange = value; }
+			set => m_State.LastTaxChange = value;
 		}
 
 		public static readonly TimeSpan TaxChangePeriod = TimeSpan.FromHours( 12.0 );
 		public static readonly TimeSpan IncomePeriod = TimeSpan.FromDays( 1.0 );
 
-		public bool TaxChangeReady
+		public bool TaxChangeReady => ( m_State.LastTaxChange + TaxChangePeriod ) < DateTime.UtcNow;
-		{
-			get{ return ( m_State.LastTaxChange + TaxChangePeriod ) < DateTime.UtcNow; }
-		}
 
 		public static Town FromRegion( Region reg )
 		{
@@ -114,15 +111,9 @@ namespace Server.Factions
 			}
 		}
 
-		public int DailyIncome
+		public int DailyIncome => (10000 * (100 + m_State.Tax)) / 100;
-		{
-			get{ return (10000 * (100 + m_State.Tax)) / 100; }
-		}
 
-		public int NetCashFlow
+		public int NetCashFlow => DailyIncome - FinanceUpkeep - SheriffUpkeep;
-		{
-			get{ return DailyIncome - FinanceUpkeep - SheriffUpkeep; }
-		}
 
 		public TownMonolith Monolith
 		{
@@ -142,8 +133,8 @@ namespace Server.Factions
 
 		public DateTime LastIncome
 		{
-			get{ return m_State.LastIncome; }
+			get => m_State.LastIncome;
-			set{ m_State.LastIncome = value; }
+			set => m_State.LastIncome = value;
 		}
 
 		public void BeginOrderFiring( Mobile from )
@@ -258,14 +249,14 @@ namespace Server.Factions
 
 		public List<VendorList> VendorLists
 		{
-			get{ return m_VendorLists; }
+			get => m_VendorLists;
-			set{ m_VendorLists = value; }
+			set => m_VendorLists = value;
 		}
 
 		public List<GuardList> GuardLists
 		{
-			get{ return m_GuardLists; }
+			get => m_GuardLists;
-			set{ m_GuardLists = value; }
+			set => m_GuardLists = value;
 		}
 
 		public void ConstructGuardLists()